From f92d5d5866cfb46de1e4c40359a7341f5f7cacdf Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Mon, 19 Aug 2024 15:24:58 +0100 Subject: [PATCH] Remove debugs & tidy up things for next update --- .../Bosses/BossEnemyPrefabTemplate.prefab | 126 ++++++++++++++++- ...agonBossEnemyPrefabTemplate Variant.prefab | 10 +- .../Enemies/BasicEnemyPrefabTemplate.prefab | 128 +++++++++++++++++- .../PlayerPrefab_Mage Variant.prefab | 21 +-- Assets/Resources/PlayerPrefab.prefab | 17 ++- .../AbilitySystem/AntiProjectileAbility.cs | 2 +- .../Base/CastingStateController.cs | 4 +- .../Effects/AbsorbEffectInstance.cs | 2 +- .../Effects/InstantValueEffect.cs | 6 +- .../Effects/OverTimeValueEffect.cs | 2 +- .../AbilitySystem/ProjectileAbility.cs | 6 +- Assets/Scripts/AbilitySystem/SummonAbility.cs | 16 ++- Assets/Scripts/CharacterAnimatorController.cs | 12 +- Assets/Scripts/ClassResource.cs | 4 +- .../Difficulty/GameDifficultyController.cs | 2 +- Assets/Scripts/Game/GameConstants.cs | 4 +- Assets/Scripts/Health.cs | 11 +- Assets/Scripts/Mana.cs | 2 +- Assets/Scripts/NPC/NPCController.cs | 2 +- .../BasicEnemy/BasicEnemyNPCController.cs | 14 +- .../DragonAnimatorController.cs | 2 +- .../NPCAnimatorControllerBase.cs | 4 +- .../NPCControllers_v2/NPCControllerBase.cs | 6 +- .../PlayerMinion/MinionNPCController.cs | 16 +-- .../Networking/NetworkedAreaOfEffect.cs | 4 +- .../NetworkedAreaOfEffectOverTime.cs | 3 +- Assets/Scripts/Networking/NetworkedSlash.cs | 6 +- .../NetworkedSlashWithOnHitEvent.cs | 2 +- Assets/Scripts/Player/PlayerLevel.cs | 6 +- Assets/Starfield Skybox/Skybox.mat | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- 31 files changed, 343 insertions(+), 101 deletions(-) diff --git a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab index 7e8dafe4..06f5d4d0 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab @@ -175,6 +175,7 @@ Transform: - {fileID: 7680563380851967174} - {fileID: 7680563380990892984} - {fileID: 6424422571297150527} + - {fileID: 5384078725410897319} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -392,18 +393,18 @@ MonoBehaviour: Vitality: statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} BaseValue: 5 - CritChance: - statTag: {fileID: 11400000, guid: 831eab0f4c8fb69459a620afd95f698f, type: 2} - BaseValue: 5 - CritDamage: - statTag: {fileID: 11400000, guid: ad5c133149d9aa641be97f85e426a01f, type: 2} - BaseValue: 50 AttackDamage: statTag: {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2} BaseValue: 1 SpellDamage: statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} BaseValue: 1 + CritChance: + statTag: {fileID: 11400000, guid: 831eab0f4c8fb69459a620afd95f698f, type: 2} + BaseValue: 5 + CritDamage: + statTag: {fileID: 11400000, guid: ad5c133149d9aa641be97f85e426a01f, type: 2} + BaseValue: 50 MaxHealth: statTag: {fileID: 11400000, guid: 4242916f0b1bf6e4e8a04bce7028b3f4, type: 2} BaseValue: 0 @@ -566,6 +567,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -593,6 +595,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -620,6 +623,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -1588,6 +1592,116 @@ Transform: m_CorrespondingSourceObject: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} m_PrefabInstance: {fileID: 2933284643590123630} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7425107645371130201 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2278116590711127942} + m_Modifications: + - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2464649666680496483, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3f2dbe50d6b1a0f4ca343324c5077160, type: 3} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.6 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6321403963943988171, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Name + value: MinimapCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} +--- !u!224 &5384078725410897319 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + m_PrefabInstance: {fileID: 7425107645371130201} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7680563380609097272 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab b/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab index 7b4410ea..d87a2d43 100644 --- a/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab +++ b/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5909578744954783083} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3837297292392134434 MonoBehaviour: @@ -179,6 +179,14 @@ PrefabInstance: propertyPath: m_Name value: DragonBossEnemyPrefabTemplate Variant objectReference: {fileID: 0} + - target: {fileID: 3508703756390926994, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5384078725410897319, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2278116590711127941, guid: d9b43fa944715a7489818765baa8fc11, type: 3} m_SourcePrefab: {fileID: 100100000, guid: d9b43fa944715a7489818765baa8fc11, type: 3} diff --git a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab index c13baa2d..3004a94b 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab @@ -255,6 +255,7 @@ Transform: - {fileID: 6901636255731641543} - {fileID: 4411435976634846363} - {fileID: 7146237025830416315} + - {fileID: 571057253116836751} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -484,18 +485,18 @@ MonoBehaviour: Vitality: statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} BaseValue: 1 - CritChance: - statTag: {fileID: 11400000, guid: 831eab0f4c8fb69459a620afd95f698f, type: 2} - BaseValue: 3 - CritDamage: - statTag: {fileID: 11400000, guid: ad5c133149d9aa641be97f85e426a01f, type: 2} - BaseValue: 50 AttackDamage: statTag: {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2} BaseValue: 1 SpellDamage: statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} BaseValue: 1 + CritChance: + statTag: {fileID: 11400000, guid: 831eab0f4c8fb69459a620afd95f698f, type: 2} + BaseValue: 3 + CritDamage: + statTag: {fileID: 11400000, guid: ad5c133149d9aa641be97f85e426a01f, type: 2} + BaseValue: 50 MaxHealth: statTag: {fileID: 11400000, guid: 4242916f0b1bf6e4e8a04bce7028b3f4, type: 2} BaseValue: 0 @@ -644,6 +645,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -671,6 +673,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -698,6 +701,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -5851,7 +5855,7 @@ MonoBehaviour: coinAmount: 2 extraDropChance: 5 onCoinDrop: {fileID: 11400000, guid: 48da3b1185c086c4c81a2b97ab7685fc, type: 2} - guaranteedDrops: [] + guaranteedItemDrop: [] extraDrops: - {fileID: 11400000, guid: 26b042abfe9104448a1e9599be66e71a, type: 2} - {fileID: 11400000, guid: e08687c26614d154cb5a9a01f4b97635, type: 2} @@ -11860,6 +11864,116 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4961915953510107608, guid: 23e24e9936f1c6f4baaaef83461437db, type: 3} m_PrefabInstance: {fileID: 2293538936043110133} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3053320187706664817 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1040714684719195969} + m_Modifications: + - target: {fileID: 921287751983194665, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2464649666680496483, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3f2dbe50d6b1a0f4ca343324c5077160, type: 3} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.6 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6321403963943988171, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Name + value: MinimapCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} +--- !u!224 &571057253116836751 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + m_PrefabInstance: {fileID: 3053320187706664817} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7665694007473686650 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab index ccc645f3..5a8f5b68 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab @@ -358,24 +358,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.size - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[2] value: - objectReference: {fileID: 3197801336946445289} + objectReference: {fileID: 3295257113280054570} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[3] value: - objectReference: {fileID: 3295257113280054570} + objectReference: {fileID: 5389195242245751343} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[4] value: - objectReference: {fileID: 5389195242245751343} + objectReference: {fileID: 7230415786316253121} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[5] value: - objectReference: {fileID: 7230415786316253121} + objectReference: {fileID: 6192144265892874537} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[6] value: @@ -465,17 +465,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc68399598b8f0e4bbfcacc0f270b054, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3197801336946445289 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9176951908243474339, guid: 9c432d220280f704684a6d5b9354c782, type: 3} - m_PrefabInstance: {fileID: 5997609963189718090} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e27fb8d81ab0d814ca4415089c513fe3, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &3295257113280054570 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9115515025738910048, guid: 9c432d220280f704684a6d5b9354c782, type: 3} diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 7cff7048..acfe3371 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -475,18 +475,18 @@ MonoBehaviour: Vitality: statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} BaseValue: 1 - CritChance: - statTag: {fileID: 11400000, guid: 831eab0f4c8fb69459a620afd95f698f, type: 2} - BaseValue: 5 - CritDamage: - statTag: {fileID: 11400000, guid: ad5c133149d9aa641be97f85e426a01f, type: 2} - BaseValue: 50 AttackDamage: statTag: {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2} BaseValue: 1 SpellDamage: statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} BaseValue: 1 + CritChance: + statTag: {fileID: 11400000, guid: 831eab0f4c8fb69459a620afd95f698f, type: 2} + BaseValue: 5 + CritDamage: + statTag: {fileID: 11400000, guid: ad5c133149d9aa641be97f85e426a01f, type: 2} + BaseValue: 50 MaxHealth: statTag: {fileID: 11400000, guid: 4242916f0b1bf6e4e8a04bce7028b3f4, type: 2} BaseValue: 0 @@ -524,7 +524,7 @@ MonoBehaviour: baseMaxValue: 100 flatRegen: 1 percentRegen: 1 - timeBetweenRegens: 1 + timeBetweenRegens: 3 onResourceChanged: m_PersistentCalls: m_Calls: [] @@ -737,6 +737,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -764,6 +765,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: @@ -791,6 +793,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] + mitigationType: 0 currentDamagePerTick: 0 OnEffectTick: m_PersistentCalls: diff --git a/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs b/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs index 5f98f886..69bf0b46 100644 --- a/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs +++ b/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs @@ -18,7 +18,7 @@ public class AntiProjectileAbility : BaseAbility { base.Execute(user, userTag); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedProjectile = PhotonNetwork.Instantiate("Abilities/" + antiProjectilePrefab.name, user.transform.position, user.GetComponentInChildren().transform.rotation); diff --git a/Assets/Scripts/AbilitySystem/Base/CastingStateController.cs b/Assets/Scripts/AbilitySystem/Base/CastingStateController.cs index 782770a0..38a03a51 100644 --- a/Assets/Scripts/AbilitySystem/Base/CastingStateController.cs +++ b/Assets/Scripts/AbilitySystem/Base/CastingStateController.cs @@ -66,7 +66,7 @@ public class CastingStateController : MonoBehaviour playerMovement.ToggleAgentMoving(false); } - Debug.Log("$$sCastbar Done casting"); + //Debug.Log("$$sCastbar Done casting"); } private IEnumerator Channeling(BaseAbility channeledAbility, Action abilityChannelExecution) @@ -95,6 +95,6 @@ public class CastingStateController : MonoBehaviour isCasting = false; playerMovement.ToggleAgentMoving(false); StopAllCoroutines(); - Debug.Log("$$ResetCastingState On Event"); + //Debug.Log("$$ResetCastingState On Event"); } } diff --git a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs index f902a02b..58fbf2c5 100644 --- a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs @@ -16,7 +16,7 @@ public class AbsorbEffectInstance : StatusEffectInstance float income; - private void Awake() + protected override void Awake() { owner = GetComponent(); diff --git a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs index a99b068f..ad7b3e3b 100644 --- a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs @@ -27,7 +27,7 @@ public class InstantValueEffect : BaseEffect { foreach (Taggable target in targets) { - Debug.Log($"Applied instant effect of {GetCorrectValueSign(user, target)} to target {target.name}"); + //Debug.Log($"Applied instant effect of {GetCorrectValueSign(user, target)} to target {target.name}"); if(applyToClassResourceInstead) { if(applyToSelfResourceInsteadOfHit) @@ -101,11 +101,11 @@ public class InstantValueEffect : BaseEffect } } - Debug.Log("FinalValue = " + finalValue + " dmgType = " + damageType); + //Debug.Log("FinalValue = " + finalValue + " dmgType = " + damageType); if (IsCrit(stats) && !applyToClassResourceInstead) { finalValue *= (1 + stats.CritDamage.Value / 100f); - Debug.Log("FinalValue IsCrit = " + finalValue + " dmgType = " + damageType); + //Debug.Log("FinalValue IsCrit = " + finalValue + " dmgType = " + damageType); } } diff --git a/Assets/Scripts/AbilitySystem/Effects/OverTimeValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/OverTimeValueEffect.cs index 386824e9..52c90d79 100644 --- a/Assets/Scripts/AbilitySystem/Effects/OverTimeValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/OverTimeValueEffect.cs @@ -13,7 +13,7 @@ public class OverTimeValueEffect : BaseEffect { foreach (Taggable target in targets) { - Debug.Log($"Applied overtime effect of {GetCorrectValueSign(user, target)} every {tickRate}s over {duration}s to target {target.name}"); + //Debug.Log($"Applied overtime effect of {GetCorrectValueSign(user, target)} every {tickRate}s over {duration}s to target {target.name}"); } } diff --git a/Assets/Scripts/AbilitySystem/ProjectileAbility.cs b/Assets/Scripts/AbilitySystem/ProjectileAbility.cs index f2a8eac3..5b3e56e1 100644 --- a/Assets/Scripts/AbilitySystem/ProjectileAbility.cs +++ b/Assets/Scripts/AbilitySystem/ProjectileAbility.cs @@ -21,7 +21,7 @@ public class ProjectileAbility : BaseAbility { base.Execute(user, userTag); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedProjectile = PhotonNetwork.Instantiate("Abilities/" + projectilePrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); @@ -42,7 +42,7 @@ public class ProjectileAbility : BaseAbility { base.Execute(user, userTag, point); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedProjectile = PhotonNetwork.Instantiate("Abilities/" + projectilePrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); @@ -63,7 +63,7 @@ public class ProjectileAbility : BaseAbility { base.Execute(user, userTag, target); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedProjectile = PhotonNetwork.Instantiate("Abilities/" + projectilePrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); diff --git a/Assets/Scripts/AbilitySystem/SummonAbility.cs b/Assets/Scripts/AbilitySystem/SummonAbility.cs index 9f8b9a8f..145af3a5 100644 --- a/Assets/Scripts/AbilitySystem/SummonAbility.cs +++ b/Assets/Scripts/AbilitySystem/SummonAbility.cs @@ -18,7 +18,7 @@ public class SummonAbility : BaseAbility { base.Execute(user, userTag); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedMinion = PhotonNetwork.Instantiate("Abilities/" + minionPrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); InitializeStatsBasedOnOwner(user); @@ -28,7 +28,7 @@ public class SummonAbility : BaseAbility { base.Execute(user, userTag); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedMinion = PhotonNetwork.Instantiate("Abilities/" + minionPrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); InitializeStatsBasedOnOwner(user); @@ -38,7 +38,7 @@ public class SummonAbility : BaseAbility { base.Execute(user, userTag); - Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); + //Debug.Log($"Player {user.name} casted {this.name} and spent {manaCost} mana."); instantiatedMinion = PhotonNetwork.Instantiate("Abilities/" + minionPrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); InitializeStatsBasedOnOwner(user); @@ -55,6 +55,16 @@ public class SummonAbility : BaseAbility minionStats.Spirit.AddModifier(new StatModifier(ownerStats.Spirit.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); minionStats.Vitality.AddModifier(new StatModifier(ownerStats.Vitality.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + minionStats.AttackDamage.AddModifier(new StatModifier(ownerStats.AttackDamage.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + minionStats.SpellDamage.AddModifier(new StatModifier(ownerStats.SpellDamage.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + + minionStats.CritChance.AddModifier(new StatModifier(ownerStats.CritChance.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + minionStats.CritDamage.AddModifier(new StatModifier(ownerStats.CritDamage.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + + minionStats.MaxHealth.AddModifier(new StatModifier(ownerStats.MaxHealth.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + minionStats.Armor.AddModifier(new StatModifier(ownerStats.Armor.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + minionStats.MagicResistance.AddModifier(new StatModifier(ownerStats.MagicResistance.Value * GameConstants.CharacterStatsBalancing.PercentageStatScaleForMinions, StatModType.Flat, ownerStats)); + minionStats.onUpdateStatValues.Invoke(); } } diff --git a/Assets/Scripts/CharacterAnimatorController.cs b/Assets/Scripts/CharacterAnimatorController.cs index 533b71ba..76ee929c 100644 --- a/Assets/Scripts/CharacterAnimatorController.cs +++ b/Assets/Scripts/CharacterAnimatorController.cs @@ -43,12 +43,12 @@ public class CharacterAnimatorController : MonoBehaviour private void OnEnable() { parentController = GetComponentInParent(); - Debug.Log("OnEnable: parentController is " + (parentController != null ? "not null" : "null")); + //Debug.Log("OnEnable: parentController is " + (parentController != null ? "not null" : "null")); if (photonView.IsMine) { CastBarHandler.Instance.OnCastingStateChanged.AddListener(UpdateIsCastingState); - Debug.Log("Adding Listener for character: " + this.gameObject.name); + //Debug.Log("Adding Listener for character: " + this.gameObject.name); } } private void OnDisable() @@ -81,10 +81,10 @@ public class CharacterAnimatorController : MonoBehaviour if (parentController == null) { parentController = GetComponentInParent(); - Debug.Log("OnEnable: parentController is " + (parentController != null ? "not null" : "null")); + //Debug.Log("OnEnable: parentController is " + (parentController != null ? "not null" : "null")); } - Debug.Log("NULL: " + parentController); + //Debug.Log("NULL: " + parentController); parentController.SetRemoteTriggerBasedOnAbility((int)CastBarHandler.Instance.currentAbility.animationType); } @@ -153,11 +153,11 @@ public class CharacterAnimatorController : MonoBehaviour public void OnAnimationEvent() { if (!photonView.IsMine) return; - Debug.Log("$$melee Animation event"); + //Debug.Log("$$melee Animation event"); //if (!isCasting) return; - Debug.Log("$$melee Animation event casting true"); + //Debug.Log("$$melee Animation event casting true"); if (CastBarHandler.Instance.currentAbility.animationType == AbilityAnimationType.Melee) { diff --git a/Assets/Scripts/ClassResource.cs b/Assets/Scripts/ClassResource.cs index fe399d74..aaf7b290 100644 --- a/Assets/Scripts/ClassResource.cs +++ b/Assets/Scripts/ClassResource.cs @@ -25,7 +25,7 @@ public class ClassResource : Resource public override void ChangeValue(float value) { if (value == 0) return; - Debug.Log("Class resource change value:" + value); + //Debug.Log("Class resource change value:" + value); currentValue += value; @@ -52,7 +52,7 @@ public class ClassResource : Resource public void RPC_ChangeValueClassResource(float value) { if (!photonView.IsMine) return; - Debug.Log("Received ChangeValue from RPC from someone"); + //Debug.Log("Received ChangeValue from RPC from someone"); ChangeValue(value); } } diff --git a/Assets/Scripts/Difficulty/GameDifficultyController.cs b/Assets/Scripts/Difficulty/GameDifficultyController.cs index ca1752b1..b8c58daf 100644 --- a/Assets/Scripts/Difficulty/GameDifficultyController.cs +++ b/Assets/Scripts/Difficulty/GameDifficultyController.cs @@ -157,7 +157,7 @@ public class GameDifficultyController : MonoBehaviour, IPunObservable currentDifficultyIndex = receivedDifficulty; onDifficultyChanged.Raise(); } - Debug.Log($"Networked Difficulty: Set to {difficultySettings[currentDifficultyIndex].name}"); + //Debug.Log($"Networked Difficulty: Set to {difficultySettings[currentDifficultyIndex].name}"); } } diff --git a/Assets/Scripts/Game/GameConstants.cs b/Assets/Scripts/Game/GameConstants.cs index 2545a0ba..4b41d8b3 100644 --- a/Assets/Scripts/Game/GameConstants.cs +++ b/Assets/Scripts/Game/GameConstants.cs @@ -98,8 +98,8 @@ public static class GameConstants public const float VitalityToHealthRate = 10f; public const float IntelligenceToManaRate = 2f; - public const float BonusStrengthToFlatRegenRate = 0.5f; - public const float BonusVitalityToPercentRegenRate = 0.01f; + public const float BonusStrengthToFlatRegenRate = 0.05f; + public const float BonusVitalityToFlatRegenRate = 0.05f; public const float BonusSpiritToFlatRegenRate = 0.5f; public const float BonusSpiritToPercentRegenRate = 0.01f; diff --git a/Assets/Scripts/Health.cs b/Assets/Scripts/Health.cs index 90f1080b..a432dead 100644 --- a/Assets/Scripts/Health.cs +++ b/Assets/Scripts/Health.cs @@ -110,10 +110,10 @@ public class Health : Resource } - Debug.Log(gameObject.name + " mitigating = " + percentStatMitigation + " percent"); + //Debug.Log(gameObject.name + " mitigating = " + percentStatMitigation + " percent"); reducedDamage = incomingValue * percentStatMitigation; incomingValue += Mathf.Abs(reducedDamage); - Debug.Log(gameObject.name + " receiving dmg = " + incomingValue + $" after mitigations from {(dmgType == DamageType.Attack ? nameof(character.Armor) : nameof(character.MagicResistance))}"); + //Debug.Log(gameObject.name + " receiving dmg = " + incomingValue + $" after mitigations from {(dmgType == DamageType.Attack ? nameof(character.Armor) : nameof(character.MagicResistance))}"); if (incomingValue > 0) //avoid damage ultra mitigated turning into healing incomingValue = 0; @@ -177,7 +177,7 @@ public class Health : Resource incomingValue = value; - Debug.Log(gameObject.name + " receiving dmg = " + incomingValue + " before mitigations " + (DamageType)dmgType); + //Debug.Log(gameObject.name + " receiving dmg = " + incomingValue + " before mitigations " + (DamageType)dmgType); if (invulnerable && incomingValue < 0) return; @@ -230,7 +230,10 @@ public class Health : Resource } public void CalculateRegenValueBasedOnStat() { - flatRegen = baseFlatRegen + (character.Strength.Value - character.Strength.BaseValue) * GameConstants.CharacterStatsBalancing.BonusStrengthToFlatRegenRate; + flatRegen = baseFlatRegen + + (character.Strength.Value - character.Strength.BaseValue) * GameConstants.CharacterStatsBalancing.BonusStrengthToFlatRegenRate + + (character.Vitality.Value - character.Vitality.BaseValue) * GameConstants.CharacterStatsBalancing.BonusVitalityToFlatRegenRate + ; //percentRegen = (character.Vitality.Value - character.Vitality.BaseValue) * GameConstants.CharacterBalancing.BonusVitalityToPercentRegenRate; //Debug.Log(this.gameObject.name + " regens health " + flatRegen + " " + percentRegen + " = " + flatRegen + (maxValue * percentRegen / 100f)); diff --git a/Assets/Scripts/Mana.cs b/Assets/Scripts/Mana.cs index 7b87a12c..bca85812 100644 --- a/Assets/Scripts/Mana.cs +++ b/Assets/Scripts/Mana.cs @@ -67,7 +67,7 @@ public class Mana : Resource public void RPC_ChangeValueMana (float value) { if (!photonView.IsMine) return; - Debug.Log("Received ChangeValue from RPC from someone"); + //Debug.Log("Received ChangeValue from RPC from someone"); ChangeValue(value); } diff --git a/Assets/Scripts/NPC/NPCController.cs b/Assets/Scripts/NPC/NPCController.cs index 78051555..d4a077b8 100644 --- a/Assets/Scripts/NPC/NPCController.cs +++ b/Assets/Scripts/NPC/NPCController.cs @@ -85,7 +85,7 @@ public class NPCController : MonoBehaviour { if (isDead) return; - Debug.Log($"{this.gameObject.name} died!"); + //Debug.Log($"{this.gameObject.name} died!"); isDead = true; diff --git a/Assets/Scripts/NPC/NPCControllers_v2/BasicEnemy/BasicEnemyNPCController.cs b/Assets/Scripts/NPC/NPCControllers_v2/BasicEnemy/BasicEnemyNPCController.cs index d52df16b..fe41c618 100644 --- a/Assets/Scripts/NPC/NPCControllers_v2/BasicEnemy/BasicEnemyNPCController.cs +++ b/Assets/Scripts/NPC/NPCControllers_v2/BasicEnemy/BasicEnemyNPCController.cs @@ -26,7 +26,7 @@ public class BasicEnemyNPCController : NPCControllerBase { if (isDead) return; - Debug.Log($"{this.gameObject.name} died!"); + //Debug.Log($"{this.gameObject.name} died!"); isDead = true; @@ -47,13 +47,13 @@ public class BasicEnemyNPCController : NPCControllerBase protected override void OnNewTargetIdentifiedAndHasTarget() { //someone entered sight, npc already has a target - Debug.Log("New Target available, current target = " + currentTarget.name); + //Debug.Log("New Target available, current target = " + currentTarget.name); } protected override void OnNewTargetIdentifiedAndNoCurrentTarget() { //someone entered sight, npc does not have a target yet - Debug.Log("New Target available, current target = null, updating target with closest"); + //Debug.Log("New Target available, current target = null, updating target with closest"); UpdateCurrentTarget(GetClosestTarget()); } @@ -109,13 +109,13 @@ public class BasicEnemyNPCController : NPCControllerBase if (ability == null) { - Debug.Log("No abilities available for current conditional state"); + //Debug.Log("No abilities available for current conditional state"); SetupAgentStats(currentTarget.transform.position, true); SetAgentMoving(true); return; } - Debug.Log("Ability with highest priority = " + ability.name); + //Debug.Log("Ability with highest priority = " + ability.name); waitingForAttackAnimation = true; @@ -132,7 +132,7 @@ public class BasicEnemyNPCController : NPCControllerBase { if (!photonView.IsMine) return; - Debug.Log("Controller on attack animation event triggered, executing ability = " + ability.name); + //Debug.Log("Controller on attack animation event triggered, executing ability = " + ability.name); if (ability is AreaOfEffectAbility && !((AreaOfEffectAbility)ability).spawnUnderUser) { @@ -151,6 +151,6 @@ public class BasicEnemyNPCController : NPCControllerBase ResetCounterOnAttackPerformed(); waitingForAttackAnimation = false; SetAgentMoving(true); - Debug.Log("Attack cycle done"); + //Debug.Log("Attack cycle done"); } } diff --git a/Assets/Scripts/NPC/NPCControllers_v2/DragonAnimatorController.cs b/Assets/Scripts/NPC/NPCControllers_v2/DragonAnimatorController.cs index 232c3881..8658f703 100644 --- a/Assets/Scripts/NPC/NPCControllers_v2/DragonAnimatorController.cs +++ b/Assets/Scripts/NPC/NPCControllers_v2/DragonAnimatorController.cs @@ -66,7 +66,7 @@ public class DragonAnimatorController : NPCAnimatorControllerBase public override void SetTriggerBasedOnAbility(AbilityAnimationType animationType) { - Debug.Log("Setting animation trigger = " + animationType); + //Debug.Log("Setting animation trigger = " + animationType); switch (animationType) { case AbilityAnimationType.Throw: diff --git a/Assets/Scripts/NPC/NPCControllers_v2/NPCAnimatorControllerBase.cs b/Assets/Scripts/NPC/NPCControllers_v2/NPCAnimatorControllerBase.cs index 74108536..de5d0ce7 100644 --- a/Assets/Scripts/NPC/NPCControllers_v2/NPCAnimatorControllerBase.cs +++ b/Assets/Scripts/NPC/NPCControllers_v2/NPCAnimatorControllerBase.cs @@ -37,7 +37,7 @@ public class NPCAnimatorControllerBase : MonoBehaviour { if (!photonView.IsMine) return; - Debug.Log("Sending Notice On Attack Animation Event Trigger"); + //Debug.Log("Sending Notice On Attack Animation Event Trigger"); //send notice for brain/abilitybinder to execute queued action/ability npcController.OnAttackAnimationEventTriggered(); } @@ -57,7 +57,7 @@ public class NPCAnimatorControllerBase : MonoBehaviour public virtual void SetTriggerBasedOnAbility(AbilityAnimationType animationType) { - Debug.Log("Setting animation trigger = " + animationType); + //Debug.Log("Setting animation trigger = " + animationType); switch (animationType) { case AbilityAnimationType.Throw: diff --git a/Assets/Scripts/NPC/NPCControllers_v2/NPCControllerBase.cs b/Assets/Scripts/NPC/NPCControllers_v2/NPCControllerBase.cs index 9b1bf583..d1d55f11 100644 --- a/Assets/Scripts/NPC/NPCControllers_v2/NPCControllerBase.cs +++ b/Assets/Scripts/NPC/NPCControllers_v2/NPCControllerBase.cs @@ -173,7 +173,7 @@ public class NPCControllerBase : MonoBehaviour possibleTargets.RemoveAt(i); } - Debug.Log("CLOSEST COUNT: " + possibleTargets.Count); + //Debug.Log("CLOSEST COUNT: " + possibleTargets.Count); for (int i = 0; i < possibleTargets.Count; i++) { @@ -359,7 +359,7 @@ public class NPCControllerBase : MonoBehaviour } else { - Debug.Log("Patrolling update, available targets, waiting for sight to do its job"); + //Debug.Log("Patrolling update, available targets, waiting for sight to do its job"); if(currentTarget == null) { UpdateCurrentTarget(GetClosestTarget()); @@ -391,7 +391,7 @@ public class NPCControllerBase : MonoBehaviour { if (isDead) return; - Debug.Log($"{this.gameObject.name} died!"); + //Debug.Log($"{this.gameObject.name} died!"); isDead = true; diff --git a/Assets/Scripts/NPC/NPCControllers_v2/PlayerMinion/MinionNPCController.cs b/Assets/Scripts/NPC/NPCControllers_v2/PlayerMinion/MinionNPCController.cs index 1fa7dd54..9e91350d 100644 --- a/Assets/Scripts/NPC/NPCControllers_v2/PlayerMinion/MinionNPCController.cs +++ b/Assets/Scripts/NPC/NPCControllers_v2/PlayerMinion/MinionNPCController.cs @@ -44,31 +44,31 @@ public class MinionNPCController : BasicEnemyNPCController { if (!HasAvailableTargets()) { - Debug.Log("BRAIN: !HasAVailableTargetsInside"); + //Debug.Log("BRAIN: !HasAVailableTargetsInside"); if (currentTarget != null) { - Debug.Log("BRAIN: TargetWasNull"); + //Debug.Log("BRAIN: TargetWasNull"); currentTarget = null; } if (agent.destination == null) { - Debug.Log("BRAIN: DEstination Null"); + //Debug.Log("BRAIN: DEstination Null"); FollowOwner(); } else if (agent.remainingDistance < distanceToChangePatrolDestination) { - Debug.Log("BRAIN: StoppingDistanceReached"); + //Debug.Log("BRAIN: StoppingDistanceReached"); FollowOwner(); } else { - Debug.Log("BRAIN: Else"); + //Debug.Log("BRAIN: Else"); FollowOwner(); } } else { - Debug.Log("BRAIN: Else Else"); + //Debug.Log("BRAIN: Else Else"); FollowOwner(); if (currentTarget == null) { @@ -84,7 +84,7 @@ public class MinionNPCController : BasicEnemyNPCController patrolDestination.y = 0f; UpdatePatrolTarget(patrolDestination); SetAgentMoving(true); - Debug.Log("BRAIN: Following owner"); + //Debug.Log("BRAIN: Following owner"); } [PunRPC] @@ -92,7 +92,7 @@ public class MinionNPCController : BasicEnemyNPCController { if (isDead) return; - Debug.Log($"{this.gameObject.name} died!"); + //Debug.Log($"{this.gameObject.name} died!"); isDead = true; diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs index 2c5ca50c..4f3d6c0c 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs @@ -113,7 +113,7 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable if (!target.IsValidTarget(ability.targettingTags)) continue; - Debug.Log("hit collider, added target: " + target.name); + //Debug.Log("hit collider, added target: " + target.name); targets.Add(target); } @@ -156,7 +156,7 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable if (!target.IsValidTarget(ability.targettingTags)) continue; - Debug.Log("hit collider, added target: " + target.name); + //Debug.Log("hit collider, added target: " + target.name); targets.Add(target); } diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs index 1e5b0b34..4ef691f5 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs @@ -55,6 +55,7 @@ public class NetworkedAreaOfEffectOverTime : NetworkedAreaOfEffect endTime = Time.time + duration; while (Time.time < endTime) { + if (this.transform == null || target == null) break; this.transform.position = target.position; yield return new WaitForEndOfFrame(); } @@ -121,7 +122,7 @@ public class NetworkedAreaOfEffectOverTime : NetworkedAreaOfEffect }*/ if (!target.IsValidTarget(ability.targettingTags)) continue; - Debug.Log("hit collider, added target: " + target.name); + //Debug.Log("hit collider, added target: " + target.name); targets.Add(target); } diff --git a/Assets/Scripts/Networking/NetworkedSlash.cs b/Assets/Scripts/Networking/NetworkedSlash.cs index 7b8f329d..c5f9116a 100644 --- a/Assets/Scripts/Networking/NetworkedSlash.cs +++ b/Assets/Scripts/Networking/NetworkedSlash.cs @@ -105,7 +105,7 @@ public class NetworkedSlash : MonoBehaviour foreach (Collider collider in hits) { - Debug.Log("hit collider " + collider.name); + //Debug.Log("hit collider " + collider.name); possibleTarget = collider.GetComponentInParent(); if (possibleTarget != null) @@ -113,7 +113,7 @@ public class NetworkedSlash : MonoBehaviour target = collider.GetComponentInParent(); - Debug.Log("hit collider, Got taggable: " + target.name); + //Debug.Log("hit collider, Got taggable: " + target.name); if (target == null) continue; @@ -126,7 +126,7 @@ public class NetworkedSlash : MonoBehaviour hitPositionCorrected.y = this.transform.position.y; onTargetHit.Invoke(hitPositionCorrected); - Debug.Log("hit collider, added target: " + target.name); + //Debug.Log("hit collider, added target: " + target.name); targets.Add(target); } diff --git a/Assets/Scripts/Networking/NetworkedSlashWithOnHitEvent.cs b/Assets/Scripts/Networking/NetworkedSlashWithOnHitEvent.cs index 228a2840..cfac7e49 100644 --- a/Assets/Scripts/Networking/NetworkedSlashWithOnHitEvent.cs +++ b/Assets/Scripts/Networking/NetworkedSlashWithOnHitEvent.cs @@ -30,7 +30,7 @@ public class NetworkedSlashWithOnHitEvent : NetworkedSlash hitPositionCorrected.y = this.transform.position.y; onTargetHit.Invoke(hitPositionCorrected); - Debug.Log("hit collider, added target: " + target.name); + //Debug.Log("hit collider, added target: " + target.name); targets.Add(target); } diff --git a/Assets/Scripts/Player/PlayerLevel.cs b/Assets/Scripts/Player/PlayerLevel.cs index 3de46c6d..df905001 100644 --- a/Assets/Scripts/Player/PlayerLevel.cs +++ b/Assets/Scripts/Player/PlayerLevel.cs @@ -43,10 +43,10 @@ public class Level currentExperience -= FinalExperienceThreshold; currentLevel++; OnLevelUpEvent.Invoke(); - Debug.Log("LevelUp Event Trigger"); + //Debug.Log("LevelUp Event Trigger"); } - Debug.Log(xpIncome + " exp received"); - Debug.Log(currentExperience + " / " + FinalExperienceThreshold); + //Debug.Log(xpIncome + " exp received"); + //Debug.Log(currentExperience + " / " + FinalExperienceThreshold); if (currentExperience >= FinalExperienceThreshold) { GainExperience(0); diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 935e0f3d..e04ccc08 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 5.759637 + - _Rotation: 284.16022 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5387cec7..0f6a50d1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.10.2 + bundleVersion: 0.11.0 preloadedAssets: - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}