diff --git a/.editorconfig b/.editorconfig index 63713d3..5b0d023 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,8 +8,9 @@ indent_style = space end_of_line = lf [*.{json,jsonc,asmdef}] -indent_size = 2 +indent_size = 4 trim_trailing_whitespace = true +insert_final_newline = true [*.{yml,yaml,sh,puml,md}] indent_size = 2 diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0595817..163b281 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,9 +1,9 @@ { - "recommendations": [ - "editorconfig.editorconfig", - "jebbs.plantuml", - "visualstudiotoolsforunity.vstuc", - "ms-dotnettools.csharp", - "ms-dotnettools.csdevkit" - ] + "recommendations": [ + "editorconfig.editorconfig", + "jebbs.plantuml", + "visualstudiotoolsforunity.vstuc", + "ms-dotnettools.csharp", + "ms-dotnettools.csdevkit" + ] } diff --git a/.vscode/launch.json b/.vscode/launch.json index a56490c..e65417c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,10 +1,10 @@ { - "version": "0.2.0", - "configurations": [ - { - "name": "Attach to Unity", - "type": "vstuc", - "request": "attach" - } - ] + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 5b65109..5e54cda 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,10 @@ { - "editor.bracketPairColorization.enabled": true, - "editor.wordWrap": "on", - "[csharp]": { - "editor.tabSize": 4, - "editor.formatOnSave": true, - "editor.formatOnType": true - }, - "omnisharp.useModernNet": false + "editor.bracketPairColorization.enabled": true, + "editor.wordWrap": "on", + "[csharp]": { + "editor.tabSize": 4, + "editor.formatOnSave": true, + "editor.formatOnType": true + }, + "omnisharp.useModernNet": false } 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/Resources/Levels.meta b/Assets/Resources/Levels.meta new file mode 100644 index 0000000..4e9fbec --- /dev/null +++ b/Assets/Resources/Levels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a276afa778b9651581567c4c5bd8c7c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Levels/BackOnTrack.json b/Assets/Resources/Levels/BackOnTrack.json new file mode 100644 index 0000000..fd9e549 --- /dev/null +++ b/Assets/Resources/Levels/BackOnTrack.json @@ -0,0 +1,16 @@ +{ + "name": "Back on Track", + "musicName": "BackOnTrack", + "totalJumps": 0, + "totalAttempts": 0, + "order": 2, + "elements": [ + { + "type": "Spike", + "position": { + "x": 0, + "y": 0 + } + } + ] +} diff --git a/Assets/Resources/Levels/BackOnTrack.json.meta b/Assets/Resources/Levels/BackOnTrack.json.meta new file mode 100644 index 0000000..c62c5f3 --- /dev/null +++ b/Assets/Resources/Levels/BackOnTrack.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f32c76b542365930aa0e19dff76d20c7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Levels/StereoMadness.json b/Assets/Resources/Levels/StereoMadness.json new file mode 100644 index 0000000..c44faa1 --- /dev/null +++ b/Assets/Resources/Levels/StereoMadness.json @@ -0,0 +1,16 @@ +{ + "name": "Stereo Madness", + "musicName": "StereoMadness", + "totalJumps": 0, + "totalAttempts": 0, + "order": 1, + "elements": [ + { + "type": "Spike", + "position": { + "x": 0, + "y": 0 + } + } + ] +} diff --git a/Assets/Resources/Levels/StereoMadness.json.meta b/Assets/Resources/Levels/StereoMadness.json.meta new file mode 100644 index 0000000..8a5f689 --- /dev/null +++ b/Assets/Resources/Levels/StereoMadness.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b865ad45000d21465bdcfbbca0225616 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Music.meta b/Assets/Resources/Musics.meta similarity index 100% rename from Assets/Music.meta rename to Assets/Resources/Musics.meta diff --git a/Assets/Music/BackOnTrack.mp3 b/Assets/Resources/Musics/BackOnTrack.mp3 similarity index 100% rename from Assets/Music/BackOnTrack.mp3 rename to Assets/Resources/Musics/BackOnTrack.mp3 diff --git a/Assets/Music/BackOnTrack.mp3.meta b/Assets/Resources/Musics/BackOnTrack.mp3.meta similarity index 100% rename from Assets/Music/BackOnTrack.mp3.meta rename to Assets/Resources/Musics/BackOnTrack.mp3.meta diff --git a/Assets/Music/BaseAfterBase.mp3 b/Assets/Resources/Musics/BaseAfterBase.mp3 similarity index 100% rename from Assets/Music/BaseAfterBase.mp3 rename to Assets/Resources/Musics/BaseAfterBase.mp3 diff --git a/Assets/Music/BaseAfterBase.mp3.meta b/Assets/Resources/Musics/BaseAfterBase.mp3.meta similarity index 100% rename from Assets/Music/BaseAfterBase.mp3.meta rename to Assets/Resources/Musics/BaseAfterBase.mp3.meta diff --git a/Assets/Music/BlastProcessing.mp3 b/Assets/Resources/Musics/BlastProcessing.mp3 similarity index 100% rename from Assets/Music/BlastProcessing.mp3 rename to Assets/Resources/Musics/BlastProcessing.mp3 diff --git a/Assets/Music/BlastProcessing.mp3.meta b/Assets/Resources/Musics/BlastProcessing.mp3.meta similarity index 100% rename from Assets/Music/BlastProcessing.mp3.meta rename to Assets/Resources/Musics/BlastProcessing.mp3.meta diff --git a/Assets/Music/CantLetGo.mp3 b/Assets/Resources/Musics/CantLetGo.mp3 similarity index 100% rename from Assets/Music/CantLetGo.mp3 rename to Assets/Resources/Musics/CantLetGo.mp3 diff --git a/Assets/Music/CantLetGo.mp3.meta b/Assets/Resources/Musics/CantLetGo.mp3.meta similarity index 100% rename from Assets/Music/CantLetGo.mp3.meta rename to Assets/Resources/Musics/CantLetGo.mp3.meta diff --git a/Assets/Music/Clubstep.mp3 b/Assets/Resources/Musics/Clubstep.mp3 similarity index 100% rename from Assets/Music/Clubstep.mp3 rename to Assets/Resources/Musics/Clubstep.mp3 diff --git a/Assets/Music/Clubstep.mp3.meta b/Assets/Resources/Musics/Clubstep.mp3.meta similarity index 100% rename from Assets/Music/Clubstep.mp3.meta rename to Assets/Resources/Musics/Clubstep.mp3.meta diff --git a/Assets/Music/Clutterfunk.mp3 b/Assets/Resources/Musics/Clutterfunk.mp3 similarity index 100% rename from Assets/Music/Clutterfunk.mp3 rename to Assets/Resources/Musics/Clutterfunk.mp3 diff --git a/Assets/Music/Clutterfunk.mp3.meta b/Assets/Resources/Musics/Clutterfunk.mp3.meta similarity index 100% rename from Assets/Music/Clutterfunk.mp3.meta rename to Assets/Resources/Musics/Clutterfunk.mp3.meta diff --git a/Assets/Music/Cycles.mp3 b/Assets/Resources/Musics/Cycles.mp3 similarity index 100% rename from Assets/Music/Cycles.mp3 rename to Assets/Resources/Musics/Cycles.mp3 diff --git a/Assets/Music/Cycles.mp3.meta b/Assets/Resources/Musics/Cycles.mp3.meta similarity index 100% rename from Assets/Music/Cycles.mp3.meta rename to Assets/Resources/Musics/Cycles.mp3.meta diff --git a/Assets/Music/Deadlocked.mp3 b/Assets/Resources/Musics/Deadlocked.mp3 similarity index 100% rename from Assets/Music/Deadlocked.mp3 rename to Assets/Resources/Musics/Deadlocked.mp3 diff --git a/Assets/Music/Deadlocked.mp3.meta b/Assets/Resources/Musics/Deadlocked.mp3.meta similarity index 100% rename from Assets/Music/Deadlocked.mp3.meta rename to Assets/Resources/Musics/Deadlocked.mp3.meta diff --git a/Assets/Music/DryOut.mp3 b/Assets/Resources/Musics/DryOut.mp3 similarity index 100% rename from Assets/Music/DryOut.mp3 rename to Assets/Resources/Musics/DryOut.mp3 diff --git a/Assets/Music/DryOut.mp3.meta b/Assets/Resources/Musics/DryOut.mp3.meta similarity index 100% rename from Assets/Music/DryOut.mp3.meta rename to Assets/Resources/Musics/DryOut.mp3.meta diff --git a/Assets/Music/Electrodynamix.mp3 b/Assets/Resources/Musics/Electrodynamix.mp3 similarity index 100% rename from Assets/Music/Electrodynamix.mp3 rename to Assets/Resources/Musics/Electrodynamix.mp3 diff --git a/Assets/Music/Electrodynamix.mp3.meta b/Assets/Resources/Musics/Electrodynamix.mp3.meta similarity index 100% rename from Assets/Music/Electrodynamix.mp3.meta rename to Assets/Resources/Musics/Electrodynamix.mp3.meta diff --git a/Assets/Music/Electroman.mp3 b/Assets/Resources/Musics/Electroman.mp3 similarity index 100% rename from Assets/Music/Electroman.mp3 rename to Assets/Resources/Musics/Electroman.mp3 diff --git a/Assets/Music/Electroman.mp3.meta b/Assets/Resources/Musics/Electroman.mp3.meta similarity index 100% rename from Assets/Music/Electroman.mp3.meta rename to Assets/Resources/Musics/Electroman.mp3.meta diff --git a/Assets/Music/GeometricalDominator.mp3 b/Assets/Resources/Musics/GeometricalDominator.mp3 similarity index 100% rename from Assets/Music/GeometricalDominator.mp3 rename to Assets/Resources/Musics/GeometricalDominator.mp3 diff --git a/Assets/Music/GeometricalDominator.mp3.meta b/Assets/Resources/Musics/GeometricalDominator.mp3.meta similarity index 100% rename from Assets/Music/GeometricalDominator.mp3.meta rename to Assets/Resources/Musics/GeometricalDominator.mp3.meta diff --git a/Assets/Music/HexagonForce.mp3 b/Assets/Resources/Musics/HexagonForce.mp3 similarity index 100% rename from Assets/Music/HexagonForce.mp3 rename to Assets/Resources/Musics/HexagonForce.mp3 diff --git a/Assets/Music/HexagonForce.mp3.meta b/Assets/Resources/Musics/HexagonForce.mp3.meta similarity index 100% rename from Assets/Music/HexagonForce.mp3.meta rename to Assets/Resources/Musics/HexagonForce.mp3.meta diff --git a/Assets/Music/Jumper.mp3 b/Assets/Resources/Musics/Jumper.mp3 similarity index 100% rename from Assets/Music/Jumper.mp3 rename to Assets/Resources/Musics/Jumper.mp3 diff --git a/Assets/Music/Jumper.mp3.meta b/Assets/Resources/Musics/Jumper.mp3.meta similarity index 100% rename from Assets/Music/Jumper.mp3.meta rename to Assets/Resources/Musics/Jumper.mp3.meta diff --git a/Assets/Music/Polargeist.mp3 b/Assets/Resources/Musics/Polargeist.mp3 similarity index 100% rename from Assets/Music/Polargeist.mp3 rename to Assets/Resources/Musics/Polargeist.mp3 diff --git a/Assets/Music/Polargeist.mp3.meta b/Assets/Resources/Musics/Polargeist.mp3.meta similarity index 100% rename from Assets/Music/Polargeist.mp3.meta rename to Assets/Resources/Musics/Polargeist.mp3.meta diff --git a/Assets/Music/StayInsideMe.mp3 b/Assets/Resources/Musics/StayInsideMe.mp3 similarity index 100% rename from Assets/Music/StayInsideMe.mp3 rename to Assets/Resources/Musics/StayInsideMe.mp3 diff --git a/Assets/Music/StayInsideMe.mp3.meta b/Assets/Resources/Musics/StayInsideMe.mp3.meta similarity index 100% rename from Assets/Music/StayInsideMe.mp3.meta rename to Assets/Resources/Musics/StayInsideMe.mp3.meta diff --git a/Assets/Music/StereoMadness.mp3 b/Assets/Resources/Musics/StereoMadness.mp3 similarity index 100% rename from Assets/Music/StereoMadness.mp3 rename to Assets/Resources/Musics/StereoMadness.mp3 diff --git a/Assets/Music/StereoMadness.mp3.meta b/Assets/Resources/Musics/StereoMadness.mp3.meta similarity index 100% rename from Assets/Music/StereoMadness.mp3.meta rename to Assets/Resources/Musics/StereoMadness.mp3.meta diff --git a/Assets/Music/TheoryOfEverything.mp3 b/Assets/Resources/Musics/TheoryOfEverything.mp3 similarity index 100% rename from Assets/Music/TheoryOfEverything.mp3 rename to Assets/Resources/Musics/TheoryOfEverything.mp3 diff --git a/Assets/Music/TheoryOfEverything.mp3.meta b/Assets/Resources/Musics/TheoryOfEverything.mp3.meta similarity index 100% rename from Assets/Music/TheoryOfEverything.mp3.meta rename to Assets/Resources/Musics/TheoryOfEverything.mp3.meta diff --git a/Assets/Music/TheoryOfEverything2.mp3 b/Assets/Resources/Musics/TheoryOfEverything2.mp3 similarity index 100% rename from Assets/Music/TheoryOfEverything2.mp3 rename to Assets/Resources/Musics/TheoryOfEverything2.mp3 diff --git a/Assets/Music/TheoryOfEverything2.mp3.meta b/Assets/Resources/Musics/TheoryOfEverything2.mp3.meta similarity index 100% rename from Assets/Music/TheoryOfEverything2.mp3.meta rename to Assets/Resources/Musics/TheoryOfEverything2.mp3.meta diff --git a/Assets/Music/TimeMachine.mp3 b/Assets/Resources/Musics/TimeMachine.mp3 similarity index 100% rename from Assets/Music/TimeMachine.mp3 rename to Assets/Resources/Musics/TimeMachine.mp3 diff --git a/Assets/Music/TimeMachine.mp3.meta b/Assets/Resources/Musics/TimeMachine.mp3.meta similarity index 100% rename from Assets/Music/TimeMachine.mp3.meta rename to Assets/Resources/Musics/TimeMachine.mp3.meta diff --git a/Assets/Music/menuLoop.mp3 b/Assets/Resources/Musics/menuLoop.mp3 similarity index 100% rename from Assets/Music/menuLoop.mp3 rename to Assets/Resources/Musics/menuLoop.mp3 diff --git a/Assets/Music/menuLoop.mp3.meta b/Assets/Resources/Musics/menuLoop.mp3.meta similarity index 100% rename from Assets/Music/menuLoop.mp3.meta rename to Assets/Resources/Musics/menuLoop.mp3.meta diff --git a/Assets/Music/secretLoop.mp3 b/Assets/Resources/Musics/secretLoop.mp3 similarity index 100% rename from Assets/Music/secretLoop.mp3 rename to Assets/Resources/Musics/secretLoop.mp3 diff --git a/Assets/Music/secretLoop.mp3.meta b/Assets/Resources/Musics/secretLoop.mp3.meta similarity index 100% rename from Assets/Music/secretLoop.mp3.meta rename to Assets/Resources/Musics/secretLoop.mp3.meta diff --git a/Assets/Music/xStep.mp3 b/Assets/Resources/Musics/xStep.mp3 similarity index 100% rename from Assets/Music/xStep.mp3 rename to Assets/Resources/Musics/xStep.mp3 diff --git a/Assets/Music/xStep.mp3.meta b/Assets/Resources/Musics/xStep.mp3.meta similarity index 100% rename from Assets/Music/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 78d0d32..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,9 +626,10 @@ GameObject: m_Component: - component: {fileID: 954359121} - component: {fileID: 954359123} - - component: {fileID: 954359122} + - component: {fileID: 954359124} + - component: {fileID: 954359125} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -640,97 +654,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &954359122 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954359120} - 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: Level - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &954359123 CanvasRenderer: m_ObjectHideFlags: 0 @@ -739,6 +662,54 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 954359120} m_CullTransparentMesh: 1 +--- !u!114 &954359124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954359120} + 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: 0, g: 0, b: 0, 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: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Level +--- !u!114 &954359125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954359120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9d2aa88c034d40f187d6ff84705da65, type: 3} + m_Name: + m_EditorClassIdentifier: + levelsLoader: {fileID: 0} + levelNameText: {fileID: 954359124} --- !u!1 &976210033 GameObject: m_ObjectHideFlags: 0 @@ -751,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 @@ -775,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: @@ -822,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} @@ -872,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 @@ -954,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 @@ -1016,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 @@ -1086,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} @@ -1136,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 @@ -1255,10 +1252,9 @@ GameObject: - component: {fileID: 1170341695} - component: {fileID: 1170341694} - component: {fileID: 1170341693} - - component: {fileID: 1170341696} m_Layer: 0 m_Name: Main Camera - m_TagString: MainCamera + m_TagString: LevelLoader m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1338,18 +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: --- !u!1 &1174740937 GameObject: m_ObjectHideFlags: 0 @@ -1634,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 @@ -1705,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: @@ -1755,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 new file mode 100644 index 0000000..37a531a --- /dev/null +++ b/Assets/Scripts/Level.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +[System.Serializable] +public class Level +{ + public string JsonName { get; set; } + + public string name; + public string musicName; + public int totalJumps; + public int totalAttempts; + public int order; + + public static Level CreateFromJSON(string jsonString) + { + return JsonUtility.FromJson(jsonString); + } +} diff --git a/Assets/Scripts/Level.cs.meta b/Assets/Scripts/Level.cs.meta new file mode 100644 index 0000000..976af79 --- /dev/null +++ b/Assets/Scripts/Level.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d646b99f5a21a91c88669a5e4d774f06 \ No newline at end of file diff --git a/Assets/Scripts/LevelsLoader.cs b/Assets/Scripts/LevelsLoader.cs new file mode 100644 index 0000000..6d227d3 --- /dev/null +++ b/Assets/Scripts/LevelsLoader.cs @@ -0,0 +1,58 @@ +using UnityEngine; +using System.Collections.Generic; +using System.IO; + +public class LevelsLoader : MonoBehaviour +{ + public List levels = new(); + public Level levelCurrent; + + private void Start() + { + DontDestroyOnLoad(gameObject); + LoadAllLevels(); + levelCurrent = levels[0]; + } + + private void LoadAllLevels() + { + TextAsset[] levelFiles = Resources.LoadAll("Levels"); + foreach (TextAsset jsonTextFile in levelFiles) + { + Level level = Level.CreateFromJSON(jsonTextFile.text); + level.JsonName = jsonTextFile.name; + levels.Add(level); + } + levels.Sort((x, y) => x.order.CompareTo(y.order)); + } + + private void SaveLevelCurrent() + { + string json = JsonUtility.ToJson(levelCurrent, true) + "\n"; + File.WriteAllText(Path.Combine(Application.dataPath, "Resources", "Levels", levelCurrent.JsonName + ".json"), json); + } + + public void NextLevel() + { + int currentIndex = levels.IndexOf(levelCurrent); + levelCurrent = levels[(currentIndex + 1) % levels.Count]; + } + + public void PreviousLevel() + { + int currentIndex = levels.IndexOf(levelCurrent); + levelCurrent = levels[(currentIndex - 1 + levels.Count) % levels.Count]; + } + + public void IncreaseTotalJumps() + { + levelCurrent.totalJumps += 1; + SaveLevelCurrent(); + } + + public void IncreaseTotalAttempts() + { + levelCurrent.totalAttempts += 1; + SaveLevelCurrent(); + } +} diff --git a/Assets/Scripts/LevelsLoader.cs.meta b/Assets/Scripts/LevelsLoader.cs.meta new file mode 100644 index 0000000..f980ce4 --- /dev/null +++ b/Assets/Scripts/LevelsLoader.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4c3543e79f987af40bbd4a51c0a334c3 \ No newline at end of file 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..97c36d1 --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNameText.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using UnityEngine.UI; + +public class LevelNameText : MonoBehaviour +{ + public Text levelNameText; + public LevelsLoader levelsLoader; + + public void Start() + { + levelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent(); + levelNameText.text = levelsLoader.levelCurrent.name; + } + + public void Update() + { + levelNameText.text = levelsLoader.levelCurrent.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..6bc51ab --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelNextButton.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class LevelNextButton : MonoBehaviour +{ + public LevelsLoader levelsLoader; + + public void Start() + { + levelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent(); + } + + public void NextLevel() + { + levelsLoader.NextLevel(); + } +} 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..66fa47c --- /dev/null +++ b/Assets/Scripts/LevelsSelect/LevelPreviousButton.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class LevelPreviousButton : MonoBehaviour +{ + public LevelsLoader levelsLoader; + + public void Start() + { + levelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent(); + } + + public void PreviousLevel() + { + levelsLoader.PreviousLevel(); + } +} 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/MainMenu.cs b/Assets/Scripts/MainMenu.cs similarity index 100% rename from Assets/MainMenu.cs rename to Assets/Scripts/MainMenu.cs diff --git a/Assets/MainMenu.cs.meta b/Assets/Scripts/MainMenu.cs.meta similarity index 100% rename from Assets/MainMenu.cs.meta rename to Assets/Scripts/MainMenu.cs.meta diff --git a/Assets/Scripts/PlayerScript.cs b/Assets/Scripts/Player.cs similarity index 85% rename from Assets/Scripts/PlayerScript.cs rename to Assets/Scripts/Player.cs index 78a5737..473bd9d 100644 --- a/Assets/Scripts/PlayerScript.cs +++ b/Assets/Scripts/Player.cs @@ -1,11 +1,13 @@ using UnityEngine; using UnityEngine.SceneManagement; +using System.IO; -public class PlayerScript : MonoBehaviour +public class Player : MonoBehaviour { public Rigidbody2D rigidBody; public GameObject playerObject; public ParticleSystem particle; + public LevelsLoader levelsLoader; public bool isColliding = true; public AudioSource audioSource; @@ -15,6 +17,12 @@ public class PlayerScript : MonoBehaviour public void Start() { + levelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent(); + levelsLoader.IncreaseTotalAttempts(); + + audioSource.clip = Resources.Load(Path.Combine("Musics", levelsLoader.levelCurrent.musicName)); + audioSource.Play(); + var mainModule = particle.main; mainModule.simulationSpace = ParticleSystemSimulationSpace.World; particle.transform.parent = null; @@ -55,6 +63,7 @@ public class PlayerScript : MonoBehaviour { rigidBody.linearVelocity = new Vector2(rigidBody.linearVelocity.x, 0); rigidBody.AddForce(Vector2.up * 26.6581f, ForceMode2D.Impulse); + levelsLoader.IncreaseTotalJumps(); } private bool IsJumping() diff --git a/Assets/Scripts/PlayerScript.cs.meta b/Assets/Scripts/Player.cs.meta similarity index 100% rename from Assets/Scripts/PlayerScript.cs.meta rename to Assets/Scripts/Player.cs.meta diff --git a/Assets/Scripts/CameraScript.cs b/Assets/Scripts/PlayerCamera.cs similarity index 89% rename from Assets/Scripts/CameraScript.cs rename to Assets/Scripts/PlayerCamera.cs index 682997f..41fa162 100644 --- a/Assets/Scripts/CameraScript.cs +++ b/Assets/Scripts/PlayerCamera.cs @@ -1,6 +1,6 @@ using UnityEngine; -public class CameraScript : MonoBehaviour +public class PlayerCamera : MonoBehaviour { public GameObject playerObject; diff --git a/Assets/Scripts/CameraScript.cs.meta b/Assets/Scripts/PlayerCamera.cs.meta similarity index 100% rename from Assets/Scripts/CameraScript.cs.meta rename to Assets/Scripts/PlayerCamera.cs.meta diff --git a/Assets/SelectLevelMenu.cs b/Assets/SelectLevelMenu.cs deleted file mode 100644 index 4fe7942..0000000 --- a/Assets/SelectLevelMenu.cs +++ /dev/null @@ -1,30 +0,0 @@ -using UnityEngine; -using UnityEngine.SceneManagement; - -public class SelectLevelMenu : MonoBehaviour -{ - 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/SelectLevelMenu.cs.meta b/Assets/SelectLevelMenu.cs.meta deleted file mode 100644 index 4989836..0000000 --- a/Assets/SelectLevelMenu.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 78914afaa50342f4fbc6b2f0d1a6c036 \ No newline at end of file diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.json b/Assets/TextMesh Pro/Sprites/EmojiOne.json index f25fb9f..34ebd63 100644 --- a/Assets/TextMesh Pro/Sprites/EmojiOne.json +++ b/Assets/TextMesh Pro/Sprites/EmojiOne.json @@ -1,155 +1,157 @@ -{"frames": [ { - "filename": "1f60a.png", - "frame": {"x":0,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f60b.png", - "frame": {"x":128,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f60d.png", - "frame": {"x":256,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f60e.png", - "frame": {"x":384,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f600.png", - "frame": {"x":0,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f601.png", - "frame": {"x":128,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f602.png", - "frame": {"x":256,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f603.png", - "frame": {"x":384,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f604.png", - "frame": {"x":0,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f605.png", - "frame": {"x":128,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f606.png", - "frame": {"x":256,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f609.png", - "frame": {"x":384,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f618.png", - "frame": {"x":0,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "1f923.png", - "frame": {"x":128,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "263a.png", - "frame": {"x":256,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }, - { - "filename": "2639.png", - "frame": {"x":384,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} - }], - "meta": { - "app": "http://www.codeandweb.com/texturepacker", - "version": "1.0", - "image": "EmojiOne.png", - "format": "RGBA8888", - "size": {"w":512,"h":512}, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:196a26a2e149d875b91ffc8fa3581e76:fc928c7e275404b7e0649307410475cb:424723c3774975ddb2053fd5c4b85f6e$" - } - } + "frames": [ + { + "filename": "1f60a.png", + "frame": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f60b.png", + "frame": { "x": 128, "y": 0, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f60d.png", + "frame": { "x": 256, "y": 0, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f60e.png", + "frame": { "x": 384, "y": 0, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f600.png", + "frame": { "x": 0, "y": 128, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f601.png", + "frame": { "x": 128, "y": 128, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f602.png", + "frame": { "x": 256, "y": 128, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f603.png", + "frame": { "x": 384, "y": 128, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f604.png", + "frame": { "x": 0, "y": 256, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f605.png", + "frame": { "x": 128, "y": 256, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f606.png", + "frame": { "x": 256, "y": 256, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f609.png", + "frame": { "x": 384, "y": 256, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f618.png", + "frame": { "x": 0, "y": 384, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "1f923.png", + "frame": { "x": 128, "y": 384, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "263a.png", + "frame": { "x": 256, "y": 384, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + }, + { + "filename": "2639.png", + "frame": { "x": 384, "y": 384, "w": 128, "h": 128 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 128, "h": 128 }, + "sourceSize": { "w": 128, "h": 128 }, + "pivot": { "x": 0.5, "y": 0.5 } + } + ], + "meta": { + "app": "http://www.codeandweb.com/texturepacker", + "version": "1.0", + "image": "EmojiOne.png", + "format": "RGBA8888", + "size": { "w": 512, "h": 512 }, + "scale": "1", + "smartupdate": "$TexturePacker:SmartUpdate:196a26a2e149d875b91ffc8fa3581e76:fc928c7e275404b7e0649307410475cb:424723c3774975ddb2053fd5c4b85f6e$" + } +} diff --git a/Documentation/UML/class-diagram.puml b/Documentation/UML/class-diagram.puml index 586944d..7c46b46 100644 --- a/Documentation/UML/class-diagram.puml +++ b/Documentation/UML/class-diagram.puml @@ -17,7 +17,7 @@ class GameManager { class Level { - name: String - - musicPath: String + - musicName: String + StartLevel() + EndLevel() + CheckCompletion(): Boolean diff --git a/Packages/manifest.json b/Packages/manifest.json index 9a4357f..97f6d1d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,46 +1,46 @@ { - "dependencies": { - "com.unity.collab-proxy": "2.6.0", - "com.unity.feature.2d": "2.0.1", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.11.2", - "com.unity.multiplayer.center": "1.0.0", - "com.unity.test-framework": "1.4.5", - "com.unity.timeline": "1.8.7", - "com.unity.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.4", - "com.unity.modules.accessibility": "1.0.0", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - } + "dependencies": { + "com.unity.collab-proxy": "2.6.0", + "com.unity.feature.2d": "2.0.1", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.inputsystem": "1.11.2", + "com.unity.multiplayer.center": "1.0.0", + "com.unity.test-framework": "1.4.5", + "com.unity.timeline": "1.8.7", + "com.unity.ugui": "2.0.0", + "com.unity.visualscripting": "1.9.4", + "com.unity.modules.accessibility": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 9c1c64b..bc894d8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,505 +1,505 @@ { - "dependencies": { - "com.unity.2d.animation": { - "version": "10.1.3", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.2d.common": "9.0.6", - "com.unity.2d.sprite": "1.0.0", - "com.unity.collections": "1.2.4", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.aseprite": { - "version": "1.1.6", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.2d.common": "6.0.6", - "com.unity.2d.sprite": "1.0.0", - "com.unity.mathematics": "1.2.6", - "com.unity.modules.animation": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.common": { - "version": "9.0.6", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.burst": "1.8.4", - "com.unity.2d.sprite": "1.0.0", - "com.unity.mathematics": "1.1.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.pixel-perfect": { - "version": "5.0.3", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.2d.psdimporter": { - "version": "9.0.3", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.2d.common": "9.0.4", - "com.unity.2d.sprite": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.sprite": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, - "com.unity.2d.spriteshape": { - "version": "10.0.6", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.2d.common": "9.0.5", - "com.unity.mathematics": "1.1.0", - "com.unity.modules.physics2d": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.tilemap": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.uielements": "1.0.0" - } - }, - "com.unity.2d.tilemap.extras": { - "version": "4.0.2", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.burst": { - "version": "1.8.18", - "depth": 3, - "source": "registry", - "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.collab-proxy": { - "version": "2.6.0", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.collections": { - "version": "2.5.1", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.test-framework.performance": "3.0.3" - }, - "url": "https://packages.unity.com" - }, - "com.unity.ext.nunit": { - "version": "2.0.5", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.feature.2d": { - "version": "2.0.1", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.2d.animation": "10.1.3", - "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "9.0.3", - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "10.0.6", - "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "4.0.2", - "com.unity.2d.aseprite": "1.1.6" - } - }, - "com.unity.ide.rider": { - "version": "3.0.31", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ext.nunit": "1.0.6" - }, - "url": "https://packages.unity.com" - }, - "com.unity.ide.visualstudio": { - "version": "2.0.22", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.9" - }, - "url": "https://packages.unity.com" - }, - "com.unity.inputsystem": { - "version": "1.11.2", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.mathematics": { - "version": "1.3.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.multiplayer.center": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - } - }, - "com.unity.nuget.mono-cecil": { - "version": "1.11.4", - "depth": 3, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.test-framework": { - "version": "1.4.5", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ext.nunit": "2.0.3", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.test-framework.performance": { - "version": "3.0.3", - "depth": 3, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.31", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.timeline": { - "version": "1.8.7", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.ugui": { - "version": "2.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0" - } - }, - "com.unity.visualscripting": { - "version": "1.9.4", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.modules.accessibility": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.ai": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.androidjni": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.animation": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.assetbundle": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.audio": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.cloth": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.physics": "1.0.0" - } - }, - "com.unity.modules.director": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.animation": "1.0.0" - } - }, - "com.unity.modules.hierarchycore": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.imageconversion": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.imgui": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.jsonserialize": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.particlesystem": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.physics": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.physics2d": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.screencapture": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.imageconversion": "1.0.0" - } - }, - "com.unity.modules.subsystems": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.modules.terrain": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.terrainphysics": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.terrain": "1.0.0" - } - }, - "com.unity.modules.tilemap": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.physics2d": "1.0.0" - } - }, - "com.unity.modules.ui": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.uielements": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" - } - }, - "com.unity.modules.umbra": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.unityanalytics": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.modules.unitywebrequest": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.unitywebrequestassetbundle": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0" - } - }, - "com.unity.modules.unitywebrequestaudio": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.audio": "1.0.0" - } - }, - "com.unity.modules.unitywebrequesttexture": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0" - } - }, - "com.unity.modules.unitywebrequestwww": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0" - } - }, - "com.unity.modules.vehicles": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.physics": "1.0.0" - } - }, - "com.unity.modules.video": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0" - } - }, - "com.unity.modules.vr": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.xr": "1.0.0" - } - }, - "com.unity.modules.wind": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.xr": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.subsystems": "1.0.0" - } + "dependencies": { + "com.unity.2d.animation": { + "version": "10.1.3", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "9.0.6", + "com.unity.2d.sprite": "1.0.0", + "com.unity.collections": "1.2.4", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.aseprite": { + "version": "1.1.6", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "6.0.6", + "com.unity.2d.sprite": "1.0.0", + "com.unity.mathematics": "1.2.6", + "com.unity.modules.animation": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.common": { + "version": "9.0.6", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.4", + "com.unity.2d.sprite": "1.0.0", + "com.unity.mathematics": "1.1.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.pixel-perfect": { + "version": "5.0.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.2d.psdimporter": { + "version": "9.0.3", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "9.0.4", + "com.unity.2d.sprite": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.spriteshape": { + "version": "10.0.6", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "9.0.5", + "com.unity.mathematics": "1.1.0", + "com.unity.modules.physics2d": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.2d.tilemap.extras": { + "version": "4.0.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.8.18", + "depth": 3, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.6.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "2.5.1", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.17", + "com.unity.test-framework": "1.4.5", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework.performance": "3.0.3" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.feature.2d": { + "version": "2.0.1", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.2d.animation": "10.1.3", + "com.unity.2d.pixel-perfect": "5.0.3", + "com.unity.2d.psdimporter": "9.0.3", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.spriteshape": "10.0.6", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.2d.tilemap.extras": "4.0.2", + "com.unity.2d.aseprite": "1.1.6" + } + }, + "com.unity.ide.rider": { + "version": "3.0.31", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.22", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.inputsystem": { + "version": "1.11.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.3.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.4", + "depth": 3, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.4.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework.performance": { + "version": "3.0.3", + "depth": 3, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.8.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "2.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualscripting": { + "version": "1.9.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } } - } } diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json index ede5887..8030331 100644 --- a/ProjectSettings/SceneTemplateSettings.json +++ b/ProjectSettings/SceneTemplateSettings.json @@ -118,4 +118,4 @@ "defaultInstantiationMode": 1 }, "newSceneOverride": 0 -} \ No newline at end of file +} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index fbd2fcc..d9200ab 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Kill - Win + - LevelsLoader layers: - Default - TransparentFX