diff --git a/Assets/Materials/GameMaps/Cloud_Less_Transparent.mat b/Assets/Materials/GameMaps/Cloud_Less_Transparent.mat index 9d1da83..50b7df7 100644 --- a/Assets/Materials/GameMaps/Cloud_Less_Transparent.mat +++ b/Assets/Materials/GameMaps/Cloud_Less_Transparent.mat @@ -62,9 +62,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 10 - _GlossMapScale: 1 - - _Glossiness: 0.965 + - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0.04 + - _Metallic: 0.401 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 79f4e28..a976340 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -95,12 +95,12 @@ RectTransform: m_Children: - {fileID: 1940098996962384946} m_Father: {fileID: 6646697163860434457} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.84400004, y: 0.13833334} m_AnchorMax: {x: 0.97400004, y: 0.34833336} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12.55693, y: 0.000008940697} + m_SizeDelta: {x: -29.999971, y: 0.000008940697} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1888588563216479368 CanvasRenderer: @@ -1083,10 +1083,10 @@ MonoBehaviour: type: 3} rightSlider: {fileID: 945030074400270222} leftSlider: {fileID: 945030072350155240} - joyStick: {fileID: 4226612651353688298} + joyStick: {fileID: 8022091355045614810} buttonState: 0 mobileHUD: - - {fileID: 4226612651353688294} + - {fileID: 8022091355045614806} - {fileID: 100827383465574966} healthSlider: {fileID: 8726250258631462083} loadingSlider: {fileID: 3775315357151066026} @@ -1575,7 +1575,7 @@ RectTransform: m_Children: - {fileID: 7589982691116345272} m_Father: {fileID: 6646697163860434457} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.42800003, y: 0.84333336} m_AnchorMax: {x: 0.57100004, y: 0.88500005} @@ -3250,20 +3250,6 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &3839555146410184728 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4226612651353688294} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1254083943, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AspectMode: 2 - m_AspectRatio: 1 --- !u!1 &4246707839883830758 GameObject: m_ObjectHideFlags: 0 @@ -5827,10 +5813,10 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 6220372457767316561} - - {fileID: 4226612651353688295} - {fileID: 196436387805544896} - {fileID: 6600621986648208414} - {fileID: 3195868577025373971} + - {fileID: 8022091355045614807} m_Father: {fileID: 945030072491325364} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6388,7 +6374,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6646697163860434457} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6689,174 +6675,6 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1001 &1297382757894453525 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6646697163860434457} - m_Modifications: - - target: {fileID: 2929252283123773939, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_Name - value: Fixed Joystick - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773937, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_SizeDelta.x - value: -5.926575 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.024 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.04166667 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.19000001 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.32666668 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} ---- !u!224 &4226612651353688295 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - m_PrefabInstance: {fileID: 1297382757894453525} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4226612651353688294 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2929252283123773939, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - m_PrefabInstance: {fileID: 1297382757894453525} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4226612651353688298 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2929252283123773951, guid: aaa2c939c0359ac4dbce3f49e8b90252, - type: 3} - m_PrefabInstance: {fileID: 1297382757894453525} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4226612651353688294} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45977bbae16431c46a013576a1aea384, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2625541246504091517 PrefabInstance: m_ObjectHideFlags: 0 @@ -6874,6 +6692,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2266308252924829166, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.000118043026 + objectReference: {fileID: 0} - target: {fileID: 7803677551726798179, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_SizeDelta.y @@ -6882,7 +6705,7 @@ PrefabInstance: - target: {fileID: 7803677551726798179, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.0000031740985 + value: 0.0000013447348 objectReference: {fileID: 0} - target: {fileID: 7735760150557661153, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -6987,7 +6810,7 @@ PrefabInstance: - target: {fileID: 6400199293123500513, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000037399703 + value: 0.0000035686373 objectReference: {fileID: 0} - target: {fileID: 4210144800760519078, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7517,7 +7340,7 @@ PrefabInstance: - target: {fileID: 533522877875429715, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_Value - value: 0.99999917 + value: 0.99999905 objectReference: {fileID: 0} - target: {fileID: 200140249942791754, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7537,12 +7360,22 @@ PrefabInstance: - target: {fileID: 287378819081046367, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000022888184 + value: 0.0000076293945 objectReference: {fileID: 0} - target: {fileID: 287378819081046367, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000030517578 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2127299112632661598, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_havePropertiesChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2127299112632661598, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_isInputParsingRequired + value: 0 objectReference: {fileID: 0} - target: {fileID: 7223862839018914468, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7554,6 +7387,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7223862839018914468, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8390974785336881647, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_AnchorMin.y @@ -7582,7 +7420,12 @@ PrefabInstance: - target: {fileID: 9149273566660902038, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_Size - value: 0.99999994 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9149273566660902038, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_Value + value: 0 objectReference: {fileID: 0} - target: {fileID: 4690460977172141611, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7594,6 +7437,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4690460977172141611, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6767292794603522796, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_AnchorMin.y @@ -7622,7 +7470,12 @@ PrefabInstance: - target: {fileID: 6456528504592396649, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_Size - value: 0.99999994 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6456528504592396649, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_Value + value: 0 objectReference: {fileID: 0} - target: {fileID: 974017672529888583, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7644,6 +7497,11 @@ PrefabInstance: propertyPath: m_Value value: 0 objectReference: {fileID: 0} + - target: {fileID: 670108021117200637, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1802172742113746851, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -7697,7 +7555,7 @@ PrefabInstance: - target: {fileID: 6297930802900580632, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_Size - value: 0.99999994 + value: 1 objectReference: {fileID: 0} - target: {fileID: 492329800650117873, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7709,6 +7567,16 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 0 objectReference: {fileID: 0} + - target: {fileID: 2033621368830711848, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_havePropertiesChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2033621368830711848, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + propertyPath: m_isInputParsingRequired + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2036146019720018316, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_havePropertiesChanged @@ -7722,7 +7590,7 @@ PrefabInstance: - target: {fileID: 2036146019720018316, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_fontSize - value: 43.05 + value: 40.1 objectReference: {fileID: 0} - target: {fileID: 1982155797989302850, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7752,7 +7620,7 @@ PrefabInstance: - target: {fileID: 8750593920423072183, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_fontSize - value: 32.8 + value: 30.55 objectReference: {fileID: 0} - target: {fileID: 8750593920423072183, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7772,27 +7640,7 @@ PrefabInstance: - target: {fileID: 5748843964364398119, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} propertyPath: m_fontSize - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 2127299112632661598, guid: 6a4a546599c5a44478d063d2be864adc, - type: 3} - propertyPath: m_havePropertiesChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127299112632661598, guid: 6a4a546599c5a44478d063d2be864adc, - type: 3} - propertyPath: m_isInputParsingRequired - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2033621368830711848, guid: 6a4a546599c5a44478d063d2be864adc, - type: 3} - propertyPath: m_havePropertiesChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2033621368830711848, guid: 6a4a546599c5a44478d063d2be864adc, - type: 3} - propertyPath: m_isInputParsingRequired - value: 0 + value: 47.65 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} @@ -7820,12 +7668,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2625541246504091517} m_PrefabAsset: {fileID: 0} ---- !u!1 &313589214623887558 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2321003491915452347, guid: 6a4a546599c5a44478d063d2be864adc, - type: 3} - m_PrefabInstance: {fileID: 2625541246504091517} - m_PrefabAsset: {fileID: 0} --- !u!114 &7812550757494190017 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5189284074566799548, guid: 6a4a546599c5a44478d063d2be864adc, @@ -7916,12 +7758,161 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2625541246504091517} m_PrefabAsset: {fileID: 0} +--- !u!1 &313589214623887558 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2321003491915452347, guid: 6a4a546599c5a44478d063d2be864adc, + type: 3} + m_PrefabInstance: {fileID: 2625541246504091517} + m_PrefabAsset: {fileID: 0} --- !u!1 &100363019924809490 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2669302489994958959, guid: 6a4a546599c5a44478d063d2be864adc, type: 3} m_PrefabInstance: {fileID: 2625541246504091517} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5184482077606798629 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6646697163860434457} + m_Modifications: + - target: {fileID: 2929252283123773939, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_Name + value: Fixed Joystick + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 135.5 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 126.5 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_SizeDelta.x + value: 165 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_SizeDelta.y + value: 165 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} +--- !u!224 &8022091355045614807 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + m_PrefabInstance: {fileID: 5184482077606798629} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8022091355045614810 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929252283123773951, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + m_PrefabInstance: {fileID: 5184482077606798629} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8022091355045614806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45977bbae16431c46a013576a1aea384, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8022091355045614806 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2929252283123773939, guid: aaa2c939c0359ac4dbce3f49e8b90252, + type: 3} + m_PrefabInstance: {fileID: 5184482077606798629} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5369204445585704093 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/NewMainMenu.unity b/Assets/Scenes/NewMainMenu.unity index 74a2bb6..7bbe42f 100644 --- a/Assets/Scenes/NewMainMenu.unity +++ b/Assets/Scenes/NewMainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.29732597, g: 0.63431764, b: 0.9956333, a: 1} + m_IndirectSpecularColor: {r: 0.2945969, g: 0.6341339, b: 0.9921766, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -7374,8 +7374,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -14925,8 +14925,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -16984,8 +16984,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d3900c2..3f4233e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -118,7 +118,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: v1.6.1-Beta + bundleVersion: v1.6.2-Beta preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c1..828e38d 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2018.3.11f1