diff --git a/Assets/Levels/back-on-track.json b/Assets/Levels/back-on-track.json index a97e351..c881349 100644 --- a/Assets/Levels/back-on-track.json +++ b/Assets/Levels/back-on-track.json @@ -1,6 +1,6 @@ { "Name": "Back on Track", - "MusicPath": "Musics/BackOnTrack.mp3", + "MusicName": "BackOnTrack.mp3", "TotalJumps": 0, "TotalAttempts": 0, "KilledCount": 0, diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..7a7eb66 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b0d0b1b64df4dd87945cd95cc7484c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Musics.meta b/Assets/Resources/Musics.meta similarity index 100% rename from Assets/Musics.meta rename to Assets/Resources/Musics.meta diff --git a/Assets/Musics/BackOnTrack.mp3 b/Assets/Resources/Musics/BackOnTrack.mp3 similarity index 100% rename from Assets/Musics/BackOnTrack.mp3 rename to Assets/Resources/Musics/BackOnTrack.mp3 diff --git a/Assets/Musics/BackOnTrack.mp3.meta b/Assets/Resources/Musics/BackOnTrack.mp3.meta similarity index 100% rename from Assets/Musics/BackOnTrack.mp3.meta rename to Assets/Resources/Musics/BackOnTrack.mp3.meta diff --git a/Assets/Musics/BaseAfterBase.mp3 b/Assets/Resources/Musics/BaseAfterBase.mp3 similarity index 100% rename from Assets/Musics/BaseAfterBase.mp3 rename to Assets/Resources/Musics/BaseAfterBase.mp3 diff --git a/Assets/Musics/BaseAfterBase.mp3.meta b/Assets/Resources/Musics/BaseAfterBase.mp3.meta similarity index 100% rename from Assets/Musics/BaseAfterBase.mp3.meta rename to Assets/Resources/Musics/BaseAfterBase.mp3.meta diff --git a/Assets/Musics/BlastProcessing.mp3 b/Assets/Resources/Musics/BlastProcessing.mp3 similarity index 100% rename from Assets/Musics/BlastProcessing.mp3 rename to Assets/Resources/Musics/BlastProcessing.mp3 diff --git a/Assets/Musics/BlastProcessing.mp3.meta b/Assets/Resources/Musics/BlastProcessing.mp3.meta similarity index 100% rename from Assets/Musics/BlastProcessing.mp3.meta rename to Assets/Resources/Musics/BlastProcessing.mp3.meta diff --git a/Assets/Musics/CantLetGo.mp3 b/Assets/Resources/Musics/CantLetGo.mp3 similarity index 100% rename from Assets/Musics/CantLetGo.mp3 rename to Assets/Resources/Musics/CantLetGo.mp3 diff --git a/Assets/Musics/CantLetGo.mp3.meta b/Assets/Resources/Musics/CantLetGo.mp3.meta similarity index 100% rename from Assets/Musics/CantLetGo.mp3.meta rename to Assets/Resources/Musics/CantLetGo.mp3.meta diff --git a/Assets/Musics/Clubstep.mp3 b/Assets/Resources/Musics/Clubstep.mp3 similarity index 100% rename from Assets/Musics/Clubstep.mp3 rename to Assets/Resources/Musics/Clubstep.mp3 diff --git a/Assets/Musics/Clubstep.mp3.meta b/Assets/Resources/Musics/Clubstep.mp3.meta similarity index 100% rename from Assets/Musics/Clubstep.mp3.meta rename to Assets/Resources/Musics/Clubstep.mp3.meta diff --git a/Assets/Musics/Clutterfunk.mp3 b/Assets/Resources/Musics/Clutterfunk.mp3 similarity index 100% rename from Assets/Musics/Clutterfunk.mp3 rename to Assets/Resources/Musics/Clutterfunk.mp3 diff --git a/Assets/Musics/Clutterfunk.mp3.meta b/Assets/Resources/Musics/Clutterfunk.mp3.meta similarity index 100% rename from Assets/Musics/Clutterfunk.mp3.meta rename to Assets/Resources/Musics/Clutterfunk.mp3.meta diff --git a/Assets/Musics/Cycles.mp3 b/Assets/Resources/Musics/Cycles.mp3 similarity index 100% rename from Assets/Musics/Cycles.mp3 rename to Assets/Resources/Musics/Cycles.mp3 diff --git a/Assets/Musics/Cycles.mp3.meta b/Assets/Resources/Musics/Cycles.mp3.meta similarity index 100% rename from Assets/Musics/Cycles.mp3.meta rename to Assets/Resources/Musics/Cycles.mp3.meta diff --git a/Assets/Musics/Deadlocked.mp3 b/Assets/Resources/Musics/Deadlocked.mp3 similarity index 100% rename from Assets/Musics/Deadlocked.mp3 rename to Assets/Resources/Musics/Deadlocked.mp3 diff --git a/Assets/Musics/Deadlocked.mp3.meta b/Assets/Resources/Musics/Deadlocked.mp3.meta similarity index 100% rename from Assets/Musics/Deadlocked.mp3.meta rename to Assets/Resources/Musics/Deadlocked.mp3.meta diff --git a/Assets/Musics/DryOut.mp3 b/Assets/Resources/Musics/DryOut.mp3 similarity index 100% rename from Assets/Musics/DryOut.mp3 rename to Assets/Resources/Musics/DryOut.mp3 diff --git a/Assets/Musics/DryOut.mp3.meta b/Assets/Resources/Musics/DryOut.mp3.meta similarity index 100% rename from Assets/Musics/DryOut.mp3.meta rename to Assets/Resources/Musics/DryOut.mp3.meta diff --git a/Assets/Musics/Electrodynamix.mp3 b/Assets/Resources/Musics/Electrodynamix.mp3 similarity index 100% rename from Assets/Musics/Electrodynamix.mp3 rename to Assets/Resources/Musics/Electrodynamix.mp3 diff --git a/Assets/Musics/Electrodynamix.mp3.meta b/Assets/Resources/Musics/Electrodynamix.mp3.meta similarity index 100% rename from Assets/Musics/Electrodynamix.mp3.meta rename to Assets/Resources/Musics/Electrodynamix.mp3.meta diff --git a/Assets/Musics/Electroman.mp3 b/Assets/Resources/Musics/Electroman.mp3 similarity index 100% rename from Assets/Musics/Electroman.mp3 rename to Assets/Resources/Musics/Electroman.mp3 diff --git a/Assets/Musics/Electroman.mp3.meta b/Assets/Resources/Musics/Electroman.mp3.meta similarity index 100% rename from Assets/Musics/Electroman.mp3.meta rename to Assets/Resources/Musics/Electroman.mp3.meta diff --git a/Assets/Musics/GeometricalDominator.mp3 b/Assets/Resources/Musics/GeometricalDominator.mp3 similarity index 100% rename from Assets/Musics/GeometricalDominator.mp3 rename to Assets/Resources/Musics/GeometricalDominator.mp3 diff --git a/Assets/Musics/GeometricalDominator.mp3.meta b/Assets/Resources/Musics/GeometricalDominator.mp3.meta similarity index 100% rename from Assets/Musics/GeometricalDominator.mp3.meta rename to Assets/Resources/Musics/GeometricalDominator.mp3.meta diff --git a/Assets/Musics/HexagonForce.mp3 b/Assets/Resources/Musics/HexagonForce.mp3 similarity index 100% rename from Assets/Musics/HexagonForce.mp3 rename to Assets/Resources/Musics/HexagonForce.mp3 diff --git a/Assets/Musics/HexagonForce.mp3.meta b/Assets/Resources/Musics/HexagonForce.mp3.meta similarity index 100% rename from Assets/Musics/HexagonForce.mp3.meta rename to Assets/Resources/Musics/HexagonForce.mp3.meta diff --git a/Assets/Musics/Jumper.mp3 b/Assets/Resources/Musics/Jumper.mp3 similarity index 100% rename from Assets/Musics/Jumper.mp3 rename to Assets/Resources/Musics/Jumper.mp3 diff --git a/Assets/Musics/Jumper.mp3.meta b/Assets/Resources/Musics/Jumper.mp3.meta similarity index 100% rename from Assets/Musics/Jumper.mp3.meta rename to Assets/Resources/Musics/Jumper.mp3.meta diff --git a/Assets/Musics/Polargeist.mp3 b/Assets/Resources/Musics/Polargeist.mp3 similarity index 100% rename from Assets/Musics/Polargeist.mp3 rename to Assets/Resources/Musics/Polargeist.mp3 diff --git a/Assets/Musics/Polargeist.mp3.meta b/Assets/Resources/Musics/Polargeist.mp3.meta similarity index 100% rename from Assets/Musics/Polargeist.mp3.meta rename to Assets/Resources/Musics/Polargeist.mp3.meta diff --git a/Assets/Musics/StayInsideMe.mp3 b/Assets/Resources/Musics/StayInsideMe.mp3 similarity index 100% rename from Assets/Musics/StayInsideMe.mp3 rename to Assets/Resources/Musics/StayInsideMe.mp3 diff --git a/Assets/Musics/StayInsideMe.mp3.meta b/Assets/Resources/Musics/StayInsideMe.mp3.meta similarity index 100% rename from Assets/Musics/StayInsideMe.mp3.meta rename to Assets/Resources/Musics/StayInsideMe.mp3.meta diff --git a/Assets/Musics/StereoMadness.mp3 b/Assets/Resources/Musics/StereoMadness.mp3 similarity index 100% rename from Assets/Musics/StereoMadness.mp3 rename to Assets/Resources/Musics/StereoMadness.mp3 diff --git a/Assets/Musics/StereoMadness.mp3.meta b/Assets/Resources/Musics/StereoMadness.mp3.meta similarity index 100% rename from Assets/Musics/StereoMadness.mp3.meta rename to Assets/Resources/Musics/StereoMadness.mp3.meta diff --git a/Assets/Musics/TheoryOfEverything.mp3 b/Assets/Resources/Musics/TheoryOfEverything.mp3 similarity index 100% rename from Assets/Musics/TheoryOfEverything.mp3 rename to Assets/Resources/Musics/TheoryOfEverything.mp3 diff --git a/Assets/Musics/TheoryOfEverything.mp3.meta b/Assets/Resources/Musics/TheoryOfEverything.mp3.meta similarity index 100% rename from Assets/Musics/TheoryOfEverything.mp3.meta rename to Assets/Resources/Musics/TheoryOfEverything.mp3.meta diff --git a/Assets/Musics/TheoryOfEverything2.mp3 b/Assets/Resources/Musics/TheoryOfEverything2.mp3 similarity index 100% rename from Assets/Musics/TheoryOfEverything2.mp3 rename to Assets/Resources/Musics/TheoryOfEverything2.mp3 diff --git a/Assets/Musics/TheoryOfEverything2.mp3.meta b/Assets/Resources/Musics/TheoryOfEverything2.mp3.meta similarity index 100% rename from Assets/Musics/TheoryOfEverything2.mp3.meta rename to Assets/Resources/Musics/TheoryOfEverything2.mp3.meta diff --git a/Assets/Musics/TimeMachine.mp3 b/Assets/Resources/Musics/TimeMachine.mp3 similarity index 100% rename from Assets/Musics/TimeMachine.mp3 rename to Assets/Resources/Musics/TimeMachine.mp3 diff --git a/Assets/Musics/TimeMachine.mp3.meta b/Assets/Resources/Musics/TimeMachine.mp3.meta similarity index 100% rename from Assets/Musics/TimeMachine.mp3.meta rename to Assets/Resources/Musics/TimeMachine.mp3.meta diff --git a/Assets/Musics/menuLoop.mp3 b/Assets/Resources/Musics/menuLoop.mp3 similarity index 100% rename from Assets/Musics/menuLoop.mp3 rename to Assets/Resources/Musics/menuLoop.mp3 diff --git a/Assets/Musics/menuLoop.mp3.meta b/Assets/Resources/Musics/menuLoop.mp3.meta similarity index 100% rename from Assets/Musics/menuLoop.mp3.meta rename to Assets/Resources/Musics/menuLoop.mp3.meta diff --git a/Assets/Musics/secretLoop.mp3 b/Assets/Resources/Musics/secretLoop.mp3 similarity index 100% rename from Assets/Musics/secretLoop.mp3 rename to Assets/Resources/Musics/secretLoop.mp3 diff --git a/Assets/Musics/secretLoop.mp3.meta b/Assets/Resources/Musics/secretLoop.mp3.meta similarity index 100% rename from Assets/Musics/secretLoop.mp3.meta rename to Assets/Resources/Musics/secretLoop.mp3.meta diff --git a/Assets/Musics/xStep.mp3 b/Assets/Resources/Musics/xStep.mp3 similarity index 100% rename from Assets/Musics/xStep.mp3 rename to Assets/Resources/Musics/xStep.mp3 diff --git a/Assets/Musics/xStep.mp3.meta b/Assets/Resources/Musics/xStep.mp3.meta similarity index 100% rename from Assets/Musics/xStep.mp3.meta rename to Assets/Resources/Musics/xStep.mp3.meta diff --git a/Assets/Scenes/HomeScene.unity b/Assets/Scenes/HomeScene.unity index 3565c10..9a3e794 100644 --- a/Assets/Scenes/HomeScene.unity +++ b/Assets/Scenes/HomeScene.unity @@ -642,6 +642,50 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1832520161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1832520163} + - component: {fileID: 1832520162} + m_Layer: 0 + m_Name: LevelsLoader + m_TagString: LevelsLoader + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1832520162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832520161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4c3543e79f987af40bbd4a51c0a334c3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1832520163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832520161} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1888054985 GameObject: m_ObjectHideFlags: 0 @@ -886,3 +930,4 @@ SceneRoots: - {fileID: 1888054988} - {fileID: 481473977} - {fileID: 948896768} + - {fileID: 1832520163} diff --git a/Assets/Scenes/LevelScene.unity b/Assets/Scenes/LevelScene.unity index 5883d85..ce0a0f2 100644 --- a/Assets/Scenes/LevelScene.unity +++ b/Assets/Scenes/LevelScene.unity @@ -5581,6 +5581,7 @@ MonoBehaviour: rigidBody: {fileID: 1267397456} playerObject: {fileID: 1267397455} particle: {fileID: 725779776} + levelsLoader: {fileID: 0} isColliding: 1 audioSource: {fileID: 1267397461} --- !u!61 &1267397460 @@ -5642,7 +5643,7 @@ AudioSource: m_audioClip: {fileID: 8300000, guid: 681525f18aa52594aa45865f4c54b61a, type: 3} m_Resource: {fileID: 8300000, guid: 681525f18aa52594aa45865f4c54b61a, type: 3} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/SelectLevelScene.unity b/Assets/Scenes/SelectLevelScene.unity index 4c5db2d..728f5f7 100644 --- a/Assets/Scenes/SelectLevelScene.unity +++ b/Assets/Scenes/SelectLevelScene.unity @@ -131,6 +131,7 @@ GameObject: - component: {fileID: 1255459} - component: {fileID: 1255458} - component: {fileID: 1255457} + - component: {fileID: 1255460} m_Layer: 5 m_Name: Level m_TagString: Untagged @@ -202,8 +203,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1170341696} - m_TargetAssemblyTypeName: SelectLevelMenu, Assembly-CSharp + - m_Target: {fileID: 1255460} + m_TargetAssemblyTypeName: LevelNameButton, Assembly-CSharp m_MethodName: PlayLevel m_Mode: 1 m_Arguments: @@ -252,6 +253,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1255455} m_CullTransparentMesh: 1 +--- !u!114 &1255460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3617637b5b720115a8f1a856cb43f8a5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &91128433 GameObject: m_ObjectHideFlags: 0 @@ -422,8 +435,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -7.8890953, y: 0} + m_SizeDelta: {x: -15.778, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &253164522 MonoBehaviour: @@ -445,7 +458,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Last + m_text: Previous m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -510,7 +523,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -13.6918335, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -613,8 +626,8 @@ GameObject: m_Component: - component: {fileID: 954359121} - component: {fileID: 954359123} - - component: {fileID: 954359125} - component: {fileID: 954359124} + - component: {fileID: 954359125} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -692,9 +705,10 @@ MonoBehaviour: m_GameObject: {fileID: 954359120} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4c3543e79f987af40bbd4a51c0a334c3, type: 3} + m_Script: {fileID: 11500000, guid: b9d2aa88c034d40f187d6ff84705da65, type: 3} m_Name: m_EditorClassIdentifier: + levelsLoader: {fileID: 0} levelNameText: {fileID: 954359124} --- !u!1 &976210033 GameObject: @@ -708,8 +722,9 @@ GameObject: - component: {fileID: 976210037} - component: {fileID: 976210036} - component: {fileID: 976210035} + - component: {fileID: 976210038} m_Layer: 5 - m_Name: LastLevel + m_Name: PreviousButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -732,8 +747,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: -389, y: 0} - m_SizeDelta: {x: 76.7583, y: 51.8448} + m_AnchoredPosition: {x: -369.9035, y: 0} + m_SizeDelta: {x: 114.9513, y: 51.8448} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &976210035 MonoBehaviour: @@ -779,9 +794,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1170341696} - m_TargetAssemblyTypeName: SelectLevelMenu, Assembly-CSharp - m_MethodName: LastLevel + - m_Target: {fileID: 976210038} + m_TargetAssemblyTypeName: LevelPreviousButton, Assembly-CSharp + m_MethodName: PreviousLevel m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -829,6 +844,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 976210033} m_CullTransparentMesh: 1 +--- !u!114 &976210038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 976210033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c53cba3260b30d02b79e69a3198546c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1094616661 GameObject: m_ObjectHideFlags: 0 @@ -911,7 +938,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1170341696} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: SelectLevelMenu, Assembly-CSharp m_MethodName: LevelStatsBtn m_Mode: 1 @@ -973,8 +1000,9 @@ GameObject: - component: {fileID: 1099679060} - component: {fileID: 1099679059} - component: {fileID: 1099679058} + - component: {fileID: 1099679061} m_Layer: 5 - m_Name: Back + m_Name: HomeButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1043,9 +1071,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1170341696} - m_TargetAssemblyTypeName: SelectLevelMenu, Assembly-CSharp - m_MethodName: BackBtn + - m_Target: {fileID: 1099679061} + m_TargetAssemblyTypeName: LevelHomeButton, Assembly-CSharp + m_MethodName: GoToHome m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1093,6 +1121,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1099679056} m_CullTransparentMesh: 1 +--- !u!114 &1099679061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099679056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ef2acea012085a3bb9a981fc334afaec, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1153106988 GameObject: m_ObjectHideFlags: 0 @@ -1105,7 +1145,6 @@ GameObject: - component: {fileID: 1153106992} - component: {fileID: 1153106991} - component: {fileID: 1153106990} - - component: {fileID: 1153106993} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1202,19 +1241,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &1153106993 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153106988} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 78914afaa50342f4fbc6b2f0d1a6c036, type: 3} - m_Name: - m_EditorClassIdentifier: - levelNameText: {fileID: 0} --- !u!1 &1170341692 GameObject: m_ObjectHideFlags: 0 @@ -1226,7 +1252,6 @@ GameObject: - component: {fileID: 1170341695} - component: {fileID: 1170341694} - component: {fileID: 1170341693} - - component: {fileID: 1170341696} m_Layer: 0 m_Name: Main Camera m_TagString: LevelLoader @@ -1309,19 +1334,6 @@ Transform: - {fileID: 1153106989} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1170341696 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1170341692} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 78914afaa50342f4fbc6b2f0d1a6c036, type: 3} - m_Name: - m_EditorClassIdentifier: - levelNameText: {fileID: 0} --- !u!1 &1174740937 GameObject: m_ObjectHideFlags: 0 @@ -1606,8 +1618,9 @@ GameObject: - component: {fileID: 1364527285} - component: {fileID: 1364527284} - component: {fileID: 1364527283} + - component: {fileID: 1364527286} m_Layer: 5 - m_Name: NextLevel + m_Name: NextButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1677,8 +1690,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1170341696} - m_TargetAssemblyTypeName: SelectLevelMenu, Assembly-CSharp + - m_Target: {fileID: 1364527286} + m_TargetAssemblyTypeName: LevelNextButton, Assembly-CSharp m_MethodName: NextLevel m_Mode: 1 m_Arguments: @@ -1727,6 +1740,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1364527281} m_CullTransparentMesh: 1 +--- !u!114 &1364527286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1364527281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c34ef065650ba0802be580828cc0d474, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Level.cs b/Assets/Scripts/Level.cs index 127f202..4cb84dc 100644 --- a/Assets/Scripts/Level.cs +++ b/Assets/Scripts/Level.cs @@ -7,10 +7,14 @@ public class Level public string Name { get; set; } [DataMember] - public string MusicPath { get; set; } + public string MusicName { get; set; } [DataMember] public int TotalJumps { get; set; } + + [DataMember] public int TotalAttempts { get; set; } + + [DataMember] public int KilledCount { get; set; } } diff --git a/Assets/Scripts/LevelLoader.cs b/Assets/Scripts/LevelsLoader.cs similarity index 66% rename from Assets/Scripts/LevelLoader.cs rename to Assets/Scripts/LevelsLoader.cs index 9ccfbc9..aba5a94 100644 --- a/Assets/Scripts/LevelLoader.cs +++ b/Assets/Scripts/LevelsLoader.cs @@ -1,28 +1,18 @@ using System.IO; using System.Runtime.Serialization.Json; using UnityEngine; -using UnityEngine.UI; -public class LevelLoader : MonoBehaviour +public class LevelsLoader : MonoBehaviour { - public Text levelNameText; public Level level; - void Start() + public void Start() { - LoadLevel(); - if (level != null) - { - levelNameText.text = level.Name; - } - else - { - levelNameText.text = "Failed to Load Level"; - } - } + DontDestroyOnLoad(gameObject); + + // var jsonTextFile = Resources.Load("Text/jsonFile01"); + //Then use JsonUtility.FromJson() to deserialize jsonTextFile into an object - void LoadLevel() - { string path = Path.Combine(Application.dataPath, "Levels", "back-on-track.json"); if (File.Exists(path)) { diff --git a/Assets/Scripts/LevelLoader.cs.meta b/Assets/Scripts/LevelsLoader.cs.meta similarity index 100% rename from Assets/Scripts/LevelLoader.cs.meta rename to Assets/Scripts/LevelsLoader.cs.meta diff --git a/Assets/Scripts/LevelsSelect.meta b/Assets/Scripts/LevelsSelect.meta new file mode 100644 index 0000000..6e05c1e --- /dev/null +++ b/Assets/Scripts/LevelsSelect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 946cccb716439eccfa13f90e2fe2abe1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelsSelect/LevelHomeButton.cs b/Assets/Scripts/LevelsSelect/LevelHomeButton.cs new file mode 100644 index 0000000..9ce0afa --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelHomeButton.cs @@ -0,0 +1,10 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LevelHomeButton : MonoBehaviour +{ + public void GoToHome() + { + SceneManager.LoadScene("HomeScene"); + } +} diff --git a/Assets/Scripts/LevelsSelect/LevelHomeButton.cs.meta b/Assets/Scripts/LevelsSelect/LevelHomeButton.cs.meta new file mode 100644 index 0000000..8222b74 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelHomeButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ef2acea012085a3bb9a981fc334afaec \ No newline at end of file diff --git a/Assets/Scripts/LevelsSelect/LevelNameButton.cs b/Assets/Scripts/LevelsSelect/LevelNameButton.cs new file mode 100644 index 0000000..2a2e2f1 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNameButton.cs @@ -0,0 +1,10 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LevelNameButton : MonoBehaviour +{ + public void PlayLevel() + { + SceneManager.LoadScene("LevelScene"); + } +} diff --git a/Assets/Scripts/LevelsSelect/LevelNameButton.cs.meta b/Assets/Scripts/LevelsSelect/LevelNameButton.cs.meta new file mode 100644 index 0000000..f251519 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNameButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3617637b5b720115a8f1a856cb43f8a5 \ No newline at end of file diff --git a/Assets/Scripts/LevelsSelect/LevelNameText.cs b/Assets/Scripts/LevelsSelect/LevelNameText.cs new file mode 100644 index 0000000..9165507 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNameText.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.SceneManagement; + +public class LevelNameText : MonoBehaviour +{ + public LevelsLoader levelsLoader; + public Text levelNameText; + + public void Start() + { + levelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent(); + levelNameText.text = levelsLoader.level.Name; + } +} diff --git a/Assets/Scripts/LevelsSelect/LevelNameText.cs.meta b/Assets/Scripts/LevelsSelect/LevelNameText.cs.meta new file mode 100644 index 0000000..97f96a7 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNameText.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b9d2aa88c034d40f187d6ff84705da65 \ No newline at end of file diff --git a/Assets/Scripts/LevelsSelect/LevelNextButton.cs b/Assets/Scripts/LevelsSelect/LevelNextButton.cs new file mode 100644 index 0000000..bbc4ebd --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNextButton.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class LevelNextButton : MonoBehaviour +{ + public void NextLevel() + { + // TODO + } +} diff --git a/Assets/Scripts/LevelsSelect/LevelNextButton.cs.meta b/Assets/Scripts/LevelsSelect/LevelNextButton.cs.meta new file mode 100644 index 0000000..d7c10b3 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNextButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c34ef065650ba0802be580828cc0d474 \ No newline at end of file diff --git a/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs b/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs new file mode 100644 index 0000000..f480ab2 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class LevelPreviousButton : MonoBehaviour +{ + public void PreviousLevel() + { + // TODO + } +} diff --git a/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs.meta b/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs.meta new file mode 100644 index 0000000..00e4484 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2c53cba3260b30d02b79e69a3198546c \ No newline at end of file diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 299a455..07afdc3 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -1,13 +1,14 @@ using UnityEngine; using UnityEngine.SceneManagement; using System.IO; +using UnityEngine.Audio; public class Player : MonoBehaviour { public Rigidbody2D rigidBody; public GameObject playerObject; public ParticleSystem particle; - public LevelLoader levelLoader; + public LevelsLoader levelsLoader; public bool isColliding = true; public AudioSource audioSource; @@ -17,26 +18,24 @@ public class Player : MonoBehaviour public void Start() { - // levelLoader = GameObject.FindGameObjectWithTag("LevelLoader").GetComponent(); + levelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent(); + + string musicPath = Path.Combine("Musics", Path.GetFileNameWithoutExtension(levelsLoader.level.MusicName)); + AudioClip clip = Resources.Load(musicPath); + if (clip == null) + { + Debug.LogError("Music file not found at: " + musicPath); + } + else + { + audioSource.clip = clip; + audioSource.Play(); + } + var mainModule = particle.main; mainModule.simulationSpace = ParticleSystemSimulationSpace.World; particle.transform.parent = null; - // if (levelLoader.level != null) - // { - // string musicPath = Path.Combine("Musics", Path.GetFileNameWithoutExtension(levelLoader.level.MusicPath)); - // AudioClip clip = Resources.Load(musicPath); - // if (clip != null) - // { - // audioSource.clip = clip; - // audioSource.Play(); - // } - // else - // { - // Debug.LogError("Failed to load music: " + musicPath); - // } - // } - Invoke(nameof(EnableInput), 0.1f); } diff --git a/Assets/Scripts/SelectLevelMenu.cs b/Assets/Scripts/SelectLevelMenu.cs deleted file mode 100644 index 85c0f6b..0000000 --- a/Assets/Scripts/SelectLevelMenu.cs +++ /dev/null @@ -1,33 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; -using UnityEngine.SceneManagement; - -public class SelectLevelMenu : MonoBehaviour -{ - public Text levelNameText; - - public void PlayLevel() - { - SceneManager.LoadScene("LevelScene"); - } - - public void BackBtn() - { - SceneManager.LoadScene("HomeScene"); - } - - public void LastLevel() - { - // TODO - } - - public void NextLevel() - { - // TODO - } - - public void LevelStatsBtn() - { - // SceneManager.LoadSceneAsync(?); - } -} diff --git a/Assets/Scripts/SelectLevelMenu.cs.meta b/Assets/Scripts/SelectLevelMenu.cs.meta deleted file mode 100644 index 4989836..0000000 --- a/Assets/Scripts/SelectLevelMenu.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 78914afaa50342f4fbc6b2f0d1a6c036 \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c62ad6f..d9200ab 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,7 +6,7 @@ TagManager: tags: - Kill - Win - - LevelLoader + - LevelsLoader layers: - Default - TransparentFX