diff --git a/Assets/Animation/EnemyAC.controller b/Assets/Animation/EnemyAC.controller
index 7798704a5de5effc7f010c36b54e31eb00734a78..e870d2dd6d62066afc83ad7f402e4a6d631b2f58 100644
--- a/Assets/Animation/EnemyAC.controller
+++ b/Assets/Animation/EnemyAC.controller
@@ -122,6 +122,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -4049321667482666445}
m_Position: {x: 250, y: 200, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 7908938725651580147}
+ m_Position: {x: 285, y: 265, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 3011294842453135158}
@@ -192,3 +195,29 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
+--- !u!1102 &7908938725651580147
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: TitanDeath
+ 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: b00359b4730bb5647bcfc0f487d4adcc, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Scenes/Ending.unity b/Assets/Scenes/Ending.unity
index e2f87bc9571d81c095ca675a3ca93bad53fdb266..630b63d0d3c1c4df8c63b577e2a5f32f3e210b51 100644
--- a/Assets/Scenes/Ending.unity
+++ b/Assets/Scenes/Ending.unity
@@ -276,7 +276,7 @@ PlayableDirector:
- key: {fileID: -2056245638614861758, guid: 32e692146d0f56e4a9042616a747e5fa, type: 2}
value: {fileID: 2025782837}
- key: {fileID: 7919334886754851006, guid: 32e692146d0f56e4a9042616a747e5fa, type: 2}
- value: {fileID: 512691449}
+ value: {fileID: 2035528383}
- key: {fileID: -7691299484967562974, guid: 32e692146d0f56e4a9042616a747e5fa, type: 2}
value: {fileID: 1659615795}
- key: {fileID: -2540277817414389433, guid: 32e692146d0f56e4a9042616a747e5fa, type: 2}
@@ -296,7 +296,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2025782836}
- - {fileID: 512691450}
+ - {fileID: 2035528384}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -706,7 +706,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalScale.x
- value: 1
+ value: 1.0000001
objectReference: {fileID: 0}
- target: {fileID: 400006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalScale.y
@@ -714,7 +714,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalScale.z
- value: 0.99999994
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 400006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.x
@@ -2757,6 +2757,81 @@ Animator:
m_CorrespondingSourceObject: {fileID: 9500000, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
m_PrefabInstance: {fileID: 836666109}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2035528382
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 306227185}
+ m_Modifications:
+ - target: {fileID: 263222732460000471, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6740959744618859462, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_IsKinematic
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 9.86541
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1.326115
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.42261824
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.9063078
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 230
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7250609702779207134, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ propertyPath: m_Name
+ value: Titan
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+--- !u!95 &2035528383 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 7250609702788582988, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ m_PrefabInstance: {fileID: 2035528382}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &2035528384 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ m_PrefabInstance: {fileID: 2035528382}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2048521461
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity
index f47d6d7377aea38592d7ffd4595fc593568e6809..4d70f30e2e70c38dcce95010a40b2e54995b8bde 100644
--- a/Assets/Scenes/Level_Final.unity
+++ b/Assets/Scenes/Level_Final.unity
@@ -2940,7 +2940,7 @@ PrefabInstance:
objectReference: {fileID: 1733139686}
- target: {fileID: 2301380300054905384, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
propertyPath: startingHealth
- value: 3000
+ value: 3500
objectReference: {fileID: 0}
- target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
propertyPath: m_RootOrder
@@ -12526,6 +12526,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1853576961}
m_CullTransparentMesh: 1
+--- !u!1 &1855573367 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7250609702779207134, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ m_PrefabInstance: {fileID: 748860720}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1864229085
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index 27092b5c81a478729a83e88dcc7f31f029d748a1..8363cb6381175b9b33b31c41d1a9961d62474a47 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -44,8 +44,9 @@ public class GameManager : MonoBehaviour
private void Awake()
{
- if (!isBoss && !isMenu) {
+ if (!isBoss) {
enemySpawner.SetActive(isEnemyActive);
+ score.SetActive(isEnemyActive);
}
if (gameManager == null)
{
diff --git a/Assets/Scripts/Managers/BossQuestManager.cs b/Assets/Scripts/Managers/BossQuestManager.cs
index 0c0d4b549a57dec4f12a08a3d2a27a1a961ff2f2..7323d571fcd6419c14fa905b8612618e662fb1c1 100644
--- a/Assets/Scripts/Managers/BossQuestManager.cs
+++ b/Assets/Scripts/Managers/BossQuestManager.cs
@@ -4,9 +4,9 @@ using UnityEngine;
public class BossQuestManager : QuestManager
{
- public static BossQuestManager questManager;
+ public static BossQuestManager questManager;
- void Awake() {
+ void Awake() {
GameManager gameManager = FindObjectOfType<GameManager>();
gameManager.isBoss = true;
@@ -19,7 +19,8 @@ public class BossQuestManager : QuestManager
{
Destroy(questManager);
}
- }
+ }
+
void Start() {
quests[0] = GenerateQuest();
ShowQuestToUI();
diff --git a/Assets/Scripts/Shop/ShopManager.cs b/Assets/Scripts/Shop/ShopManager.cs
index 2a21b4ad7563d5033e27afec92455db2575bc936..ac61e5cc9749a8e11f3f37d79966f79b3de1b4ac 100644
--- a/Assets/Scripts/Shop/ShopManager.cs
+++ b/Assets/Scripts/Shop/ShopManager.cs
@@ -27,8 +27,8 @@ public class ShopManager : MonoBehaviour
private void Awake()
{
petData.Add(new PetData("rabbit", "heal", 3, 50, "rabbit", 1));
- petData.Add(new PetData("sparrow", "defense", 3, 40, "sparrow", 2));
- petData.Add(new PetData("cultist", "attack", 3, 40, "cultist", 3));
+ petData.Add(new PetData("sparrow", "attack", 3, 40, "sparrow", 2));
+ petData.Add(new PetData("cultist", "buff", 3, 40, "cultist", 3));
weaponData.Add(new WeaponData("shotgun", 50, "shotgun",2));
weaponData.Add(new WeaponData("sword", 80, "sword",3));
diff --git a/Assets/Timeline/EndingCutscene.playable b/Assets/Timeline/EndingCutscene.playable
index 9b971b3496d552aa48a0df92d1c9552fc609c980..0d7033349e1b35de870070897a31550bc52fac77 100644
--- a/Assets/Timeline/EndingCutscene.playable
+++ b/Assets/Timeline/EndingCutscene.playable
@@ -127,28 +127,6 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
---- !u!114 &-2582437068100016335
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
- m_Name: AnimationPlayableAsset
- m_EditorClassIdentifier:
- m_Clip: {fileID: 7400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- m_Position: {x: 0, y: 0, z: 0}
- m_EulerAngles: {x: 0, y: 0, z: 0}
- m_UseTrackMatchFields: 1
- m_MatchTargetFields: 63
- m_RemoveStartOffset: 1
- m_ApplyFootIK: 1
- m_Loop: 0
- m_Version: 1
- m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-2540277817414389433
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -314,25 +292,7 @@ MonoBehaviour:
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
+ m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -359,25 +319,7 @@ MonoBehaviour:
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
+ m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -723,6 +665,173 @@ MonoBehaviour:
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!74 &7325904929744141343
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Recorded (2)
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.3666667
+ value: {x: 0, y: -0.1, 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.9333334
+ value: {x: 0, y: -15, 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}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ 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: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 2.9333334
+ 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.3666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2.9333334
+ 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_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.3666667
+ value: -0.1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2.9333334
+ value: -15
+ 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_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 1.3666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2.9333334
+ 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_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
--- !u!114 &7625490194592843141
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -759,46 +868,13 @@ MonoBehaviour:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
- m_Clips:
- - m_Version: 1
- m_Start: 0
- m_ClipIn: 0
- m_Asset: {fileID: -2582437068100016335}
- m_Duration: 2.7318115991540255
- m_TimeScale: 0.5
- m_ParentTrack: {fileID: 7919334886754851006}
- m_EaseInDuration: 0
- m_EaseOutDuration: 0
- m_BlendInDuration: -1
- m_BlendOutDuration: -1
- m_MixInCurve:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- m_MixOutCurve:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- m_BlendInCurveMode: 0
- m_BlendOutCurveMode: 0
- m_ExposedParameterNames: []
- m_AnimationCurves: {fileID: 0}
- m_Recordable: 0
- m_PostExtrapolationMode: 1
- m_PreExtrapolationMode: 1
- m_PostExtrapolationTime: Infinity
- m_PreExtrapolationTime: 0
- m_DisplayName: Death
+ m_Clips: []
m_Markers:
m_Objects: []
- m_InfiniteClipPreExtrapolation: 0
- m_InfiniteClipPostExtrapolation: 0
- m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
- m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+ m_InfiniteClipPreExtrapolation: 1
+ m_InfiniteClipPostExtrapolation: 1
+ m_InfiniteClipOffsetPosition: {x: 9.86541, y: 0, z: 1.326115}
+ m_InfiniteClipOffsetEulerAngles: {x: -0, y: 230, z: 0}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
@@ -809,7 +885,7 @@ MonoBehaviour:
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
- m_InfiniteClip: {fileID: 0}
+ m_InfiniteClip: {fileID: 7325904929744141343}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0