diff --git a/Assets/Animation/GameOverClip.anim b/Assets/Animation/GameOverClip.anim
index 7f89835ad058987c103b5e93cbf1ef80b8d31964..42a27ea765c7ad8465a646174673175f5221b757 100644
--- a/Assets/Animation/GameOverClip.anim
+++ b/Assets/Animation/GameOverClip.anim
@@ -55,6 +55,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 1.5
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 2
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -62,9 +71,25 @@ AnimationClip:
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: SurvivalTimeGameOver
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2
- value: {x: 0.8, y: 0.8, z: 0.8}
+ value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -74,7 +99,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- path: Score
+ path: ScoreGameOverText
m_FloatCurves:
- curve:
serializedVersion: 2
@@ -103,7 +128,7 @@ AnimationClip:
attribute: m_Color.r
path: GameOverText
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -131,7 +156,7 @@ AnimationClip:
attribute: m_Color.g
path: GameOverText
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -159,7 +184,7 @@ AnimationClip:
attribute: m_Color.b
path: GameOverText
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -187,7 +212,7 @@ AnimationClip:
attribute: m_Color.a
path: GameOverText
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -215,7 +240,7 @@ AnimationClip:
attribute: m_Color.r
path: ScreenFade
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -243,7 +268,7 @@ AnimationClip:
attribute: m_Color.g
path: ScreenFade
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -271,7 +296,7 @@ AnimationClip:
attribute: m_Color.b
path: ScreenFade
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -299,122 +324,13 @@ AnimationClip:
attribute: m_Color.a
path: ScreenFade
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_PPtrCurves: []
- m_SampleRate: 60
- m_WrapMode: 0
- m_Bounds:
- m_Center: {x: 0, y: 0, z: 0}
- m_Extent: {x: 0, y: 0, z: 0}
- m_ClipBindingConstant:
- genericBindings:
- - serializedVersion: 2
- path: 2185909552
- attribute: 3
- script: {fileID: 0}
- typeID: 4
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 4082636885
- attribute: 3
- script: {fileID: 0}
- typeID: 4
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 2185909552
- attribute: 304273561
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 1453643700
- attribute: 304273561
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 2185909552
- attribute: 2526845255
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 2185909552
- attribute: 4215373228
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 2185909552
- attribute: 2334886179
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 1453643700
- attribute: 2526845255
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 1453643700
- attribute: 4215373228
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 1453643700
- attribute: 2334886179
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- typeID: 114
- customType: 0
- isPPtrCurve: 0
- pptrCurveMapping: []
- m_AnimationClipSettings:
- serializedVersion: 2
- m_AdditiveReferencePoseClip: {fileID: 0}
- m_AdditiveReferencePoseTime: 0
- m_StartTime: 0
- m_StopTime: 2
- m_OrientationOffsetY: 0
- m_Level: 0
- m_CycleOffset: 0
- m_HasAdditiveReferencePose: 0
- m_LoopTime: 0
- m_LoopBlend: 0
- m_LoopBlendOrientation: 0
- m_LoopBlendPositionY: 0
- m_LoopBlendPositionXZ: 0
- m_KeepOriginalOrientation: 0
- m_KeepOriginalPositionY: 1
- m_KeepOriginalPositionXZ: 0
- m_HeightFromFeet: 0
- m_Mirror: 0
- m_EditorCurves:
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1.8333334
- value: 1.2
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -433,25 +349,16 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_LocalScale.x
- path: GameOverText
- classID: 224
- script: {fileID: 0}
+ attribute: m_Color.r
+ path: SurvivalTimeGameOver
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1.8333334
- value: 1.2
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -470,25 +377,16 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_LocalScale.y
- path: GameOverText
- classID: 224
- script: {fileID: 0}
+ attribute: m_Color.g
+ path: SurvivalTimeGameOver
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1.8333334
- value: 1.2
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -507,16 +405,16 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_LocalScale.z
- path: GameOverText
- classID: 224
- script: {fileID: 0}
+ attribute: m_Color.b
+ path: SurvivalTimeGameOver
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 1
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -535,38 +433,29 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_Color.r
- path: GameOverText
+ attribute: m_Color.a
+ path: SurvivalTimeGameOver
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 136
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
+ inWeight: 0
+ outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_Color.g
- path: GameOverText
- classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ attribute: m_IsActive
+ path: TimeSurvival
+ classID: 1
+ script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
@@ -591,16 +480,16 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_Color.b
- path: GameOverText
+ attribute: m_Color.r
+ path: ScoreGameOverText
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 0
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -619,10 +508,10 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_Color.a
- path: GameOverText
+ attribute: m_Color.g
+ path: ScoreGameOverText
classID: 114
- script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -637,7 +526,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
- value: 0.8
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -647,16 +536,16 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_LocalScale.x
- path: Score
- classID: 224
- script: {fileID: 0}
+ attribute: m_Color.b
+ path: ScoreGameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 1
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -665,7 +554,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
- value: 0.8
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -675,72 +564,685 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_LocalScale.y
- path: Score
- classID: 224
- script: {fileID: 0}
+ attribute: m_Color.a
+ path: ScoreGameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2
- value: 0.8
- inSlope: 0
- outSlope: 0
- tangentMode: 136
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
+ inWeight: 0
+ outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_LocalScale.z
+ attribute: m_IsActive
path: Score
- classID: 224
+ classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
- value: 0.16078432
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2
- value: 0.16078432
- inSlope: 0
- outSlope: 0
- tangentMode: 136
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
+ inWeight: 0
+ outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- attribute: m_Color.r
- path: ScreenFade
+ attribute: m_IsActive
+ path: Wave
+ classID: 1
+ script: {fileID: 0}
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 2185909552
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2174733879
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 924804161
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2185909552
+ attribute: 304273561
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1453643700
+ attribute: 304273561
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2174733879
+ attribute: 304273561
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 653077880
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 924804161
+ attribute: 304273561
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 4082636885
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2050359991
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2185909552
+ attribute: 2526845255
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2185909552
+ attribute: 4215373228
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2185909552
+ attribute: 2334886179
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1453643700
+ attribute: 2526845255
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1453643700
+ attribute: 4215373228
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1453643700
+ attribute: 2334886179
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2174733879
+ attribute: 2526845255
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2174733879
+ attribute: 4215373228
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2174733879
+ attribute: 2334886179
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 924804161
+ attribute: 2526845255
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 924804161
+ attribute: 4215373228
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 924804161
+ attribute: 2334886179
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 2
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.8333334
+ value: 1.2
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.x
+ path: GameOverText
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.8333334
+ value: 1.2
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.y
+ path: GameOverText
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.8333334
+ value: 1.2
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.z
+ path: GameOverText
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.r
+ path: GameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.g
+ path: GameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.b
+ path: GameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.a
+ path: GameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0.16078432
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.16078432
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.r
+ path: ScreenFade
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0.30588236
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.30588236
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.g
+ path: ScreenFade
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0.6
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.6
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.b
+ path: ScreenFade
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.85
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.a
+ path: ScreenFade
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.r
+ path: SurvivalTimeGameOver
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.g
+ path: SurvivalTimeGameOver
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.b
+ path: SurvivalTimeGameOver
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.a
+ path: SurvivalTimeGameOver
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 0.30588236
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -749,7 +1251,138 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
- value: 0.30588236
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.x
+ path: SurvivalTimeGameOver
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.y
+ path: SurvivalTimeGameOver
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.z
+ path: SurvivalTimeGameOver
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: TimeSurvival
+ classID: 1
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Color.r
+ path: ScoreGameOverText
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -760,15 +1393,15 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
- path: ScreenFade
+ path: ScoreGameOverText
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.5
- value: 0.6
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -777,7 +1410,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
- value: 0.6
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -788,9 +1421,9 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
- path: ScreenFade
+ path: ScoreGameOverText
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -805,7 +1438,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
- value: 0.85
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -816,9 +1449,131 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
- path: ScreenFade
+ path: ScoreGameOverText
classID: 114
- script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.x
+ path: ScoreGameOverText
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.y
+ path: ScoreGameOverText
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.z
+ path: ScoreGameOverText
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: Score
+ classID: 1
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: Wave
+ classID: 1
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index ef5006a15a1b1e06899f2d0daeb61b0a59ca4876..8a0b575cf0f0e6437c983c0f4a76e2c4b4c0fb45 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.4506148, g: 0.49860865, b: 0.56437486, a: 1}
+ m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -638,13 +638,14 @@ RectTransform:
- {fileID: 2070728229}
- {fileID: 1109176448}
- {fileID: 839222783}
- - {fileID: 732164004}
- - {fileID: 1401845283}
- - {fileID: 1733453808}
- - {fileID: 387973549}
- - {fileID: 1755254423}
- {fileID: 1214467934}
- {fileID: 1702970505}
+ - {fileID: 1755254423}
+ - {fileID: 387973549}
+ - {fileID: 732164004}
+ - {fileID: 1733453808}
+ - {fileID: 1408824054}
+ - {fileID: 1401845283}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -687,6 +688,8 @@ MonoBehaviour:
warningText: {fileID: 839222784}
playerHealth: {fileID: 33458251}
restartDelay: 5
+ survival: {fileID: 1733453809}
+ timeText: {fileID: 1408824055}
--- !u!1 &180263584
GameObject:
m_ObjectHideFlags: 0
@@ -6166,7 +6169,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 38786128}
- m_RootOrder: 4
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -6430,7 +6433,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 50, y: 50}
+ m_AnchoredPosition: {x: 51, y: 49.9}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &857069322
@@ -6846,7 +6849,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 38786128}
- m_RootOrder: 9
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -7102,7 +7105,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 38786128}
- m_RootOrder: 5
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -7151,6 +7154,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1401845282}
m_CullTransparentMesh: 0
+--- !u!1 &1408824053
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1408824054}
+ - component: {fileID: 1408824056}
+ - component: {fileID: 1408824055}
+ m_Layer: 5
+ m_Name: SurvivalTimeGameOver
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1408824054
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1408824053}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 38786128}
+ m_RootOrder: 10
+ 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: 0, y: -52.3}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1408824055
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1408824053}
+ 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: 1, g: 1, b: 1, a: 0}
+ 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: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!222 &1408824056
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1408824053}
+ m_CullTransparentMesh: 1
--- !u!1001 &1687477066
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7238,7 +7320,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 38786128}
- m_RootOrder: 10
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -7318,7 +7400,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 38786128}
- m_RootOrder: 6
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -7337,6 +7419,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7bccca8b40843e648b4854db6e9b97f7, type: 3}
m_Name:
m_EditorClassIdentifier:
+ player: {fileID: 33458251}
--- !u!114 &1733453810
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7536,7 +7619,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 38786128}
- m_RootOrder: 8
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity
index d1eb8cd152c7b59ba026c09ceec21940562b25f7..eb24e04a3059697282d079128d63a937d63d3476 100644
--- a/Assets/Scenes/Level_02.unity
+++ b/Assets/Scenes/Level_02.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.4506148, g: 0.49860865, b: 0.56437486, a: 1}
+ m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -501,6 +501,19 @@ MonoBehaviour:
deathClip: {fileID: 8300000, guid: d36a393bca4582043982db9089e1694f, type: 3}
flashSpeed: 5
flashColour: {r: 1, g: 0, b: 0, a: 0.1}
+--- !u!114 &33458252
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 33458244}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 086efe07b15c7524cab29a25be9d642b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ gameOverManager: {fileID: 38786130}
--- !u!135 &33458253
SphereCollider:
m_ObjectHideFlags: 0
@@ -514,19 +527,6 @@ SphereCollider:
serializedVersion: 2
m_Radius: 0.8
m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &33458254
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 33458244}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ec23ede6cd50b4d469c10465b307f39a, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- gameOverManager: {fileID: 38786130}
--- !u!1 &36326047
GameObject:
m_ObjectHideFlags: 0
@@ -678,6 +678,7 @@ RectTransform:
- {fileID: 1214467934}
- {fileID: 1702970505}
- {fileID: 83661864}
+ - {fileID: 1095512510}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -714,12 +715,15 @@ MonoBehaviour:
m_GameObject: {fileID: 38786124}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d9c9e0011c2ed97428a4efc03b455359, type: 3}
+ m_Script: {fileID: 11500000, guid: 4c5d9298a28a8fd489d5044c170d37fe, type: 3}
m_Name:
m_EditorClassIdentifier:
- warningText: {fileID: 839222784}
- playerHealth: {fileID: 33458251}
- restartDelay: 5
+ warningTextWave: {fileID: 83661862}
+ playerHealthWave: {fileID: 33458251}
+ restartDelayWave: 5
+ scoreWave: {fileID: 1095512511}
+ wave: {fileID: 240257949}
+ score: {fileID: 1733453809}
--- !u!1 &83661861
GameObject:
m_ObjectHideFlags: 0
@@ -6665,6 +6669,85 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 33458250}
smoothing: 5
+--- !u!1 &1095512509
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1095512510}
+ - component: {fileID: 1095512512}
+ - component: {fileID: 1095512511}
+ m_Layer: 5
+ m_Name: ScoreGameOverText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1095512510
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1095512509}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 38786128}
+ m_RootOrder: 12
+ 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: 0, y: -42.79}
+ m_SizeDelta: {x: 500, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1095512511
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1095512509}
+ 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: 1, g: 1, b: 1, a: 0}
+ 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: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: New Text
+--- !u!222 &1095512512
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1095512509}
+ m_CullTransparentMesh: 1
--- !u!1 &1099601752
GameObject:
m_ObjectHideFlags: 0
@@ -7141,7 +7224,7 @@ 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: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 33.52}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1401845284
diff --git a/Assets/Scripts/Controller.meta b/Assets/Scripts/Controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..aea6df49ea0ef49e59f01504b614c3821b0eb79a
--- /dev/null
+++ b/Assets/Scripts/Controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c9367a4c8fa7ce4f8a404ea265e1b56
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Controller/UsernameController.cs b/Assets/Scripts/Controller/UsernameController.cs
new file mode 100644
index 0000000000000000000000000000000000000000..64c3babb013de4dff58770e7189a773d812816c0
--- /dev/null
+++ b/Assets/Scripts/Controller/UsernameController.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class UsernameController : MonoBehaviour
+{
+ public InputField user_name;
+
+ public string getName(){
+ return user_name.text;
+ }
+}
diff --git a/Assets/Scripts/Controller/UsernameController.cs.meta b/Assets/Scripts/Controller/UsernameController.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..62313ea47b916e90ff018ba3f2f636695ac1f3d9
--- /dev/null
+++ b/Assets/Scripts/Controller/UsernameController.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 35a146045f1fded4383665ee61a0e330
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Managers/EnemyManagerWave.cs b/Assets/Scripts/Managers/EnemyManagerWave.cs
index 26f6d9411692d123c5d6b96adb4241693af840ba..d683489828322c19dc6a9445c78f587f387a8a7d 100644
--- a/Assets/Scripts/Managers/EnemyManagerWave.cs
+++ b/Assets/Scripts/Managers/EnemyManagerWave.cs
@@ -104,4 +104,8 @@ public class EnemyManagerWave : MonoBehaviour
}
}
}
+
+ public int getWave(){
+ return currentWaves+1;
+ }
}
diff --git a/Assets/Scripts/Managers/GameOverManagerWave.cs b/Assets/Scripts/Managers/GameOverManagerWave.cs
new file mode 100644
index 0000000000000000000000000000000000000000..02d643221153c2c0ca5bbe5c2d5967a9d758cbb5
--- /dev/null
+++ b/Assets/Scripts/Managers/GameOverManagerWave.cs
@@ -0,0 +1,50 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+
+public class GameOverManagerWave : MonoBehaviour
+{
+ public Text warningTextWave;
+ public PlayerHealth playerHealthWave;
+ public float restartDelayWave = 5f;
+ public Text scoreWave;
+ public EnemyManagerWave wave;
+ public ScoreManager score;
+
+ Animator anim;
+ float restartTimer;
+
+ void Awake()
+ {
+ anim = GetComponent<Animator>();
+ }
+
+
+ void Update()
+ {
+ if (playerHealthWave.currentHealth <= 0)
+ {
+ anim.SetTrigger("GameOver");
+
+ restartTimer += Time.deltaTime;
+
+ if (restartTimer >= restartDelayWave)
+ {
+ SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+ }
+ scoreWave.text = "Score : "+score.getScore()+" - Wave : "+wave.getWave();
+ }
+ }
+
+ public void ShowWarning(float enemyDistance)
+ {
+ if (playerHealthWave.currentHealth > 0)
+ {
+ warningTextWave.text = string.Format("! {0} m", Mathf.RoundToInt(enemyDistance));
+ anim.SetTrigger("Warning");
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Managers/GameOverManagerWave.cs.meta b/Assets/Scripts/Managers/GameOverManagerWave.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8d0f6e84c02ca718881dcd5f5f1572a8a51a96c8
--- /dev/null
+++ b/Assets/Scripts/Managers/GameOverManagerWave.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4c5d9298a28a8fd489d5044c170d37fe
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManagerZen.cs
similarity index 85%
rename from Assets/Scripts/Managers/GameOverManager.cs
rename to Assets/Scripts/Managers/GameOverManagerZen.cs
index df4ab7bae7150815a53035910c3fbcde70a3c51f..0e12cdbb16c751a0c190ea756524a58389b30bf7 100644
--- a/Assets/Scripts/Managers/GameOverManager.cs
+++ b/Assets/Scripts/Managers/GameOverManagerZen.cs
@@ -4,11 +4,13 @@ using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
-public class GameOverManager : MonoBehaviour
+public class GameOverManagerZen : MonoBehaviour
{
public Text warningText;
public PlayerHealth playerHealth;
public float restartDelay = 5f;
+ public TimeSurvival survival;
+ public Text timeText;
Animator anim;
float restartTimer;
@@ -32,6 +34,7 @@ public class GameOverManager : MonoBehaviour
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
}
}
+ timeText.text = survival.getSurvival();
}
public void ShowWarning(float enemyDistance)
diff --git a/Assets/Scripts/Managers/GameOverManager.cs.meta b/Assets/Scripts/Managers/GameOverManagerZen.cs.meta
similarity index 100%
rename from Assets/Scripts/Managers/GameOverManager.cs.meta
rename to Assets/Scripts/Managers/GameOverManagerZen.cs.meta
diff --git a/Assets/Scripts/Managers/ScoreManager.cs b/Assets/Scripts/Managers/ScoreManager.cs
index b5d094dc12c86c2387e941c2f2ffb9f4626a3fea..31140c4f541deb023a17cffa061ea18a3c350d28 100644
--- a/Assets/Scripts/Managers/ScoreManager.cs
+++ b/Assets/Scripts/Managers/ScoreManager.cs
@@ -21,4 +21,8 @@ public class ScoreManager : MonoBehaviour
{
text.text = "Score: " + score;
}
+
+ public int getScore(){
+ return score;
+ }
}
diff --git a/Assets/Scripts/Managers/TimeSurvival.cs b/Assets/Scripts/Managers/TimeSurvival.cs
index 0d4b16453024ba8d4f4d78fa8fa7830096d7b1d4..304d2330710dd08b6cea7014cb455f211b16c1c3 100644
--- a/Assets/Scripts/Managers/TimeSurvival.cs
+++ b/Assets/Scripts/Managers/TimeSurvival.cs
@@ -4,6 +4,7 @@ using System.Collections;
public class TimeSurvival : MonoBehaviour
{
+ public PlayerHealth player;
float time;
int survive;
int j;
@@ -25,7 +26,9 @@ public class TimeSurvival : MonoBehaviour
void Update ()
{
- time += Time.deltaTime;
+ if(player.currentHealth >= 0){
+ time += Time.deltaTime;
+ }
survive = (int)(time);
j = survive/3600;
m = (survive-(j*3600))/60;
@@ -50,4 +53,8 @@ public class TimeSurvival : MonoBehaviour
}
text.text = str_j+":" +str_m+":"+str_d ;
}
+
+ public string getSurvival() {
+ return str_j+":" +str_m+":"+str_d ;
+ }
}
diff --git a/Assets/Scripts/Player/PlayerDetectorWave.cs b/Assets/Scripts/Player/PlayerDetectorWave.cs
new file mode 100644
index 0000000000000000000000000000000000000000..dd1fec75ed6a6755130f8a205d17236f8f52fa85
--- /dev/null
+++ b/Assets/Scripts/Player/PlayerDetectorWave.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerDetectorWave : MonoBehaviour
+{
+ public GameOverManagerWave gameOverManager;
+
+ private void OnTriggerEnter(Collider other)
+ {
+ if (other.tag == "Enemy" && other.isTrigger)
+ {
+ float enemyDistance = Vector3.Distance(transform.position, other.transform.position);
+ gameOverManager.ShowWarning(enemyDistance);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Player/PlayerDetectorWave.cs.meta b/Assets/Scripts/Player/PlayerDetectorWave.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f3bf1922df86e998d8c1ef7e0b95f9e3cfe46206
--- /dev/null
+++ b/Assets/Scripts/Player/PlayerDetectorWave.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 086efe07b15c7524cab29a25be9d642b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Player/PlayerDetector.cs b/Assets/Scripts/Player/PlayerDetectorZen.cs
similarity index 79%
rename from Assets/Scripts/Player/PlayerDetector.cs
rename to Assets/Scripts/Player/PlayerDetectorZen.cs
index c29bdf5270c43f849eda0ac26800aff838a8a2fc..b618f43bb3f2e9013305608147df8a3605eb0222 100644
--- a/Assets/Scripts/Player/PlayerDetector.cs
+++ b/Assets/Scripts/Player/PlayerDetectorZen.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using UnityEngine;
-public class PlayerDetector : MonoBehaviour
+public class PlayerDetectorZen : MonoBehaviour
{
- public GameOverManager gameOverManager;
+ public GameOverManagerZen gameOverManager;
private void OnTriggerEnter(Collider other)
{
diff --git a/Assets/Scripts/Player/PlayerDetector.cs.meta b/Assets/Scripts/Player/PlayerDetectorZen.cs.meta
similarity index 100%
rename from Assets/Scripts/Player/PlayerDetector.cs.meta
rename to Assets/Scripts/Player/PlayerDetectorZen.cs.meta
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 96fedf74de9f3cbbaed76c85fe21c53145b5650b..181a8d3b0c9021f9da5c431b061675a6883f7a05 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,16 +12,16 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7315001214157c796661633c133af6f9
flags: 0
RecentlyUsedScenePath-2:
- value: 22424703114646680e0b0227036c7315001214157c7968252320092a
+ value: 224247031146466218090437153079021312352f38292a1d2c3d1821ebe1382badc333e4e8750c3f0626ca112b013819df27363be40e1c021419b31b1ff6040a
flags: 0
RecentlyUsedScenePath-3:
- value: 22424703114646680e0b0227036c7315001214157c7a68252320092a
+ value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0
RecentlyUsedScenePath-4:
- value: 224247031146466218090437153079021312352f38292a1d2c3d1821ebe1382badc333e4e8750c3f0626ca112b013819df27363be40e1c021419b31b1ff6040a
+ value: 22424703114646680e0b0227036c7315001214157c7968252320092a
flags: 0
RecentlyUsedScenePath-5:
- value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+ value: 22424703114646680e0b0227036c7315001214157c7a68252320092a
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650