MICOST/Barrack-Unity
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

TO SQUASH: Added faders to game scene.

Browse Source
This commit is contained in:
WallyHackenslacker
2026-07-28 00:57:57 -04:00
parent 7a6c2802f4
commit caef6dbb71
5 changed files with 155 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Game.unity
+149
View File
@@ -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}
Assets/Scripts/Game/Player.cs
+3 -1
View File
@@ -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();
}
}