diff --git a/Assets/_CompletedAssets/Prefabs/HUDCanvas.prefab b/Assets/_CompletedAssets/Prefabs/HUDCanvas.prefab index 2202ebc09867d9fddf928d6f2683905728ee9bb5..1bc4c835b12db62b50433706660743cda4d14738 100644 --- a/Assets/_CompletedAssets/Prefabs/HUDCanvas.prefab +++ b/Assets/_CompletedAssets/Prefabs/HUDCanvas.prefab @@ -4184,8 +4184,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.0002, y: 4.501} - m_SizeDelta: {x: 569.22, y: 305.53} + m_AnchoredPosition: {x: 1.0002, y: -2.5011} + m_SizeDelta: {x: 569.22, y: 318.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7731984866803119936 CanvasRenderer: diff --git a/Assets/_CompletedAssets/Scenes/Ending.unity b/Assets/_CompletedAssets/Scenes/Ending.unity index da27b4d5f030babc4b5fcce107e7b647e31f1743..8f6355a1a7f47bcc0f0fb47f0118a9a4a50b6ec3 100644 --- a/Assets/_CompletedAssets/Scenes/Ending.unity +++ b/Assets/_CompletedAssets/Scenes/Ending.unity @@ -159,8 +159,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 192, y: -96} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: 79.67137, y: -96} + m_SizeDelta: {x: 1407.3516, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &169943381 MonoBehaviour: @@ -195,7 +195,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: restart from the beginning? + m_Text: you've completed the game! --- !u!222 &169943382 CanvasRenderer: m_ObjectHideFlags: 0 @@ -246,8 +246,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 192, y: 0} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 110.99376, y: 0} + m_SizeDelta: {x: 218.3245, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &433327823 MonoBehaviour: @@ -292,7 +292,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 433327824} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1608283819} + m_TargetAssemblyTypeName: LevelLoader, Assembly-CSharp + m_MethodName: Restart + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &433327824 MonoBehaviour: m_ObjectHideFlags: 0 @@ -795,8 +807,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 192, y: -64} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 110.99376, y: -64} + m_SizeDelta: {x: 218.3245, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &847708854 MonoBehaviour: @@ -841,7 +853,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 847708855} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1608283819} + m_TargetAssemblyTypeName: LevelLoader, Assembly-CSharp + m_MethodName: MainMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &847708855 MonoBehaviour: m_ObjectHideFlags: 0 @@ -914,8 +938,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -138, y: -50} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: -79.1355, y: -50} + m_SizeDelta: {x: 910.2395, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &867885969 MonoBehaviour: @@ -1134,8 +1158,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -1169, y: -451.80753} + m_AnchoredPosition: {x: 0.009399414, y: 0} + m_SizeDelta: {x: -832.97, y: -451.8075} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1091976342 MonoBehaviour: @@ -2145,8 +2169,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 160, y: 21} - m_SizeDelta: {x: 900, y: 400} + m_AnchoredPosition: {x: 42.14199, y: 21} + m_SizeDelta: {x: 1055.5137, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1684091118 MonoBehaviour: @@ -2344,8 +2368,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 192, y: -50} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: 79.67137, y: -50} + m_SizeDelta: {x: 1407.3516, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1730844333 MonoBehaviour: diff --git a/Assets/_CompletedAssets/Scenes/Level1.unity b/Assets/_CompletedAssets/Scenes/Level1.unity index 2c786e5c4dcab05fdbad96ae2dce8671cb9923fd..c0809ecd45afde16000f935179b7ad798540eb6f 100644 --- a/Assets/_CompletedAssets/Scenes/Level1.unity +++ b/Assets/_CompletedAssets/Scenes/Level1.unity @@ -2702,6 +2702,41 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 122.874695 objectReference: {fileID: 0} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 767420974} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: MainMenu + objectReference: {fileID: 0} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: LevelLoader, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1023676140872936827, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1573780625587797144, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_IsActive @@ -2737,6 +2772,41 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -84.53587 objectReference: {fileID: 0} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 767420974} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Restart + objectReference: {fileID: 0} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: LevelLoader, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3425990498122828999, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 3505870070799784637, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/_CompletedAssets/Scenes/Level2.unity b/Assets/_CompletedAssets/Scenes/Level2.unity index 3c349989c7a647caf495e90ffa72cc823cd63252..cac9ae13ecf6b26301b9fe2b9647951c05d80b7d 100644 --- a/Assets/_CompletedAssets/Scenes/Level2.unity +++ b/Assets/_CompletedAssets/Scenes/Level2.unity @@ -246,8 +246,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 192, y: 0} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 75.89108, y: 0} + m_SizeDelta: {x: 206.4436, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &25011183 MonoBehaviour: @@ -292,7 +292,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 25011184} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1193841690} + m_TargetAssemblyTypeName: LevelLoader, Assembly-CSharp + m_MethodName: Restart + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &25011184 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2100,8 +2112,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 192, y: -64} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 75.89108, y: -64} + m_SizeDelta: {x: 206.4436, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &563815476 MonoBehaviour: @@ -2146,7 +2158,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 563815477} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1193841690} + m_TargetAssemblyTypeName: LevelLoader, Assembly-CSharp + m_MethodName: MainMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &563815477 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3038,8 +3062,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 160, y: 21} - m_SizeDelta: {x: 900, y: 400} + m_AnchoredPosition: {x: 49.862537, y: 21} + m_SizeDelta: {x: 762.4302, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &921669781 MonoBehaviour: @@ -3283,8 +3307,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 192, y: -96} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: 76.971146, y: -96} + m_SizeDelta: {x: 1016.5736, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1020609961 MonoBehaviour: @@ -3670,8 +3694,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -138, y: -100} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: -85.61597, y: -100} + m_SizeDelta: {x: 942.1396, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1311611082 MonoBehaviour: @@ -3791,8 +3815,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -138, y: -50} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: -85.61597, y: -50} + m_SizeDelta: {x: 942.1396, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1356592796 MonoBehaviour: @@ -3972,8 +3996,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -1169, y: -451.80753} + m_AnchoredPosition: {x: 0.009399414, y: 0} + m_SizeDelta: {x: -832.97, y: -451.8075} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1413291114 MonoBehaviour: @@ -4407,7 +4431,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3505870070799784637, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} - insertIndex: 12 + insertIndex: 16 addedObject: {fileID: 1413291113} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} @@ -5335,8 +5359,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 192, y: -50} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: 76.971146, y: -50} + m_SizeDelta: {x: 1016.5736, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1995714984 MonoBehaviour: diff --git a/Assets/_CompletedAssets/Scenes/Level3.unity b/Assets/_CompletedAssets/Scenes/Level3.unity index dcb1b14391c244bfcd5340ecc789432e090c54f3..31e2685999a74c6301f1f221c2b8c4950aaf20ea 100644 --- a/Assets/_CompletedAssets/Scenes/Level3.unity +++ b/Assets/_CompletedAssets/Scenes/Level3.unity @@ -3390,6 +3390,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 237742116} + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: MainMenu + objectReference: {fileID: 0} + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: LevelLoader, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 390138801857367385, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1573780625587797144, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2044902531734948076, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_AnchorMax.x @@ -3400,6 +3440,21 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2929080417684315587, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: -832.97 + objectReference: {fileID: 0} + - target: {fileID: 2929080417684315587, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.y + value: -451.8075 + objectReference: {fileID: 0} + - target: {fileID: 2929080417684315587, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.009399414 + objectReference: {fileID: 0} - target: {fileID: 3435657504190047670, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_AnchoredPosition.x @@ -3505,6 +3560,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3534584725592860997, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 1308.9927 + objectReference: {fileID: 0} + - target: {fileID: 3534584725592860997, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 106.13341 + objectReference: {fileID: 0} + - target: {fileID: 3597609549807808686, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 934.1646 + objectReference: {fileID: 0} + - target: {fileID: 3597609549807808686, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -83.99584 + objectReference: {fileID: 0} - target: {fileID: 3935974254808794679, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_Name @@ -3547,6 +3622,36 @@ PrefabInstance: Get 1000 points' objectReference: {fileID: 0} + - target: {fileID: 5485366110872691233, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 934.1646 + objectReference: {fileID: 0} + - target: {fileID: 5485366110872691233, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -83.99584 + objectReference: {fileID: 0} + - target: {fileID: 5765276694159027062, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 1308.9927 + objectReference: {fileID: 0} + - target: {fileID: 5765276694159027062, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 106.13341 + objectReference: {fileID: 0} + - target: {fileID: 5980034304355555053, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 981.7446 + objectReference: {fileID: 0} + - target: {fileID: 5980034304355555053, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 71.22693 + objectReference: {fileID: 0} - target: {fileID: 6022347655562472724, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -3572,6 +3677,61 @@ PrefabInstance: propertyPath: gameOverScreen value: objectReference: {fileID: 363229162} + - target: {fileID: 7542000904252350433, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 202.1233 + objectReference: {fileID: 0} + - target: {fileID: 7542000904252350433, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 123.41476 + objectReference: {fileID: 0} + - target: {fileID: 7678647016072598649, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_SizeDelta.x + value: 202.1233 + objectReference: {fileID: 0} + - target: {fileID: 7678647016072598649, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 123.41476 + objectReference: {fileID: 0} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 237742116} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Restart + objectReference: {fileID: 0} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: LevelLoader, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7723826430016679379, guid: 420d052720d6dee47abc3b3b63b1264c, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8283325633908098608, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} propertyPath: m_SizeDelta.y @@ -3583,7 +3743,8 @@ PrefabInstance: value: -9.266785 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 7077911813326782219, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} diff --git a/Assets/_CompletedAssets/Scenes/LevelBoss.unity b/Assets/_CompletedAssets/Scenes/LevelBoss.unity index a9353c89ee5561fb70d166972bb8f18f4eb5affe..02090426be7a2039ca89b2045ba8b14af32b7cb8 100644 --- a/Assets/_CompletedAssets/Scenes/LevelBoss.unity +++ b/Assets/_CompletedAssets/Scenes/LevelBoss.unity @@ -663,8 +663,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -138, y: -50} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: -86.696045, y: -50} + m_SizeDelta: {x: 947.4563, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &168591859 MonoBehaviour: @@ -1739,11 +1739,14 @@ PrefabInstance: value: objectReference: {fileID: 1749167514} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 1573780625587797144, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} + - {fileID: 7077911813326782219, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} + - {fileID: 890961843462469113, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3505870070799784637, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} - insertIndex: 12 + insertIndex: -1 addedObject: {fileID: 1749167515} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 420d052720d6dee47abc3b3b63b1264c, type: 3} @@ -3379,8 +3382,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -138, y: -100} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: -86.696045, y: -100} + m_SizeDelta: {x: 947.4563, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1093222811 MonoBehaviour: @@ -3994,8 +3997,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 192, y: 0} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 140.15598, y: 0} + m_SizeDelta: {x: 209.6838, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1516522369 MonoBehaviour: @@ -4040,7 +4043,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1516522370} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 433861357} + m_TargetAssemblyTypeName: LevelLoader, Assembly-CSharp + m_MethodName: Restart + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1516522370 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4113,8 +4128,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 160, y: 21} - m_SizeDelta: {x: 900, y: 400} + m_AnchoredPosition: {x: 46.862, y: 21} + m_SizeDelta: {x: 1108.2, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1580855805 MonoBehaviour: @@ -4410,8 +4425,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 192, y: -50} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: 109.37366, y: -50} + m_SizeDelta: {x: 1606.728, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1668062697 MonoBehaviour: @@ -4611,8 +4626,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 192, y: -64} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 140.15598, y: -64} + m_SizeDelta: {x: 209.6838, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1726954515 MonoBehaviour: @@ -4657,7 +4672,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1726954516} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 433861357} + m_TargetAssemblyTypeName: LevelLoader, Assembly-CSharp + m_MethodName: MainMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1726954516 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4737,8 +4764,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -1169, y: -451.80753} + m_AnchoredPosition: {x: 0.009399414, y: 0} + m_SizeDelta: {x: -832.97, y: -451.8075} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1749167516 MonoBehaviour: @@ -5222,8 +5249,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 192, y: -96} - m_SizeDelta: {x: 1200, y: 400} + m_AnchoredPosition: {x: 109.37366, y: -96} + m_SizeDelta: {x: 1606.728, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1917521022 MonoBehaviour: diff --git a/Assets/_CompletedAssets/Scenes/Main Menu.unity b/Assets/_CompletedAssets/Scenes/Main Menu.unity index 7677c5b3657974269011dd94606902006ecf1529..2e0f1af8b02796f7effe10e8fb9a59f019e657f1 100644 --- a/Assets/_CompletedAssets/Scenes/Main Menu.unity +++ b/Assets/_CompletedAssets/Scenes/Main Menu.unity @@ -9013,6 +9013,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -322.0649 objectReference: {fileID: 0} + - target: {fileID: 5577222124365197196, guid: ac7a565691ef7cd46b4574bf39f97a5c, + type: 3} + propertyPath: m_Text + value: Statistik Total + objectReference: {fileID: 0} - target: {fileID: 5689685709656604302, guid: ac7a565691ef7cd46b4574bf39f97a5c, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/_CompletedAssets/Scenes/Opening.unity b/Assets/_CompletedAssets/Scenes/Opening.unity index 80fc76ae202a14399fd3b119d465a602cac19dde..785c7621dffe3734343a8ae06021067904692e81 100644 --- a/Assets/_CompletedAssets/Scenes/Opening.unity +++ b/Assets/_CompletedAssets/Scenes/Opening.unity @@ -688,6 +688,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerHealth: {fileID: 2023876516} + pointsText: {fileID: 0} + countdownText: {fileID: 0} + gameOverScreen: {fileID: 0} --- !u!95 &1139190137 Animator: serializedVersion: 5 @@ -1348,6 +1351,16 @@ PrefabInstance: propertyPath: transition value: objectReference: {fileID: 1139190137} + - target: {fileID: 4564212333443853797, guid: 31db2b96ec2925347875a65b3aaea693, + type: 3} + propertyPath: m_SizeDelta.y + value: 86.0674 + objectReference: {fileID: 0} + - target: {fileID: 4564212333443853797, guid: 31db2b96ec2925347875a65b3aaea693, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -6.1476135 + objectReference: {fileID: 0} - target: {fileID: 5811538227032464787, guid: 31db2b96ec2925347875a65b3aaea693, type: 3} propertyPath: m_Name diff --git a/Assets/_CompletedAssets/Scripts/LevelLoader.cs b/Assets/_CompletedAssets/Scripts/LevelLoader.cs index 51515efd323702264e73e557885cdafdf00934ec..1c6fa56694a1c637ae3ec4fc9b6c5a74a78619ed 100644 --- a/Assets/_CompletedAssets/Scripts/LevelLoader.cs +++ b/Assets/_CompletedAssets/Scripts/LevelLoader.cs @@ -20,7 +20,7 @@ public class LevelLoader : MonoBehaviour { StartCoroutine(LoadLevel(levelName)); } - + IEnumerator LoadLevel(int levelIndex) { transition.SetTrigger("Start"); @@ -59,6 +59,17 @@ public class LevelLoader : MonoBehaviour yield return new WaitForSeconds(1f); countdownTime--; } + MainMenu(); // SceneManager.LoadScene(0); } + + public void MainMenu() + { + LoadLevelString("Main Menu"); + } + + public void Restart() + { + LoadLevelString("Opening"); + } }