diff --git a/Assets/Animation/GameOverClip.anim b/Assets/Animation/GameOverClip.anim
index 32b5f6860102d1dd23efcf09389d64b5ce4d0ee1..2009dbbbbd294a0ce41fa51fcbec065c05840ec5 100644
--- a/Assets/Animation/GameOverClip.anim
+++ b/Assets/Animation/GameOverClip.anim
@@ -20,7 +20,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -29,7 +29,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1.8
+ time: 2
value: {x: 1.2, y: 1.2, z: 1.2}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -38,7 +38,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -54,7 +54,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -63,7 +63,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: {x: 0.8, y: 0.8, z: 0.8}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -80,7 +80,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0.19607843
inSlope: 0
outSlope: 0
@@ -89,7 +89,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -108,7 +108,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0.19607843
inSlope: 0
outSlope: 0
@@ -117,7 +117,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -136,7 +136,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0.19607843
inSlope: 0
outSlope: 0
@@ -145,7 +145,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -164,7 +164,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -173,7 +173,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -192,7 +192,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -201,7 +201,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: 0
outSlope: 0
@@ -220,7 +220,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -229,7 +229,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: 0
outSlope: 0
@@ -248,7 +248,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -257,7 +257,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: 0
outSlope: 0
@@ -276,7 +276,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -285,7 +285,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -313,7 +313,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -322,7 +322,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -350,7 +350,16 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 2
+ time: 4.9666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 5
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -365,6 +374,219 @@ AnimationClip:
path: QuestDisplay
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
+ - serializedVersion: 3
+ time: 4.9666667
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 10
+ value: 1
+ 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: LoadLastSave
+ classID: 1
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 4.9666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 10
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 10.05
+ 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: GameOverText
+ classID: 1
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ value: 0
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ value: 0
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ value: 0
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 6
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -436,6 +658,27 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3023897193
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2185909552
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3023897193
+ attribute: 304273561
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1453643700
attribute: 2526845255
@@ -457,13 +700,34 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3023897193
+ attribute: 2526845255
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3023897193
+ attribute: 4215373228
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3023897193
+ attribute: 2334886179
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_StopTime: 10.05
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -483,7 +747,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0.19607843
inSlope: 0
outSlope: 0
@@ -492,7 +756,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -511,7 +775,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0.19607843
inSlope: 0
outSlope: 0
@@ -520,7 +784,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -539,7 +803,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0.19607843
inSlope: 0
outSlope: 0
@@ -548,7 +812,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -567,7 +831,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -576,7 +840,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -595,7 +859,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -604,7 +868,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1.8
+ time: 2
value: 1.2
inSlope: 0
outSlope: 0
@@ -613,7 +877,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -632,7 +896,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -641,7 +905,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1.8
+ time: 2
value: 1.2
inSlope: 0
outSlope: 0
@@ -650,7 +914,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -669,7 +933,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -678,7 +942,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1.8
+ time: 2
value: 1.2
inSlope: 0
outSlope: 0
@@ -687,7 +951,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -706,7 +970,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 1
inSlope: 0
outSlope: 0
@@ -715,7 +979,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0.8
inSlope: 0
outSlope: 0
@@ -734,7 +998,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 1
inSlope: 0
outSlope: 0
@@ -743,7 +1007,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0.8
inSlope: 0
outSlope: 0
@@ -762,7 +1026,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 1
inSlope: 0
outSlope: 0
@@ -771,7 +1035,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0.8
inSlope: 0
outSlope: 0
@@ -790,7 +1054,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -799,7 +1063,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: 0
outSlope: 0
@@ -818,7 +1082,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -827,7 +1091,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: 0
outSlope: 0
@@ -846,7 +1110,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -855,7 +1119,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: 0
outSlope: 0
@@ -874,7 +1138,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: 0
outSlope: 0
@@ -883,7 +1147,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 1
inSlope: 0
outSlope: 0
@@ -911,7 +1175,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 1.5
+ time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -920,7 +1184,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 2
+ time: 4.9666667
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -948,7 +1212,16 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 2
+ time: 4.9666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 5
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -963,7 +1236,227 @@ AnimationClip:
path: QuestDisplay
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
+ - serializedVersion: 3
+ time: 4.9666667
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 10
+ value: 1
+ 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: LoadLastSave
+ classID: 1
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 4.9666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 10
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 10.05
+ 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: GameOverText
+ classID: 1
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ value: 0
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ value: 0
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ value: 0
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 6
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 10.05
+ 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: LoadLastSave
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 10
+ functionName: LoadMainMenuScene
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Animation/HUDCanvas.controller b/Assets/Animation/HUDCanvas.controller
index 7eb1c61c8607f0f70272e3419bf8bc6eaa414630..25bf175339f8d9b47543adb075819519e67cfdf9 100644
--- a/Assets/Animation/HUDCanvas.controller
+++ b/Assets/Animation/HUDCanvas.controller
@@ -52,6 +52,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1101 &-3847783786160829090
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: NewQuest
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -8610961184488463820}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.97512436
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -66,19 +91,19 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
- m_Name: Warning
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
- m_Name: NewQuest
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -189,7 +214,8 @@ AnimatorState:
m_Name: GameOverClip
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: -3847783786160829090}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
diff --git a/Assets/Animation/PlayerAC.controller b/Assets/Animation/PlayerAC.controller
index 39dc336160527e128d6f8f124ed998dce9dd1986..baa9395d41cb941634ce012d1386690abd48ecc1 100644
--- a/Assets/Animation/PlayerAC.controller
+++ b/Assets/Animation/PlayerAC.controller
@@ -1,5 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-3358561631604783818
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Revive
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 3703539032459467294}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.94
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1101 &-1492533168735859135
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -73,6 +98,13 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
+ - m_Name: Revive
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -96,7 +128,8 @@ AnimatorState:
m_Name: Death
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: -3358561631604783818}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index cc9dfd4cd70518dc9a417bb34fb92d7ebc8fc94f..6fd855dd34c7cf9081c95653083d96b2f58af8fc 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -9113,6 +9113,140 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &670043600
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 670043601}
+ - component: {fileID: 670043604}
+ - component: {fileID: 670043603}
+ - component: {fileID: 670043602}
+ m_Layer: 5
+ m_Name: YesButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &670043601
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 670043600}
+ 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:
+ - {fileID: 1841146651}
+ m_Father: {fileID: 845946675}
+ m_RootOrder: 1
+ 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: -31}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &670043602
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 670043600}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 670043603}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1939156177}
+ m_TargetAssemblyTypeName: GameOverManager, Assembly-CSharp
+ m_MethodName: OnLoadLastSave
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &670043603
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 670043600}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &670043604
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 670043600}
+ m_CullTransparentMesh: 1
--- !u!224 &674570986 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 22403982, guid: c0134381ae00c4c55871549e355e5943, type: 3}
@@ -9545,6 +9679,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 796152076}
m_CullTransparentMesh: 0
+--- !u!1 &845946674
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 845946675}
+ - component: {fileID: 845946677}
+ - component: {fileID: 845946676}
+ m_Layer: 5
+ m_Name: LoadLastSave
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &845946675
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845946674}
+ 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:
+ - {fileID: 2058008482}
+ - {fileID: 670043601}
+ m_Father: {fileID: 1939156175}
+ m_RootOrder: 15
+ 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_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &845946676
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845946674}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &845946677
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845946674}
+ m_CullTransparentMesh: 1
--- !u!1 &862835713
GameObject:
m_ObjectHideFlags: 0
@@ -10336,13 +10548,25 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: 0.000030517578
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: 0.000015258789
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.z
@@ -10354,15 +10578,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -23577,6 +23801,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1825124403}
m_CullTransparentMesh: 1
+--- !u!1 &1841146650
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1841146651}
+ - component: {fileID: 1841146653}
+ - component: {fileID: 1841146652}
+ m_Layer: 5
+ m_Name: Yes
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1841146651
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841146650}
+ 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: 670043601}
+ m_RootOrder: 0
+ 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_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1841146652
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841146650}
+ 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: Yes
+ 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_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 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 &1841146653
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1841146650}
+ m_CullTransparentMesh: 1
--- !u!224 &1847469154 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 22475538, guid: 751f7137cfffd4a16b1a4c191e687d64, type: 3}
@@ -23841,6 +24200,7 @@ RectTransform:
- {fileID: 862835714}
- {fileID: 1987641287}
- {fileID: 1866292404}
+ - {fileID: 845946675}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -23885,6 +24245,9 @@ MonoBehaviour:
warningText: {fileID: 1970749372}
playerHealth: {fileID: 624092170}
time: {fileID: 1987641286}
+ saveHandler: {fileID: 1939156179}
+ enemyManager: {fileID: 192641034}
+ canvas: {fileID: 1939156171}
--- !u!114 &1939156178
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -24396,6 +24759,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2057183753}
m_CullTransparentMesh: 1
+--- !u!1 &2058008481
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2058008482}
+ - component: {fileID: 2058008484}
+ - component: {fileID: 2058008483}
+ m_Layer: 5
+ m_Name: LoadLastSaveText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2058008482
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2058008481}
+ 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: 845946675}
+ m_RootOrder: 0
+ 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: 20}
+ m_SizeDelta: {x: 500, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2058008483
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2058008481}
+ 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: Load Last Save?
+ 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: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, 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: 36
+ m_fontSizeBase: 36
+ 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_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 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 &2058008484
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2058008481}
+ m_CullTransparentMesh: 1
--- !u!1 &2083979817
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Enemy/EnemyHealth.cs b/Assets/Scripts/Enemy/EnemyHealth.cs
index 04b7260fb735bec94ad5f8954af74726d2ccbb74..446740ec1ec9b385d0429f5059e62b055f3d10ab 100644
--- a/Assets/Scripts/Enemy/EnemyHealth.cs
+++ b/Assets/Scripts/Enemy/EnemyHealth.cs
@@ -118,15 +118,17 @@ public class EnemyHealth : MonoBehaviour, Attackable
//trigger play animation Dead
anim.SetTrigger("Dead");
- //Play Sound Dead
- enemyAudio.clip = deathClip;
- enemyAudio.Play();
+
// notify quest manager
if (!bySystem)
{
questManager.monsterDeadNotification(monsterType, scoreValue);
ScoreManager.score += scoreValue;
+
+ //Play Sound Dead
+ enemyAudio.clip = deathClip;
+ enemyAudio.Play();
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs
index 5037af601378a229c700fa02f128946c3ec417a2..18fcec1aba132931ca365f275c3bd7a4160141f0 100644
--- a/Assets/Scripts/Managers/GameOverManager.cs
+++ b/Assets/Scripts/Managers/GameOverManager.cs
@@ -12,6 +12,10 @@ public class GameOverManager : MonoBehaviour
// public GameObject scoreboard;
Animator anim;
public GameObject time;
+ public SaveHandler saveHandler;
+ public EnemyManager enemyManager;
+ public GameObject canvas;
+ public bool triggeredGameOver = false;
void Awake()
{
@@ -20,12 +24,19 @@ public class GameOverManager : MonoBehaviour
void Update()
{
- if (playerHealth.GetCurrentHealth() <= 0)
+ if (playerHealth.GetCurrentHealth() <= 0 && !triggeredGameOver)
{
anim.SetTrigger("GameOver");
time.SetActive(false);
+ triggeredGameOver = true;
// StartCoroutine(LoadScoreBoard());
}
+
+ AnimatorStateInfo stateInfo = anim.GetCurrentAnimatorStateInfo(0);
+ if (stateInfo.normalizedTime >= 1 && stateInfo.IsName("GameOverClip"))
+ {
+ SceneManager.LoadScene("MainMenu");
+ }
}
public void ShowWarning(float enemyDistance)
@@ -41,4 +52,20 @@ public class GameOverManager : MonoBehaviour
// yield return new WaitForSeconds(5);
// SceneManager.LoadScene("MainMenu");
// }
+ public void OnLoadLastSave()
+ {
+ enemyManager.killAllEnemies();
+ playerHealth.Revive();
+ canvas.GetComponent<Animator>().SetTrigger("NewQuest");
+ bool load = saveHandler.loadLastSave();
+
+ if (load)
+ {
+ triggeredGameOver = false;
+ } else
+ {
+ SceneManager.LoadScene("MainMenu");
+ }
+ }
+
}
\ No newline at end of file
diff --git a/Assets/Music.cs b/Assets/Scripts/Music.cs
similarity index 100%
rename from Assets/Music.cs
rename to Assets/Scripts/Music.cs
diff --git a/Assets/Music.cs.meta b/Assets/Scripts/Music.cs.meta
similarity index 100%
rename from Assets/Music.cs.meta
rename to Assets/Scripts/Music.cs.meta
diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs
index 6a5b3d989fc42f8032df0623dd605cfc32024fee..ef18b98059fbc08ca008cf5475484f6842e02cc5 100644
--- a/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Assets/Scripts/Player/PlayerHealth.cs
@@ -105,7 +105,7 @@ public class PlayerHealth : MonoBehaviour, Attackable
playerShooting.DisableEffects();
//mentrigger animasi Die
- anim.SetTrigger("Die");
+ anim.SetBool("Die", true);
//Memainkan suara ketika mati
playerAudio.clip = deathClip;
@@ -116,5 +116,21 @@ public class PlayerHealth : MonoBehaviour, Attackable
playerShooting.enabled = false;
}
+
+ public void Revive()
+ {
+ isDead = false;
+
+ playerShooting.EnableEffects();
+
+ //mentrigger animasi Die
+ anim.SetTrigger("Revive");
+ anim.SetBool("Die", false);
+
+ //mematikan script player movement
+ playerMovement.enabled = true;
+
+ playerShooting.enabled = true;
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs
index db204b63a489e5d2d431594c486983b68c76768c..88d7429bfc32c8ec8c7dceec0278b93d1a846e41 100644
--- a/Assets/Scripts/Player/PlayerShooting.cs
+++ b/Assets/Scripts/Player/PlayerShooting.cs
@@ -56,6 +56,15 @@ public class PlayerShooting : MonoBehaviour
gunLight.enabled = false;
}
+ public void EnableEffects()
+ {
+ //disable line renderer
+ gunLine.enabled = true;
+
+ //disable light
+ gunLight.enabled = true;
+ }
+
public void Shoot()
{
diff --git a/Assets/Scripts/Save/SaveData.cs b/Assets/Scripts/Save/SaveData.cs
index ee4add1e08674694f72c419be58167c3702ec4fb..f227a85451af40189913e4074d9f43ed44667fbe 100644
--- a/Assets/Scripts/Save/SaveData.cs
+++ b/Assets/Scripts/Save/SaveData.cs
@@ -25,7 +25,7 @@ public class SaveData
data.playerHealth = player.GetComponent<PlayerHealth>().currentHealth;
data.goldAmount = player.GetComponent<PlayerGold>().getGoldAmount();
data.questIdx = canvas.GetComponent<QuestManager>().getQuestIdx();
- data.petIdx = canvas.GetComponent<PlayerMovement>().getPetIdx();
+ data.petIdx = player.GetComponent<PlayerMovement>().getPetIdx();
data.saveTime = DateTime.Now;
return data;
}