diff --git a/.gitignore b/.gitignore index 6a93aa0..a0ad4b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Library/ -Logs/ \ No newline at end of file +Logs/ +Temp/ \ No newline at end of file diff --git a/Assets/game/Scenes/About.unity b/Assets/game/Scenes/About.unity index 5a1f81b..9f8ce4f 100644 --- a/Assets/game/Scenes/About.unity +++ b/Assets/game/Scenes/About.unity @@ -331,32 +331,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - levelToLoad: LevelSelect - start: Start - levelselect: LevelSelect - levelTutorial: levelTutorial - level1: level1 - level2: level2 - level3: level3 - level4: level4 - level5: level5 - level6: level6 - level7: level7 - level8: level8 - level9: level9 - level10: level10 - level11: level11 - level12: level12 - level13: level13 - level14: level14 - level15: level15 - level16: level16 - level17: level17 - level18: level18 - level19: level19 - level20: level20 - bonus: bonus - about: About + scenes: + - Start + - LevelSelect + - levelTutorial + - level1 + - level2 + - level3 + - level4 + - level5 + - level6 + - level7 + - level8 + - level9 + - level10 + - level11 + - level12 + - level13 + - level14 + - level15 + - level16 + - level17 + - level18 + - level19 + - level20 + - bonus + - About + standardUI: [] + secondUI: [] + changeWhenEnabledUI: [] + changeWhenDisabledUI: [] sceneFader: {fileID: 2273668184668631824} --- !u!4 &134660639 Transform: @@ -644,141 +648,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 160531043} m_CullTransparentMesh: 1 ---- !u!1 &185181197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 185181198} - - component: {fileID: 185181200} - - component: {fileID: 185181199} - m_Layer: 5 - m_Name: Made with Gods help - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &185181198 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185181197} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 233859885} - m_RootOrder: 19 - 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: 0, y: -1501} - m_SizeDelta: {x: 398.563, y: 42.9682} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &185181199 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185181197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Made with Gods help - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &185181200 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185181197} - m_CullTransparentMesh: 1 --- !u!1 &204377657 GameObject: m_ObjectHideFlags: 0 @@ -903,7 +772,6 @@ RectTransform: - {fileID: 981257181} - {fileID: 1058785994} - {fileID: 759678594} - - {fileID: 185181198} - {fileID: 443955549} m_Father: {fileID: 1062810259} m_RootOrder: 1 @@ -1251,7 +1119,7 @@ GameObject: - component: {fileID: 352403323} - component: {fileID: 352403322} m_Layer: 5 - m_Name: Coded by Marc Tismonar + m_Name: Coded by MarcUs7i m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1297,7 +1165,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Coded by Marc Tismonar + m_text: Coded by MarcUs7i m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1868,7 +1736,7 @@ GameObject: - component: {fileID: 443955551} - component: {fileID: 443955550} m_Layer: 5 - m_Name: Published by Marc Tismonar + m_Name: Published by MarcUs7i m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1887,7 +1755,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 233859885} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1914,7 +1782,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Published by Marc Tismonar + m_text: Published by MarcUs7i m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5407,7 +5275,7 @@ GameObject: - component: {fileID: 1597522198} - component: {fileID: 1597522197} m_Layer: 5 - m_Name: Graphics by Shant Haijnian and Marc Tismonar + m_Name: Graphics by Shant Haijnian and MarcUs7i m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5453,7 +5321,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Graphics by Shant Haijnian and Marc Tismonar + m_text: Graphics by Shant Haijnian and MarcUs7i m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5976,7 +5844,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1854825688 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5993,7 +5861,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1854825689 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/game/Scenes/LevelSelect.unity b/Assets/game/Scenes/LevelSelect.unity index ffb7700..c8febc0 100644 --- a/Assets/game/Scenes/LevelSelect.unity +++ b/Assets/game/Scenes/LevelSelect.unity @@ -301,7 +301,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &72071814 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -318,7 +318,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &72071815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -362,19 +363,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 72071816} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: About - 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 + m_Calls: [] --- !u!114 &72071816 MonoBehaviour: m_ObjectHideFlags: 0 @@ -497,19 +486,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 82618494} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level6 - 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 + m_Calls: [] --- !u!114 &82618494 MonoBehaviour: m_ObjectHideFlags: 0 @@ -550,7 +527,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &82618496 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -567,7 +544,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &98657160 GameObject: m_ObjectHideFlags: 0 @@ -652,19 +630,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 98657163} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level15 - 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 + m_Calls: [] --- !u!114 &98657163 MonoBehaviour: m_ObjectHideFlags: 0 @@ -705,7 +671,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &98657165 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -722,7 +688,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &107462682 GameObject: m_ObjectHideFlags: 0 @@ -1212,19 +1179,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 179488768} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level13 - 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 + m_Calls: [] --- !u!114 &179488768 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1265,7 +1220,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &179488770 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1282,7 +1237,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &199408594 GameObject: m_ObjectHideFlags: 0 @@ -1856,19 +1812,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 244869647} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level7 - 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 + m_Calls: [] --- !u!114 &244869647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1909,7 +1853,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &244869649 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1926,7 +1870,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &256684746 GameObject: m_ObjectHideFlags: 0 @@ -2249,19 +2194,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 282093793} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level19 - 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 + m_Calls: [] --- !u!114 &282093793 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2302,7 +2235,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &282093795 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2319,7 +2252,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &298818784 GameObject: m_ObjectHideFlags: 0 @@ -2473,7 +2407,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 339853405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} m_ConstrainProportionsScale: 0 @@ -2484,7 +2418,7 @@ 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: -300, y: -90} + m_AnchoredPosition: {x: -300, y: -90.000015} m_SizeDelta: {x: 61.6243, y: 52.4488} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &339853407 @@ -2530,19 +2464,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 339853408} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level17 - 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 + m_Calls: [] --- !u!114 &339853408 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2583,7 +2505,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &339853410 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2600,7 +2522,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &346966058 GameObject: m_ObjectHideFlags: 0 @@ -3169,19 +3092,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 566573426} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level12 - 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 + m_Calls: [] --- !u!114 &566573426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3222,7 +3133,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &566573428 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3239,7 +3150,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &611071360 GameObject: m_ObjectHideFlags: 0 @@ -3324,19 +3236,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 611071363} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level2 - 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 + m_Calls: [] --- !u!114 &611071363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3377,7 +3277,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &611071365 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3394,7 +3294,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &625387252 GameObject: m_ObjectHideFlags: 0 @@ -4262,19 +4163,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 827849757} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level11 - 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 + m_Calls: [] --- !u!114 &827849757 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4315,7 +4204,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &827849759 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4332,7 +4221,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &841872336 GameObject: m_ObjectHideFlags: 0 @@ -4990,7 +4880,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &915736139 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5007,7 +4897,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &915736140 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5167,19 +5058,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 942385034} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level3 - 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 + m_Calls: [] --- !u!114 &942385034 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5220,7 +5099,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &942385036 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5237,7 +5116,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &947887934 GameObject: m_ObjectHideFlags: 0 @@ -5726,19 +5606,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1037862605} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level1 - 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 + m_Calls: [] --- !u!114 &1037862605 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5779,7 +5647,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1037862607 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5796,7 +5664,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1042967034 GameObject: m_ObjectHideFlags: 0 @@ -5881,19 +5750,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1042967037} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level16 - 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 + m_Calls: [] --- !u!114 &1042967037 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5934,7 +5791,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1042967039 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5951,7 +5808,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1052454101 GameObject: m_ObjectHideFlags: 0 @@ -6641,19 +6499,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1279432889} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level8 - 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 + m_Calls: [] --- !u!114 &1279432889 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6694,7 +6540,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1279432891 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6711,7 +6557,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1357706961 GameObject: m_ObjectHideFlags: 0 @@ -6796,19 +6643,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1357706964} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level18 - 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 + m_Calls: [] --- !u!114 &1357706964 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6849,7 +6684,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1357706966 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6866,7 +6701,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1371086063 GameObject: m_ObjectHideFlags: 0 @@ -7082,7 +6918,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 1} --- !u!95 &1395801218 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -7099,7 +6935,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1406962473 GameObject: m_ObjectHideFlags: 0 @@ -7530,19 +7367,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1535031779} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level14 - 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 + m_Calls: [] --- !u!114 &1535031779 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7583,7 +7408,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1535031781 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -7600,7 +7425,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1542378183 GameObject: m_ObjectHideFlags: 0 @@ -7685,19 +7511,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1542378186} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level4 - 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 + m_Calls: [] --- !u!114 &1542378186 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7738,7 +7552,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1542378188 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -7755,7 +7569,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1546849379 GameObject: m_ObjectHideFlags: 0 @@ -8110,19 +7925,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1721178875} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level20 - 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 + m_Calls: [] --- !u!114 &1721178875 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8163,7 +7966,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1721178877 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8180,7 +7983,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1733537009 GameObject: m_ObjectHideFlags: 0 @@ -8265,19 +8069,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1733537012} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level10 - 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 + m_Calls: [] --- !u!114 &1733537012 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8318,7 +8110,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1733537014 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8335,7 +8127,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1752626837 GameObject: m_ObjectHideFlags: 0 @@ -8442,32 +8235,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - levelToLoad: Main - start: Start - levelselect: LevelSelect - levelTutorial: levelTutorial - level1: level1 - level2: level2 - level3: level3 - level4: level4 - level5: level5 - level6: level6 - level7: level7 - level8: level8 - level9: level9 - level10: level10 - level11: level11 - level12: level12 - level13: level13 - level14: level14 - level15: level15 - level16: level16 - level17: level17 - level18: level18 - level19: level19 - level20: level20 - bonus: bonus - about: About + scenes: + - Start + - LevelSelect + - levelTutorial + - level1 + - level2 + - level3 + - level4 + - level5 + - level6 + - level7 + - level8 + - level9 + - level10 + - level11 + - level12 + - level13 + - level14 + - level15 + - level16 + - level17 + - level18 + - level19 + - level20 + - bonus + - About + standardUI: [] + secondUI: [] + changeWhenEnabledUI: [] + changeWhenDisabledUI: [] sceneFader: {fileID: 655661370} --- !u!4 &1769907044 Transform: @@ -8496,29 +8293,29 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7aea6a0c467002347998ecd910850108, type: 3} m_Name: m_EditorClassIdentifier: - level1: {fileID: 1037862604} - level2: {fileID: 611071362} - level3: {fileID: 942385033} - level4: {fileID: 1542378185} - level5: {fileID: 2125746475} - level6: {fileID: 82618493} - level7: {fileID: 244869646} - level8: {fileID: 1279432888} - level9: {fileID: 1986589198} - level10: {fileID: 1733537011} - level11: {fileID: 827849756} - level12: {fileID: 566573425} - level13: {fileID: 179488767} - level14: {fileID: 1535031778} - level15: {fileID: 98657162} - level16: {fileID: 1042967036} - level17: {fileID: 339853407} - level18: {fileID: 1357706963} - level19: {fileID: 282093792} - level20: {fileID: 1721178874} - bonus: {fileID: 2030434647} - about: {fileID: 72071815} - test: 0 + buttons: + - {fileID: 1037862604} + - {fileID: 611071362} + - {fileID: 942385033} + - {fileID: 1542378185} + - {fileID: 2125746475} + - {fileID: 82618493} + - {fileID: 244869646} + - {fileID: 1279432888} + - {fileID: 1986589198} + - {fileID: 1733537011} + - {fileID: 827849756} + - {fileID: 566573425} + - {fileID: 179488767} + - {fileID: 1535031778} + - {fileID: 98657162} + - {fileID: 1042967036} + - {fileID: 339853407} + - {fileID: 1357706963} + - {fileID: 282093792} + - {fileID: 1721178874} + - {fileID: 2030434647} + - {fileID: 72071815} --- !u!1 &1795589700 GameObject: m_ObjectHideFlags: 0 @@ -8814,19 +8611,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1986589199} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level9 - 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 + m_Calls: [] --- !u!114 &1986589199 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8867,7 +8652,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1986589201 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8884,7 +8669,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2026989088 GameObject: m_ObjectHideFlags: 0 @@ -9063,7 +8849,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &2030434646 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -9080,7 +8866,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &2030434647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9124,19 +8911,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2030434648} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Bonus - 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 + m_Calls: [] --- !u!114 &2030434648 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9259,19 +9034,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2125746476} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907043} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Level5 - 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 + m_Calls: [] --- !u!114 &2125746476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9312,7 +9075,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &2125746478 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -9329,4 +9092,5 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/game/Scenes/MarcPresents.unity b/Assets/game/Scenes/MarcPresents.unity index fda800e..8782a65 100644 --- a/Assets/game/Scenes/MarcPresents.unity +++ b/Assets/game/Scenes/MarcPresents.unity @@ -245,6 +245,7 @@ MonoBehaviour: m_EditorClassIdentifier: sceneFader: {fileID: 2273668184668631824} levelToLoad: Start + howMuchToWait: 3 --- !u!1 &617360962 GameObject: m_ObjectHideFlags: 0 @@ -379,7 +380,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Marc & Shant + m_text: 'MarcUs7i & Shant Presents' @@ -724,7 +725,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1124239879 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -741,7 +742,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1162654542 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/game/Scenes/Start.unity b/Assets/game/Scenes/Start.unity index d26b98e..f93028f 100644 --- a/Assets/game/Scenes/Start.unity +++ b/Assets/game/Scenes/Start.unity @@ -609,7 +609,7 @@ 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: -40, y: -65} + m_AnchoredPosition: {x: -60, y: -40} m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &133844057 @@ -747,32 +747,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - levelToLoad: LevelSelect - start: Start - levelselect: LevelSelect - levelTutorial: levelTutorial - level1: level1 - level2: level2 - level3: level3 - level4: level4 - level5: level5 - level6: level6 - level7: level7 - level8: level8 - level9: level9 - level10: level10 - level11: level11 - level12: level12 - level13: level13 - level14: level14 - level15: level15 - level16: level16 - level17: level17 - level18: level18 - level19: level19 - level20: level20 - bonus: bonus - about: About + scenes: + - Start + - LevelSelect + - levelTutorial + - level1 + - level2 + - level3 + - level4 + - level5 + - level6 + - level7 + - level8 + - level9 + - level10 + - level11 + - level12 + - level13 + - level14 + - level15 + - level16 + - level17 + - level18 + - level19 + - level20 + - bonus + - About + standardUI: + - {fileID: 757622826} + - {fileID: 1534272371} + - {fileID: 2077052637} + secondUI: + - {fileID: 1145183729} + changeWhenEnabledUI: [] + changeWhenDisabledUI: + - {fileID: 1198550610} + - {fileID: 626197108} sceneFader: {fileID: 2273668184668631824} --- !u!4 &134660639 Transform: @@ -1807,8 +1817,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: 0, y: 13} - m_SizeDelta: {x: 250, y: 150} + m_AnchoredPosition: {x: 3, y: 0} + m_SizeDelta: {x: 280, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &469781835 MonoBehaviour: @@ -1830,8 +1840,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Version: 2.1\nMade with Unity 2021.3.9f1\nRelease Date: 01.09.2023\nThanks - to Shant Haijnian, \n Simon Tismonar\n" + m_text: 'Version: 2.1 + + Made with Unity 2021.3.33f1 + + Release Date: 01.09.2023 + +' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1858,8 +1873,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4601,7 +4616,7 @@ 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: 40, y: -65} + m_AnchoredPosition: {x: 60, y: -40} m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1071939532 @@ -5155,7 +5170,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 300, y: 200} + m_SizeDelta: {x: 300, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1166592186 MonoBehaviour: @@ -6090,7 +6105,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 134660638} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Play + m_MethodName: LevelSelect m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/game/Scenes/bonus.unity b/Assets/game/Scenes/bonus.unity index 6480619..c7205a8 100644 --- a/Assets/game/Scenes/bonus.unity +++ b/Assets/game/Scenes/bonus.unity @@ -123,77 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &25963397 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 25963400} - - component: {fileID: 25963399} - - component: {fileID: 25963398} - m_Layer: 0 - m_Name: UnderLevel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!61 &25963398 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25963397} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1000, y: 1} - m_EdgeRadius: 0 ---- !u!114 &25963399 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25963397} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 20ca5d9de408c3347b2a96699499adf2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &25963400 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25963397} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 42.9, y: -5.4, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 20 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &40152486 GameObject: m_ObjectHideFlags: 0 @@ -1593,32 +1522,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - levelToLoad: Start - start: Start - levelselect: LevelSelect - levelTutorial: levelTutorial - level1: level1 - level2: level2 - level3: level3 - level4: level4 - level5: level5 - level6: level6 - level7: level7 - level8: level8 - level9: level9 - level10: level10 - level11: level11 - level12: level12 - level13: level13 - level14: level14 - level15: level15 - level16: level16 - level17: level17 - level18: level18 - level19: level19 - level20: level20 - bonus: bonus - about: About + scenes: + - Start + - LevelSelect + - levelTutorial + - level1 + - level2 + - level3 + - level4 + - level5 + - level6 + - level7 + - level8 + - level9 + - level10 + - level11 + - level12 + - level13 + - level14 + - level15 + - level16 + - level17 + - level18 + - level19 + - level20 + - bonus + - About + standardUI: [] + secondUI: [] + changeWhenEnabledUI: [] + changeWhenDisabledUI: [] sceneFader: {fileID: 301995584} --- !u!4 &263201670 Transform: @@ -2292,41 +2225,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &653634548 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 653634549} - m_Layer: 0 - m_Name: Enemy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &653634549 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653634548} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1201979656} - - {fileID: 753431387} - - {fileID: 1848770825} - - {fileID: 1336699994} - m_Father: {fileID: 0} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &676821073 GameObject: m_ObjectHideFlags: 0 @@ -2383,7 +2281,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &685855898 GameObject: @@ -2620,7 +2518,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &753311475 GameObject: @@ -2789,76 +2687,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 753311475} m_CullTransparentMesh: 1 ---- !u!1001 &753431386 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 653634549} - m_Modifications: - - target: {fileID: 3842616199149028051, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_Name - value: Claudia - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalScale.y - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalPosition.x - value: 117.74 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalPosition.y - value: -1.1110001 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762593006546395627, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - propertyPath: target - value: - objectReference: {fileID: 820667352} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} ---- !u!4 &753431387 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3842616199149028060, guid: 45086a1c1d8f2464ca7d263202e2e2e0, type: 3} - m_PrefabInstance: {fileID: 753431386} - m_PrefabAsset: {fileID: 0} --- !u!1 &762224437 GameObject: m_ObjectHideFlags: 0 @@ -3405,7 +3233,7 @@ MonoBehaviour: runSpeed: 40 --- !u!95 &820667358 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3422,7 +3250,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &820667359 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3852,7 +3681,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &963269651 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3869,7 +3698,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &963269652 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5402,7 +5232,7 @@ MonoBehaviour: animator: {fileID: 1170870016} --- !u!95 &1170870016 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5419,7 +5249,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1170870017 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5458,72 +5289,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1170870013} m_CullTransparentMesh: 1 ---- !u!1001 &1201979655 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 653634549} - m_Modifications: - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalPosition.x - value: 34.68 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalPosition.y - value: 6.857 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 733867154069418475, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: m_Name - value: Niko - objectReference: {fileID: 0} - - target: {fileID: 8839028357585900681, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - propertyPath: target - value: - objectReference: {fileID: 820667352} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} ---- !u!4 &1201979656 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 733867154069418468, guid: 1ebf5405780ee1c4d86fd110b90f6ac5, type: 3} - m_PrefabInstance: {fileID: 1201979655} - m_PrefabAsset: {fileID: 0} --- !u!1 &1202863714 GameObject: m_ObjectHideFlags: 0 @@ -5942,72 +5707,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &1336699993 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 653634549} - m_Modifications: - - target: {fileID: 4684037969454935696, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: target - value: - objectReference: {fileID: 820667352} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalPosition.x - value: 20.02 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalPosition.y - value: -1.112 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6505881996475540685, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - propertyPath: m_Name - value: Kimberley - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} ---- !u!4 &1336699994 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6505881996475540674, guid: a1347fb4c52e6a548bd9062e7d13680c, type: 3} - m_PrefabInstance: {fileID: 1336699993} - m_PrefabAsset: {fileID: 0} --- !u!1 &1338080560 GameObject: m_ObjectHideFlags: 0 @@ -10873,64 +10572,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1380501858 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1380501860} - - component: {fileID: 1380501859} - m_Layer: 0 - m_Name: LeftCorner (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &1380501859 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1380501858} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 4.92172} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 13.528014} - m_EdgeRadius: 0 ---- !u!4 &1380501860 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1380501858} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 23.27, y: -26.26, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1479413691 GameObject: m_ObjectHideFlags: 0 @@ -11091,7 +10732,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!70 &1511595344 CapsuleCollider2D: @@ -12167,7 +11808,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1726973747 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -12184,7 +11825,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &1727647056 PrefabInstance: m_ObjectHideFlags: 0 @@ -26344,68 +25986,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1827969999} m_CullTransparentMesh: 1 ---- !u!1001 &1848770824 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 653634549} - m_Modifications: - - target: {fileID: 331284003590270464, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_Name - value: Zoltan - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalPosition.x - value: 22.5 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalPosition.y - value: 0.927 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} ---- !u!4 &1848770825 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2472003459060674357, guid: ad180bd9dbc48b24cb65ac52928f9626, type: 3} - m_PrefabInstance: {fileID: 1848770824} - m_PrefabAsset: {fileID: 0} --- !u!1 &1854525211 GameObject: m_ObjectHideFlags: 0 @@ -27127,7 +26707,7 @@ PrefabInstance: objectReference: {fileID: 1082662665} - target: {fileID: 5947294273481416654, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} propertyPath: m_RootOrder - value: 22 + value: 19 objectReference: {fileID: 0} - target: {fileID: 5947294273481416654, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} propertyPath: m_LocalPosition.x @@ -27216,7 +26796,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5550679522902189044, guid: b92ade8210d0041498ed6095031f9d98, type: 3} propertyPath: m_RootOrder - value: 21 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5550679522902189044, guid: b92ade8210d0041498ed6095031f9d98, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/game/Scenes/level1.unity b/Assets/game/Scenes/level1.unity index 9f8f463..fbf94d1 100644 --- a/Assets/game/Scenes/level1.unity +++ b/Assets/game/Scenes/level1.unity @@ -207,7 +207,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &13219021 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -224,7 +224,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &13219022 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1787,32 +1788,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - levelToLoad: Start - start: Start - levelselect: LevelSelect - levelTutorial: levelTutorial - level1: level1 - level2: level2 - level3: level3 - level4: level4 - level5: level5 - level6: level6 - level7: level7 - level8: level8 - level9: level9 - level10: level10 - level11: level11 - level12: level12 - level13: level13 - level14: level14 - level15: level15 - level16: level16 - level17: level17 - level18: level18 - level19: level19 - level20: level20 - bonus: bonus - about: About + scenes: + - Start + - LevelSelect + - levelTutorial + - level1 + - level2 + - level3 + - level4 + - level5 + - level6 + - level7 + - level8 + - level9 + - level10 + - level11 + - level12 + - level13 + - level14 + - level15 + - level16 + - level17 + - level18 + - level19 + - level20 + - bonus + - About + standardUI: [] + secondUI: [] + changeWhenEnabledUI: [] + changeWhenDisabledUI: [] sceneFader: {fileID: 301995584} --- !u!4 &263201670 Transform: @@ -8324,7 +8329,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1726973745 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8341,7 +8346,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1726973746 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8603,7 +8609,7 @@ MonoBehaviour: animator: {fileID: 1732107369} --- !u!95 &1732107369 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8620,7 +8626,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1732107370 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/game/Scripts/UI/Pause.cs b/Assets/game/Scripts/UI/Pause.cs index 248e46f..093aa8a 100644 --- a/Assets/game/Scripts/UI/Pause.cs +++ b/Assets/game/Scripts/UI/Pause.cs @@ -20,62 +20,49 @@ public class Pause : MonoBehaviour public void IsPauseing() { - /*IsPause = true; - PlayerMovement.horizontalMove = 0f; - animator.SetFloat("Speed", 0f);*/ PauseGame(); } public void IsNotPauseing() { - /*IsPause = false; - PlayerMovement.crouch = false; - animator.SetBool("IsCrouching", false);*/ PauseGame(); } void Update() { - if (Input.GetKeyDown(KeyCode.P)) + if (Input.GetKeyDown(KeyCode.P) || Input.GetKeyDown(KeyCode.Escape)) { PauseGame(); } } public void PauseGame() { - if(IsPause && !Bonus.BonusForJump) + if (!Bonus.BonusForJump) { - IsPause = false; - PlayerMovement.crouch = false; - animator.SetBool("IsCrouching", false); - PauseMenu.SetActive(false); - PauseButton.SetActive(true); - CoinCounterUI.SetActive(true); - HealthBar.SetActive(true); - Left.SetActive(true); - Right.SetActive(true); - Jump.SetActive(true); - Crouch.SetActive(true); - Fire.SetActive(true); - } - else if (!IsPause && !Bonus.BonusForJump) - { - IsPause = true; - PlayerMovement.horizontalMove = 0f; - animator.SetFloat("Speed", 0f); - PauseMenu.SetActive(true); - PauseButton.SetActive(false); - CoinCounterUI.SetActive(false); - HealthBar.SetActive(false); - Left.SetActive(false); - Right.SetActive(false); - Jump.SetActive(false); - Crouch.SetActive(false); - Fire.SetActive(false); - if (Image != null) + IsPause = !IsPause; + PauseMenu.SetActive(IsPause); + PauseButton.SetActive(!IsPause); + CoinCounterUI.SetActive(!IsPause); + HealthBar.SetActive(!IsPause); + Left.SetActive(!IsPause); + Right.SetActive(!IsPause); + Jump.SetActive(!IsPause); + Crouch.SetActive(!IsPause); + Fire.SetActive(!IsPause); + if (Image != null && !IsPause) { Image.SetActive(false); } + if (IsPause) + { + PlayerMovement.horizontalMove = 0f; + animator.SetFloat("Speed", 0f); + } + else + { + PlayerMovement.crouch = false; + animator.SetBool("IsCrouching", false); + } } } } diff --git a/Assets/game/Scripts/UI_start/LevelButtons.cs b/Assets/game/Scripts/UI_start/LevelButtons.cs index 94b5059..0912e91 100644 --- a/Assets/game/Scripts/UI_start/LevelButtons.cs +++ b/Assets/game/Scripts/UI_start/LevelButtons.cs @@ -1,184 +1,88 @@ using System.Collections; using System.Collections.Generic; +using System.Runtime.CompilerServices; using UnityEngine; using UnityEngine.UI; public class LevelButtons : MonoBehaviour { - public Button level1; - public Button level2; - public Button level3; - public Button level4; - public Button level5; - public Button level6; - public Button level7; - public Button level8; - public Button level9; - public Button level10; - public Button level11; - public Button level12; - public Button level13; - public Button level14; - public Button level15; - public Button level16; - public Button level17; - public Button level18; - public Button level19; - public Button level20; - public Button bonus; - public Button about; + public ButtonData[] buttonData; + public Button[] buttons; + private MainMenu mainMenu; + + private int level = 0; - public int test = 0; - void Awake() { - level1.interactable = true; - PlayerSaving.LoadingPlayer = true; - test = PlayerSaving.levels; + buttonData = new ButtonData[buttons.Length]; + for (int i = 0; i < buttonData.Length; i++) + { + buttonData[i] = new ButtonData(buttons[i], i + 1); + } + mainMenu = FindObjectOfType().GetComponent(); - level1.interactable = true; - level2.interactable = false; - level3.interactable = false; - level4.interactable = false; - level5.interactable = false; - level6.interactable = false; - level7.interactable = false; - level8.interactable = false; - level9.interactable = false; - level10.interactable = false; - level11.interactable = false; - level12.interactable = false; - level13.interactable = false; - level14.interactable = false; - level15.interactable = false; - level16.interactable = false; - level17.interactable = false; - level18.interactable = false; - level19.interactable = false; - level20.interactable = false; - bonus.interactable = false; - about.interactable = true; + PlayerSaving.LoadingPlayer = true; + level = PlayerSaving.levels; + + InitializeButtonListeners(); + UpdateButtons(); } - void Update() + void UpdateButtons() { - // Test if its working - /*if (Input.GetKeyDown(KeyCode.U)) - { - test--; - } + for (int i = 0; i < level; i++) + { + if (buttonData.Length > i) + { + buttonData[i].button.interactable = true; + } + } + for (int i = level; i < buttonData.Length; i++) + { + buttonData[i].button.interactable = false; + } + + buttonData[0].button.interactable = true; + buttonData[^1].button.interactable = true; + } + + void InitializeButtonListeners() + { + foreach (ButtonData data in buttonData) + { + if (data.button.interactable) + { + data.button.onClick.AddListener(() => mainMenu.StartLevels(data.level)); + } + } + } + + // Test if its working + /*void Update() + { + if (Input.GetKeyDown(KeyCode.U)) + { + level--; + UpdateButtons(); + Debug.Log("Test: " + level); + } if (Input.GetKeyDown(KeyCode.I)) - { - test++; - } - Debug.Log("Test: " + test);*/ - - level1.interactable = true; - about.interactable = true; - - if (test >= 1) { - level2.interactable = true; + level++; + UpdateButtons(); + Debug.Log("Test: " + level); } + }*/ - if (test >= 2) - { - level3.interactable = true; - } + public class ButtonData + { + public Button button; + public int level; - if (test >= 3) + public ButtonData(Button button, int level) { - level4.interactable = true; - } - - if (test >= 4) - { - level5.interactable = true; - } - - if (test >= 5) - { - level6.interactable = true; - } - - if (test >= 6) - { - level7.interactable = true; - } - - if (test >= 7) - { - level8.interactable = true; - } - - if (test >= 8) - { - level9.interactable = true; - } - - if (test >= 9) - { - level10.interactable = true; - } - - if (test >= 10) - { - level11.interactable = true; - } - - if (test >= 11) - { - level12.interactable = true; - } - - if (test >= 12) - { - level13.interactable = true; - } - - if (test >= 13) - { - level14.interactable = true; - } - - if (test >= 14) - { - level15.interactable = true; - } - - if (test >= 15) - { - level16.interactable = true; - } - - if (test >= 16) - { - level17.interactable = true; - } - - if (test >= 17) - { - level18.interactable = true; - } - - if (test >= 18) - { - level19.interactable = true; - } - - if (test >= 19) - { - level20.interactable = true; - } - - if (test >= 20) - { - bonus.interactable = true; - } - - if (test >= 21) - { - about.interactable = true; + this.button = button; + this.level = level; } } } diff --git a/Assets/game/Scripts/UI_start/MainMenu.cs b/Assets/game/Scripts/UI_start/MainMenu.cs index 21ec9de..ec3ba9e 100644 --- a/Assets/game/Scripts/UI_start/MainMenu.cs +++ b/Assets/game/Scripts/UI_start/MainMenu.cs @@ -3,33 +3,12 @@ using UnityEngine.SceneManagement; public class MainMenu : MonoBehaviour { - public string levelToLoad = "MainLevel"; - public string start = "Start"; - public string levelselect = "LevelSelect"; - public string levelTutorial = "levelTutorial"; - public string level1 = "level1"; - public string level2 = "level2"; - public string level3 = "level3"; - public string level4 = "level4"; - public string level5 = "level5"; - public string level6 = "level6"; - public string level7 = "level7"; - public string level8 = "level8"; - public string level9 = "level9"; - public string level10 = "level10"; - public string level11 = "level11"; - public string level12 = "level12"; - public string level13 = "level13"; - public string level14 = "level14"; - public string level15 = "level15"; - public string level16 = "level16"; - public string level17 = "level17"; - public string level18 = "level18"; - public string level19 = "level19"; - public string level20 = "level20"; - public string bonus = "bonus"; - public string about = "About"; + public string[] scenes = {"Start", "LevelSelect", "levelTutorial", "level1", "level2", "level3", "level4", "level5", "level6", "level7", "level8", "level9", "level10", "level11", "level12", "level13", "level14", "level15", "level16", "level17", "level18", "level19", "level20", "bonus", "About"}; + public GameObject[] standardUI; + public GameObject[] secondUI; + public GameObject[] changeWhenEnabledUI; + public GameObject[] changeWhenDisabledUI; public static int Tutorial; public SceneFader sceneFader; @@ -42,180 +21,92 @@ public class MainMenu : MonoBehaviour { Tutorial = PlayerSaving.tutorial; } - public void Play () + public void StartScene() { - sceneFader.FadeTo(levelToLoad); - } - - public void StartScene () - { - sceneFader.FadeTo(start); + sceneFader.FadeTo(scenes[0]); ExitLevel = true; } - public void LevelSelect () + public void LevelSelect() { - sceneFader.FadeTo(levelselect); + sceneFader.FadeTo(scenes[1]); ExitLevel = true; } - public void Level1 () + public void StartLevels(int level) { - if (Tutorial == 0) + if (level == 1 && Tutorial == 0) { - sceneFader.FadeTo(levelTutorial); + sceneFader.FadeTo(scenes[2]); ExitLevel = false; + return; } - if (Tutorial == 1) - { - sceneFader.FadeTo(level1); - ExitLevel = false; - } - - } - - public void Level2 () - { - sceneFader.FadeTo(level2); + level += 2; + sceneFader.FadeTo(scenes[level]); ExitLevel = false; } - public void Level3 () + public void About() { - sceneFader.FadeTo(level3); - ExitLevel = false; - } - - public void Level4 () - { - sceneFader.FadeTo(level4); - ExitLevel = false; - } - - public void Level5 () - { - sceneFader.FadeTo(level5); - ExitLevel = false; - } - - public void Level6 () - { - sceneFader.FadeTo(level6); - ExitLevel = false; - } - - public void Level7 () - { - sceneFader.FadeTo(level7); - ExitLevel = false; - } - - public void Level8 () - { - sceneFader.FadeTo(level8); - ExitLevel = false; - } - - public void Level9 () - { - sceneFader.FadeTo(level9); - ExitLevel = false; - } - - public void Level10 () - { - sceneFader.FadeTo(level10); - ExitLevel = false; - } - - public void Level11 () - { - sceneFader.FadeTo(level11); - ExitLevel = false; - } - - public void Level12 () - { - sceneFader.FadeTo(level12); - ExitLevel = false; - } - - public void Level13 () - { - sceneFader.FadeTo(level13); - ExitLevel = false; - } - - public void Level14 () - { - sceneFader.FadeTo(level14); - ExitLevel = false; - } - - public void Level15 () - { - sceneFader.FadeTo(level15); - ExitLevel = false; - } - - public void Level16 () - { - sceneFader.FadeTo(level16); - ExitLevel = false; - } - - public void Level17 () - { - sceneFader.FadeTo(level17); - ExitLevel = false; - } - - public void Level18 () - { - sceneFader.FadeTo(level18); - ExitLevel = false; - } - - public void Level19 () - { - sceneFader.FadeTo(level19); - ExitLevel = false; - } - - public void Level20 () - { - sceneFader.FadeTo(level20); - ExitLevel = false; - } - - public void Bonus () - { - sceneFader.FadeTo(bonus); - ExitLevel = false; - } - - public void About () - { - sceneFader.FadeTo(about); + sceneFader.FadeTo(scenes[^1]); ExitLevel = true; } - public void Quit () - {// If Game is going public delete nr. 1 or set it as a comment + public void Quit() + { Debug.Log("Exciting..."); Application.Quit(); #if UNITY_EDITOR UnityEditor.EditorApplication.isPlaying = false; - #endif // 1 + #endif } - public void Update (){ - if (Input.GetKeyDown(KeyCode.Escape)) + public void ToggleUI() + { + //The check + foreach (GameObject ui in changeWhenEnabledUI) { - Application.Quit(); - #if UNITY_EDITOR - UnityEditor.EditorApplication.isPlaying = false; - #endif // 1 + if (!ui.activeSelf) return; + } + foreach (GameObject ui in changeWhenDisabledUI) + { + if (ui.activeSelf) return; + } + + //The change + foreach (GameObject ui in standardUI) + { + ui.SetActive(!ui.activeSelf); + } + foreach (GameObject ui in secondUI) + { + ui.SetActive(!ui.activeSelf); + } + } + + public void Update() + { + if (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.Backspace)) + { + string currentScene = SceneManager.GetActiveScene().name; + if (currentScene == "LevelSelect" || currentScene == "levelTutorial" || currentScene == "bonus" || currentScene == "About") + { + StartScene(); + } + else if (currentScene == "MarcPresents") + { + Quit(); + } + else + { + ToggleUI(); + } + + //Pause in game is handled in Pause.cs + } + if ((Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.Return)) && SceneManager.GetActiveScene().name == "Start") + { + LevelSelect(); } } diff --git a/Assets/game/bonus/Rettung/Animation/Rettung.controller b/Assets/game/bonus/Rettung/Animation/Rettung.controller index 52253e4..4d31bef 100644 --- a/Assets/game/bonus/Rettung/Animation/Rettung.controller +++ b/Assets/game/bonus/Rettung/Animation/Rettung.controller @@ -95,25 +95,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IdleAfter m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: RunAfter m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IdleAfterAfter m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -292,7 +292,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.7692308 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 244d132..4dc94d5 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 1920 - height: 997 + y: 43.2 + width: 1536 + height: 780.8 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1536 + height: 780.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1536 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 760.8 + width: 1536 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -115,12 +115,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1536 + height: 730.8 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 43 + controlID: 56 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 808 - height: 947 + width: 646.4 + height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 48 + controlID: 42 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 808 - height: 486 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 646.4 + height: 374.4 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -189,18 +189,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 486 - width: 808 - height: 461 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + y: 374.4 + width: 646.4 + height: 356.4 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 16} - {fileID: 17} m_Selected: 0 - m_LastSelected: 2 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -218,14 +218,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 808 + x: 646.4 y: 0 - width: 668 - height: 947 + width: 534.4 + height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 116 + controlID: 57 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,8 +243,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 668 - height: 579 + width: 534.4 + height: 446.4 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -268,9 +268,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 579 - width: 668 - height: 368 + y: 446.4 + width: 534.4 + height: 284.4 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 19} @@ -293,12 +293,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1476 + x: 1180.8 y: 0 - width: 444 - height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 355.19995 + height: 730.8 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -320,14 +320,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 559 - width: 807 - height: 440 + y: 448 + width: 645.4 + height: 335.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -339,7 +339,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 807, y: 419} + m_TargetSize: {x: 806.75, y: 393} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -354,10 +354,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -403.5 - m_HBaseRangeMax: 403.5 - m_VBaseRangeMin: -209.5 - m_VBaseRangeMax: 209.5 + m_HBaseRangeMin: -322.7 + m_HBaseRangeMax: 322.7 + m_VBaseRangeMin: -157.2 + m_VBaseRangeMax: 157.2 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -375,26 +375,26 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 807 - height: 419 + width: 645.4 + height: 314.4 m_Scale: {x: 1, y: 1} - m_Translation: {x: 403.5, y: 209.5} + m_Translation: {x: 322.7, y: 157.2} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -403.5 - y: -209.5 - width: 807 - height: 419 + x: -322.7 + y: -157.2 + width: 645.4 + height: 314.4 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 807, y: 440} + m_LastWindowPixelSize: {x: 806.75, y: 419.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000001000000000000 + m_LowResolutionForAspectRatios: 00000001000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} --- !u!114 &14 @@ -413,14 +413,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 807 - height: 465 + y: 73.6 + width: 645.4 + height: 353.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -431,7 +431,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} + snapOffsetDelta: {x: -100, y: -25.600006} snapCorner: 3 id: Tool Settings index: 0 @@ -645,9 +645,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 170.84305, y: 7.3114862, z: -1.2178346} + m_Target: {x: 282.73828, y: 122.85923, z: -3.3159134} speed: 2 - m_Value: {x: 170.84305, y: 7.3114862, z: -1.2178346} + m_Value: {x: 282.73828, y: 122.85923, z: -3.3159134} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -698,9 +698,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 54.449482 + m_Target: 249.90207 speed: 2 - m_Value: 54.449482 + m_Value: 249.90207 m_Ortho: m_Target: 1 speed: 2 @@ -741,14 +741,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 605 - height: 373 + y: 73.6 + width: 645.4 + height: 353.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -862,14 +862,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.32395834 + - e00: 0.6596369 e01: 0 e02: 0 - e03: 2.041687 + e03: -109.53493 e10: 0 - e11: 0.32395834 + e11: 0.6596369 e12: 0 - e13: 149.1823 + e13: 126.76031 e20: 0 e21: 0 e22: 1 @@ -911,9 +911,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 0dca35214bd7a3a469d10a7210211701, type: 2} + m_AnimatorController: {fileID: 9100000, guid: 6f62eb45989cd644f9ef12c806a26e11, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 3999337838961725336, guid: 0dca35214bd7a3a469d10a7210211701, type: 2} + - m_Target: {fileID: 1086148805416401830, guid: 6f62eb45989cd644f9ef12c806a26e11, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -942,14 +942,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 467 - width: 605 - height: 352 + y: 448 + width: 645.4 + height: 335.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -971,14 +971,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 467 - width: 605 - height: 352 + y: 448 + width: 645.4 + height: 335.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -986,7 +986,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 26266 + m_LastSelectedObjectID: -17232 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1003,14 +1003,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 808 - y: 73 - width: 666 - height: 558 + x: 646.4 + y: 73.6 + width: 532.4 + height: 425.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1019,9 +1019,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec600000 - m_LastClickedID: 0 - m_ExpandedIDs: + m_SelectedIDs: 04fbffff + m_LastClickedID: -1276 + m_ExpandedIDs: b0bcffffb4d2ffffdefaffff06fbffff0afbffff0cfbffff0efbffff9c670000286e0000bc000100ce120100b0130100e01b0100283c010038410100cc410100084201002c480100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1061,14 +1061,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 808 - y: 652 - width: 666 - height: 347 + x: 646.4 + y: 520 + width: 532.4 + height: 263.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1085,23 +1085,23 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/game/Scripts + - Assets/game/Scripts/UI m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/game/Scripts + - Assets/game/Scripts/UI m_LastFoldersGridSize: 64 - m_LastProjectPath: C:\Users\Marc Tismonar\unity\Shanti Manti + m_LastProjectPath: C:\Users\MarcUs7\unity\ShantiManti m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 1177} - m_SelectedIDs: ee680000 - m_LastClickedID: 26862 - m_ExpandedIDs: 00000000ba680000bc680000be680000c0680000c2680000c4680000c6680000c8680000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000da680000dc680000de680000e0680000e2680000e4680000e6680000e8680000ea680000ec680000ee680000f0680000f2680000f4680000f6680000f8680000fa680000fc680000fe68000000690000026900000469000000ca9a3b + scrollPos: {x: 0, y: 124.600006} + m_SelectedIDs: 0a700000 + m_LastClickedID: 28682 + m_ExpandedIDs: 00000000d66a0000ea6a0000506b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1129,7 +1129,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ba680000bc680000be680000c0680000c2680000c4680000c6680000c8680000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000da680000dc680000de680000e0680000e2680000e4680000e6680000e8680000ea680000ec680000ee680000f0680000f2680000f4680000f6680000f8680000fa680000fc680000fe680000006900000269000004690000 + m_ExpandedIDs: 00000000d66a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1201,14 +1201,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1476 - y: 73 - width: 443 - height: 926 + x: 1180.8 + y: 73.6 + width: 354.19995 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default