Commit 50a9a27104a6081d168bb04208d7a312ec6ad028
1 parent
16f01a72
Exists in
master
and in
6 other branches
Include scene
Showing
2 changed files
with
27 additions
and
181 deletions
Show diff stats
.gitignore
Assets/Scenes/Main.unity
@@ -3890,8 +3890,7 @@ RectTransform: | @@ -3890,8 +3890,7 @@ RectTransform: | ||
3890 | m_LocalPosition: {x: 0, y: 0, z: 0} | 3890 | m_LocalPosition: {x: 0, y: 0, z: 0} |
3891 | m_LocalScale: {x: 1, y: 1, z: 1} | 3891 | m_LocalScale: {x: 1, y: 1, z: 1} |
3892 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 3892 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3893 | - m_Children: | ||
3894 | - - {fileID: 1745273949} | 3893 | + m_Children: [] |
3895 | m_Father: {fileID: 1112380079} | 3894 | m_Father: {fileID: 1112380079} |
3896 | m_RootOrder: 0 | 3895 | m_RootOrder: 0 |
3897 | m_AnchorMin: {x: 0, y: 1} | 3896 | m_AnchorMin: {x: 0, y: 1} |
@@ -4190,6 +4189,17 @@ MonoBehaviour: | @@ -4190,6 +4189,17 @@ MonoBehaviour: | ||
4190 | m_StringArgument: | 4189 | m_StringArgument: |
4191 | m_BoolArgument: 0 | 4190 | m_BoolArgument: 0 |
4192 | m_CallState: 2 | 4191 | m_CallState: 2 |
4192 | + - m_Target: {fileID: 1153850833} | ||
4193 | + m_MethodName: ReselectActiveItem | ||
4194 | + m_Mode: 1 | ||
4195 | + m_Arguments: | ||
4196 | + m_ObjectArgument: {fileID: 0} | ||
4197 | + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine | ||
4198 | + m_IntArgument: 0 | ||
4199 | + m_FloatArgument: 0 | ||
4200 | + m_StringArgument: | ||
4201 | + m_BoolArgument: 0 | ||
4202 | + m_CallState: 2 | ||
4193 | m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, | 4203 | m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, |
4194 | Culture=neutral, PublicKeyToken=null | 4204 | Culture=neutral, PublicKeyToken=null |
4195 | --- !u!222 &699695152 | 4205 | --- !u!222 &699695152 |
@@ -6917,7 +6927,7 @@ MonoBehaviour: | @@ -6917,7 +6927,7 @@ MonoBehaviour: | ||
6917 | m_EditorClassIdentifier: | 6927 | m_EditorClassIdentifier: |
6918 | manager: {fileID: 578311381} | 6928 | manager: {fileID: 578311381} |
6919 | list: {fileID: 663262204} | 6929 | list: {fileID: 663262204} |
6920 | - SampleItem: {fileID: 0} | 6930 | + SampleItem: {fileID: 1000010591902608, guid: f4297397cec02284cadd2fe1e37166c2, type: 2} |
6921 | --- !u!222 &1153850834 | 6931 | --- !u!222 &1153850834 |
6922 | CanvasRenderer: | 6932 | CanvasRenderer: |
6923 | m_ObjectHideFlags: 0 | 6933 | m_ObjectHideFlags: 0 |
@@ -7619,6 +7629,17 @@ MonoBehaviour: | @@ -7619,6 +7629,17 @@ MonoBehaviour: | ||
7619 | m_StringArgument: | 7629 | m_StringArgument: |
7620 | m_BoolArgument: 1 | 7630 | m_BoolArgument: 1 |
7621 | m_CallState: 2 | 7631 | m_CallState: 2 |
7632 | + - m_Target: {fileID: 1153850833} | ||
7633 | + m_MethodName: ReselectActiveItem | ||
7634 | + m_Mode: 1 | ||
7635 | + m_Arguments: | ||
7636 | + m_ObjectArgument: {fileID: 0} | ||
7637 | + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine | ||
7638 | + m_IntArgument: 0 | ||
7639 | + m_FloatArgument: 0 | ||
7640 | + m_StringArgument: | ||
7641 | + m_BoolArgument: 1 | ||
7642 | + m_CallState: 2 | ||
7622 | m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, | 7643 | m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, |
7623 | Culture=neutral, PublicKeyToken=null | 7644 | Culture=neutral, PublicKeyToken=null |
7624 | --- !u!114 &1221056138 | 7645 | --- !u!114 &1221056138 |
@@ -9091,7 +9112,7 @@ MonoBehaviour: | @@ -9091,7 +9112,7 @@ MonoBehaviour: | ||
9091 | m_BoolArgument: 0 | 9112 | m_BoolArgument: 0 |
9092 | m_CallState: 2 | 9113 | m_CallState: 2 |
9093 | - m_Target: {fileID: 1153850833} | 9114 | - m_Target: {fileID: 1153850833} |
9094 | - m_MethodName: OnSelect | 9115 | + m_MethodName: OnDone |
9095 | m_Mode: 1 | 9116 | m_Mode: 1 |
9096 | m_Arguments: | 9117 | m_Arguments: |
9097 | m_ObjectArgument: {fileID: 0} | 9118 | m_ObjectArgument: {fileID: 0} |
@@ -11072,183 +11093,6 @@ CanvasRenderer: | @@ -11072,183 +11093,6 @@ CanvasRenderer: | ||
11072 | type: 2} | 11093 | type: 2} |
11073 | m_PrefabInternal: {fileID: 0} | 11094 | m_PrefabInternal: {fileID: 0} |
11074 | m_GameObject: {fileID: 1731945570} | 11095 | m_GameObject: {fileID: 1731945570} |
11075 | ---- !u!1001 &1745273948 | ||
11076 | -Prefab: | ||
11077 | - m_ObjectHideFlags: 0 | ||
11078 | - serializedVersion: 2 | ||
11079 | - m_Modification: | ||
11080 | - m_TransformParent: {fileID: 663262205} | ||
11081 | - m_Modifications: | ||
11082 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11083 | - type: 2} | ||
11084 | - propertyPath: m_LocalPosition.x | ||
11085 | - value: 0 | ||
11086 | - objectReference: {fileID: 0} | ||
11087 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11088 | - type: 2} | ||
11089 | - propertyPath: m_LocalPosition.y | ||
11090 | - value: 0 | ||
11091 | - objectReference: {fileID: 0} | ||
11092 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11093 | - type: 2} | ||
11094 | - propertyPath: m_LocalPosition.z | ||
11095 | - value: 0 | ||
11096 | - objectReference: {fileID: 0} | ||
11097 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11098 | - type: 2} | ||
11099 | - propertyPath: m_LocalRotation.x | ||
11100 | - value: -0 | ||
11101 | - objectReference: {fileID: 0} | ||
11102 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11103 | - type: 2} | ||
11104 | - propertyPath: m_LocalRotation.y | ||
11105 | - value: -0 | ||
11106 | - objectReference: {fileID: 0} | ||
11107 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11108 | - type: 2} | ||
11109 | - propertyPath: m_LocalRotation.z | ||
11110 | - value: -0 | ||
11111 | - objectReference: {fileID: 0} | ||
11112 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11113 | - type: 2} | ||
11114 | - propertyPath: m_LocalRotation.w | ||
11115 | - value: 1 | ||
11116 | - objectReference: {fileID: 0} | ||
11117 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11118 | - type: 2} | ||
11119 | - propertyPath: m_RootOrder | ||
11120 | - value: 0 | ||
11121 | - objectReference: {fileID: 0} | ||
11122 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11123 | - type: 2} | ||
11124 | - propertyPath: m_AnchoredPosition.x | ||
11125 | - value: 272.76697 | ||
11126 | - objectReference: {fileID: 0} | ||
11127 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11128 | - type: 2} | ||
11129 | - propertyPath: m_AnchoredPosition.y | ||
11130 | - value: -42 | ||
11131 | - objectReference: {fileID: 0} | ||
11132 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11133 | - type: 2} | ||
11134 | - propertyPath: m_SizeDelta.x | ||
11135 | - value: 545.53394 | ||
11136 | - objectReference: {fileID: 0} | ||
11137 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11138 | - type: 2} | ||
11139 | - propertyPath: m_SizeDelta.y | ||
11140 | - value: 84 | ||
11141 | - objectReference: {fileID: 0} | ||
11142 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11143 | - type: 2} | ||
11144 | - propertyPath: m_AnchorMin.x | ||
11145 | - value: 0 | ||
11146 | - objectReference: {fileID: 0} | ||
11147 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11148 | - type: 2} | ||
11149 | - propertyPath: m_AnchorMin.y | ||
11150 | - value: 1 | ||
11151 | - objectReference: {fileID: 0} | ||
11152 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11153 | - type: 2} | ||
11154 | - propertyPath: m_AnchorMax.x | ||
11155 | - value: 0 | ||
11156 | - objectReference: {fileID: 0} | ||
11157 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11158 | - type: 2} | ||
11159 | - propertyPath: m_AnchorMax.y | ||
11160 | - value: 1 | ||
11161 | - objectReference: {fileID: 0} | ||
11162 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11163 | - type: 2} | ||
11164 | - propertyPath: m_Pivot.x | ||
11165 | - value: 0.5 | ||
11166 | - objectReference: {fileID: 0} | ||
11167 | - - target: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11168 | - type: 2} | ||
11169 | - propertyPath: m_Pivot.y | ||
11170 | - value: 0.5 | ||
11171 | - objectReference: {fileID: 0} | ||
11172 | - m_RemovedComponents: [] | ||
11173 | - m_ParentPrefab: {fileID: 100100000, guid: f4297397cec02284cadd2fe1e37166c2, type: 2} | ||
11174 | - m_IsPrefabParent: 0 | ||
11175 | ---- !u!224 &1745273949 stripped | ||
11176 | -RectTransform: | ||
11177 | - m_PrefabParentObject: {fileID: 224000011473446186, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11178 | - type: 2} | ||
11179 | - m_PrefabInternal: {fileID: 1745273948} | ||
11180 | ---- !u!1 &1745273950 stripped | ||
11181 | -GameObject: | ||
11182 | - m_PrefabParentObject: {fileID: 1000010591902608, guid: f4297397cec02284cadd2fe1e37166c2, | ||
11183 | - type: 2} | ||
11184 | - m_PrefabInternal: {fileID: 1745273948} | ||
11185 | ---- !u!114 &1745273951 | ||
11186 | -MonoBehaviour: | ||
11187 | - m_ObjectHideFlags: 0 | ||
11188 | - m_PrefabParentObject: {fileID: 0} | ||
11189 | - m_PrefabInternal: {fileID: 0} | ||
11190 | - m_GameObject: {fileID: 1745273950} | ||
11191 | - m_Enabled: 1 | ||
11192 | - m_EditorHideFlags: 0 | ||
11193 | - m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
11194 | - m_Name: | ||
11195 | - m_EditorClassIdentifier: | ||
11196 | - m_Material: {fileID: 0} | ||
11197 | - m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
11198 | - m_RaycastTarget: 1 | ||
11199 | - m_OnCullStateChanged: | ||
11200 | - m_PersistentCalls: | ||
11201 | - m_Calls: [] | ||
11202 | - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
11203 | - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
11204 | - m_Texture: {fileID: 0} | ||
11205 | - m_UVRect: | ||
11206 | - serializedVersion: 2 | ||
11207 | - x: 0 | ||
11208 | - y: 0 | ||
11209 | - width: 1 | ||
11210 | - height: 1 | ||
11211 | ---- !u!114 &1745273952 | ||
11212 | -MonoBehaviour: | ||
11213 | - m_ObjectHideFlags: 0 | ||
11214 | - m_PrefabParentObject: {fileID: 0} | ||
11215 | - m_PrefabInternal: {fileID: 0} | ||
11216 | - m_GameObject: {fileID: 1745273950} | ||
11217 | - m_Enabled: 1 | ||
11218 | - m_EditorHideFlags: 0 | ||
11219 | - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
11220 | - m_Name: | ||
11221 | - m_EditorClassIdentifier: | ||
11222 | - m_Navigation: | ||
11223 | - m_Mode: 3 | ||
11224 | - m_SelectOnUp: {fileID: 0} | ||
11225 | - m_SelectOnDown: {fileID: 0} | ||
11226 | - m_SelectOnLeft: {fileID: 0} | ||
11227 | - m_SelectOnRight: {fileID: 0} | ||
11228 | - m_Transition: 1 | ||
11229 | - m_Colors: | ||
11230 | - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
11231 | - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
11232 | - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | ||
11233 | - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | ||
11234 | - m_ColorMultiplier: 1 | ||
11235 | - m_FadeDuration: 0.1 | ||
11236 | - m_SpriteState: | ||
11237 | - m_HighlightedSprite: {fileID: 0} | ||
11238 | - m_PressedSprite: {fileID: 0} | ||
11239 | - m_DisabledSprite: {fileID: 0} | ||
11240 | - m_AnimationTriggers: | ||
11241 | - m_NormalTrigger: Normal | ||
11242 | - m_HighlightedTrigger: Highlighted | ||
11243 | - m_PressedTrigger: Pressed | ||
11244 | - m_DisabledTrigger: Disabled | ||
11245 | - m_Interactable: 1 | ||
11246 | - m_TargetGraphic: {fileID: 1745273951} | ||
11247 | - m_OnClick: | ||
11248 | - m_PersistentCalls: | ||
11249 | - m_Calls: [] | ||
11250 | - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, | ||
11251 | - Culture=neutral, PublicKeyToken=null | ||
11252 | --- !u!1 &1763219241 | 11096 | --- !u!1 &1763219241 |
11253 | GameObject: | 11097 | GameObject: |
11254 | m_ObjectHideFlags: 0 | 11098 | m_ObjectHideFlags: 0 |