diff --git a/Assets/1-Packs/Others/SkySeries Freebie/CosmicCoolCloud_Eq.mat b/Assets/1-Packs/Others/SkySeries Freebie/CosmicCoolCloud_Eq.mat index 2f64ffd5..172aac86 100644 --- a/Assets/1-Packs/Others/SkySeries Freebie/CosmicCoolCloud_Eq.mat +++ b/Assets/1-Packs/Others/SkySeries Freebie/CosmicCoolCloud_Eq.mat @@ -78,7 +78,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 467.0527 + - _Rotation: 714.68445 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 06d5f05e..d236fef6 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -7476,9 +7476,10 @@ MonoBehaviour: - characterClass: {fileID: 11400000, guid: 0751a225be067c646b9bc92f245d4292, type: 2} possibleClassAbilities: - {fileID: 11400000, guid: 2aedba226d5809043bcd0f660b35f74f, type: 2} + - {fileID: 11400000, guid: c602778d057001d4b929c6685f50bb59, type: 2} + - {fileID: 11400000, guid: e8ac285f957ac924babbb299999e6dbb, type: 2} - {fileID: 11400000, guid: 679598ad64000fa4aa4a8b5c1cb568e3, type: 2} - {fileID: 11400000, guid: 48a85da984c9762418f0badd5730672a, type: 2} - - {fileID: 11400000, guid: e8ac285f957ac924babbb299999e6dbb, type: 2} - {fileID: 11400000, guid: c546bb78e840d7c4abad8eff71c1dffe, type: 2} - {fileID: 11400000, guid: 7d49a35055b686649bf20062b02d68cb, type: 2} - characterClass: {fileID: 11400000, guid: 99c760c6691f1ad4eb236e73002266f5, type: 2} @@ -7503,10 +7504,10 @@ MonoBehaviour: - {fileID: 11400000, guid: ed52cb04f25a91847bdbc3ac11142eaf, type: 2} - characterClass: {fileID: 11400000, guid: 2f597af241e09124aa5a0d69c6904f47, type: 2} possibleClassAbilities: + - {fileID: 11400000, guid: 67c07fd55113f25478bc5a7954290614, type: 2} - {fileID: 11400000, guid: f35636078aa06a448bead42af714b933, type: 2} - - {fileID: 11400000, guid: 8db358ce2e880d4448781465c8b4b20f, type: 2} - {fileID: 11400000, guid: 0b73b57ca7c920f4995050e42164560e, type: 2} - - {fileID: 11400000, guid: b98492af4276f0c44986d559b5320619, type: 2} + - {fileID: 11400000, guid: 8db358ce2e880d4448781465c8b4b20f, type: 2} - characterClass: {fileID: 11400000, guid: 292f720fb1a62f44c9d54c8ab56bc660, type: 2} possibleClassAbilities: - {fileID: 11400000, guid: 8476123513cabfe4c92edb83943222dd, type: 2} @@ -11896,6 +11897,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 61df608056f0b9b46aed454e89c37da7, type: 2} - {fileID: 11400000, guid: 39dfddb48b4b32149a137e79cc6a320c, type: 2} - {fileID: 11400000, guid: 3cfe4199144e60d4ebd43f95df59d6e2, type: 2} + - {fileID: 11400000, guid: 67c07fd55113f25478bc5a7954290614, type: 2} + - {fileID: 11400000, guid: c602778d057001d4b929c6685f50bb59, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index 4d5c4739..435cfab6 100644 --- a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat +++ b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat @@ -78,7 +78,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 12.130711 + - _Rotation: 14.226553 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab index 5ea6366a..b0686632 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Mirror Image Variant.prefab @@ -233,6 +233,10 @@ PrefabInstance: propertyPath: baseMaxValue value: 25 objectReference: {fileID: 0} + - target: {fileID: 2475434436818348714, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: percentRegen + value: -12.5 + objectReference: {fileID: 0} - target: {fileID: 2475434436818348715, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: Intelligence.BaseValue value: 2 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab index 69de6ed1..96e5b5ed 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Mage Variant.prefab @@ -103,6 +103,10 @@ PrefabInstance: propertyPath: baseMaxValue value: 25 objectReference: {fileID: 0} + - target: {fileID: 2475434436818348714, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: percentRegen + value: -1 + objectReference: {fileID: 0} - target: {fileID: 2475434436818348715, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: Intelligence.BaseValue value: 2 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab index 646be378..aa4dcd15 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Rogue Variant.prefab @@ -24,6 +24,10 @@ PrefabInstance: propertyPath: baseMaxValue value: 25 objectReference: {fileID: 0} + - target: {fileID: 2475434436818348714, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: percentRegen + value: -1 + objectReference: {fileID: 0} - target: {fileID: 2475434436818348715, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: Agility.BaseValue value: 2 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab index 567bedca..ca34e940 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Savage Variant.prefab @@ -16,6 +16,10 @@ PrefabInstance: propertyPath: baseMaxValue value: 30 objectReference: {fileID: 0} + - target: {fileID: 2475434436818348714, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: percentRegen + value: -1 + objectReference: {fileID: 0} - target: {fileID: 2475434436818348715, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: Strength.BaseValue value: 2 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab index 590aa8fa..a6b31c02 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Vamp-Cultist-Satanist Bloody Shadow Variant.prefab @@ -269,6 +269,10 @@ PrefabInstance: propertyPath: baseMaxValue value: 25 objectReference: {fileID: 0} + - target: {fileID: 2475434436818348714, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: percentRegen + value: -12.5 + objectReference: {fileID: 0} - target: {fileID: 2475434436818348715, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: Agility.BaseValue value: 2 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab index 4aec7e3d..0d0226c8 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab @@ -103,6 +103,10 @@ PrefabInstance: propertyPath: baseMaxValue value: 45 objectReference: {fileID: 0} + - target: {fileID: 2475434436818348714, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: percentRegen + value: -1 + objectReference: {fileID: 0} - target: {fileID: 2475434436818348715, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: Vitality.BaseValue value: 2 diff --git a/Assets/Resources/CoinDrop.prefab b/Assets/Resources/CoinDrop.prefab index 1aeccdff..4b199fc4 100644 --- a/Assets/Resources/CoinDrop.prefab +++ b/Assets/Resources/CoinDrop.prefab @@ -32,7 +32,6 @@ RectTransform: m_Children: - {fileID: 7706952695148737092} m_Father: {fileID: 9183945980234720946} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -69,8 +68,8 @@ MonoBehaviour: m_Calls: [] m_text: +1 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} + m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -171,7 +170,6 @@ RectTransform: m_Children: - {fileID: 5292925440159000192} m_Father: {fileID: 7706952695029526539} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -195,7 +193,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -296,6 +296,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7706952695029526538} + serializedVersion: 2 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} @@ -304,7 +305,6 @@ Transform: - {fileID: 991749253198538616} - {fileID: 9183945980234720946} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7706952695029526540 MonoBehaviour: @@ -350,7 +350,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5292925440159000192} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -400,6 +399,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7706952695029526539} m_Modifications: - target: {fileID: 6272991663287146852, guid: 880e0aa9a46bc614e97f15d3d10b1423, type: 3} @@ -459,6 +459,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 880e0aa9a46bc614e97f15d3d10b1423, type: 3} --- !u!4 &991749253198538616 stripped Transform: diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 8bff9e27..038e533a 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -3078,7 +3078,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6063186782999826210 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-Firewall_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-Firewall_AoEOverTimeAbility.asset index 9d3ffbfc..130a412e 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-Firewall_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-Firewall_AoEOverTimeAbility.asset @@ -28,9 +28,12 @@ MonoBehaviour: - {fileID: 11400000, guid: ec49b842b28619943b859c6e8454ffa5, type: 2} - {fileID: 11400000, guid: 99d01e354c5b96b40856587b3600d512, type: 2} castTime: 0.5 - manaCost: 15 + manaCost: 20 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.05 + percentMaxHealthCost: 0 cooldown: 0.6 castableWhileMoving: 0 animationType: 1 @@ -44,8 +47,8 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 0 + rotateOnSpawn: 1 duration: 4 followUser: 0 followTarget: 0 damageFollowingTarget: 0 - rotateOnSpawn: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset index 72b1370f..c7701840 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset @@ -32,6 +32,9 @@ MonoBehaviour: manaCost: 15 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.05 + percentMaxHealthCost: 0 cooldown: 1.5 castableWhileMoving: 0 animationType: 1 @@ -45,8 +48,8 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 0 + rotateOnSpawn: 0 duration: 4 followUser: 0 followTarget: 0 damageFollowingTarget: 0 - rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonMage.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonMage.asset index c6babb9d..7451c5ad 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonMage.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonMage.asset @@ -13,20 +13,20 @@ MonoBehaviour: m_Name: SummonMage m_EditorClassIdentifier: displayName: Summon Mage - Icon: {fileID: 0} + Icon: {fileID: 21300000, guid: 20268d45579dab54185187cec9429e9e, type: 3} targettingTags: [] tags: [] abilityEffects: [] - castTime: 0 - manaCost: 0 + castTime: 0.5 + manaCost: 5 healthCost: 0 classResourceCost: 0 - spiritPowerReserveCost: 10 - percentMaxManaCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.08 percentMaxHealthCost: 0 - cooldown: 4 + cooldown: 0 castableWhileMoving: 0 - animationType: 1 + animationType: 4 minionPrefab: {fileID: 5182193148598858814, guid: a23c3bbe3a299bc4fb87a4645ea4a8c2, type: 3} numberOfSpawns: 1 instantlyReady: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonRogue.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonRogue.asset index 54bd287a..fcaf01cd 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonRogue.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonRogue.asset @@ -13,20 +13,20 @@ MonoBehaviour: m_Name: SummonRogue m_EditorClassIdentifier: displayName: Summon Rogue - Icon: {fileID: 0} + Icon: {fileID: 21300000, guid: b6f0d248f0224884b812fc58e4bc83a7, type: 3} targettingTags: [] tags: [] abilityEffects: [] - castTime: 0 - manaCost: 0 + castTime: 0.5 + manaCost: 5 healthCost: 0 classResourceCost: 0 - spiritPowerReserveCost: 10 - percentMaxManaCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.08 percentMaxHealthCost: 0 - cooldown: 4 + cooldown: 0 castableWhileMoving: 0 - animationType: 1 + animationType: 4 minionPrefab: {fileID: 3704396325418192251, guid: baa2ee7657d7f4f48b3f5ae8dab11efe, type: 3} numberOfSpawns: 1 instantlyReady: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSavage.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSavage.asset index 18a876ee..a195d628 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSavage.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSavage.asset @@ -13,20 +13,20 @@ MonoBehaviour: m_Name: SummonSavage m_EditorClassIdentifier: displayName: Summon Savage - Icon: {fileID: 0} + Icon: {fileID: 21300000, guid: 27436ee226e01984186f717231988681, type: 3} targettingTags: [] tags: [] abilityEffects: [] - castTime: 0 - manaCost: 0 + castTime: 0.5 + manaCost: 5 healthCost: 0 classResourceCost: 0 - spiritPowerReserveCost: 10 - percentMaxManaCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.08 percentMaxHealthCost: 0 - cooldown: 4 + cooldown: 0 castableWhileMoving: 0 - animationType: 1 + animationType: 4 minionPrefab: {fileID: 4457675943992054240, guid: aba296cc1f703a74fb09bb0f6b31e2ba, type: 3} numberOfSpawns: 1 instantlyReady: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSequenceComboAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSequenceComboAbility.asset new file mode 100644 index 00000000..5f35c0d4 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSequenceComboAbility.asset @@ -0,0 +1,34 @@ +%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: 8d984ee2631747a489cd6d5a31b7c26e, type: 3} + m_Name: SummonSequenceComboAbility + m_EditorClassIdentifier: + displayName: Summon Skeletons + Icon: {fileID: 21300000, guid: eac3e2cd2f3070a4cb2521c534e1964f, type: 3} + targettingTags: [] + tags: [] + abilityEffects: [] + castTime: 0 + manaCost: 0 + healthCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 0 + comboChain: + - {fileID: 11400000, guid: 0db150a6bbd0c1d478dbd3fc09a6ef85, type: 2} + - {fileID: 11400000, guid: 4b21d1ec90616ac4a8f0ff30311a6a1f, type: 2} + - {fileID: 11400000, guid: f0272d37cc7635f4cbdfb40b1a16a9e7, type: 2} + - {fileID: 11400000, guid: 6cf7c174663354f4bb94833236e61c18, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSequenceComboAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSequenceComboAbility.asset.meta new file mode 100644 index 00000000..3abf3abe --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonSequenceComboAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c602778d057001d4b929c6685f50bb59 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonWarrior.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonWarrior.asset index a7e05c7f..b453d4d8 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonWarrior.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Summons/SummonWarrior.asset @@ -13,20 +13,20 @@ MonoBehaviour: m_Name: SummonWarrior m_EditorClassIdentifier: displayName: Summon Warrior - Icon: {fileID: 0} + Icon: {fileID: 21300000, guid: 8d898605bc986464591eaa5d2670793b, type: 3} targettingTags: [] tags: [] abilityEffects: [] - castTime: 0 - manaCost: 0 + castTime: 0.5 + manaCost: 5 healthCost: 0 classResourceCost: 0 - spiritPowerReserveCost: 10 - percentMaxManaCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.08 percentMaxHealthCost: 0 - cooldown: 4 + cooldown: 0 castableWhileMoving: 0 - animationType: 1 + animationType: 4 minionPrefab: {fileID: 5113932649102621176, guid: 205e3d0d6f1a8b94fb06103f9a47bb27, type: 3} numberOfSpawns: 1 instantlyReady: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/0-CrossbowComboAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/0-CrossbowComboAbility.asset new file mode 100644 index 00000000..9002f424 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/0-CrossbowComboAbility.asset @@ -0,0 +1,33 @@ +%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: 8d984ee2631747a489cd6d5a31b7c26e, type: 3} + m_Name: 0-CrossbowComboAbility + m_EditorClassIdentifier: + displayName: Crossbow Combo + Icon: {fileID: 21300000, guid: e30eb9c3272550d49acfb818d86bd67b, type: 3} + targettingTags: [] + tags: [] + abilityEffects: [] + castTime: 0 + manaCost: 0 + healthCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 0 + comboChain: + - {fileID: 11400000, guid: 4a43c80e0cffd1447b4bf2e849ce0c59, type: 2} + - {fileID: 11400000, guid: b98492af4276f0c44986d559b5320619, type: 2} + - {fileID: 11400000, guid: 5f182e00a40fa0f47a204be0fde67888, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/0-CrossbowComboAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/0-CrossbowComboAbility.asset.meta new file mode 100644 index 00000000..9a5c0796 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/0-CrossbowComboAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67c07fd55113f25478bc5a7954290614 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-FanOfArrows_Shoot_ImpactEventIntoProjectilesAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-FanOfArrows_Shoot_ImpactEventIntoProjectilesAbility.asset index fd41088a..654518e5 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-FanOfArrows_Shoot_ImpactEventIntoProjectilesAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-FanOfArrows_Shoot_ImpactEventIntoProjectilesAbility.asset @@ -18,10 +18,11 @@ MonoBehaviour: tags: [] abilityEffects: [] castTime: 0.25 - manaCost: 0 + manaCost: 5 healthCost: 0 - classResourceCost: 10 - percentMaxManaCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.05 percentMaxHealthCost: 0 cooldown: 3 castableWhileMoving: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-ShootArrow_III_Fork_ImpactEventIntoProjectilesAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-ShootArrow_III_Fork_ImpactEventIntoProjectilesAbility.asset index 0129b052..0b06104b 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-ShootArrow_III_Fork_ImpactEventIntoProjectilesAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-ShootArrow_III_Fork_ImpactEventIntoProjectilesAbility.asset @@ -21,7 +21,8 @@ MonoBehaviour: manaCost: 2 healthCost: 0 classResourceCost: 0 - percentMaxManaCost: 0.1 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.02 percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 diff --git a/Assets/Scripts/Game/GameConstants.cs b/Assets/Scripts/Game/GameConstants.cs index ae04f9b4..7a0bf4aa 100644 --- a/Assets/Scripts/Game/GameConstants.cs +++ b/Assets/Scripts/Game/GameConstants.cs @@ -153,7 +153,7 @@ public static class GameConstants public const float BonusStrengthToFlatRegenRate = 0.05f; public const float BonusVitalityToFlatRegenRate = 0.05f; - public const float BonusSpiritToFlatRegenRate = 0.05f; + public const float BonusSpiritToFlatRegenRate = 0.15f; public const float BonusSpiritToPercentRegenRate = 0.01f; public const float RelativePowerToSpiritCostPercent = 0.05f; diff --git a/Assets/Scripts/Player/AbilityKeyBinder.cs b/Assets/Scripts/Player/AbilityKeyBinder.cs index f3468087..b0f2bdda 100644 --- a/Assets/Scripts/Player/AbilityKeyBinder.cs +++ b/Assets/Scripts/Player/AbilityKeyBinder.cs @@ -110,6 +110,10 @@ public class AbilityKeyBinder : MonoBehaviour AdvanceCombo(); }); } + else + { + ResetCombo(); + } } else { @@ -229,12 +233,18 @@ public class AbilityKeyBinder : MonoBehaviour abilityBindInstance.ForceUpdateOnComboAbility(GetCurrentAbility()); } + private void ResetCombo() + { + comboState.currentComboIndex = 0; + abilityBindInstance.ForceUpdateOnComboAbility(GetCurrentAbility()); + } // Public methods for external access (useful for UI or debugging) public int GetCurrentComboIndex() { return comboState.currentComboIndex; } + public BaseAbility GetCurrentAbility() { if (combo.comboChain.Count == 0) return null;