diff --git a/Assets/External/ZRNAssets/Skyboxes/Sunny3 Skybox.mat b/Assets/External/ZRNAssets/Skyboxes/Sunny3 Skybox.mat index 4ddedeb795b05bb5eff3c460582f2d231fee6f55..20118ed728deb5a26a94985c01510efe28547fdc 100644 --- a/Assets/External/ZRNAssets/Skyboxes/Sunny3 Skybox.mat +++ b/Assets/External/ZRNAssets/Skyboxes/Sunny3 Skybox.mat @@ -54,7 +54,7 @@ Material: m_Ints: [] m_Floats: - _Exposure: 1 - - _Rotation: 95.503204 + - _Rotation: 6.061867 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 2cbf712106210e46f26cdbd1110fd98084ca5a76..0a4a348a7f462dc87f891126c558b45ae3c1c64c 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -5728,7 +5728,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: movement: - speed: 2.7 + speed: 4 gravity: -9.81 groundCheck: origin: {fileID: 6638072582959177784} @@ -5764,10 +5764,12 @@ MonoBehaviour: easingTime: 0.5 fillSlider: {fileID: 0} easeFillSlider: {fileID: 0} + postProcessVolume: {fileID: 0} playerStats: {fileID: 0} gameOver: {fileID: 0} isInvincible: 0 difficulty: 0 + deathCounted: 0 --- !u!114 &6305082279367553248 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5786,6 +5788,7 @@ MonoBehaviour: minutes: 0 hours: 0 isDie: 0 + isWin: 0 shotAccuracy: 0 shotOnTarget: 0 totalShot: 0 diff --git a/Assets/Scenes/Main 1.unity b/Assets/Scenes/Main 1.unity index 4d2601036fe57f59d8c3e7c6451532acd01d1c51..95554987ce1d0ca4871792b41d9ab76e769f5fe7 100644 --- a/Assets/Scenes/Main 1.unity +++ b/Assets/Scenes/Main 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -21786,10 +21786,6 @@ PrefabInstance: propertyPath: playerHealth value: objectReference: {fileID: 1734600102} - - target: {fileID: 7686958831580430926, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} - propertyPath: movement.speed - value: 20 - objectReference: {fileID: 0} - target: {fileID: 8132293519141734770, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/Scripts/Main Scene/MainSceneController.cs b/Assets/Scripts/Main Scene/MainSceneController.cs index 91e96b3987f268caa8944049714d8e04e284cdca..afb2da727f211f43cbd8c6cba8879e39f541c13f 100644 --- a/Assets/Scripts/Main Scene/MainSceneController.cs +++ b/Assets/Scripts/Main Scene/MainSceneController.cs @@ -90,7 +90,7 @@ public class MainSceneController : MonoBehaviour // apply game state to the game player.GetComponent<PlayerHealth>().SetHealth(gameState.playerHealth); - managers.GetComponent<QuestManager>().SetQuestIndex(gameState.lastQuestIndex); + inGameTimelineManager.SkipToQuest(gameState.lastQuestIndex); player.GetComponent<PlayerHealth>().difficulty = difficulty; shopTabel.GetComponent<Shop>().SpawnAllPets(gameState.spawnedPets); } @@ -125,6 +125,7 @@ public class MainSceneController : MonoBehaviour gameState.difficulty = difficulty; gameState.spawnedPets = shopTabel.GetComponent<Shop>().spawnedPets; + gameState.Print(); } diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs index 83a95bd26ae9847b19b7bb351004ac10cc074b78..5a24809a57a85844b6e23c6876900da3a24c2645 100644 --- a/Assets/Scripts/Quest/QuestManager.cs +++ b/Assets/Scripts/Quest/QuestManager.cs @@ -73,9 +73,9 @@ public class QuestManager : MonoBehaviour // QUEST 2 quests.Add(new Quest(new List<Goal> { - // new GoalSurvive("Survive for for 45 sec ", 45), - new GoalKill("Kill 5 Bu Mer", 1, EnemyType.Thrower), - // new GoalKill("Kill 5 Pak Mer", 5, EnemyType.Keroco) + new GoalSurvive("Survive for for 45 sec ", 45), + new GoalKill("Kill 5 Bu Mer", 5, EnemyType.Thrower), + new GoalKill("Kill 5 Pak Mer", 5, EnemyType.Keroco) }, 100, new WaveData { Spawners = new List<SpawnerData> @@ -110,8 +110,8 @@ public class QuestManager : MonoBehaviour // QUEST 3 quests.Add(new Quest(new List<Goal> { - // new GoalSurvive("Survive for 60 sec ", 60), - new GoalKill("Kill 3 generals", 1, EnemyType.General) + new GoalSurvive("Survive for 60 sec ", 60), + new GoalKill("Kill 3 generals", 3, EnemyType.General) }, 200, new WaveData { Spawners = new List<SpawnerData>