diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab index 2e8126bd..b1e5929a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab @@ -30,13 +30,7 @@ Transform: - {fileID: 2498033717143991101} - {fileID: 6362814815096740739} - {fileID: 2498033717226844050} - - {fileID: 2845075459559541233} - - {fileID: 5623201354958912150} - - {fileID: 1895130018301109748} - - {fileID: 8126610038817762681} - - {fileID: 4378297054251438819} - - {fileID: 5210202879090184585} - - {fileID: 5912541010185850641} + - {fileID: 7269014383480657833} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -128,7 +122,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -47.398438} - m_SizeDelta: {x: 217, y: 74} + m_SizeDelta: {x: 0, y: 74} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2498033716561349208 CanvasRenderer: @@ -238,10 +232,10 @@ RectTransform: m_Father: {fileID: 2498033717790956849} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.5, y: -40} - m_SizeDelta: {x: 145, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2498033716790378516 CanvasRenderer: @@ -469,10 +463,10 @@ RectTransform: m_Father: {fileID: 2498033716561349204} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.5, y: -40} - m_SizeDelta: {x: 145, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2498033717375854815 CanvasRenderer: @@ -606,7 +600,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -23.900024, y: -136.39844} - m_SizeDelta: {x: 217, y: 74} + m_SizeDelta: {x: 0, y: 74} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2498033717790956851 CanvasRenderer: @@ -684,6 +678,43 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &3927864348137186791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7269014383480657833} + m_Layer: 0 + m_Name: StageTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7269014383480657833 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3927864348137186791} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.63, z: 70.6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2845075459559541233} + - {fileID: 5623201354958912150} + - {fileID: 1895130018301109748} + - {fileID: 8126610038817762681} + - {fileID: 4378297054251438819} + - {fileID: 5210202879090184585} + - {fileID: 5912541010185850641} + m_Father: {fileID: 8987015135604457535} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4858745001267193434 GameObject: m_ObjectHideFlags: 0 @@ -708,7 +739,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4858745001267193434} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -5.89, z: 70.6} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7299868319642549078} @@ -718,8 +749,8 @@ Transform: - {fileID: 3051576594862347254} - {fileID: 5828317068859372389} - {fileID: 4023274041187776678} - m_Father: {fileID: 8987015135604457535} - m_RootOrder: 3 + m_Father: {fileID: 7269014383480657833} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5102312600086609631 GameObject: @@ -1116,12 +1147,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8987015135604457535} + m_TransformParent: {fileID: 7269014383480657833} m_Modifications: - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} propertyPath: m_RootOrder - value: 7 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} @@ -1131,12 +1162,12 @@ PrefabInstance: - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} propertyPath: m_LocalPosition.y - value: -5.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} propertyPath: m_LocalPosition.z - value: 70.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} @@ -1178,6 +1209,11 @@ PrefabInstance: propertyPath: m_Name value: Stage2b objectReference: {fileID: 0} + - target: {fileID: 8063655011831821646, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} --- !u!4 &4378297054251438819 stripped @@ -1266,12 +1302,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8987015135604457535} + m_TransformParent: {fileID: 7269014383480657833} m_Modifications: - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} propertyPath: m_RootOrder - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} @@ -1281,12 +1317,12 @@ PrefabInstance: - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} propertyPath: m_LocalPosition.y - value: -5.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} propertyPath: m_LocalPosition.z - value: 70.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} @@ -1328,6 +1364,11 @@ PrefabInstance: propertyPath: m_Name value: Stage1b objectReference: {fileID: 0} + - target: {fileID: 6825300293089241174, guid: bbd611303c5ec4c41a4ceca6a0bb9148, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} --- !u!4 &1895130018301109748 stripped @@ -1586,7 +1627,7 @@ PrefabInstance: - target: {fileID: 4931350312200274921, guid: acd6e6365b5fe4863aedc684a50b8028, type: 3} propertyPath: m_LocalPosition.y - value: -4.6622753 + value: 1.79 objectReference: {fileID: 0} - target: {fileID: 4931350312200274921, guid: acd6e6365b5fe4863aedc684a50b8028, type: 3} @@ -2576,12 +2617,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8987015135604457535} + m_TransformParent: {fileID: 7269014383480657833} m_Modifications: - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} propertyPath: m_RootOrder - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} @@ -2591,12 +2632,12 @@ PrefabInstance: - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} propertyPath: m_LocalPosition.y - value: -5.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} propertyPath: m_LocalPosition.z - value: 70.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} @@ -2638,6 +2679,11 @@ PrefabInstance: propertyPath: m_Name value: Stage1a objectReference: {fileID: 0} + - target: {fileID: 5140115440945204540, guid: 4700f2d6cab15484295a1f9b42d78ec9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} --- !u!4 &5623201354958912150 stripped @@ -2651,12 +2697,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8987015135604457535} + m_TransformParent: {fileID: 7269014383480657833} m_Modifications: - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} propertyPath: m_RootOrder - value: 6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} @@ -2666,12 +2712,12 @@ PrefabInstance: - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} propertyPath: m_LocalPosition.y - value: -5.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} propertyPath: m_LocalPosition.z - value: 70.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} @@ -2713,6 +2759,11 @@ PrefabInstance: propertyPath: m_Name value: Stage2a objectReference: {fileID: 0} + - target: {fileID: 7862439291227870202, guid: 904e56c15b0d140e18306aaa0cc87dd0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} --- !u!4 &8126610038817762681 stripped @@ -3036,12 +3087,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8987015135604457535} + m_TransformParent: {fileID: 7269014383480657833} m_Modifications: - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} propertyPath: m_RootOrder - value: 8 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} @@ -3051,12 +3102,12 @@ PrefabInstance: - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} propertyPath: m_LocalPosition.y - value: -5.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} propertyPath: m_LocalPosition.z - value: 70.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} @@ -3098,6 +3149,11 @@ PrefabInstance: propertyPath: m_Name value: Stage3a objectReference: {fileID: 0} + - target: {fileID: 3563731758725637829, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} --- !u!4 &5210202879090184585 stripped @@ -3111,12 +3167,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8987015135604457535} + m_TransformParent: {fileID: 7269014383480657833} m_Modifications: - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} propertyPath: m_RootOrder - value: 9 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} @@ -3126,12 +3182,12 @@ PrefabInstance: - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} propertyPath: m_LocalPosition.y - value: -5.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} propertyPath: m_LocalPosition.z - value: 70.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} @@ -3173,6 +3229,11 @@ PrefabInstance: propertyPath: m_Name value: Stage3b objectReference: {fileID: 0} + - target: {fileID: 7741594668631066970, guid: ac953b6a40d53457aa1f141c14a8b485, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} --- !u!4 &5912541010185850641 stripped