From ee2df3d136772159f301dbf964ef7a0d062769fa Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 22 Dec 2024 13:03:00 +0000 Subject: [PATCH] More abilities & UI/UX - Mage Mana Barrier ability - Added absorb fill visual on top of max health, showing how much absorb the player has compared to his health - Updated Knight ShieldWall anti projectile ability --- .../Prefabs/Persistent Objects.prefab | 173 +++-- .../Developer/Prefabs/UI/ResourceOrb.prefab | 83 ++- ...ldWall_AntiProjectilePrefab Variant.prefab | 696 ++++++++++++++++++ .../PlayerPrefab_Knight Variant.prefab | 2 +- .../PlayerPrefab_Mage Variant.prefab | 10 +- .../2-ShieldWall_AntiProjectileAbility.asset | 4 +- .../Player/Mage/3-ManaBarrierAbility.asset | 37 + .../Mage/3-ManaBarrierAbility.asset.meta | 8 + .../Player/Mage/3-ManaBarrierEffects.meta | 8 + .../Mage_ManaBarrier_AbsorbEffect.asset | 28 + .../Mage_ManaBarrier_AbsorbEffect.asset.meta | 8 + .../Priest_BurstofHope_AbsorbEffect.asset | 6 +- .../Priest_BurstofHope_InstantEffect.asset | 4 +- .../PlayerSpecificTargetTags/Mage.asset | 18 + .../PlayerSpecificTargetTags/Mage.asset.meta | 8 + .../AbilitySystem/AntiProjectileAbility.cs | 2 + .../Networking/NetworkedAntiProjectile.cs | 5 + Assets/Scripts/UI/ResourceOrbUI.cs | 16 + ProjectSettings/ProjectSettings.asset | 2 +- 19 files changed, 1044 insertions(+), 74 deletions(-) create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset.meta create mode 100644 Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects.meta create mode 100644 Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset create mode 100644 Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset create mode 100644 Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset.meta diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index d512daa6..8579c6ad 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -679,6 +679,7 @@ MonoBehaviour: health_TMP: {fileID: 3244949944383087614} manaFill: {fileID: 4514444964280280819} mana_TMP: {fileID: 2589173984611106071} + absorbFill: {fileID: 172299705894054427} onPlayerSpawned: {fileID: 7475116342871483259} --- !u!1 &592444273080244905 GameObject: @@ -5994,6 +5995,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 814d914c000537b498aa4bcee4f1c00a, type: 2} - {fileID: 11400000, guid: ec49b842b28619943b859c6e8454ffa5, type: 2} - {fileID: 11400000, guid: 0a7e8749423809a42a49789325a9c663, type: 2} + - {fileID: 11400000, guid: 127f92fd14a21174695a692c0cf18746, type: 2} + - {fileID: 11400000, guid: 2536fad89b0bac442a6ef81548aa028c, type: 2} --- !u!1 &7246719027537041170 GameObject: m_ObjectHideFlags: 0 @@ -6841,6 +6844,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 3cb8d7161315a384586026a48385b0b1, type: 2} - {fileID: 11400000, guid: fe98f38f1a3841844a391b5ff4637669, type: 2} - {fileID: 11400000, guid: 8909ebd83ca05b140b506a197c124582, type: 2} + - {fileID: 11400000, guid: c1f9774af0e242a4d8d3ce1bf9f30154, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 @@ -10447,7 +10451,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4228710720008241670, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4228710720008241671, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_Pivot.x @@ -10535,243 +10539,243 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5864595336779636464, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595336779636464, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595336779636464, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595336779636464, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595336779636464, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 217 objectReference: {fileID: 0} - target: {fileID: 5864595336779636464, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -123 objectReference: {fileID: 0} - target: {fileID: 5864595336871478815, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595336871478815, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595336871478815, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595336871478815, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595336871478815, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 85 objectReference: {fileID: 0} - target: {fileID: 5864595336871478815, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -321 objectReference: {fileID: 0} - target: {fileID: 5864595336913408117, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595336913408117, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595336913408117, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595336913408117, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595336913408117, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 217 objectReference: {fileID: 0} - target: {fileID: 5864595336913408117, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -57 objectReference: {fileID: 0} - target: {fileID: 5864595337165705912, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337165705912, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337165705912, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595337165705912, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595337165705912, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 85 objectReference: {fileID: 0} - target: {fileID: 5864595337165705912, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -189 objectReference: {fileID: 0} - target: {fileID: 5864595337523070249, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337523070249, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337523070249, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595337523070249, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595337523070249, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 85 objectReference: {fileID: 0} - target: {fileID: 5864595337523070249, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -123 objectReference: {fileID: 0} - target: {fileID: 5864595337659751732, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337659751732, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337659751732, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595337659751732, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595337659751732, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 85 objectReference: {fileID: 0} - target: {fileID: 5864595337659751732, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -57 objectReference: {fileID: 0} - target: {fileID: 5864595337965328865, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337965328865, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595337965328865, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595337965328865, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595337965328865, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 217 objectReference: {fileID: 0} - target: {fileID: 5864595337965328865, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -321 objectReference: {fileID: 0} - target: {fileID: 5864595338208591964, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595338208591964, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595338208591964, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595338208591964, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595338208591964, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 217 objectReference: {fileID: 0} - target: {fileID: 5864595338208591964, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -189 objectReference: {fileID: 0} - target: {fileID: 5864595338434716313, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595338434716313, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595338434716313, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595338434716313, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595338434716313, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 85 objectReference: {fileID: 0} - target: {fileID: 5864595338434716313, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -255 objectReference: {fileID: 0} - target: {fileID: 5864595338537863571, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595338537863571, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5864595338537863571, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5864595338537863571, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5864595338537863571, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 217 objectReference: {fileID: 0} - target: {fileID: 5864595338537863571, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -255 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} @@ -13449,6 +13453,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 5 objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_Color.a + value: 0.6313726 + objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_Color.g + value: 0.8047662 + objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_Color.r + value: 0.33490568 + objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_FillMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_FillOrigin + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6457379297969381675, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} propertyPath: m_IsActive value: 1 @@ -13469,6 +13501,10 @@ PrefabInstance: propertyPath: m_FillAmount value: 1 objectReference: {fileID: 0} + - target: {fileID: 7447225258002529524, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7954829550763797800, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} propertyPath: m_Pivot.x value: 0 @@ -13503,6 +13539,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} +--- !u!114 &172299705894054427 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6007244575595237068, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + m_PrefabInstance: {fileID: 5853031031762265303} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &3244949944383087614 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8949290719095785257, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} @@ -14130,6 +14177,10 @@ PrefabInstance: propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} + - target: {fileID: 7447225258002529524, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fdc1a8e676d40104b83168df3c0856cf, type: 3} --- !u!114 &2589173984611106071 stripped diff --git a/Assets/Developer/Prefabs/UI/ResourceOrb.prefab b/Assets/Developer/Prefabs/UI/ResourceOrb.prefab index fad39802..a14adfe0 100644 --- a/Assets/Developer/Prefabs/UI/ResourceOrb.prefab +++ b/Assets/Developer/Prefabs/UI/ResourceOrb.prefab @@ -261,6 +261,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8664379845326558719} + - {fileID: 3055847295108877318} - {fileID: 5681511739835515077} - {fileID: 5388739539684075278} - {fileID: 3358722754019980027} @@ -341,7 +342,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2165543660254686210} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -476,7 +477,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2165543660254686210} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -521,6 +522,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7447225258002529524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3055847295108877318} + - component: {fileID: 676267265632498106} + - component: {fileID: 6007244575595237068} + m_Layer: 5 + m_Name: Absorb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3055847295108877318 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447225258002529524} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2165543660254686210} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 5} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &676267265632498106 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447225258002529524} + m_CullTransparentMesh: 1 +--- !u!114 &6007244575595237068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447225258002529524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7216981, g: 0.90731096, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 20e7acf3283c8d14e8d86147b673bced, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 3 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7613185430928622840 GameObject: m_ObjectHideFlags: 0 @@ -552,7 +629,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2165543660254686210} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} diff --git a/Assets/Resources/Abilities/ShieldWall_AntiProjectilePrefab Variant.prefab b/Assets/Resources/Abilities/ShieldWall_AntiProjectilePrefab Variant.prefab index d3d6a9c8..b40d759d 100644 --- a/Assets/Resources/Abilities/ShieldWall_AntiProjectilePrefab Variant.prefab +++ b/Assets/Resources/Abilities/ShieldWall_AntiProjectilePrefab Variant.prefab @@ -1,5 +1,684 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &254561073568469335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6222841745844303196} + - component: {fileID: 5386870371358427241} + - component: {fileID: 6808303808816698683} + - component: {fileID: 2701564531941195878} + m_Layer: 31 + m_Name: Badge_Shield (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6222841745844303196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254561073568469335} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 1.25, y: 0.6, z: 0} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!33 &5386870371358427241 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254561073568469335} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &6808303808816698683 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254561073568469335} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2701564531941195878 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254561073568469335} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &765020559344565128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6333551545617044173} + - component: {fileID: 2227081978132316460} + - component: {fileID: 973953369834168618} + - component: {fileID: 2562288494147043251} + m_Layer: 31 + m_Name: Badge_Shield (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6333551545617044173 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765020559344565128} + m_LocalRotation: {x: 0, y: 0.92387956, z: 0, w: 0.38268343} + m_LocalPosition: {x: 0.85, y: 0.6, z: -0.85} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 135, z: 0} +--- !u!33 &2227081978132316460 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765020559344565128} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &973953369834168618 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765020559344565128} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2562288494147043251 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765020559344565128} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3159872392462202489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 874770474015057346} + - component: {fileID: 8715117305852036698} + - component: {fileID: 4999814224616259863} + - component: {fileID: 8872848262238892051} + m_Layer: 31 + m_Name: Badge_Shield (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &874770474015057346 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159872392462202489} + m_LocalRotation: {x: 0, y: -0.92387956, z: 0, w: 0.38268343} + m_LocalPosition: {x: -0.85, y: 0.6, z: -0.85} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -135, z: 0} +--- !u!33 &8715117305852036698 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159872392462202489} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &4999814224616259863 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159872392462202489} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &8872848262238892051 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159872392462202489} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3871751478029596385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4427581954599995053} + - component: {fileID: 4449597646048864028} + - component: {fileID: 6672496006284131155} + - component: {fileID: 6273567802539376020} + m_Layer: 31 + m_Name: Badge_Shield (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4427581954599995053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3871751478029596385} + m_LocalRotation: {x: 0, y: 0.7071068, z: -0, w: -0.7071068} + m_LocalPosition: {x: -1.25, y: 0.6, z: 0} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 270, z: 0} +--- !u!33 &4449597646048864028 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3871751478029596385} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &6672496006284131155 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3871751478029596385} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6273567802539376020 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3871751478029596385} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8643537622662589190 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1185487640653443028} + - component: {fileID: 4466770676421426145} + - component: {fileID: 2941250361741790303} + - component: {fileID: 860285179093540771} + m_Layer: 31 + m_Name: Badge_Shield (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1185487640653443028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8643537622662589190} + m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0.85, y: 0.6, z: 0.85} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!33 &4466770676421426145 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8643537622662589190} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &2941250361741790303 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8643537622662589190} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &860285179093540771 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8643537622662589190} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8854262875146111212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1311072793520551630} + - component: {fileID: 1994772084168701205} + - component: {fileID: 5836294089637739674} + - component: {fileID: 2055668889747142766} + m_Layer: 31 + m_Name: Badge_Shield (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1311072793520551630 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8854262875146111212} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0.6, z: -1.25} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!33 &1994772084168701205 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8854262875146111212} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &5836294089637739674 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8854262875146111212} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2055668889747142766 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8854262875146111212} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &9194739936849506723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4438984830087012496} + - component: {fileID: 406109615412968885} + - component: {fileID: 5220344055770673532} + - component: {fileID: 787292469180149865} + m_Layer: 31 + m_Name: Badge_Shield (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4438984830087012496 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194739936849506723} + m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: -0.85, y: 0.6, z: 0.85} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.49999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9043445715495222851} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!33 &406109615412968885 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194739936849506723} + m_Mesh: {fileID: -5379632889980691270, guid: 885b9a6787e3a86428d410e94dfa120f, type: 3} +--- !u!23 &5220344055770673532 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194739936849506723} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d15930285f71c3d46af53a5a7cc7b578, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &787292469180149865 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194739936849506723} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 2, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &8117241100896947988 PrefabInstance: m_ObjectHideFlags: 0 @@ -23,6 +702,14 @@ PrefabInstance: propertyPath: m_Size.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 947724257692438896, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} + propertyPath: targetTag.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947724257692438896, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} + propertyPath: targetTag.Array.data[0] + value: + objectReference: {fileID: 11400000, guid: bbc3165000346194985eebb628129001, type: 2} - target: {fileID: 947724257692438898, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} propertyPath: sceneViewId value: 0 @@ -75,5 +762,14 @@ PrefabInstance: propertyPath: m_Name value: ShieldWall_AntiProjectilePrefab Variant objectReference: {fileID: 0} + - target: {fileID: 947724257993371990, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} + propertyPath: rotationSpeed + value: 180 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} +--- !u!4 &9043445715495222851 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 947724257993371991, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} + m_PrefabInstance: {fileID: 8117241100896947988} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab index 7c77f1c0..320b7480 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab @@ -86,7 +86,7 @@ PrefabInstance: - target: {fileID: 6259208590911633741, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: - objectReference: {fileID: 11400000, guid: f78ff85297eeec34a941affb095f27f4, type: 2} + objectReference: {fileID: 11400000, guid: da1fbcda369605140b8241d12c165bc4, type: 2} - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: sceneViewId value: 0 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab index d1fda1e8..1616f235 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab @@ -343,7 +343,7 @@ PrefabInstance: - target: {fileID: 5627210965781110480, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: - objectReference: {fileID: 11400000, guid: d58ac5a6fef83a24e93311b30cc34b0d, type: 2} + objectReference: {fileID: 11400000, guid: c1f9774af0e242a4d8d3ce1bf9f30154, type: 2} - target: {fileID: 6259208590911633741, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: @@ -448,6 +448,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8867901703884003658, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: targetTag.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8867901703884003658, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: targetTag.Array.data[1] + value: + objectReference: {fileID: 11400000, guid: db18749a3dda77b4ca92b1eb1f19195e, type: 2} - target: {fileID: 9176951908243474339, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: maxValue value: 100 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset index 2b040420..354af22d 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset @@ -23,9 +23,9 @@ MonoBehaviour: manaCost: 20 healthCost: 0 classResourceCost: 0 - cooldown: 0 + cooldown: 5 castableWhileMoving: 0 animationType: 0 antiProjectilePrefab: {fileID: 9043445715802431074, guid: 222e283b3616ff84f9094c92c14fce24, type: 3} - duration: 4 + duration: 3 followUser: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset new file mode 100644 index 00000000..80a3bbdd --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset @@ -0,0 +1,37 @@ +%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: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} + m_Name: 3-ManaBarrierAbility + m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 1458237dbb3c6d54f8fe9d39c0175d00, type: 3} + targettingTags: + - {fileID: 11400000, guid: db18749a3dda77b4ca92b1eb1f19195e, type: 2} + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} + - {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + - {fileID: 11400000, guid: 9ffd1c81aeea68b4eb6b0f054f0d989f, type: 2} + - {fileID: 11400000, guid: 5ff891a32306c504f8f6159f69a1866e, type: 2} + abilityEffects: + - {fileID: 11400000, guid: 2536fad89b0bac442a6ef81548aa028c, type: 2} + castTime: 0.25 + manaCost: 40 + healthCost: 0 + classResourceCost: 0 + cooldown: 5 + castableWhileMoving: 1 + animationType: 1 + projectilePrefab: {fileID: 3740678194898045934, guid: b347988a444ef2a4aabcc7394add4db2, type: 3} + projectileSpeed: 4.5 + lifeSpan: 1 + canPierce: 0 + canHitSelf: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset.meta new file mode 100644 index 00000000..19e24ff3 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1f9774af0e242a4d8d3ce1bf9f30154 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects.meta b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects.meta new file mode 100644 index 00000000..50de64f8 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08fe67522db09dd4f8a7736beac3153d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset new file mode 100644 index 00000000..97f9129c --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset @@ -0,0 +1,28 @@ +%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: bbb95d10fa2aa464a84aecc6a7a7ef31, type: 3} + m_Name: Mage_ManaBarrier_AbsorbEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + percentInfluence: 0.15 + - statTag: {fileID: 11400000, guid: 9ffd1c81aeea68b4eb6b0f054f0d989f, type: 2} + percentInfluence: 0.01 + - statTag: {fileID: 11400000, guid: 5ff891a32306c504f8f6159f69a1866e, type: 2} + percentInfluence: 0.01 + duration: 5 + applyToTargetsHit: 0 + applyToSelf: 1 + amount: 30 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset.meta b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset.meta new file mode 100644 index 00000000..1722748f --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2536fad89b0bac442a6ef81548aa028c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset index 15af0d15..54f893ce 100644 --- a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset @@ -17,8 +17,8 @@ MonoBehaviour: - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} influencingStats: - statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} - percentInfluence: 0.15 - duration: 3 + percentInfluence: 0.25 + duration: 4 applyToTargetsHit: 1 applyToSelf: 0 - amount: 4 + amount: 5 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset index adbd811f..1d34e424 100644 --- a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset @@ -16,8 +16,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} - percentInfluence: 0.5 - baseValue: 4 + percentInfluence: 0.45 + baseValue: 2 damageType: 1 AlliedTargetMultiplier: 0 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset new file mode 100644 index 00000000..aa51a939 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset @@ -0,0 +1,18 @@ +%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: Mage + m_EditorClassIdentifier: + AlliedTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + - {fileID: 11400000} + - {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2} diff --git a/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset.meta b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset.meta new file mode 100644 index 00000000..33206b12 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags/Mage.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db18749a3dda77b4ca92b1eb1f19195e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs b/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs index 69bf0b46..dd9cd6e5 100644 --- a/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs +++ b/Assets/Scripts/AbilitySystem/AntiProjectileAbility.cs @@ -10,6 +10,7 @@ public class AntiProjectileAbility : BaseAbility public float duration; public bool followUser; + public bool breakOnHit; private GameObject instantiatedProjectile; private NetworkedAntiProjectile networkedAntiProjectile; @@ -29,6 +30,7 @@ public class AntiProjectileAbility : BaseAbility networkedAntiProjectile.ownerTag = userTag; networkedAntiProjectile.ability = this; networkedAntiProjectile.followUser = followUser; + networkedAntiProjectile.breakOnHit = breakOnHit; networkedAntiProjectile.Init(); } diff --git a/Assets/Scripts/Networking/NetworkedAntiProjectile.cs b/Assets/Scripts/Networking/NetworkedAntiProjectile.cs index beab50b4..350038dd 100644 --- a/Assets/Scripts/Networking/NetworkedAntiProjectile.cs +++ b/Assets/Scripts/Networking/NetworkedAntiProjectile.cs @@ -19,6 +19,8 @@ public class NetworkedAntiProjectile : MonoBehaviour public AntiProjectileAbility ability; public float duration; public bool followUser; + public bool breakOnHit; + private bool waitingForDestroy = false; @@ -63,6 +65,7 @@ public class NetworkedAntiProjectile : MonoBehaviour private void RPC_RemoteInit(int abilityIndex) { ability = (AntiProjectileAbility)AbilityIndexer.Instance.Abilities[abilityIndex]; + breakOnHit = ability.breakOnHit; } [PunRPC] @@ -81,6 +84,8 @@ public class NetworkedAntiProjectile : MonoBehaviour [PunRPC] private void RPC_SendBlockNotice() { + if (!breakOnHit) return; + waitingForDestroy = true; if (!photonView.IsMine) diff --git a/Assets/Scripts/UI/ResourceOrbUI.cs b/Assets/Scripts/UI/ResourceOrbUI.cs index 30a440f0..aa60087d 100644 --- a/Assets/Scripts/UI/ResourceOrbUI.cs +++ b/Assets/Scripts/UI/ResourceOrbUI.cs @@ -14,12 +14,15 @@ public class ResourceOrbUI : MonoBehaviour [Header("Mana:")] [SerializeField] private Image manaFill; [SerializeField] private TMP_Text mana_TMP; + [Header("Absorb:")] + [SerializeField] private Image absorbFill; [Header("Listeners:")] [SerializeField] private GameEventListener_PhotonView onPlayerSpawned; Health health; Mana mana; + AbsorbEffectInstance absorb; private void Awake() @@ -39,18 +42,26 @@ public class ResourceOrbUI : MonoBehaviour health = ((RiftPlayer)spawnedPlayer.Owner.TagObject).GetComponent(); mana = ((RiftPlayer)spawnedPlayer.Owner.TagObject).GetComponent(); + absorb = ((RiftPlayer)spawnedPlayer.Owner.TagObject).GetComponent(); health.onResourceChanged.AddListener(UpdateCurrentHealth); health.onMaxHealthChanged.AddListener(UpdateMaxHealth); + health.onMaxHealthChanged.AddListener((x) => UpdateCurrentAbsorb()); mana.onResourceChanged.AddListener(UpdateCurrentMana); mana.onMaxManaChanged.AddListener(UpdateMaxMana); + absorb.OnEffectStackAddedEvent.AddListener(UpdateCurrentAbsorb); + absorb.OnAbsorbDamage.AddListener(UpdateCurrentAbsorb); + absorb.OnEffectEnded.AddListener(UpdateCurrentAbsorb); + UpdateCurrentHealth(health.GetCurrentValue()); UpdateMaxHealth(health.GetMaxValue()); UpdateCurrentMana(mana.GetCurrentValue()); UpdateMaxMana(mana.GetMaxValue()); + + UpdateCurrentAbsorb(); } public void UpdateCurrentHealth(float value) @@ -84,4 +95,9 @@ public class ResourceOrbUI : MonoBehaviour { mana_TMP.text = $"{mana.GetCurrentValue().ToString("F1")}/{mana.GetMaxValue().ToString("F1")}"; } + + public void UpdateCurrentAbsorb() + { + absorbFill.fillAmount = absorb.currentAmount / health.GetMaxValue(); + } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 17354f04..72aac662 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.11.1 + bundleVersion: 0.11.2 preloadedAssets: - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}