diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab index 1f784280..8c595d70 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab @@ -6870,7 +6870,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &1986279549173157408 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6907,7 +6907,6 @@ MonoBehaviour: DiaLogBox2: {fileID: 1986279547715622013} Right_Message: {fileID: 1986279549232645831} Right_Message2: {fileID: 1986279548795827112} - dropdwn: {fileID: 0} Tip123: {fileID: 0} MapTapPanel: {fileID: 6389238419783627009} Command02: {fileID: 2991637681471873777} @@ -6929,12 +6928,6 @@ MonoBehaviour: TP_3: {fileID: 1986279548399004370} TP_4: {fileID: 1986279547719244043} Intercom: {fileID: 0} - Prop1: {fileID: 0} - Prop2: {fileID: 0} - Prop3: {fileID: 0} - Prop4: {fileID: 0} - Prop5: {fileID: 0} - Prop6: {fileID: 0} DialogboxSure: {fileID: 1986279548770340787} Dialogbox2A: {fileID: 1986279549002270256} Dialogbox2B: {fileID: 1986279548425159737} @@ -7015,6 +7008,7 @@ MonoBehaviour: showPositionX: 0 hidePositionX: 0 bg: {fileID: 0} + isFrist: 0 gridLayoutGroup: {fileID: 3221337158919056189} --- !u!1 &1986279549197966134 GameObject: diff --git a/xiaofang/Assets/Scenes/HylScene/Test.unity b/xiaofang/Assets/Scenes/HylScene/Test.unity index 0d82c8b7..2cf2ef34 100644 --- a/xiaofang/Assets/Scenes/HylScene/Test.unity +++ b/xiaofang/Assets/Scenes/HylScene/Test.unity @@ -1004,6 +1004,7 @@ MonoBehaviour: m_EditorClassIdentifier: jSONReader: {fileID: 2009348684} isYou: 1 + isHYL: 0 --- !u!1 &1509783291 GameObject: m_ObjectHideFlags: 0 @@ -1588,123 +1589,123 @@ PrefabInstance: m_Modifications: - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43.38 objectReference: {fileID: 0} - target: {fileID: 1407198451437384586, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 302 objectReference: {fileID: 0} - target: {fileID: 1407198451437384586, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 101 objectReference: {fileID: 0} - target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 226.40001 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -139.02 objectReference: {fileID: 0} - target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 101 objectReference: {fileID: 0} - target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 226.40001 objectReference: {fileID: 0} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 302 objectReference: {fileID: 0} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -139.02 objectReference: {fileID: 0} - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 68.100006 objectReference: {fileID: 0} - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 504 objectReference: {fileID: 0} - target: {fileID: 3032695105467395617, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 302 objectReference: {fileID: 0} - target: {fileID: 3032695105467395617, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_Pivot.x @@ -1796,55 +1797,55 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3077635299444999931, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43.38 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43.38 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 940be89243a038b4090a77556e45a06d, type: 3} diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity index 480a5c98..63617fe3 100644 --- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity +++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity @@ -635,6 +635,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1986279548795827112, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549107877099, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive value: 0 @@ -643,6 +651,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1986279549173157409, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.x value: 0 diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index 54faff8b..0b419144 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -2250,6 +2250,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Id: 0 +--- !u!224 &95789182 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} + m_PrefabInstance: {fileID: 690261542} + m_PrefabAsset: {fileID: 0} --- !u!1001 &95811050 PrefabInstance: m_ObjectHideFlags: 0 @@ -5646,7 +5651,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &159663861 PrefabInstance: @@ -7398,7 +7403,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 44 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &295391225 MeshCollider: @@ -8380,6 +8385,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2548037664796047208, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} m_PrefabInstance: {fileID: 359102599} m_PrefabAsset: {fileID: 0} +--- !u!1 &368403110 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6187326699852508386, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 2044803814} + m_PrefabAsset: {fileID: 0} --- !u!64 &368610314 MeshCollider: m_ObjectHideFlags: 0 @@ -8601,7 +8611,7 @@ Transform: - {fileID: 272025130} - {fileID: 1600741273} m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &382802813 BoxCollider: @@ -10045,7 +10055,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 45 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &437592029 GameObject: @@ -10547,7 +10557,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &479940076 MonoBehaviour: @@ -11238,7 +11248,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 43 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &526829806 GameObject: @@ -11269,7 +11279,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &530412951 GameObject: @@ -12000,7 +12010,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &583497863 PrefabInstance: @@ -12885,6 +12895,17 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6788383922943872000, guid: 00003e04dc9a2534eb207f108c7b0cd3, type: 3} +--- !u!114 &634947902 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1100707199, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 2044803814} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &639843208 PrefabInstance: m_ObjectHideFlags: 0 @@ -13097,7 +13118,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &673038100 PrefabInstance: @@ -13413,8 +13434,24 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1039624185} m_Modifications: + - target: {fileID: 1834165867, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834348371, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 12404731708869884, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 538932270724316463, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 750830055125599038, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_IsActive value: 0 @@ -13445,26 +13482,54 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y + value: -43.38 + objectReference: {fileID: 0} + - target: {fileID: 1058687965985811252, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 64.4652 + objectReference: {fileID: 0} + - target: {fileID: 1058687967299122086, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1058687967299122086, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1058687967299122086, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1058687967299122086, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1058687967299122086, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1058687967604199525, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 1139272851256039431, guid: 940be89243a038b4090a77556e45a06d, type: 3} @@ -13473,43 +13538,47 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1407198451437384586, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 302 objectReference: {fileID: 0} - target: {fileID: 1407198451437384586, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y + value: 126 + objectReference: {fileID: 0} + - target: {fileID: 1407198451437384587, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 101 objectReference: {fileID: 0} - target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 226.40001 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -139.02 objectReference: {fileID: 0} - target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y @@ -13535,60 +13604,136 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2573574797694731611, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574797864840819, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2573574797864840819, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2573574797864840819, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 176 + objectReference: {fileID: 0} + - target: {fileID: 2573574797864840819, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 54.328 + objectReference: {fileID: 0} + - target: {fileID: 2573574797864840819, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 88 + objectReference: {fileID: 0} + - target: {fileID: 2573574797864840819, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -27.164 + objectReference: {fileID: 0} + - target: {fileID: 2573574798152419113, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574798589251226, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574799009490446, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574799009490446, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574799009490446, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574799009490446, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574799009490446, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573574799009490446, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2858733837374708439, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 101 objectReference: {fileID: 0} - target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y + value: 226.40001 + objectReference: {fileID: 0} + - target: {fileID: 3032695104264456878, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 302 objectReference: {fileID: 0} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -139.02 objectReference: {fileID: 0} - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 68.100006 objectReference: {fileID: 0} - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y + value: 504 + objectReference: {fileID: 0} + - target: {fileID: 3032695105467395616, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 3032695105467395617, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 302 objectReference: {fileID: 0} - target: {fileID: 3032695105467395617, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y + value: 126 + objectReference: {fileID: 0} + - target: {fileID: 3077635298785468487, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 3077635299444999924, guid: 940be89243a038b4090a77556e45a06d, type: 3} @@ -13601,15 +13746,15 @@ PrefabInstance: objectReference: {fileID: 1196345900} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_Pivot.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_RootOrder - value: 21 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.x @@ -13629,11 +13774,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 2430 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_LocalScale.x + value: 0.79012346 + objectReference: {fileID: 0} + - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_LocalScale.y + value: 0.79012346 + objectReference: {fileID: 0} + - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_LocalScale.z + value: 0.79012346 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_LocalPosition.x @@ -13653,23 +13810,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 960 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 426.66666 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13687,59 +13844,462 @@ PrefabInstance: propertyPath: m_Name value: FreePanel_End objectReference: {fileID: 0} - - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + - target: {fileID: 3077635299444999931, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3649662722171167503, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 122 + objectReference: {fileID: 0} + - target: {fileID: 3649662722676972070, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + - target: {fileID: 3649662722676972070, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + - target: {fileID: 3649662722676972070, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 350.09814 objectReference: {fileID: 0} - - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + - target: {fileID: 3649662722676972070, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3649662722676972070, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 175.04906 + objectReference: {fileID: 0} + - target: {fileID: 3649662722676972070, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -61 + objectReference: {fileID: 0} + - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 344.1 + objectReference: {fileID: 0} + - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 86.76 + objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43.38 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 344.1 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 86.76 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 198.05 objectReference: {fileID: 0} - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchoredPosition.y + value: -43.38 + objectReference: {fileID: 0} + - target: {fileID: 4204757181707656208, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757181707656208, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757181707656208, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 1741.5 + objectReference: {fileID: 0} + - target: {fileID: 4204757181707656208, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 4204757181707656208, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 870.75 + objectReference: {fileID: 0} + - target: {fileID: 4204757181707656208, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -149.287 + objectReference: {fileID: 0} + - target: {fileID: 4204757181844444130, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757181844444130, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757181844444130, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 1741.5 + objectReference: {fileID: 0} + - target: {fileID: 4204757181844444130, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 4204757181844444130, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 870.75 + objectReference: {fileID: 0} + - target: {fileID: 4204757181844444130, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -265.574 + objectReference: {fileID: 0} + - target: {fileID: 4204757181860768739, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757181860768739, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757181860768739, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 1741.5 + objectReference: {fileID: 0} + - target: {fileID: 4204757181860768739, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 4204757181860768739, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 870.75 + objectReference: {fileID: 0} + - target: {fileID: 4204757181860768739, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 4204757182757858849, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757182757858849, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204757182757858849, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 1741.5 + objectReference: {fileID: 0} + - target: {fileID: 4204757182757858849, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 4204757182757858849, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 870.75 + objectReference: {fileID: 0} + - target: {fileID: 4204757182757858849, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -381.86102 + objectReference: {fileID: 0} + - target: {fileID: 5030372608302415783, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 5252296846619923061, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 5265658744918873890, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308210759801158, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308210759801158, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308210759801158, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308210759801158, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308210759801158, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308210759801158, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308211952711777, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5333308212176818491, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5333308212176818491, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5333308212176818491, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 5333308212176818491, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 54.328 + objectReference: {fileID: 0} + - target: {fileID: 5333308212176818491, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 5333308212176818491, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -27.164 + objectReference: {fileID: 0} + - target: {fileID: 6707187711609657255, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187711609657255, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187711609657255, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: 6707187711609657255, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187711609657255, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187711609657255, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187711662088500, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187711662088500, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187711662088500, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 372 + objectReference: {fileID: 0} + - target: {fileID: 6707187711662088500, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187711662088500, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187711662088500, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187712083460479, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712083460479, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712083460479, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 372 + objectReference: {fileID: 0} + - target: {fileID: 6707187712083460479, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187712083460479, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187712083460479, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187712162247693, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712162247693, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712162247693, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: 6707187712162247693, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187712162247693, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187712162247693, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187712636084949, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712636084949, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712636084949, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 372 + objectReference: {fileID: 0} + - target: {fileID: 6707187712636084949, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187712636084949, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 287.354 + objectReference: {fileID: 0} + - target: {fileID: 6707187712636084949, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187712654955590, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712654955590, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712654955590, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: 6707187712654955590, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187712654955590, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187712654955590, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187712941723915, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712941723915, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187712941723915, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: 6707187712941723915, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187712941723915, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187712941723915, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6707187713517528185, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187713517528185, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6707187713517528185, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.x + value: 372 + objectReference: {fileID: 0} + - target: {fileID: 6707187713517528185, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 6707187713517528185, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 186 + objectReference: {fileID: 0} + - target: {fileID: 6707187713517528185, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 8424717683019133688, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8424717683019133688, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8424717683019133688, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 8424717683019133688, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8424717683019133688, guid: 940be89243a038b4090a77556e45a06d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3077635299444999928, guid: 940be89243a038b4090a77556e45a06d, type: 3} + - {fileID: 3077635299444999929, guid: 940be89243a038b4090a77556e45a06d, type: 3} + - {fileID: 3077635299444999926, guid: 940be89243a038b4090a77556e45a06d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 940be89243a038b4090a77556e45a06d, type: 3} --- !u!1 &702577174 GameObject: @@ -13771,7 +14331,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 39 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &702577176 MonoBehaviour: @@ -14321,7 +14881,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3} propertyPath: m_RootOrder - value: 23 + value: 21 objectReference: {fileID: 0} - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3} propertyPath: m_LocalPosition.x @@ -15185,7 +15745,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &810501282 MonoBehaviour: @@ -17670,7 +18230,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &996888830 MonoBehaviour: @@ -18289,6 +18849,8 @@ RectTransform: - {fileID: 1359335859} - {fileID: 491544196} - {fileID: 1375880035} + - {fileID: 95789182} + - {fileID: 1226195643} m_Father: {fileID: 0} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -21427,6 +21989,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Id: 1062 +--- !u!224 &1226195643 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 2044803814} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1227382122 PrefabInstance: m_ObjectHideFlags: 0 @@ -22077,7 +22644,7 @@ Transform: - {fileID: 496425325} - {fileID: 1670656697} m_Father: {fileID: 0} - m_RootOrder: 40 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1298227765 GameObject: @@ -24614,7 +25181,7 @@ Transform: - {fileID: 1882199187} - {fileID: 119116319} m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1453694928 MeshCollider: @@ -25022,7 +25589,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1474431325 GameObject: @@ -25203,7 +25770,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1481704192 PrefabInstance: @@ -26385,7 +26952,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 37 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1526740603 MonoBehaviour: @@ -28265,7 +28832,7 @@ Transform: - {fileID: 58543477} - {fileID: 712846463} m_Father: {fileID: 0} - m_RootOrder: 42 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1670656696 GameObject: @@ -30933,17 +31500,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3077635298785468487, guid: 940be89243a038b4090a77556e45a06d, type: 3} m_PrefabInstance: {fileID: 690261542} m_PrefabAsset: {fileID: 0} ---- !u!114 &1849458145 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3077635298785468485, guid: 940be89243a038b4090a77556e45a06d, type: 3} - m_PrefabInstance: {fileID: 690261542} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1849458144} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 13fa0701c49727a4c84282a40243e52d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1849458147 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30956,7 +31512,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b2ff411b5e682c439d271893fe57cf2, type: 3} m_Name: m_EditorClassIdentifier: - jSONReader: {fileID: 1849458145} --- !u!1001 &1855712065 PrefabInstance: m_ObjectHideFlags: 0 @@ -31742,7 +32297,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1912094932 GameObject: @@ -33498,11 +34053,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1039624185} m_Modifications: + - target: {fileID: 676728424, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Tip123 + value: + objectReference: {fileID: 634947902} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: content + value: + objectReference: {fileID: 368403110} - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y @@ -33552,21 +34119,77 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1986279547715622013, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279547866209846, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1986279548795827112, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549107877099, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1986279549150508378, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1986279549173157410, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_RootOrder - value: 22 + value: 15 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.x @@ -33586,11 +34209,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 2430 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_LocalScale.x + value: 0.79012346 + objectReference: {fileID: 0} + - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_LocalScale.y + value: 0.79012346 + objectReference: {fileID: 0} + - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_LocalScale.z + value: 0.79012346 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_LocalPosition.x @@ -33610,23 +34245,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 960 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 426.66666 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -33644,10 +34279,22 @@ PrefabInstance: propertyPath: m_Name value: Command_End objectReference: {fileID: 0} + - target: {fileID: 1986279549232645831, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549403144390, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1986279549438857641, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2991637681471873777, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -33696,6 +34343,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -245 objectReference: {fileID: 0} + - target: {fileID: 6389238419783627009, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6852673806710748770, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8231224075310808718, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -33744,7 +34403,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -105 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1986279549173157409, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + - {fileID: 1986279549173157408, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + - {fileID: 1986279549173157410, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} --- !u!1001 &2047118982 PrefabInstance: @@ -33961,7 +34623,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &2069562217 MeshCollider: @@ -40399,7 +41061,7 @@ Transform: m_Children: - {fileID: 2057924365034160257} m_Father: {fileID: 0} - m_RootOrder: 41 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2057924365745864529 MonoBehaviour: @@ -44279,7 +44941,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} propertyPath: m_RootOrder - value: 25 + value: 23 objectReference: {fileID: 0} - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} propertyPath: m_LocalPosition.x diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs index 8d52deef..f46e4c11 100644 --- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs +++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs @@ -41,10 +41,10 @@ public class ZZUIManager : MonoBehaviour /// 为能安全撤离的框 /// public GameObject Right_Message2; - /// - /// 下拉框 - /// - public Dropdown dropdwn; + ///// + ///// 下拉框 + ///// + //public Dropdown dropdwn; /// /// 撤离方案选择 /// @@ -111,18 +111,6 @@ public class ZZUIManager : MonoBehaviour /// public Button Intercom; /// - /// 左边的物品栏 - /// - public Button Prop1; - public Button Prop2; - public Button Prop3; - /// - /// 右边物品栏 - /// - public Button Prop4; - public Button Prop5; - public Button Prop6; - /// /// 撤离方案确定 /// public Button DialogboxSure; @@ -339,6 +327,8 @@ public class ZZUIManager : MonoBehaviour int num = 0; public Image bg; + public bool isFrist=false; + #region 疏散情况班级排序 public GridLayoutGroup gridLayoutGroup; private List textFields = new List(); @@ -357,7 +347,7 @@ public class ZZUIManager : MonoBehaviour { //测试 - // Frist(); + Frist(); //FixWarn(1,jsonReader.SetUIText(50102)); //string str = jsonReader.SetUIText(50102); //Debug.Log(jsonReader.SetUIText(50102)); @@ -382,33 +372,6 @@ public class ZZUIManager : MonoBehaviour OnClickHideButton(); }); - #region 道具 - Prop1.onClick.AddListener(() => - { - Prop(1); - }); - Prop2.onClick.AddListener(() => - { - Prop(2); - }); - Prop3.onClick.AddListener(() => - { - Prop(3); - }); - Prop4.onClick.AddListener(() => - { - Prop(4); - }); - Prop5.onClick.AddListener(() => - { - Prop(5); - }); - Prop6.onClick.AddListener(() => - { - Prop(6); - }); - #endregion - #region 地标点击事件(地图那四个点) TP_1.onClick.AddListener(() => { @@ -454,20 +417,27 @@ public class ZZUIManager : MonoBehaviour //打开队形 Flee.onClick.AddListener(() => { - DiaLogBox2.SetActive(true); - Close1Panel.SetActive(true); + if (!isFrist) + { + DiaLogBox2.SetActive(true); + Close1Panel.SetActive(true); + } + else + { + Frist(); + } }); Close1.onClick.AddListener(() => { Close(); }); Close2.onClick.AddListener(() => { Close(); }); //下拉列表(人物选着) - dropdwn.onValueChanged.AddListener(delegate - { - DropdownValueChanged(dropdwn); - }); - //默认开一次这样开局就能默认第一个选项一次 - DropdownValueChanged(dropdwn); + //dropdwn.onValueChanged.AddListener(delegate + //{ + // DropdownValueChanged(dropdwn); + //}); + ////默认开一次这样开局就能默认第一个选项一次 + //DropdownValueChanged(dropdwn); //右边框框 上报总指 (已经安全撤离的) Sumbit.onClick.AddListener(() => @@ -531,30 +501,7 @@ public class ZZUIManager : MonoBehaviour } private void Update() { - //测试面板 - if (Input.GetKeyDown("j")) - { - //string str = "aaa"; - //FixWarnPanelText(str); - //WarnPanel(); - GcreationSelect(10829); - Frist(); - - } - if (Input.GetKeyDown("k")) - { - FixWarnPanelText("aaaa"); - } - // 更新时间 - timeElapsed += Time.deltaTime; - - // 计算分钟和秒数 - int minutes = Mathf.FloorToInt(timeElapsed / 60); - int seconds = Mathf.FloorToInt(timeElapsed % 60); - - // 格式化时间为 "00.00" 格式 - TimeText.text = string.Format("{0:00}.{1:00}", minutes, seconds); - + } /// @@ -588,6 +535,7 @@ public class ZZUIManager : MonoBehaviour /// public void Frist() { + isFrist=true; DiaLogBox2?.SetActive(true); Close1Panel.SetActive(false); @@ -1047,6 +995,52 @@ public class ZZUIManager : MonoBehaviour WarnTip_Text.text = Message; } /// + /// 给我张三geigei看的(偷懒的,我错了HYLgeigei) + /// + /// + public void CSZS(string ID) + { + switch (ID) + { + case "8000": + Head_Text.text = "主持人"; + break; + case "8001": + Head_Text.text = "总指挥"; + break; + case "8002": + Head_Text.text = "抢险救援组"; + break; + case "8003": + Head_Text.text = "(组长)抢险救援组"; + break; + case "8004": + Head_Text.text = "医疗救护组"; + break; + case "8005": + Head_Text.text = "(组长)医疗救援组"; + break; + case "8006": + Head_Text.text = "疏散引导组1"; + break; + case "8007": + Head_Text.text = "疏散引导组2"; + break; + case "8008": + Head_Text.text = "后勤保障组"; + break; + case "8009": + Head_Text.text = "(组长)后勤保障组"; + break; + case "8010": + Head_Text.text = "搜寻组"; + break; + case "8011": + Head_Text.text = "学生寝室长"; + break; + } + } + /// /// 修改总指挥框框 无图像,名字,内容 /// /// 名字