From 2478c8b3fb42097b4ad87b20771eb9d096a0fcae Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Oct 2023 19:23:24 -0400 Subject: [PATCH] Added show victory and defeat screens animation --- Assets/Animations/UI.meta | 8 + Assets/Animations/UI/VictoryAndDefeat.meta | 8 + .../VictoryAndDefeat/ShowVictoryOrDefeat.anim | 512 ++++++++++++++++++ .../ShowVictoryOrDefeat.anim.meta | 8 + .../ShowVictoryOrDefeatAnimator.controller | 101 ++++ ...howVictoryOrDefeatAnimator.controller.meta | 8 + Assets/GlobalConfig.asset | 3 + Assets/Prefabs/UI/VictoryDefeatScreen.prefab | 386 +++++++------ Assets/Scripts/ReloadSceneButton.cs | 5 - Assets/Scripts/SceneLoader.cs | 2 - Assets/Scripts/VictoryDefeat.cs | 24 +- 11 files changed, 889 insertions(+), 176 deletions(-) create mode 100644 Assets/Animations/UI.meta create mode 100644 Assets/Animations/UI/VictoryAndDefeat.meta create mode 100644 Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim create mode 100644 Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim.meta create mode 100644 Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller create mode 100644 Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller.meta diff --git a/Assets/Animations/UI.meta b/Assets/Animations/UI.meta new file mode 100644 index 0000000..d39061c --- /dev/null +++ b/Assets/Animations/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d2bcb657247b8a46becda143bb63bca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/UI/VictoryAndDefeat.meta b/Assets/Animations/UI/VictoryAndDefeat.meta new file mode 100644 index 0000000..0571a9e --- /dev/null +++ b/Assets/Animations/UI/VictoryAndDefeat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ab8973704eee8d4f882979b7b79e1ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim new file mode 100644 index 0000000..a7ab357 --- /dev/null +++ b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim @@ -0,0 +1,512 @@ +%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: ShowVictoryOrDefeat + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - 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: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_Alpha + path: + classID: 225 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: + classID: 225 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -184 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -87.20001 + 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_AnchoredPosition.y + path: button_return_map + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -183.99998 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -87.2 + 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_AnchoredPosition.y + path: button_retry + classID: 224 + 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: 0.48333332 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_Alpha + path: button_retry + classID: 225 + 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: 0.48333332 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_Alpha + path: button_return_map + classID: 225 + 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: 0 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4287062452 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3739863151 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1512356454 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2776425473 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2776425473 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1512356454 + attribute: 1574349066 + script: {fileID: 0} + typeID: 225 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_Alpha + path: + classID: 225 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Interactable + path: + classID: 225 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_BlocksRaycasts + path: + classID: 225 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -184 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -87.20001 + 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_AnchoredPosition.y + path: button_return_map + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -183.99998 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -87.2 + 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_AnchoredPosition.y + path: button_retry + classID: 224 + 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: 0.48333332 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_Alpha + path: button_retry + classID: 225 + 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: 0.48333332 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_Alpha + path: button_return_map + classID: 225 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim.meta b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim.meta new file mode 100644 index 0000000..4afcfc3 --- /dev/null +++ b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeat.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85f96888c003abf468f843a17e107ce9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller new file mode 100644 index 0000000..faebf93 --- /dev/null +++ b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6156261652256207310 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4965206063250560136} + m_Position: {x: 250, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5998391165896476555} + m_Position: {x: 250, y: 50, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5998391165896476555} +--- !u!1102 &-5998391165896476555 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: emtpy + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4965206063250560136 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShowVictoryOrDefeat + 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: 85f96888c003abf468f843a17e107ce9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShowVictoryOrDefeatAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6156261652256207310} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller.meta b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller.meta new file mode 100644 index 0000000..ec7850e --- /dev/null +++ b/Assets/Animations/UI/VictoryAndDefeat/ShowVictoryOrDefeatAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b76dded4ab008e445a747c4cb08aacb4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GlobalConfig.asset b/Assets/GlobalConfig.asset index 74ae7ed..c7ad5b5 100644 --- a/Assets/GlobalConfig.asset +++ b/Assets/GlobalConfig.asset @@ -28,3 +28,6 @@ MonoBehaviour: useRandomHarvestDuration: 0 randomHarvestDurationMinimum: 0 randomHarvestDurationMaximum: 0 + loadingAddedTime: 1 + baseTileSpawnSpeed: 33 + tileSpawnAcceleration: 1 diff --git a/Assets/Prefabs/UI/VictoryDefeatScreen.prefab b/Assets/Prefabs/UI/VictoryDefeatScreen.prefab index e2ecce7..988116d 100644 --- a/Assets/Prefabs/UI/VictoryDefeatScreen.prefab +++ b/Assets/Prefabs/UI/VictoryDefeatScreen.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 740703796599744445} - component: {fileID: 8294646689286962149} - component: {fileID: 4193157642648793052} + - component: {fileID: 5039495834785293127} m_Layer: 5 m_Name: button_retry m_TagString: Untagged @@ -33,7 +34,7 @@ RectTransform: m_Children: - {fileID: 5003587432453059199} - {fileID: 8092251556153147222} - m_Father: {fileID: 494259009502797871} + m_Father: {fileID: 5657514704583612134} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -135,6 +136,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!225 &5039495834785293127 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 110822708543464917} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1329954704519971664 GameObject: m_ObjectHideFlags: 0 @@ -242,16 +255,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6815344318669879228} - - component: {fileID: 6952967856839119328} - - component: {fileID: 1174141841651929322} - - component: {fileID: 3809990833352285392} m_Layer: 5 m_Name: DefeatScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6815344318669879228 RectTransform: m_ObjectHideFlags: 0 @@ -264,11 +274,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4339600188337271886} - - {fileID: 9192792989065223898} - - {fileID: 78683217320187542} - - {fileID: 5292759096211187571} - - {fileID: 3667694395554855592} + - {fileID: 6320512473735389933} m_Father: {fileID: 237603381855510324} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -277,67 +283,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6952967856839119328 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1828805461815096518} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &1174141841651929322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1828805461815096518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &3809990833352285392 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1828805461815096518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &1910359689139390642 GameObject: m_ObjectHideFlags: 0 @@ -417,13 +362,13 @@ RectTransform: m_LocalScale: {x: 1.0000111, y: 1.0000111, z: 1.0000111} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6815344318669879228} + m_Father: {fileID: 6320512473735389933} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -289.40002, y: 132} - m_SizeDelta: {x: -1760, y: -1050} + m_SizeDelta: {x: 60, y: -70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4323084007102793093 CanvasRenderer: @@ -522,6 +467,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2027494015025996081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6320512473735389933} + - component: {fileID: 3689118664757728834} + - component: {fileID: 4405428827937827954} + m_Layer: 5 + m_Name: animRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6320512473735389933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2027494015025996081} + 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: 4339600188337271886} + - {fileID: 9192792989065223898} + - {fileID: 78683217320187542} + - {fileID: 5292759096211187571} + - {fileID: 3667694395554855592} + m_Father: {fileID: 6815344318669879228} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &3689118664757728834 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2027494015025996081} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b76dded4ab008e445a747c4cb08aacb4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!225 &4405428827937827954 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2027494015025996081} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 --- !u!1 &2653537068159360332 GameObject: m_ObjectHideFlags: 0 @@ -687,13 +708,13 @@ RectTransform: m_LocalScale: {x: 1.0000111, y: 1.0000111, z: 1.0000111} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 494259009502797871} + m_Father: {fileID: 5657514704583612134} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -289.40002, y: 132} - m_SizeDelta: {x: -1760, y: -1050} + m_SizeDelta: {x: 60, y: -70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3659764582147165824 CanvasRenderer: @@ -853,6 +874,7 @@ GameObject: - component: {fileID: 8787176605876279479} - component: {fileID: 838425864700652935} - component: {fileID: 5834068843128854906} + - component: {fileID: 8932854571213147808} m_Layer: 5 m_Name: button_return_map m_TagString: Untagged @@ -874,7 +896,7 @@ RectTransform: m_Children: - {fileID: 5030428040076984108} - {fileID: 8420366790135506435} - m_Father: {fileID: 6815344318669879228} + m_Father: {fileID: 6320512473735389933} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -976,6 +998,94 @@ MonoBehaviour: m_StringArgument: LevelSelect m_BoolArgument: 0 m_CallState: 2 +--- !u!225 &8932854571213147808 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3454316012886498669} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1 &3535722836581251388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5657514704583612134} + - component: {fileID: 8071611143690215500} + - component: {fileID: 6781149581850041608} + m_Layer: 5 + m_Name: animRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5657514704583612134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3535722836581251388} + 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: 498711934806538206} + - {fileID: 8293521282933201042} + - {fileID: 451974527714251400} + - {fileID: 1898867796507831975} + - {fileID: 668960248859756355} + m_Father: {fileID: 494259009502797871} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &8071611143690215500 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3535722836581251388} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b76dded4ab008e445a747c4cb08aacb4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!225 &6781149581850041608 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3535722836581251388} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 --- !u!1 &3881291524365010121 GameObject: m_ObjectHideFlags: 0 @@ -1123,6 +1233,7 @@ GameObject: - component: {fileID: 8776338669073819887} - component: {fileID: 7696139465593537796} - component: {fileID: 5472426507894260587} + - component: {fileID: 6777808088117540374} m_Layer: 5 m_Name: button_retry m_TagString: Untagged @@ -1144,7 +1255,7 @@ RectTransform: m_Children: - {fileID: 1657393889047020581} - {fileID: 1635367268799643456} - m_Father: {fileID: 6815344318669879228} + m_Father: {fileID: 6320512473735389933} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1246,6 +1357,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!225 &6777808088117540374 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4340026575478686146} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &4677950654192362210 GameObject: m_ObjectHideFlags: 0 @@ -1271,12 +1394,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4677950654192362210} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 6815344318669879228} + m_Father: {fileID: 6320512473735389933} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1487,13 +1610,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6815344318669879228} + m_Father: {fileID: 6320512473735389933} 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_SizeDelta: {x: 1820, y: 980} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4078985639568988741 CanvasRenderer: @@ -1558,12 +1681,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7643789049378435288} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 494259009502797871} + m_Father: {fileID: 5657514704583612134} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1618,16 +1741,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 494259009502797871} - - component: {fileID: 6841044048527200490} - - component: {fileID: 5543521968471930998} - - component: {fileID: 6616332112240631888} m_Layer: 5 m_Name: VictoryScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &494259009502797871 RectTransform: m_ObjectHideFlags: 0 @@ -1640,11 +1760,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 498711934806538206} - - {fileID: 8293521282933201042} - - {fileID: 451974527714251400} - - {fileID: 1898867796507831975} - - {fileID: 668960248859756355} + - {fileID: 5657514704583612134} m_Father: {fileID: 237603381855510324} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1653,67 +1769,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6841044048527200490 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8331573904037261011} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &5543521968471930998 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8331573904037261011} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &6616332112240631888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8331573904037261011} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &8433619855353240514 GameObject: m_ObjectHideFlags: 0 @@ -1760,8 +1815,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3193a4b6870e31b4a81e5b929e95d1db, type: 3} m_Name: m_EditorClassIdentifier: - victoryCanvas: {fileID: 6841044048527200490} - defeatCanvas: {fileID: 6952967856839119328} + _victoryAnimator: {fileID: 8071611143690215500} + _defeatAnimator: {fileID: 3689118664757728834} --- !u!1 &8523519674317970500 GameObject: m_ObjectHideFlags: 0 @@ -1922,18 +1977,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8785747014417694050} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 494259009502797871} + m_Father: {fileID: 5657514704583612134} 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_SizeDelta: {x: 1820, y: 980} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6335419742824526466 CanvasRenderer: @@ -1985,6 +2040,7 @@ GameObject: - component: {fileID: 6754140279212621798} - component: {fileID: 4961682457552479919} - component: {fileID: 3692823960974056797} + - component: {fileID: 394287036066732850} m_Layer: 5 m_Name: button_return_map m_TagString: Untagged @@ -2006,7 +2062,7 @@ RectTransform: m_Children: - {fileID: 5068307372320555281} - {fileID: 5043341332739550677} - m_Father: {fileID: 494259009502797871} + m_Father: {fileID: 5657514704583612134} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2108,3 +2164,15 @@ MonoBehaviour: m_StringArgument: LevelSelect m_BoolArgument: 0 m_CallState: 2 +--- !u!225 &394287036066732850 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8921239231521910128} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 diff --git a/Assets/Scripts/ReloadSceneButton.cs b/Assets/Scripts/ReloadSceneButton.cs index 131e968..ce0955e 100644 --- a/Assets/Scripts/ReloadSceneButton.cs +++ b/Assets/Scripts/ReloadSceneButton.cs @@ -1,16 +1,11 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; public class ReloadSceneButton : MonoBehaviour { - public void ReloadCurrentScene() { - string currentSceneName = SceneManager.GetActiveScene().name; SceneManager.LoadScene(currentSceneName); - } } \ No newline at end of file diff --git a/Assets/Scripts/SceneLoader.cs b/Assets/Scripts/SceneLoader.cs index ca82e03..317583c 100644 --- a/Assets/Scripts/SceneLoader.cs +++ b/Assets/Scripts/SceneLoader.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/Scripts/VictoryDefeat.cs b/Assets/Scripts/VictoryDefeat.cs index f529eff..fde40a0 100644 --- a/Assets/Scripts/VictoryDefeat.cs +++ b/Assets/Scripts/VictoryDefeat.cs @@ -5,35 +5,39 @@ using UnityEngine; public class VictoryDefeat : MonoBehaviour { private bool _wavesEnd = false; - public Canvas victoryCanvas; - public Canvas defeatCanvas; + private bool _isShowingVictoryOrDefeat = false; + [SerializeField] private Animator _victoryAnimator; + [SerializeField] private Animator _defeatAnimator; public const float positionLoseLimit = -10.0f; - void Start() + private void Start() { - victoryCanvas.gameObject.SetActive(false); - defeatCanvas.gameObject.SetActive(false); + _isShowingVictoryOrDefeat = false; } void Update() { + if (_isShowingVictoryOrDefeat) return; + List opponentsList = LevelManager.Instance.GetAll(x => x is Opponent); //I believe that we win if the waves are finished and there are no more monsters (to be modified in the case that's not it) - if(_wavesEnd && opponentsList.Count == 0) { - victoryCanvas.gameObject.SetActive(true); - + if(_wavesEnd && opponentsList.Count == 0) + { + _victoryAnimator.Play("ShowVictoryOrDefeat"); + _isShowingVictoryOrDefeat = true; //win ! } //I estimate that we lose if one of the enemies arrives behind our line of defense (to be modified in the case it's not that) foreach (Opponent opponent in opponentsList) { - + if (opponent == null) return; if (opponent.transform.position.x < positionLoseLimit) { - defeatCanvas.gameObject.SetActive(true); + _defeatAnimator.Play("ShowVictoryOrDefeat"); + _isShowingVictoryOrDefeat = true; //lose :( } }