From b16bbc3c7336376898da8557d06f8af9e381a719 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Thu, 25 Jul 2024 22:04:25 +0100 Subject: [PATCH] Update Targeting system - Targetting tags can now hold more than one tag, keeping IsValidTarget, AlliesContains and HasSameTag checks available. - Added generic target tags for enemies and players - Optional specific targetting tags if needed for future enhanced targetting --- .../Bosses/BossEnemyPrefabTemplate.prefab | 4 ++- ...ossEnemyPrefab_AngrySkelly_ Variant.prefab | 8 +++++ .../BossEnemyPrefab_SkellyMage_Variant.prefab | 8 +++++ .../BossEnemyPrefab_VineGolem_Variant.prefab | 10 ++++++- .../Enemies/BasicEnemyPrefabTemplate.prefab | 3 +- ...asicEnemyPrefab_AngrySkelly_Variant.prefab | 8 +++++ ...BasicEnemyPrefab_SkellyMage_Variant.prefab | 8 +++++ .../BasicEnemyPrefab_VineGolem_Variant.prefab | 8 +++++ .../PlayerPrefab_Priest Variant.prefab | 19 ++++++++++-- Assets/Resources/PlayerPrefab.prefab | 3 +- .../Slash/Boss_AngrySkelly_MeleeSlash.asset | 1 + .../Abilities/Debug/Player/AoEAbility.asset | 12 ++++++-- .../1-AxeThrow_ProjectileAbility.asset | 2 ++ .../2-WhirlingAxes_AoEOverTimeAbility.asset | 2 ++ .../3-RageStorm_ChanneledAbility.asset | 2 ++ .../1-ShieldThrow_ProjectileAbility.asset | 2 ++ .../2-ShieldWall_AntiProjectileAbility.asset | 2 ++ .../3-ConsecrationAoEOverTimeAbility.asset | 2 ++ .../0-Mage_MeleeElectroSlash_Ability.asset | 1 + .../Mage/1-IceShard_ProjectileAbility.asset | 1 + .../Mage/2-Blizzard_AoEOverTimeAbility.asset | 1 + ...lacialBomb_AoEWithImpactEventAbility.asset | 1 + .../Mage/C-ChargedUp_AoEOverTimeAbility.asset | 1 + .../Debug/Player/MeleeSlashAbility.asset | 2 ++ .../0-Necro_MeleeSiphonSlash_Ability.asset | 2 ++ .../Necromancer/Minions/GolemSlam.asset | 1 + .../Minions/Golem_MeleeSlashAbility.asset | 2 +- .../MinionDarkMatter_ProjectileAbility.asset | 2 ++ .../Minions/Minion_BoneThrow.asset | 2 ++ .../Minions/Minion_MeleeSlashAbility.asset | 1 + .../Necromancer/SoulBomb/SoulBomb.asset | 2 ++ .../Priest/1-HolyBall_ProjectileAbility.asset | 1 + .../Priest/2-BurstOfHope_AoEAbility.asset | 1 + .../3-HolyCircleAoEOverTimeAbility.asset | 1 + .../Data/Tags/TargetType/Enemies.meta | 8 +++++ .../Data/Tags/TargetType/Enemies/Enemy.asset | 16 ++++++++++ .../Tags/TargetType/Enemies/Enemy.asset.meta | 8 +++++ .../{ => Enemies}/EnemyAntiProjectile.asset | 0 .../EnemyAntiProjectile.asset.meta | 0 .../Tags/TargetType/Enemies/EnemyBoss.asset | 16 ++++++++++ .../TargetType/Enemies/EnemyBoss.asset.meta | 8 +++++ .../Enemies/EnemySpecificTargetTags.meta | 8 +++++ .../AngrySkelly.asset | 2 ++ .../AngrySkelly.asset.meta | 0 .../EnemySpecificTargetTags}/SkellyMage.asset | 4 ++- .../SkellyMage.asset.meta | 0 .../EnemySpecificTargetTags/VineGolem.asset | 19 ++++++++++++ .../VineGolem.asset.meta | 8 +++++ .../Data/Tags/TargetType/Players.meta | 8 +++++ .../TargetType/{ => Players}/Player.asset | 0 .../{ => Players}/Player.asset.meta | 0 .../{ => Players}/PlayerAntiProjectile.asset | 0 .../PlayerAntiProjectile.asset.meta | 0 .../{ => Players}/PlayerMinion.asset | 0 .../{ => Players}/PlayerMinion.asset.meta | 0 .../Players/PlayerSpecificTargetTags.meta | 8 +++++ .../AbilitySystem/Effects/AbsorbEffect.cs | 3 +- .../Effects/InstantValueEffect.cs | 3 +- Assets/Scripts/NPC/BossController.cs | 3 +- Assets/Scripts/NPC/NPCController.cs | 3 +- .../NPCSightControllerBase.cs | 3 +- .../Scripts/Networking/NetworkedChanneling.cs | 2 +- Assets/Scripts/Networking/NetworkedSlash.cs | 2 +- Assets/Scripts/Taggable.cs | 29 +++++++++++++++++-- Assets/Scripts/Targetting/TargetTag.cs | 2 +- Assets/Starfield Skybox/Skybox.mat | 2 +- 66 files changed, 269 insertions(+), 22 deletions(-) create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies.meta create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset.meta rename Assets/Scriptables/Data/Tags/TargetType/{ => Enemies}/EnemyAntiProjectile.asset (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Enemies}/EnemyAntiProjectile.asset.meta (100%) create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset.meta create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags.meta rename Assets/Scriptables/Data/Tags/TargetType/{ => Enemies/EnemySpecificTargetTags}/AngrySkelly.asset (77%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Enemies/EnemySpecificTargetTags}/AngrySkelly.asset.meta (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Enemies/EnemySpecificTargetTags}/SkellyMage.asset (77%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Enemies/EnemySpecificTargetTags}/SkellyMage.asset.meta (100%) create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset.meta create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Players.meta rename Assets/Scriptables/Data/Tags/TargetType/{ => Players}/Player.asset (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Players}/Player.asset.meta (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Players}/PlayerAntiProjectile.asset (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Players}/PlayerAntiProjectile.asset.meta (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Players}/PlayerMinion.asset (100%) rename Assets/Scriptables/Data/Tags/TargetType/{ => Players}/PlayerMinion.asset.meta (100%) create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags.meta diff --git a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab index 82afa80a..bb1fbab3 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab @@ -302,7 +302,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3} m_Name: m_EditorClassIdentifier: - targetTag: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + targetTag: + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} + - {fileID: 11400000, guid: 93dd72cde2a0f904fae3c6ef79d83d65, type: 2} --- !u!114 &457396336866213366 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab index 7f20355a..a9b8982b 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab @@ -746,6 +746,14 @@ PrefabInstance: propertyPath: sceneViewId value: 0 objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.data[2] + value: + objectReference: {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: Spirit.BaseValue value: 3 diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab index fbf7f61b..d3e426c4 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab @@ -1712,6 +1712,14 @@ PrefabInstance: propertyPath: sceneViewId value: 0 objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.data[2] + value: + objectReference: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - target: {fileID: 457396336866213365, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: maxValue value: 500 diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab index 16374d25..26f228b2 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab @@ -93,6 +93,14 @@ PrefabInstance: propertyPath: targetTag value: objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.data[2] + value: + objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} - target: {fileID: 457396336866213365, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: maxValue value: 200 @@ -167,7 +175,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2278116590711127943, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: m_Name - value: BossEnemyPrefab_VineGolem_ Variant + value: BossEnemyPrefab_VineGolem_Variant objectReference: {fileID: 0} - target: {fileID: 5690275390890447421, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: m_Avatar diff --git a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab index cd40cff5..212aa51e 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab @@ -381,7 +381,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3} m_Name: m_EditorClassIdentifier: - targetTag: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + targetTag: + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} --- !u!114 &1708233211970282801 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab index c95a4465..d7fa0ff2 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab @@ -148,6 +148,14 @@ PrefabInstance: propertyPath: maxValue value: 50 objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.data[1] + value: + objectReference: {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - target: {fileID: 1708233211970282806, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: sceneViewId value: 0 diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab index 8a89a4c6..abce11d3 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab @@ -55,6 +55,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.data[1] + value: + objectReference: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - target: {fileID: 1708233211970282806, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: sceneViewId value: 0 diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab index 4395c745..62e91a8a 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab @@ -87,6 +87,14 @@ PrefabInstance: propertyPath: targetTag value: objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.data[1] + value: + objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} - target: {fileID: 1708233211970282805, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: m_StoppingDistance value: 1.65 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab index 5dbff9db..a7a99a13 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab @@ -37,15 +37,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.size - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[3] value: - objectReference: {fileID: 1240144468001624216} + objectReference: {fileID: 4586982804749702518} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ObservedComponents.Array.data[4] value: + objectReference: {fileID: 1240144468001624216} + - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: ObservedComponents.Array.data[5] + value: objectReference: {fileID: 8112063480741076945} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag @@ -116,6 +120,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6cb53fadb6be8254587f5d0ad1c57778, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4586982804749702518 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1869432520870514277, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + m_PrefabInstance: {fileID: 2763436073792215827} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b337f6af01e751c44b6fb3a810398498, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &4686711277245459575 stripped Transform: m_CorrespondingSourceObject: {fileID: 7445357712997283684, guid: 9c432d220280f704684a6d5b9354c782, type: 3} diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index ca41fe73..f80430b0 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -424,7 +424,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3} m_Name: m_EditorClassIdentifier: - targetTag: {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + targetTag: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} --- !u!114 &8273564744905798527 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset index 69dc83cd..60e09ca3 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} - {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2} + targettingTags_Compact: {fileID: 11400000, guid: 0f06f490ae5d3ab42a1d4159bff90df8, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/AoEAbility.asset index a94fdd9b..8b03ea4a 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/AoEAbility.asset @@ -12,16 +12,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0c765e9ddb90681418e5635dc93b7716, type: 3} m_Name: AoEAbility m_EditorClassIdentifier: + Icon: {fileID: 0} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} + tags: [] abilityEffects: - {fileID: 11400000, guid: 209c85810803863418c79e39a75c6e31, type: 2} castTime: 0.5 manaCost: 10 + healthCost: 0 + classResourceCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} @@ -30,4 +33,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 0.25 radius: 1 + shouldResizeVisuals: 0 telegraphDelay: 0.5 + canHitSelf: 0 + spawnUnderUser: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset index 2b1d7316..0fc6c107 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -28,6 +29,7 @@ MonoBehaviour: castTime: 0.5 manaCost: 6 healthCost: 0 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset index 302c4ab6..0ac6b9bc 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -25,6 +26,7 @@ MonoBehaviour: castTime: 0.25 manaCost: 20 healthCost: 0 + classResourceCost: 0 cooldown: 2 castableWhileMoving: 0 animationType: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset index 6bed963a..1ec95f43 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -28,6 +29,7 @@ MonoBehaviour: castTime: 0 manaCost: 50 healthCost: 0 + classResourceCost: 0 cooldown: 10 castableWhileMoving: 1 animationType: 3 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset index 5b46d15e..db0894bd 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -25,6 +26,7 @@ MonoBehaviour: castTime: 0.5 manaCost: 6 healthCost: 0 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset index 17e40400..2b040420 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset @@ -16,11 +16,13 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: [] abilityEffects: [] castTime: 0.25 manaCost: 20 healthCost: 0 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset index ce1c3877..e96fce47 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -28,6 +29,7 @@ MonoBehaviour: castTime: 0.5 manaCost: 50 healthCost: 0 + classResourceCost: 0 cooldown: 3 castableWhileMoving: 0 animationType: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/0-Mage_MeleeElectroSlash_Ability.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/0-Mage_MeleeElectroSlash_Ability.asset index 9cc2116f..b57cdb17 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/0-Mage_MeleeElectroSlash_Ability.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/0-Mage_MeleeElectroSlash_Ability.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset index 15a3de0b..25faa08f 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset index 82eae852..c0d92819 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset index 4e899d61..811a49e0 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/C-ChargedUp_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/C-ChargedUp_AoEOverTimeAbility.asset index 0d85978b..34785379 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/C-ChargedUp_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/C-ChargedUp_AoEOverTimeAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset index d9dd4f51..29925058 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -25,6 +26,7 @@ MonoBehaviour: castTime: 0.5 manaCost: 0 healthCost: 0 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 2 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/0-Necro_MeleeSiphonSlash_Ability.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/0-Necro_MeleeSiphonSlash_Ability.asset index 077999f3..f08851d1 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/0-Necro_MeleeSiphonSlash_Ability.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/0-Necro_MeleeSiphonSlash_Ability.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -27,6 +28,7 @@ MonoBehaviour: castTime: 0.5 manaCost: 0 healthCost: 0 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 2 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/GolemSlam.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/GolemSlam.asset index 615b3705..4cbf71da 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/GolemSlam.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/GolemSlam.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Golem_MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Golem_MeleeSlashAbility.asset index 3ca3dba3..f9606efd 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Golem_MeleeSlashAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Golem_MeleeSlashAbility.asset @@ -16,7 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - - {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/MinionDarkMatter_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/MinionDarkMatter_ProjectileAbility.asset index c34c7afa..1e8e3295 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/MinionDarkMatter_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/MinionDarkMatter_ProjectileAbility.asset @@ -17,6 +17,7 @@ MonoBehaviour: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} @@ -26,6 +27,7 @@ MonoBehaviour: castTime: 0.75 manaCost: 5 healthCost: 5 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_BoneThrow.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_BoneThrow.asset index 9fe9ad71..4b3a8397 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_BoneThrow.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_BoneThrow.asset @@ -17,6 +17,7 @@ MonoBehaviour: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} @@ -27,6 +28,7 @@ MonoBehaviour: castTime: 0.5 manaCost: 2 healthCost: 5 + classResourceCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_MeleeSlashAbility.asset index cba19741..5bed0148 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_MeleeSlashAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_MeleeSlashAbility.asset @@ -17,6 +17,7 @@ MonoBehaviour: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/SoulBomb/SoulBomb.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/SoulBomb/SoulBomb.asset index 89f30d39..91c37a8a 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/SoulBomb/SoulBomb.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/SoulBomb/SoulBomb.asset @@ -16,6 +16,7 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} @@ -25,6 +26,7 @@ MonoBehaviour: castTime: 0.75 manaCost: 20 healthCost: 10 + classResourceCost: 0 cooldown: 5 castableWhileMoving: 0 animationType: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset index 8dbfb0b2..c8dc7ee9 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset @@ -18,6 +18,7 @@ MonoBehaviour: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset index 01d132db..e3182f52 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset @@ -18,6 +18,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset index e9106ae9..3dcae7cf 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset @@ -18,6 +18,7 @@ MonoBehaviour: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} - {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies.meta new file mode 100644 index 00000000..3ad6a956 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 496827523e87f15469bcf10c34c740f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset b/Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset new file mode 100644 index 00000000..846d414f --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d69dea404b9524746b70c71ca35252de, type: 3} + m_Name: Enemy + m_EditorClassIdentifier: + AlliedTags: + - {fileID: 11400000} diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset.meta new file mode 100644 index 00000000..0b136d0a --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Tags/TargetType/EnemyAntiProjectile.asset b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyAntiProjectile.asset similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/EnemyAntiProjectile.asset rename to Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyAntiProjectile.asset diff --git a/Assets/Scriptables/Data/Tags/TargetType/EnemyAntiProjectile.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyAntiProjectile.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/EnemyAntiProjectile.asset.meta rename to Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyAntiProjectile.asset.meta diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset new file mode 100644 index 00000000..b21f8531 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d69dea404b9524746b70c71ca35252de, type: 3} + m_Name: EnemyBoss + m_EditorClassIdentifier: + AlliedTags: + - {fileID: 11400000} diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset.meta new file mode 100644 index 00000000..a9de206d --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93dd72cde2a0f904fae3c6ef79d83d65 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags.meta new file mode 100644 index 00000000..6e489748 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5e135254c44f7740bc231e186b8d608 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset similarity index 77% rename from Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset rename to Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset index b00a7a43..2195f945 100644 --- a/Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset @@ -15,3 +15,5 @@ MonoBehaviour: AlliedTags: - {fileID: 11400000} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} diff --git a/Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset.meta rename to Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset.meta diff --git a/Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset similarity index 77% rename from Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset rename to Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset index 4d91f1af..c97cd2ad 100644 --- a/Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset @@ -13,5 +13,7 @@ MonoBehaviour: m_Name: SkellyMage m_EditorClassIdentifier: AlliedTags: - - {fileID: 11400000} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000} + - {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} diff --git a/Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset.meta rename to Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset.meta diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset new file mode 100644 index 00000000..d8d9192c --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d69dea404b9524746b70c71ca35252de, type: 3} + m_Name: VineGolem + m_EditorClassIdentifier: + AlliedTags: + - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000} + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} diff --git a/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset.meta new file mode 100644 index 00000000..e88e6f6c --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ac13d1337574174486b5f7d8879d221 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Tags/TargetType/Players.meta b/Assets/Scriptables/Data/Tags/TargetType/Players.meta new file mode 100644 index 00000000..5aba9141 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Players.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3833956d3c68bc4488cbff08c63e25b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Tags/TargetType/Player.asset b/Assets/Scriptables/Data/Tags/TargetType/Players/Player.asset similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/Player.asset rename to Assets/Scriptables/Data/Tags/TargetType/Players/Player.asset diff --git a/Assets/Scriptables/Data/Tags/TargetType/Player.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Players/Player.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/Player.asset.meta rename to Assets/Scriptables/Data/Tags/TargetType/Players/Player.asset.meta diff --git a/Assets/Scriptables/Data/Tags/TargetType/PlayerAntiProjectile.asset b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerAntiProjectile.asset similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/PlayerAntiProjectile.asset rename to Assets/Scriptables/Data/Tags/TargetType/Players/PlayerAntiProjectile.asset diff --git a/Assets/Scriptables/Data/Tags/TargetType/PlayerAntiProjectile.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerAntiProjectile.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/PlayerAntiProjectile.asset.meta rename to Assets/Scriptables/Data/Tags/TargetType/Players/PlayerAntiProjectile.asset.meta diff --git a/Assets/Scriptables/Data/Tags/TargetType/PlayerMinion.asset b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerMinion.asset similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/PlayerMinion.asset rename to Assets/Scriptables/Data/Tags/TargetType/Players/PlayerMinion.asset diff --git a/Assets/Scriptables/Data/Tags/TargetType/PlayerMinion.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerMinion.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Tags/TargetType/PlayerMinion.asset.meta rename to Assets/Scriptables/Data/Tags/TargetType/Players/PlayerMinion.asset.meta diff --git a/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags.meta b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags.meta new file mode 100644 index 00000000..ba537f79 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 552b0f3537ec58f489d37dc8cc85f63b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs index df6e1fc2..61acf2e0 100644 --- a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs @@ -37,7 +37,8 @@ public class AbsorbEffect : StatusEffect private bool IsAlliedTarget(Taggable user, Taggable target) { - return user.targetTag.AlliedTags.Contains(target.targetTag); + //return user.targetTag.Contains(target.targetTag); + return user.AlliedTagsContains(target.targetTag); } private float CalculateFinalAmount(Taggable user) diff --git a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs index 89cb8e5b..214a9851 100644 --- a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs @@ -59,7 +59,8 @@ public class InstantValueEffect : BaseEffect stats = user.GetComponent(); GetFinalValue(stats); - return user.targetTag.AlliedTags.Contains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier); + //return user.targetTag.AlliedTags.Contains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier); + return user.AlliedTagsContains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier); } /* diff --git a/Assets/Scripts/NPC/BossController.cs b/Assets/Scripts/NPC/BossController.cs index faac304e..9fd8bdd8 100644 --- a/Assets/Scripts/NPC/BossController.cs +++ b/Assets/Scripts/NPC/BossController.cs @@ -257,7 +257,8 @@ public class BossController : NPCController if (possibleTarget == null) continue; - if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) continue; + //if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) continue; + if (possibleTarget.HasSameTag(myTag.targetTag) || myTag.AlliedTagsContains(possibleTarget.targetTag)) continue; if (possibleTargets.Contains(possibleTarget)) continue; diff --git a/Assets/Scripts/NPC/NPCController.cs b/Assets/Scripts/NPC/NPCController.cs index 08f6eda4..78051555 100644 --- a/Assets/Scripts/NPC/NPCController.cs +++ b/Assets/Scripts/NPC/NPCController.cs @@ -214,7 +214,8 @@ public class NPCController : MonoBehaviour if (possibleTarget == null) return; - if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return; + //if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return; + if (possibleTarget.HasSameTag(myTag.targetTag) || myTag.AlliedTagsContains(possibleTarget.targetTag)) return; if (possibleTargets.Contains(possibleTarget)) return; diff --git a/Assets/Scripts/NPC/NPCControllers_v2/NPCSightControllerBase.cs b/Assets/Scripts/NPC/NPCControllers_v2/NPCSightControllerBase.cs index 0f55bc4c..b3851ef2 100644 --- a/Assets/Scripts/NPC/NPCControllers_v2/NPCSightControllerBase.cs +++ b/Assets/Scripts/NPC/NPCControllers_v2/NPCSightControllerBase.cs @@ -48,7 +48,8 @@ public class NPCSightControllerBase : MonoBehaviour if (possibleTarget == null) return; - if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return; + //if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return; + if (possibleTarget.HasSameTag(myTag.targetTag) || myTag.AlliedTagsContains(possibleTarget.targetTag)) return; if (npcController.possibleTargets.Contains(possibleTarget)) return; diff --git a/Assets/Scripts/Networking/NetworkedChanneling.cs b/Assets/Scripts/Networking/NetworkedChanneling.cs index 9395945c..cb9d05c1 100644 --- a/Assets/Scripts/Networking/NetworkedChanneling.cs +++ b/Assets/Scripts/Networking/NetworkedChanneling.cs @@ -113,7 +113,7 @@ public class NetworkedChanneling : MonoBehaviour if (target == null) continue; - Debug.Log("hit collider, targetTag: " + target.targetTag.name); + //Debug.Log("hit collider, targetTag: " + target.targetTag.name); foreach (TargetTag tag in ability.targettingTags) { diff --git a/Assets/Scripts/Networking/NetworkedSlash.cs b/Assets/Scripts/Networking/NetworkedSlash.cs index 4ce7da28..7b8f329d 100644 --- a/Assets/Scripts/Networking/NetworkedSlash.cs +++ b/Assets/Scripts/Networking/NetworkedSlash.cs @@ -117,7 +117,7 @@ public class NetworkedSlash : MonoBehaviour if (target == null) continue; - Debug.Log("hit collider, targetTag: " + target.targetTag.name); + //Debug.Log("hit collider, targetTag: " + target.targetTag.name); if (!target.IsValidTarget(ability.targettingTags)) continue; diff --git a/Assets/Scripts/Taggable.cs b/Assets/Scripts/Taggable.cs index 61de0c69..9befc663 100644 --- a/Assets/Scripts/Taggable.cs +++ b/Assets/Scripts/Taggable.cs @@ -5,11 +5,36 @@ using UnityEngine; public class Taggable : MonoBehaviour { - public TargetTag targetTag; + public List targetTag = new List(); public bool IsValidTarget(List tags) { - return tags.Contains(targetTag); + for (int i = 0; i < targetTag.Count; i++) + { + if (tags.Contains(targetTag[i])) return true; + } + return false; + } + + public bool AlliedTagsContains(List tags) + { + for (int i = 0; i < targetTag.Count; i++) + { + for (int j = 0; j < tags.Count; j++) + { + if (targetTag[i].AlliedTags.Contains(tags[j])) return true; + } + } + return false; + } + + public bool HasSameTag(List tags) + { + for (int i = 0; i < targetTag.Count; i++) + { + if (tags.Contains(targetTag[i])) return true; + } + return false; } //private IEnumerable commonItems; //public bool IsValidTarget(List tags) diff --git a/Assets/Scripts/Targetting/TargetTag.cs b/Assets/Scripts/Targetting/TargetTag.cs index b81195a0..fdd0d6cb 100644 --- a/Assets/Scripts/Targetting/TargetTag.cs +++ b/Assets/Scripts/Targetting/TargetTag.cs @@ -6,4 +6,4 @@ using UnityEngine; public class TargetTag : ScriptableObject { public List AlliedTags = new List(); -} +} \ No newline at end of file diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 1aa61a27..fba3cf32 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: 7.8304377 + - _Rotation: 9.476569 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1