From caef6dbb7128c4539f4609f32d0b8c565d171f26 Mon Sep 17 00:00:00 2001 From: Miguel Astor Date: Tue, 28 Jul 2026 00:57:57 -0400 Subject: [PATCH] TO SQUASH: Added faders to game scene. --- Assets/Scenes/Game.unity | 149 ++++++++++++++++++++++ Assets/Scripts/Game/Player.cs | 4 +- Packages/manifest.json | 1 - Packages/packages-lock.json | 18 +-- ProjectSettings/EditorBuildSettings.asset | 1 + 5 files changed, 155 insertions(+), 18 deletions(-) diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 25d4444..d1e0935 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -119,6 +119,107 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &40868030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 695379293392124469, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_Name + value: Faders + objectReference: {fileID: 0} + - target: {fileID: 2430368862052493625, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: fadeDuration + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalPosition.x + value: -1.0961 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalPosition.y + value: -0.152 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7115921516423370064, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7586141922689918976, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: fadeDuration + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7586141922689918976, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + propertyPath: callbackScript + value: + objectReference: {fileID: 485553218} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6091165974763695331, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + insertIndex: -1 + addedObject: {fileID: 40868032} + m_SourcePrefab: {fileID: 100100000, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} +--- !u!1 &40868031 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6091165974763695331, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + m_PrefabInstance: {fileID: 40868030} + m_PrefabAsset: {fileID: 0} +--- !u!114 &40868032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40868031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9dde416d552cd8958925fd470f36454c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EndSplash + nextSceneName: +--- !u!114 &40868033 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7586141922689918976, guid: 989290b32c4040e43afd4f29b24b669e, type: 3} + m_PrefabInstance: {fileID: 40868030} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40868031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5620dafb42f459dcfa30ddbbefd24be1, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Fader --- !u!1 &57932791 GameObject: m_ObjectHideFlags: 0 @@ -753,6 +854,51 @@ Transform: - {fileID: 1357719766} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &485553217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 485553219} + - component: {fileID: 485553218} + m_Layer: 0 + m_Name: EndSplash + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &485553218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485553217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9dde416d552cd8958925fd470f36454c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EndSplash + nextSceneName: GameOver +--- !u!4 &485553219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485553217} + 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 &739145244 GameObject: m_ObjectHideFlags: 0 @@ -1260,6 +1406,7 @@ MonoBehaviour: killed: {fileID: 8300000, guid: c74d2609b63376fe48afdf9e4f2e03c0, type: 3} defeat: {fileID: 8300000, guid: ee144100b299499cab684e20021c6392, type: 3} musicManager: {fileID: 933658174} + fader: {fileID: 40868033} --- !u!58 &1002905793 CircleCollider2D: m_ObjectHideFlags: 0 @@ -2071,3 +2218,5 @@ SceneRoots: - {fileID: 470931998} - {fileID: 1002905790} - {fileID: 292763468} + - {fileID: 40868030} + - {fileID: 485553219} diff --git a/Assets/Scripts/Game/Player.cs b/Assets/Scripts/Game/Player.cs index a010551..170ed52 100644 --- a/Assets/Scripts/Game/Player.cs +++ b/Assets/Scripts/Game/Player.cs @@ -28,6 +28,8 @@ public class Player : MonoBehaviour public MusicManager musicManager; + public Fader fader; + private bool flipped = false; private bool gameOver = false; @@ -122,6 +124,6 @@ public class Player : MonoBehaviour musicManager.pauseMusic(); audioSource.PlayOneShot(defeat); yield return new WaitForSeconds(1.3f); - UnityEngine.SceneManagement.SceneManager.LoadScene("GameOver"); + fader.resetFader(); } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 046e44d..6dc9495 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,5 @@ { "dependencies": { - "com.unity.ai.assistant": "2.16.0-pre.1", "com.unity.ai.inference": "2.6.1", "com.unity.collab-proxy": "2.12.4", "com.unity.feature.2d": "2.0.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f40f41f..4a69780 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -108,20 +108,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ai.assistant": { - "version": "2.16.0-pre.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.mathematics": "1.3.2", - "com.unity.nuget.mono-cecil": "1.11.5", - "com.unity.modules.uielements": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.ai.inference": { "version": "2.6.1", "depth": 0, @@ -227,7 +213,7 @@ }, "com.unity.mathematics": { "version": "1.3.3", - "depth": 1, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -242,7 +228,7 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.6", - "depth": 1, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 841f6c7..c3d94c1 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -21,4 +21,5 @@ EditorBuildSettings: path: Assets/Scenes/GameOver.unity guid: fc3d06f0dbc99a990952937c7628c9cd m_configObjects: + com.unity.dt.app-ui: {fileID: 11400000, guid: 1b1c20d82303e4b5781c3ef50ac1449f, type: 2} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 3590b91b4603b465dbb4216d601bff33, type: 3}