Commit 466a121f authored by radow's avatar radow

final push

parent 0ec89832
......@@ -1844,7 +1844,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: A Kings Tale
m_text: A benevolent Ruler
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
......@@ -1910,10 +1910,10 @@ MonoBehaviour:
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: -434.4491, w: -72.03297}
m_margin: {x: 0, y: 0, z: -597.0359, w: -72.03297}
m_textInfo:
textComponent: {fileID: 139988169}
characterCount: 12
characterCount: 18
spriteCount: 0
spaceCount: 2
wordCount: 3
......@@ -2413,7 +2413,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 36
m_fontSize: 18
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
......@@ -2430,7 +2430,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_firstOverflowCharacterIndex: 0
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
......@@ -2459,7 +2459,7 @@ MonoBehaviour:
spaceCount: 9
wordCount: 10
linkCount: 0
lineCount: 1
lineCount: 4
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
......@@ -6711,22 +6711,32 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 133.09
objectReference: {fileID: 0}
- target: {fileID: 9034003901906512278, guid: 909f3c4e4d1386e47a7563fbe33e101e,
- target: {fileID: 5785807960476185052, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_IsActive
value: 1
propertyPath: m_LocalPosition.y
value: -3.06
objectReference: {fileID: 0}
- target: {fileID: 9034003902041976135, guid: 909f3c4e4d1386e47a7563fbe33e101e,
- target: {fileID: 5785807960414000053, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_IsActive
value: 1
propertyPath: m_LocalPosition.y
value: -1.69
objectReference: {fileID: 0}
- target: {fileID: 9034003902130934256, guid: 909f3c4e4d1386e47a7563fbe33e101e,
- target: {fileID: 5785807960089643464, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.12
objectReference: {fileID: 0}
- target: {fileID: 5785807959665798883, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.29
objectReference: {fileID: 0}
- target: {fileID: 9034003902041976135, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9034003902667746435, guid: 909f3c4e4d1386e47a7563fbe33e101e,
- target: {fileID: 9034003901906512278, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_IsActive
value: 1
......@@ -6742,6 +6752,16 @@ PrefabInstance:
value:
objectReference: {fileID: 11400000, guid: a7ae60198bf804447b2b5d62bec22725,
type: 2}
- target: {fileID: 9034003902667746435, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9034003902130934256, guid: 909f3c4e4d1386e47a7563fbe33e101e,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 909f3c4e4d1386e47a7563fbe33e101e, type: 3}
--- !u!1 &667450777
......@@ -18717,6 +18737,97 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5539498db20178749abeaeb0f5f457b1, type: 3}
--- !u!1 &2014087972
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2014087974}
- component: {fileID: 2014087973}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &2014087973
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2014087972}
m_Enabled: 1
serializedVersion: 9
m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 100
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &2014087974
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2014087972}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -32, y: 62.56, z: -109.27}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2031808349
GameObject:
m_ObjectHideFlags: 0
......@@ -18823,6 +18934,97 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2031808349}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &2041249628
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2041249630}
- component: {fileID: 2041249629}
m_Layer: 0
m_Name: Point Light (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &2041249629
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041249628}
m_Enabled: 1
serializedVersion: 9
m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 100
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &2041249630
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041249628}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -27.99, y: 65.28, z: -115.09}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2043387909
GameObject:
m_ObjectHideFlags: 0
......
......@@ -48,7 +48,7 @@ public class InputMode : MonoBehaviour {
public void UpdateCursorMode() {
if (mode == InputModeType.movement) {
Cursor.visible = true;
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
} else {
// mode UI
......
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
fileFormatVersion: 2
guid: adf4bba33e2644447b016784b62e8654
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 105758ea38dca4e42baba16a00477206
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment