diff --git a/Assets/Scenes/Mode Select Scene.unity b/Assets/Scenes/Mode Select Scene.unity index 8e22f25..a3db1d6 100644 --- a/Assets/Scenes/Mode Select Scene.unity +++ b/Assets/Scenes/Mode Select Scene.unity @@ -469,6 +469,38 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &644719113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 644719114} + m_Layer: 0 + m_Name: Post-Tutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &644719114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644719113} + 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_Children: + - {fileID: 2089610061} + - {fileID: 1319550371} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &704198595 GameObject: m_ObjectHideFlags: 0 @@ -759,12 +791,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1319550368} - 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: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 644719114} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1485915875 GameObject: @@ -849,6 +881,38 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1587950601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1587950602} + m_Layer: 0 + m_Name: Pre-Tutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1587950602 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587950601} + 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_Children: + - {fileID: 2143425944} + - {fileID: 2009173521} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1630445784 GameObject: m_ObjectHideFlags: 0 @@ -1065,6 +1129,87 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2009173520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2009173521} + - component: {fileID: 2009173522} + m_Layer: 0 + m_Name: Unavailable Challenge Select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2009173521 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009173520} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1587950602} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2009173522 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009173520} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 2135489387 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: ee8faa73ff6fb6d40bf8652b17f95bca, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.29411766} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 2.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2014073822 GameObject: m_ObjectHideFlags: 0 @@ -1121,6 +1266,8 @@ MonoBehaviour: - {fileID: 8300000, guid: bb957ec62d60fce4bb525e27fb73be59, type: 3} - {fileID: 8300000, guid: b05fdd36c9072e242b2f11af34b153b6, type: 3} - {fileID: 8300000, guid: 38364180a5adc0743a02ec84976b2ac2, type: 3} + PreTutorial: {fileID: 1587950601} + PostTutorial: {fileID: 644719113} --- !u!82 &2014073825 AudioSource: m_ObjectHideFlags: 0 @@ -1318,10 +1465,91 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2089610058} - 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.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 644719114} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2143425943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143425944} + - component: {fileID: 2143425945} + m_Layer: 0 + m_Name: Unavailable Endless Select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2143425944 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143425943} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1587950602} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2143425945 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143425943} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 2135489387 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 26ea7129a4c7aa04d89173497e397ec1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.29411766} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 2.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index 491c5df..101fecb 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -232,6 +232,8 @@ public class GMScript : MonoBehaviour if(PlayerPrefs.GetInt("GameMode") == 0) { + PlayerPrefs.SetInt("Level", 10); + maxLevel = 10; if(PlayerPrefs.GetInt("Level") == 1) @@ -255,8 +257,6 @@ public class GMScript : MonoBehaviour SeedParse(new int[] {0,0,6,6,8,8,8,6,0,4,0,6,0,6,0}); } else if(PlayerPrefs.GetInt("Level") == 10){ SeedParse(new int[] {0,4,8,13,8,8,8,0,4,6,6,10,2,6,10,2,0}); - } else if (PlayerPrefs.GetInt("Level") >= 11){ - SceneManager.LoadScene("Mode Select Scene"); } } @@ -287,8 +287,6 @@ public class GMScript : MonoBehaviour SeedParse(new int[] {6,2,10,4,1,1,2,3,5,4,8,10,0,4,0}); } else if (PlayerPrefs.GetInt("Level") == 10){ SeedParse(new int[] {11,3,1,5,0,1,3,6,2,4,7,9,11,5,0}); - } else if (PlayerPrefs.GetInt("Level") >= 11){ - SceneManager.LoadScene("Mode Select Scene"); } } @@ -428,6 +426,7 @@ public class GMScript : MonoBehaviour if(PlayerPrefs.GetInt("Level") >= maxLevel) { + PlayerPrefs.SetInt("TutorialComplete", 1); StartCoroutine(BackToModeSelect()); } diff --git a/Assets/Scripts/SelectScript.cs b/Assets/Scripts/SelectScript.cs index b2e5b21..2f0614c 100644 --- a/Assets/Scripts/SelectScript.cs +++ b/Assets/Scripts/SelectScript.cs @@ -10,6 +10,9 @@ public class SelectScript : MonoBehaviour public AudioClip[] SelectionSounds; + public GameObject PreTutorial; + public GameObject PostTutorial; + private int gameMode; private int level; private GameObject SideTrimObject; @@ -53,6 +56,15 @@ public class SelectScript : MonoBehaviour Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y); RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero); + + if(PlayerPrefs.GetInt("TutorialComplete") == 1) + { + PreTutorial.SetActive(false); + PostTutorial.SetActive(true); + } else { + PreTutorial.SetActive(true); + PostTutorial.SetActive(false); + } if (hit.collider != null) {