From 95f98847ca3d1277320b29573fa456bf7420d2a4 Mon Sep 17 00:00:00 2001 From: MarcUs7i <96580944+MarcUs7i@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:03:01 +0200 Subject: [PATCH] Refactor system code --- Assets/game/Coin/SC_2DCoin.cs | 12 +- Assets/game/Coin/minusCounter/minusCounter.cs | 12 +- Assets/game/Scenes/levelTutorial.unity | 1907 +---------------- Assets/game/Scripts/Endlevel.cs | 33 +- Assets/game/Scripts/Save/PlayerData.cs | 18 +- Assets/game/Scripts/Save/PlayerSaving.cs | 74 +- Assets/game/Scripts/Save/PlayerSaving.cs.meta | 2 +- Assets/game/Scripts/Save/SaveSystem.cs | 4 +- Assets/game/Scripts/SkyBackground/Clouds.cs | 7 +- .../Scripts/SkyBackground/CloudsToggle.cs | 99 +- Assets/game/Scripts/UI/CheckDeleted.cs | 8 +- Assets/game/Scripts/UI/Pause.cs | 2 +- Assets/game/Scripts/UI/Tutorial.cs | 65 +- Assets/game/Scripts/UI_start/LevelButtons.cs | 6 +- Assets/game/Scripts/UI_start/MainMenu.cs | 29 +- Assets/game/Scripts/UI_start/levelTutorial.cs | 19 - .../Scripts/UI_start/levelTutorial.cs.meta | 11 - Assets/game/player/scripts/PlayerHealth.cs | 14 +- .../Layouts/CurrentMaximizeLayout.dwlt | 190 +- UserSettings/Layouts/default-2021.dwlt | 78 +- 20 files changed, 360 insertions(+), 2230 deletions(-) delete mode 100644 Assets/game/Scripts/UI_start/levelTutorial.cs delete mode 100644 Assets/game/Scripts/UI_start/levelTutorial.cs.meta diff --git a/Assets/game/Coin/SC_2DCoin.cs b/Assets/game/Coin/SC_2DCoin.cs index fac932b..88284c5 100644 --- a/Assets/game/Coin/SC_2DCoin.cs +++ b/Assets/game/Coin/SC_2DCoin.cs @@ -16,8 +16,8 @@ public class SC_2DCoin : MonoBehaviour { //Make Collider2D as trigger GetComponent().isTrigger = true; - PlayerSaving.LoadingPlayer = true; - totalCoins = PlayerSaving.savedCoins; + //PlayerSaving.LoadPlayer(); + totalCoins = PlayerSaving.coins; } void OnTriggerEnter2D(Collider2D c2d) @@ -28,7 +28,6 @@ public class SC_2DCoin : MonoBehaviour //Add coin to counter totalCoins++; //Test: Print total number of coins - Debug.Log("You currently have " + SC_2DCoin.totalCoins + " Coins."); IsPlaying = true; //Destroy coin Destroy(gameObject); @@ -46,11 +45,10 @@ public class SC_2DCoin : MonoBehaviour void Update() { - if (totalCoins != PlayerSaving.savedCoins && PlayerSaving.Deleteing == false) + if (totalCoins != PlayerSaving.coins && !PlayerSaving.Deleteing) { - PlayerSaving.savedCoins = totalCoins; - PlayerSaving.SavingPlayer = true; - Debug.Log("Saved " + PlayerSaving.savedCoins); + PlayerSaving.coins = totalCoins; + PlayerSaving.SavePlayer(); } } } \ No newline at end of file diff --git a/Assets/game/Coin/minusCounter/minusCounter.cs b/Assets/game/Coin/minusCounter/minusCounter.cs index 8d6017a..099c978 100644 --- a/Assets/game/Coin/minusCounter/minusCounter.cs +++ b/Assets/game/Coin/minusCounter/minusCounter.cs @@ -27,11 +27,10 @@ public class minusCounter : MonoBehaviour PlayerHealth.minus = false; Destroy(gameObject); } - if (Endlevel.LevelForCoinBool <= 5 && PlayerHealth.minus == true) + if (PlayerSaving.level <= 5 && PlayerHealth.minus == true) { if (SC_2DCoin.totalCoins < 5) { - //counterText.text = "-" + SC_2DCoin.totalCoins + " "; Destroy(gameObject); } if (SC_2DCoin.totalCoins >= 5) @@ -41,11 +40,10 @@ public class minusCounter : MonoBehaviour PlayerHealth.minus = false; StartCoroutine(Animation()); } - if (Endlevel.LevelForCoinBool <= 9 && Endlevel.LevelForCoinBool >= 6 && PlayerHealth.minus == true) + if (PlayerSaving.level <= 9 && PlayerSaving.level >= 6 && PlayerHealth.minus == true) { if (SC_2DCoin.totalCoins < 10) { - //counterText.text = "-" + SC_2DCoin.totalCoins; Destroy(gameObject); } if (SC_2DCoin.totalCoins >= 10) @@ -55,11 +53,10 @@ public class minusCounter : MonoBehaviour PlayerHealth.minus = false; StartCoroutine(Animation()); } - if (Endlevel.LevelForCoinBool <= 15 && Endlevel.LevelForCoinBool >= 10 && PlayerHealth.minus == true) + if (PlayerSaving.level <= 15 && PlayerSaving.level >= 10 && PlayerHealth.minus == true) { if (SC_2DCoin.totalCoins < 15) { - //counterText.text = "-" + SC_2DCoin.totalCoins; Destroy(gameObject); } if (SC_2DCoin.totalCoins >= 15) @@ -69,11 +66,10 @@ public class minusCounter : MonoBehaviour PlayerHealth.minus = false; StartCoroutine(Animation()); } - if (Endlevel.LevelForCoinBool <= 20 && Endlevel.LevelForCoinBool >= 16 && PlayerHealth.minus == true) + if (PlayerSaving.level <= 20 && PlayerSaving.level >= 16 && PlayerHealth.minus == true) { if (SC_2DCoin.totalCoins < 20) { - //counterText.text = "-" + SC_2DCoin.totalCoins; Destroy(gameObject); } if (SC_2DCoin.totalCoins >= 20) diff --git a/Assets/game/Scenes/levelTutorial.unity b/Assets/game/Scenes/levelTutorial.unity index 913c1c9..95a3fcf 100644 --- a/Assets/game/Scenes/levelTutorial.unity +++ b/Assets/game/Scenes/levelTutorial.unity @@ -206,19 +206,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7731611} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1769907045} - m_TargetAssemblyTypeName: levelTutorial, Assembly-CSharp - m_MethodName: StartLevel1 - 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 &7731611 MonoBehaviour: m_ObjectHideFlags: 0 @@ -297,141 +285,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &107462682 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 107462683} - - component: {fileID: 107462685} - - component: {fileID: 107462684} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &107462683 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107462682} - 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: 954424796} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &107462684 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107462682} - 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: Exit - 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - 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 &107462685 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107462682} - m_CullTransparentMesh: 1 --- !u!1 &186440503 GameObject: m_ObjectHideFlags: 0 @@ -516,22 +369,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 680418528} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 20657414} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1570864309} + m_TargetAssemblyTypeName: Tutorial, Assembly-CSharp + m_MethodName: NextPage + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -662,191 +503,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &256684746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 256684747} - - component: {fileID: 256684748} - m_Layer: 5 - m_Name: MusicSlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &256684747 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 256684746} - 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: 1752626838} - - {fileID: 933061253} - - {fileID: 1052454102} - m_Father: {fileID: 298818785} - m_RootOrder: 4 - 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: -10.392, y: 19.5} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &256684748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 256684746} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1795589702} - m_FillRect: {fileID: 670830986} - m_HandleRect: {fileID: 1795589701} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine - m_MethodName: set_volume - m_Mode: 0 - 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!1 &298818784 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 298818785} - - component: {fileID: 298818787} - - component: {fileID: 298818786} - m_Layer: 5 - m_Name: SettingsMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &298818785 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 298818784} - 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: 1406962474} - - {fileID: 954424796} - - {fileID: 1261688437} - - {fileID: 1224448756} - - {fileID: 256684747} - - {fileID: 625387253} - m_Father: {fileID: 1217893259} - m_RootOrder: 1 - 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: -141, y: -4.3951} - m_SizeDelta: {x: 194.2252, y: 230.7902} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &298818786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 298818784} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.4392157} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &298818787 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 298818784} - m_CullTransparentMesh: 1 --- !u!1 &323594037 GameObject: m_ObjectHideFlags: 0 @@ -891,141 +547,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &346966058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 346966059} - - component: {fileID: 346966061} - - component: {fileID: 346966060} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &346966059 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 346966058} - 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: 1261688437} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &346966060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 346966058} - 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: X - 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - 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 &346966061 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 346966058} - m_CullTransparentMesh: 1 --- !u!1 &358119620 GameObject: m_ObjectHideFlags: 0 @@ -1068,86 +589,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &391854770 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 391854771} - - component: {fileID: 391854773} - - component: {fileID: 391854772} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &391854771 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391854770} - 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: 625387253} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9, y: -0.5} - m_SizeDelta: {x: -28, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &391854772 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391854770} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Music ---- !u!222 &391854773 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391854770} - m_CullTransparentMesh: 1 --- !u!1 &438902925 GameObject: m_ObjectHideFlags: 0 @@ -1227,7 +668,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &438902929 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1244,7 +685,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &562292538 GameObject: m_ObjectHideFlags: 0 @@ -1308,33 +750,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1427812056} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 358119620} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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_Target: {fileID: 1570864309} m_TargetAssemblyTypeName: Tutorial, Assembly-CSharp - m_MethodName: nextButton + m_MethodName: NextPage m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1479,105 +897,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 568986106} m_CullTransparentMesh: 1 ---- !u!1 &625387252 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 625387253} - - component: {fileID: 625387254} - m_Layer: 5 - m_Name: MusicToggle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &625387253 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625387252} - 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: 1371086064} - - {fileID: 391854771} - m_Father: {fileID: 298818785} - m_RootOrder: 5 - 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: -37.816, y: 39.5} - m_SizeDelta: {x: 105.1525, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &625387254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625387252} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1371086065} - toggleTransition: 1 - graphic: {fileID: 1477553968} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine - m_MethodName: set_enabled - m_Mode: 0 - 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_IsOn: 1 --- !u!1001 &655661369 PrefabInstance: m_ObjectHideFlags: 0 @@ -1646,82 +965,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73abc98a010110f489e86c717a2d30c3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &670830985 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 670830986} - - component: {fileID: 670830988} - - component: {fileID: 670830987} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &670830986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 670830985} - 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: 933061253} - m_RootOrder: 0 - 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: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &670830987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 670830985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &670830988 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 670830985} - m_CullTransparentMesh: 1 --- !u!1 &680418528 GameObject: m_ObjectHideFlags: 0 @@ -2057,33 +1300,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 358119620} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 1427812056} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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_Target: {fileID: 1570864309} m_TargetAssemblyTypeName: Tutorial, Assembly-CSharp - m_MethodName: backButton + m_MethodName: PreviousPage m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2210,7 +1429,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &783906616 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2227,7 +1446,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &817088834 GameObject: m_ObjectHideFlags: 0 @@ -2312,22 +1532,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 680418528} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 358119620} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1570864309} + m_TargetAssemblyTypeName: Tutorial, Assembly-CSharp + m_MethodName: PreviousPage + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -2611,7 +1819,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} @@ -2628,7 +1836,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 @@ -2667,214 +1876,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915736137} m_CullTransparentMesh: 1 ---- !u!1 &933061252 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 933061253} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &933061253 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 933061252} - 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: 670830986} - m_Father: {fileID: 256684747} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &954424795 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 954424796} - - component: {fileID: 954424799} - - component: {fileID: 954424798} - - component: {fileID: 954424797} - m_Layer: 5 - m_Name: ExitButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &954424796 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954424795} - 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: 107462683} - m_Father: {fileID: 298818785} - m_RootOrder: 1 - 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: -58.2078, y: -94} - m_SizeDelta: {x: 64.3685, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &954424797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954424795} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_HighlightedColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.78431374} - m_PressedColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.87058824} - m_SelectedColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 954424798} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: Quit - 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 &954424798 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954424795} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &954424799 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954424795} - m_CullTransparentMesh: 1 ---- !u!1 &1052454101 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1052454102} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1052454102 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1052454101} - 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: 1795589701} - m_Father: {fileID: 256684747} - m_RootOrder: 2 - 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: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1058321250 GameObject: m_ObjectHideFlags: 0 @@ -3179,7 +2180,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 915736138} - - {fileID: 298818785} - {fileID: 1570864306} m_Father: {fileID: 0} m_RootOrder: 3 @@ -3189,313 +2189,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1224448755 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1224448756} - - component: {fileID: 1224448758} - - component: {fileID: 1224448757} - m_Layer: 5 - m_Name: StartSettingsText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1224448756 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1224448755} - 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: 298818785} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.6083318} - m_AnchorMax: {x: 1, y: 0.6083318} - m_AnchoredPosition: {x: 160, y: 2.2940006} - m_SizeDelta: {x: 192.96838, y: 141.4124} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1224448757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1224448755} - 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: 'Shanti - - Manti' - 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: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - 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 &1224448758 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1224448755} - m_CullTransparentMesh: 1 ---- !u!1 &1261688436 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1261688437} - - component: {fileID: 1261688440} - - component: {fileID: 1261688439} - - component: {fileID: 1261688438} - m_Layer: 5 - m_Name: ExitMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1261688437 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261688436} - 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: 346966059} - m_Father: {fileID: 298818785} - m_RootOrder: 2 - 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: 96, y: 113} - m_SizeDelta: {x: 29.2098, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1261688438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261688436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_HighlightedColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.78431374} - m_PressedColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.87058824} - m_SelectedColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1261688439} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 298818784} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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_Target: {fileID: 1395801214} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 562292538} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 ---- !u!114 &1261688439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261688436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1261688440 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261688436} - m_CullTransparentMesh: 1 --- !u!1 &1311059922 GameObject: m_ObjectHideFlags: 0 @@ -3850,22 +2543,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 358119620} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 680418528} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1570864309} + m_TargetAssemblyTypeName: Tutorial, Assembly-CSharp + m_MethodName: NextPage + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3912,83 +2593,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363343394} m_CullTransparentMesh: 1 ---- !u!1 &1371086063 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1371086064} - - component: {fileID: 1371086066} - - component: {fileID: 1371086065} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1371086064 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1371086063} - 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: 1477553967} - m_Father: {fileID: 625387253} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1371086065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1371086063} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 0.6509804} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1371086066 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1371086063} - m_CullTransparentMesh: 1 --- !u!1 &1393265747 GameObject: m_ObjectHideFlags: 0 @@ -4259,141 +2863,6 @@ RectTransform: m_AnchoredPosition: {x: -143.6409, y: 104} m_SizeDelta: {x: 198.9268, y: 38.9872} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &1406962473 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1406962474} - - component: {fileID: 1406962476} - - component: {fileID: 1406962475} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1406962474 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406962473} - 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: 298818785} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -28} - m_SizeDelta: {x: 146.5588, y: 44.3746} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1406962475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406962473} - 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: Settings - 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: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - 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 &1406962476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406962473} - m_CullTransparentMesh: 1 --- !u!1 &1427812056 GameObject: m_ObjectHideFlags: 0 @@ -4436,82 +2905,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1477553966 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1477553967} - - component: {fileID: 1477553969} - - component: {fileID: 1477553968} - m_Layer: 5 - m_Name: Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1477553967 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1477553966} - 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: 1371086064} - m_RootOrder: 0 - 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: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1477553968 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1477553966} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1477553969 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1477553966} - m_CullTransparentMesh: 1 --- !u!1 &1491135609 GameObject: m_ObjectHideFlags: 0 @@ -4953,7 +3346,7 @@ RectTransform: - {fileID: 358119621} - {fileID: 1427812057} m_Father: {fileID: 1217893259} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5010,7 +3403,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1e3be940818f7041915df85a5a2455b, type: 3} m_Name: m_EditorClassIdentifier: - level1: {fileID: 7731610} + button: {fileID: 7731610} + menus: + - {fileID: 20657414} + - {fileID: 680418528} + - {fileID: 358119620} + - {fileID: 1427812056} --- !u!1 &1594841595 GameObject: m_ObjectHideFlags: 0 @@ -5230,22 +3628,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 20657414} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 680418528} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1570864309} + m_TargetAssemblyTypeName: Tutorial, Assembly-CSharp + m_MethodName: PreviousPage + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -5561,82 +3947,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695560409} m_CullTransparentMesh: 1 ---- !u!1 &1752626837 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1752626838} - - component: {fileID: 1752626840} - - component: {fileID: 1752626839} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1752626838 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752626837} - 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: 256684747} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1752626839 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752626837} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1752626840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752626837} - m_CullTransparentMesh: 1 --- !u!1 &1769907042 GameObject: m_ObjectHideFlags: 0 @@ -5647,7 +3957,6 @@ GameObject: m_Component: - component: {fileID: 1769907044} - component: {fileID: 1769907043} - - component: {fileID: 1769907045} m_Layer: 0 m_Name: MainMenu m_TagString: Untagged @@ -5667,32 +3976,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: @@ -5709,20 +4022,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1769907045 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769907042} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caa2afd4c3425f740aed46f2905bac07, type: 3} - m_Name: - m_EditorClassIdentifier: - level1: level1 - sceneFader: {fileID: 655661370} --- !u!1 &1773094344 GameObject: m_ObjectHideFlags: 0 @@ -5934,82 +4233,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789757253} m_CullTransparentMesh: 1 ---- !u!1 &1795589700 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1795589701} - - component: {fileID: 1795589703} - - component: {fileID: 1795589702} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1795589701 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795589700} - 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: 1052454102} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1795589702 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795589700} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1795589703 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795589700} - m_CullTransparentMesh: 1 --- !u!1 &1819667740 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/game/Scripts/Endlevel.cs b/Assets/game/Scripts/Endlevel.cs index 50be364..5be93ce 100644 --- a/Assets/game/Scripts/Endlevel.cs +++ b/Assets/game/Scripts/Endlevel.cs @@ -7,22 +7,21 @@ public class Endlevel : MonoBehaviour public string levelToLoad = "Level2"; public SceneFader sceneFader; public static int level = 0; - public int SetLevel = 1; + private int SetLevel; public static bool nextLevel = false; - public static int LevelForCoinBool = 0; void Awake() { //Make Collider2D as trigger GetComponent().isTrigger = true; - level = PlayerSaving.levels; - PlayerSaving.LoadingPlayer = true; + level = PlayerSaving.level; + //PlayerSaving.LoadPlayer(); Debug.Log(level); + SetLevel = GetValueForSetLevel(); } void OnTriggerEnter2D(Collider2D c2d) { - //Destroy the coin if Object tagged Player comes in contact with it if (c2d.CompareTag("Player")) { level = SetLevel; @@ -34,19 +33,16 @@ public class Endlevel : MonoBehaviour void Update() { //Debug.Log(level); - if (level != PlayerSaving.levels && PlayerSaving.Deleteing == false) + if (level != PlayerSaving.level && !PlayerSaving.Deleteing) { - if (PlayerSaving.levels < level) + if (PlayerSaving.level < level) { - PlayerSaving.levels = level; - PlayerSaving.SavingPlayer = true; + PlayerSaving.level = level; + PlayerSaving.SavePlayer(); //Debug.Log("Saved " + PlayerSaving.levels + " Level"); } } - // this one is not just for coin bool used. It's used in Pause.cs too! - LevelForCoinBool = SetLevel; - if (nextLevel == true) { nextLevel = false; @@ -55,4 +51,17 @@ public class Endlevel : MonoBehaviour sceneFader.FadeTo(levelToLoad); } } + + public int GetValueForSetLevel() + { + string levelInString = ""; + for(int i = 0; i < levelToLoad.Length; i++) + { + if (char.IsDigit(levelToLoad[i])) + { + levelInString += levelToLoad[i]; + } + } + return int.Parse(levelInString); + } } diff --git a/Assets/game/Scripts/Save/PlayerData.cs b/Assets/game/Scripts/Save/PlayerData.cs index 2bc7d73..bef0212 100644 --- a/Assets/game/Scripts/Save/PlayerData.cs +++ b/Assets/game/Scripts/Save/PlayerData.cs @@ -5,16 +5,16 @@ using UnityEngine; [System.Serializable] public class PlayerData { - public int level = 0; - public int coins = 0; - public int tutorial = 0; - public int cloudsMoveData = 0; + public int savedLevels = 0; + public int savedCoins = 0; + public bool tutorial = false; + public bool cloudsMove = true; - public PlayerData (PlayerSaving player) + public PlayerData () { - level = PlayerSaving.levels; - coins = PlayerSaving.savedCoins; - tutorial = PlayerSaving.tutorial; - cloudsMoveData = PlayerSaving.cloudMove; + savedLevels = PlayerSaving.level; + savedCoins = PlayerSaving.coins; + tutorial = PlayerSaving.hasCompletedTutorial; + cloudsMove = PlayerSaving.movingClouds; } } diff --git a/Assets/game/Scripts/Save/PlayerSaving.cs b/Assets/game/Scripts/Save/PlayerSaving.cs index 524c326..5117256 100644 --- a/Assets/game/Scripts/Save/PlayerSaving.cs +++ b/Assets/game/Scripts/Save/PlayerSaving.cs @@ -4,74 +4,46 @@ using UnityEngine; public class PlayerSaving : MonoBehaviour { - public static int levels = 0; - public static int savedCoins = 0; - public static int tutorial = 0; - public static int cloudMove = 0; - public static bool SavingPlayer = false; - public static bool LoadingPlayer = false; - public static bool DeleteingPlayer = false; + public static int level = 0; + public static int coins = 0; + public static bool hasCompletedTutorial = false; + public static bool movingClouds = true; public static bool Deleteing = false; - void Update() + void Awake() { - /*if (levels != Endlevel.level) - { - Endlevel.level = levels; - } - if (savedCoins != SC_2DCoin.totalCoins && Loading == false) - { - SC_2DCoin.totalCoins = savedCoins; - }*/ - if(SavingPlayer == true) - { - SavingPlayer = false; - SavePlayer(); - } - if (LoadingPlayer == true) - { - LoadingPlayer = false; - LoadPlayer(); - } - if (DeleteingPlayer == true) - { - DeleteingPlayer = false; - DeletePlayer(); - } - /*if (Input.GetKeyDown(KeyCode.L)) - { - levels = 1; - SavingPlayer = true; - }*/ + LoadPlayer(); } - public void SavePlayer() + public static void SavePlayer() { - SaveSystem.SavePlayer(this); + SaveSystem.SavePlayer(); Debug.Log("Saved"); + Debug.Log($"Saved level: {level}, coins: {coins}, tutorial: {hasCompletedTutorial}, cloudsMove: {movingClouds}"); } - public void LoadPlayer() + public static void LoadPlayer() { PlayerData data = SaveSystem.LoadPlayer(); - levels = data.level; - savedCoins = data.coins; - tutorial = data.tutorial; - cloudMove = data.cloudsMoveData; + level = data.savedLevels; + coins = data.savedCoins; + hasCompletedTutorial = data.tutorial; + movingClouds = data.cloudsMove; Debug.Log("Loaded"); - SC_2DCoin.totalCoins = savedCoins; - Endlevel.level = levels; + Debug.Log($"Loaded level: {level}, coins: {coins}, tutorial: {hasCompletedTutorial}, cloudsMove: {movingClouds}"); + SC_2DCoin.totalCoins = coins; + Endlevel.level = level; } - public void DeletePlayer() + public static void DeletePlayer() { Deleteing = true; - savedCoins = 0; - levels = 0; - tutorial = 0; - cloudMove = 0; + level = 0; + coins = 0; + hasCompletedTutorial = false; + movingClouds = true; // For MusicToggle.cs PlayerPrefs.SetInt("MusicToggled", 1); @@ -81,7 +53,7 @@ public class PlayerSaving : MonoBehaviour PlayerPrefs.SetFloat("SoundVolume", 0.75f); PlayerPrefs.Save(); - SaveSystem.SavePlayer(this); + SaveSystem.SavePlayer(); Debug.Log("Deleted"); } } diff --git a/Assets/game/Scripts/Save/PlayerSaving.cs.meta b/Assets/game/Scripts/Save/PlayerSaving.cs.meta index 0f8ddab..9e0a6f7 100644 --- a/Assets/game/Scripts/Save/PlayerSaving.cs.meta +++ b/Assets/game/Scripts/Save/PlayerSaving.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -32000 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/game/Scripts/Save/SaveSystem.cs b/Assets/game/Scripts/Save/SaveSystem.cs index d9002d8..25df643 100644 --- a/Assets/game/Scripts/Save/SaveSystem.cs +++ b/Assets/game/Scripts/Save/SaveSystem.cs @@ -4,13 +4,13 @@ using System.Runtime.Serialization.Formatters.Binary; public static class SaveSystem { - public static void SavePlayer (PlayerSaving player) + public static void SavePlayer () { BinaryFormatter formatter = new BinaryFormatter(); string path = Application.persistentDataPath + "/player.save"; FileStream stream = new FileStream(path, FileMode.Create); - PlayerData data = new PlayerData(player); + PlayerData data = new PlayerData(); formatter.Serialize(stream, data); stream.Close(); diff --git a/Assets/game/Scripts/SkyBackground/Clouds.cs b/Assets/game/Scripts/SkyBackground/Clouds.cs index f8c93e5..f2f70f2 100644 --- a/Assets/game/Scripts/SkyBackground/Clouds.cs +++ b/Assets/game/Scripts/SkyBackground/Clouds.cs @@ -21,13 +21,13 @@ public class Clouds : MonoBehaviour void Update() { - float distance = Vector2.Distance(transform.position, destroyPoint.position); - int distanceOfDestroyPoint = (int)Math.Round(distance); + float distanceX = destroyPoint.position.x - transform.position.x; + if (!Pause.IsPause && CloudsToggle.cloudsCanMove) { transform.position += Vector3.right * Time.deltaTime * speed; //rb.velocity = transform.right * speed; - if (distanceOfDestroyPoint <= 0) + if (distanceX <= 0) { Instantiate(cloudPrefab, clonePoint.position, Quaternion.identity); Destroy(gameObject); @@ -35,7 +35,6 @@ public class Clouds : MonoBehaviour } UpdateYPosition(transform); - UpdateYPosition(destroyPoint); UpdateYPosition(clonePoint); } diff --git a/Assets/game/Scripts/SkyBackground/CloudsToggle.cs b/Assets/game/Scripts/SkyBackground/CloudsToggle.cs index bc5057f..2aef787 100644 --- a/Assets/game/Scripts/SkyBackground/CloudsToggle.cs +++ b/Assets/game/Scripts/SkyBackground/CloudsToggle.cs @@ -5,108 +5,51 @@ using UnityEngine.UI; public class CloudsToggle : MonoBehaviour { - public static int cloudsMoveInt; - public static bool cloudsCanMove = true; + public static bool cloudsCanMove; public Toggle cloudsToggle; - //public GameObject imageOfToggleOn; - - int checkInStorage = 0; bool previousCloudsCanMoveState; - bool loaded = false; + bool changingStates = false; void Start() { - PlayerSaving.LoadingPlayer = true; - checkInStorage = 0; - StartCoroutine(waitToLoadData()); + changingStates = true; + + cloudsCanMove = PlayerSaving.movingClouds; + cloudsToggle.isOn = cloudsCanMove; + previousCloudsCanMoveState = cloudsCanMove; + + changingStates = false; } // Update is called once per frame void Update() { - if(checkInStorage == 0) - { - checkInStorage++; - cloudsMoveInt = PlayerSaving.cloudMove; - if(cloudsMoveInt == 0) - { - cloudsToggle.isOn = true; - //imageOfToggleOn.SetActive(true); - cloudsCanMove = true; - } - if(cloudsMoveInt == 1) - { - //imageOfToggleOn.SetActive(false); - cloudsToggle.isOn = false; - cloudsCanMove = false; - } - } - if (Input.GetKeyDown(KeyCode.C)) { ChangeBool(); } - /*if ((PlayerSaving.cloudMove != 0 && cloudsCanMove) && checkInStorage != 1) - { - PlayerSaving.cloudMove = 0; - PlayerSaving.SavingPlayer = true; - } - else if ((PlayerSaving.cloudMove != 1 && !cloudsCanMove) && checkInStorage != 1) - { - PlayerSaving.cloudMove = 1; - PlayerSaving.SavingPlayer = true; - }*/ - - if (cloudsCanMove != previousCloudsCanMoveState && loaded) + if (cloudsCanMove != previousCloudsCanMoveState) { //Debug.Log("State changed. Saving Clouds state: " + cloudsCanMove); - PlayerSaving.cloudMove = cloudsCanMove ? 0 : 1; - PlayerSaving.SavingPlayer = true; + PlayerSaving.movingClouds = cloudsCanMove; + PlayerSaving.SavePlayer(); previousCloudsCanMoveState = cloudsCanMove; } - - checkInStorage++; } public void ChangeBool() { - if(cloudsCanMove) + if (changingStates) { - cloudsToggle.isOn = false; - //imageOfToggleOn.SetActive(false); - cloudsCanMove = false; - } - else if(!cloudsCanMove) - { - cloudsToggle.isOn = true; - //imageOfToggleOn.SetActive(true); - cloudsCanMove = true; + return; } + changingStates = true; + + cloudsToggle.isOn = !cloudsCanMove; + cloudsCanMove = !cloudsCanMove; + + changingStates = false; //Debug.Log("Clouds state changed by user: " + cloudsCanMove); } - - IEnumerator waitToLoadData() - { - yield return new WaitForSeconds(0.1f); - - cloudsMoveInt = PlayerSaving.cloudMove; - /*if(cloudsMoveInt == 0) - { - cloudsToggle.isOn = true; - //imageOfToggleOn.SetActive(true); - cloudsCanMove = true; - } - if(cloudsMoveInt == 1) - { - //imageOfToggleOn.SetActive(false); - cloudsToggle.isOn = false; - cloudsCanMove = false; - }*/ - cloudsToggle.isOn = (cloudsMoveInt == 0); - cloudsCanMove = (cloudsMoveInt == 0); - previousCloudsCanMoveState = cloudsCanMove; - //Debug.Log("Clouds state changed by user: " + cloudsCanMove); - loaded = true; - } -} +} \ No newline at end of file diff --git a/Assets/game/Scripts/UI/CheckDeleted.cs b/Assets/game/Scripts/UI/CheckDeleted.cs index c692832..59129d5 100644 --- a/Assets/game/Scripts/UI/CheckDeleted.cs +++ b/Assets/game/Scripts/UI/CheckDeleted.cs @@ -41,7 +41,7 @@ public class CheckDeleted : MonoBehaviour } count++; Exit = 0; - if (PlayerSaving.levels == 0 && PlayerSaving.savedCoins == 0 && PlayerSaving.tutorial == 0 && PlayerSaving.cloudMove == 0) + if (PlayerSaving.level == 0 && PlayerSaving.coins == 0 && !PlayerSaving.hasCompletedTutorial && PlayerSaving.movingClouds) { Deleted.SetActive(true); @@ -52,7 +52,7 @@ public class CheckDeleted : MonoBehaviour } if (count == 1 || count == 2) { - PlayerSaving.DeleteingPlayer = true; + PlayerSaving.DeletePlayer(); if (Delete == 0) { StartCoroutine(WaitForDelete()); @@ -61,10 +61,10 @@ public class CheckDeleted : MonoBehaviour { return; } - PlayerSaving.LoadingPlayer = true; + PlayerSaving.LoadPlayer(); count++; Delete = 0; - if (PlayerSaving.levels == 0 && PlayerSaving.savedCoins == 0 && PlayerSaving.tutorial == 0 && PlayerSaving.cloudMove == 0) + if (PlayerSaving.level == 0 && PlayerSaving.coins == 0 && !PlayerSaving.hasCompletedTutorial && PlayerSaving.movingClouds) { Deleted.SetActive(true); Debug.Log("Done Stage: " + count); diff --git a/Assets/game/Scripts/UI/Pause.cs b/Assets/game/Scripts/UI/Pause.cs index 093aa8a..8ae6575 100644 --- a/Assets/game/Scripts/UI/Pause.cs +++ b/Assets/game/Scripts/UI/Pause.cs @@ -49,7 +49,7 @@ public class Pause : MonoBehaviour Jump.SetActive(!IsPause); Crouch.SetActive(!IsPause); Fire.SetActive(!IsPause); - if (Image != null && !IsPause) + if (Image != null && IsPause) { Image.SetActive(false); } diff --git a/Assets/game/Scripts/UI/Tutorial.cs b/Assets/game/Scripts/UI/Tutorial.cs index e34ebeb..0e5545f 100644 --- a/Assets/game/Scripts/UI/Tutorial.cs +++ b/Assets/game/Scripts/UI/Tutorial.cs @@ -5,40 +5,59 @@ using UnityEngine.UI; public class Tutorial : MonoBehaviour { - public Button level1; - public static bool pressedBack = true; + public Button button; + public GameObject[] menus; + MainMenu mainMenu; + int currentPage = 0; void Awake() { - //level1 = GetComponent