diff --git a/Assets/Animation/HUDCanvas.controller b/Assets/Animation/HUDCanvas.controller
index a44f669c630852b15bb47f5ec91d24711bd1479d..77f86c05095516ebefc4e37ef9abd66907f7f63c 100644
--- a/Assets/Animation/HUDCanvas.controller
+++ b/Assets/Animation/HUDCanvas.controller
@@ -1,5 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-4212562844653379911
+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: Win
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 8900840664685790605}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -14,13 +39,19 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
- m_Name: Warning
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
+ - m_Name: Win
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -173,17 +204,21 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102828773405103130}
- m_Position: {x: 530, y: 240, z: 0}
+ m_Position: {x: 380, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102635298293003362}
m_Position: {x: 24, y: 324, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102249087295179486}
- m_Position: {x: 252, y: 240, z: 0}
+ m_Position: {x: 130, y: 240, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 8900840664685790605}
+ m_Position: {x: 660, y: 240, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101051981478896966}
- {fileID: 1101084900133509844}
+ - {fileID: -4212562844653379911}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -192,3 +227,29 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102635298293003362}
+--- !u!1102 &8900840664685790605
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Win
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: c1e0a73410265eb43a41a7196315990e, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Animation/Win.anim b/Assets/Animation/Win.anim
new file mode 100644
index 0000000000000000000000000000000000000000..3bec48620b878b831c40d9fd26ca6fe1c3f79ca4
--- /dev/null
+++ b/Assets/Animation/Win.anim
@@ -0,0 +1,673 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Win
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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}
+ tangentMode: 0
+ 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: Win
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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.5166667
+ 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.5166667
+ 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.5166667
+ 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}
+ 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: 2290580886
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2290580886
+ 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: 2290580886
+ attribute: 2526845255
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2290580886
+ attribute: 4215373228
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2290580886
+ 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
+ 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.5166667
+ 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: Win
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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: Win
+ classID: 114
+ script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.5166667
+ 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.5166667
+ 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.5166667
+ 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.5166667
+ 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}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Animation/Win.anim.meta b/Assets/Animation/Win.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d710fad602e0884970a422036eed0a6fa812288c
--- /dev/null
+++ b/Assets/Animation/Win.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c1e0a73410265eb43a41a7196315990e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index e241b3fc3101934052b43cc15c69bcea727971e6..23a373933733ffe9ea135ce412da4c2208ecca63 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:
@@ -690,7 +690,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
warningText: {fileID: 839222784}
playerHealth: {fileID: 33458251}
- restartDelay: 5
survival: {fileID: 1733453809}
timeText: {fileID: 1408824055}
--- !u!114 &38786131
@@ -6493,7 +6492,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 25}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &732164005
diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity
index 8577041066bac673885f977bad77524e4d6d0045..0ea6fe6534bc8b2d7691b3e3fdf63c85d6bc1521 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:
@@ -588,6 +588,7 @@ GameObject:
- component: {fileID: 38786129}
- component: {fileID: 38786130}
- component: {fileID: 38786131}
+ - component: {fileID: 38786132}
m_Layer: 5
m_Name: HUDCanvas
m_TagString: Untagged
@@ -682,6 +683,7 @@ RectTransform:
- {fileID: 1095512510}
- {fileID: 77102139}
- {fileID: 2124817587}
+ - {fileID: 2026062943}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -723,7 +725,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
warningTextWave: {fileID: 839222784}
playerHealthWave: {fileID: 33458251}
- restartDelayWave: 5
scoreWave: {fileID: 1095512511}
wave: {fileID: 240257949}
score: {fileID: 1733453809}
@@ -739,6 +740,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e16e79fec71a694c868a8a313711bcc, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &38786132
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 38786124}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 257ba50da6fb87244b0339f5c3a1064e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ enemyManagerWave: {fileID: 240257949}
+ restartDelayWave: 5
+ mesg: {fileID: 2026062944}
--- !u!1 &77102138
GameObject:
m_ObjectHideFlags: 0
@@ -1275,13 +1291,12 @@ MonoBehaviour:
spawnPointsCenter: {x: 0, y: 0, z: 0}
spawnRotation: {x: 0, y: 0, z: 0}
size: {x: 70, y: 0, z: 70}
- poolEnemy1: 01000000010000000100000001000000010000000100000001000000
- poolEnemy2: 01000000010000000100000001000000010000000100000001000000
- poolEnemy3: 00000000000000000100000000000000000000000100000000000000
- numOfTotalWaves: 7
+ poolEnemy1: 01000000
+ poolEnemy2: 01000000
+ poolEnemy3: 00000000
+ numOfTotalWaves: 1
startWaves: 1
waveText: {fileID: 83661862}
- currentWaves: 0
factory: {fileID: 180263585}
--- !u!4 &240257950
Transform:
@@ -8816,6 +8831,85 @@ MonoBehaviour:
center: {x: 0, y: 0, z: 0}
size: {x: 30, y: 30, z: 30}
player: {fileID: 33458244}
+--- !u!1 &2026062942
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2026062943}
+ - component: {fileID: 2026062945}
+ - component: {fileID: 2026062944}
+ m_Layer: 5
+ m_Name: Win
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2026062943
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2026062942}
+ 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: 15
+ 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_SizeDelta: {x: 300, y: 90}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2026062944
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2026062942}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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 &2026062945
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2026062942}
+ m_CullTransparentMesh: 1
--- !u!1 &2070728228
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Managers/EnemyManagerWave.cs b/Assets/Scripts/Managers/EnemyManagerWave.cs
index 68299c70fe1fa0363d74aebcdd1584b6c8029a59..790b4d8c6e1417e9915343c328e6d082bb7502c4 100644
--- a/Assets/Scripts/Managers/EnemyManagerWave.cs
+++ b/Assets/Scripts/Managers/EnemyManagerWave.cs
@@ -23,7 +23,7 @@ public class EnemyManagerWave : MonoBehaviour
public int numOfTotalWaves = 3;
public int startWaves = 1;
public Text waveText;
- int currentWaves = 0;
+ int currentWaves = 0;
UnityEngine.AI.NavMeshAgent nav;
[SerializeField]
@@ -108,4 +108,9 @@ public class EnemyManagerWave : MonoBehaviour
public int getWave(){
return currentWaves+1;
}
+
+ public bool win(){
+ GameObject enemy = GameObject.FindGameObjectWithTag("Enemy");
+ return (enemy == null && currentWaves == numOfTotalWaves-1);
+ }
}
diff --git a/Assets/Scripts/Managers/GameOverManagerWave.cs b/Assets/Scripts/Managers/GameOverManagerWave.cs
index 02d643221153c2c0ca5bbe5c2d5967a9d758cbb5..3c3da74ba053dfde455b580abc2329484056f947 100644
--- a/Assets/Scripts/Managers/GameOverManagerWave.cs
+++ b/Assets/Scripts/Managers/GameOverManagerWave.cs
@@ -8,13 +8,11 @@ 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()
{
@@ -27,13 +25,6 @@ public class GameOverManagerWave : MonoBehaviour
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();
}
}
diff --git a/Assets/Scripts/Managers/GameOverManagerZen.cs b/Assets/Scripts/Managers/GameOverManagerZen.cs
index 0e12cdbb16c751a0c190ea756524a58389b30bf7..9cef73d515bb4f6a7c7703fbbada27d3547ba96e 100644
--- a/Assets/Scripts/Managers/GameOverManagerZen.cs
+++ b/Assets/Scripts/Managers/GameOverManagerZen.cs
@@ -8,12 +8,10 @@ public class GameOverManagerZen : MonoBehaviour
{
public Text warningText;
public PlayerHealth playerHealth;
- public float restartDelay = 5f;
public TimeSurvival survival;
public Text timeText;
Animator anim;
- float restartTimer;
void Awake()
{
@@ -26,13 +24,6 @@ public class GameOverManagerZen : MonoBehaviour
if (playerHealth.currentHealth <= 0)
{
anim.SetTrigger("GameOver");
-
- restartTimer += Time.deltaTime;
-
- if (restartTimer >= restartDelay)
- {
- SceneManager.LoadScene(SceneManager.GetActiveScene().name);
- }
}
timeText.text = survival.getSurvival();
}
diff --git a/Assets/Scripts/Managers/WinManager.cs b/Assets/Scripts/Managers/WinManager.cs
new file mode 100644
index 0000000000000000000000000000000000000000..73c0ee86828b6333382005bd21145c069ea04bd3
--- /dev/null
+++ b/Assets/Scripts/Managers/WinManager.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+
+public class WinManager : MonoBehaviour
+{
+ public EnemyManagerWave enemyManagerWave;
+ public float restartDelayWave = 5f;
+ public Text mesg;
+
+ Animator anim;
+ float restartTimer;
+
+ void Awake()
+ {
+ anim = GetComponent<Animator>();
+ }
+
+
+ void Update()
+ {
+ if (enemyManagerWave.win())
+ {
+ anim.SetTrigger("Win");
+
+ restartTimer += Time.deltaTime;
+
+ if (restartTimer >= restartDelayWave)
+ {
+ SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+ }
+ mesg.text = "Congratulations!\nYou win this game";
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Managers/WinManager.cs.meta b/Assets/Scripts/Managers/WinManager.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f6bc0ff13d67b96583f2d9b0feb2260b58fd52ea
--- /dev/null
+++ b/Assets/Scripts/Managers/WinManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 257ba50da6fb87244b0339f5c3a1064e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 181a8d3b0c9021f9da5c431b061675a6883f7a05..cb2ce15efb453322d3b6abc31a5c6bed2e39c9a7 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -18,10 +18,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0
RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c7315001214157c7968252320092a
+ value: 22424703114646680e0b0227036c7315001214157c7a68252320092a
flags: 0
RecentlyUsedScenePath-5:
- value: 22424703114646680e0b0227036c7315001214157c7a68252320092a
+ value: 22424703114646680e0b0227036c7315001214157c7968252320092a
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650