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/Level_Final.unity b/Assets/Scenes/Level_Final.unity index 6f98a0a17debf0f21606d168dd8a05e3aaf2d181..6885fe1cbe3f2507aabf1376def29ce75121f9da 100644 --- a/Assets/Scenes/Level_Final.unity +++ b/Assets/Scenes/Level_Final.unity @@ -2281,7 +2281,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 @@ -9760,8 +9760,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: petPanelPrefab: {fileID: 2251194373224310919, guid: 6fe25831cffe5a144a2487aff6b7f3ca, type: 3} - weaponPanelPrefab: {fileID: 0} - parent: {fileID: 0} + weaponPanelPrefab: {fileID: 2251194373224310919, guid: af7e994fa9bda0a4eb114e9b6765cedf, type: 3} + parent: {fileID: 1823714612} hudManager: {fileID: 491809539} coins: {fileID: 1678682909} --- !u!1 &1456880656 @@ -10447,7 +10447,7 @@ MonoBehaviour: currentWeapon: 0 availableWeapon: 01000000 hudManager: {fileID: 491809539} - enemySpawner: {fileID: 7250609702671589678} + enemySpawner: {fileID: 1855573367} score: {fileID: 2030411490} --- !u!114 &1644740160 MonoBehaviour: @@ -11285,6 +11285,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 5e4abd6e366d3fcd14d5344ddb789693b1d42d8e..84ad17a36ff68a3ba91987b48a023f7b50231db1 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -42,9 +42,8 @@ public class GameManager : MonoBehaviour private void Awake() { - if (!isBoss) { - enemySpawner.SetActive(isEnemyActive); - } + enemySpawner.SetActive(isEnemyActive); + score.SetActive(isEnemyActive); if (gameManager == null) { gameManager = this; diff --git a/Assets/Scripts/Managers/BossQuestManager.cs b/Assets/Scripts/Managers/BossQuestManager.cs index 4aea36adba2d7025f974c842814418bd713b4e80..5568531ec29b9f03844638a6de8b6bba0c25a48e 100644 --- a/Assets/Scripts/Managers/BossQuestManager.cs +++ b/Assets/Scripts/Managers/BossQuestManager.cs @@ -6,7 +6,18 @@ public class BossQuestManager : QuestManager { void Awake() { GameManager gameManager = FindObjectOfType<GameManager>(); - gameManager.isBoss = true; + if (gameManager != null) + { + gameManager.isBoss = false; + } + if (questManager == null) + { + questManager = this; + } + else + { + Destroy(questManager); + } } void Start() { quests[0] = GenerateQuest(); diff --git a/Assets/Scripts/Managers/QuestManager.cs b/Assets/Scripts/Managers/QuestManager.cs index e9d6e9cd6ec78c2e7553ded27ac320efbd984827..75d79ecbbd969309fc91fe7fb5454cf957b59a15 100644 --- a/Assets/Scripts/Managers/QuestManager.cs +++ b/Assets/Scripts/Managers/QuestManager.cs @@ -23,7 +23,7 @@ public class QuestManager : MonoBehaviour public static QuestManager questManager; - protected void Awake() + void Awake() { GameManager gameManager = FindObjectOfType<GameManager>(); if (gameManager != null) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index bbc77ab80ea862e64b0eeaff9ede4a6a06ebdd14..da43a274c0ac872baa5000db69c41c558b2f8d50 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -29,4 +29,13 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/GameOver.unity guid: 61604cf4c54f4704f8b6558f4a81ec64 + - enabled: 1 + path: Assets/Scenes/Ending.unity + guid: 660c040bf38590745bbf04241606d456 + - enabled: 1 + path: Assets/Scenes/Opening.unity + guid: 1c2ff92ae05b29c4e9beb506fb26fc87 + - enabled: 1 + path: Assets/Scenes/ShopCutscene.unity + guid: 5d4e22bb4a7ede749a48a286b13a4a38 m_configObjects: {}