From 50b41b97e007bbc15e91cb0e24775d743e92ec07 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 1 Jun 2025 12:19:14 +0100 Subject: [PATCH] Combo abilities --- .../Prefabs/Persistent Objects.prefab | 41 +- .../Panoramics/FS002/FS002_Night.mat | 2 +- .../Abilities/BasicMinionPrefab.prefab | 49 -- .../EquinoxCore_ProjectilePrefab.prefab | 531 +++++++++++++ .../EquinoxCore_ProjectilePrefab.prefab.meta | 7 + .../PlayerPrefab_Human Variant.prefab | 6 +- Assets/Resources/PlayerPrefab.prefab | 2 +- Assets/Scenes/0-Splash.unity | 8 + Assets/Scenes/Dev/Abilities.unity | 719 ++++++++++++++++-- ...tile_AoEOverTimeWithTickEventAbility.asset | 6 +- .../Debug/Player/Human/0-HitCombo.asset | 33 + .../Debug/Player/Human/0-HitCombo.asset.meta | 8 + .../1-Human_FrontalPunch_SlashAbility.asset | 7 +- .../Human/1-Human_Kick_SlashAbility.asset | 7 +- .../Human/1-Human_Uppercut_SlashAbility.asset | 11 +- ...set => 0-IceShard_ProjectileAbility.asset} | 7 +- ...> 0-IceShard_ProjectileAbility.asset.meta} | 0 .../1-ShadowOrb_ProjectileAbility.asset | 5 +- .../2-BurstOfCorruption_AoEAbility.asset | 6 +- ...3-CorruptedGroundsAoEOverTimeAbility.asset | 7 +- .../C-TaintedStar_AoEOverTimeAbility.asset | 9 +- .../Priest/1-HolyBall_ProjectileAbility.asset | 5 +- .../Priest/2-BurstOfHope_AoEAbility.asset | 7 +- .../3-HolyCircleAoEOverTimeAbility.asset | 7 +- .../C-ShinningStar_AoEOverTimeAbility.asset | 11 +- .../Abilities/Debug/Player/Priest/Combos.meta | 8 + .../Combos/1-DualityOrbComboAbility.asset | 33 + .../1-DualityOrbComboAbility.asset.meta | 8 + .../1-EquinoxCore_ProjectileAbility.asset | 46 ++ ...1-EquinoxCore_ProjectileAbility.asset.meta | 8 + .../Player/Priest/Combos/2-ParadoxBurst.asset | 32 + .../Priest/Combos/2-ParadoxBurst.asset.meta | 8 + .../Player/Priest/Combos/3-Purgefield.asset | 32 + .../Priest/Combos/3-Purgefield.asset.meta | 8 + .../Priest/Combos/4-FallenConstellation.asset | 32 + .../Combos/4-FallenConstellation.asset.meta | 8 + .../0-Werewolf_ClawingComboAbility.asset | 32 + .../0-Werewolf_ClawingComboAbility.asset.meta | 8 + .../1-Werewolf_Claw_SlashAbility.asset | 8 +- .../1-Werewolf_Rake_SlashAbility.asset | 6 +- .../Scripts/AbilitySystem/AbilityIndexer.cs | 2 +- Assets/Scripts/AbilitySystem/ComboAbility.cs | 17 + .../AbilitySystem/ComboAbility.cs.meta | 11 + .../Game/ChooseClassToggleController.cs | 2 +- Assets/Scripts/Game/GameConstants.cs | 6 +- .../Scripts/Networking/SpiritPowerAutocast.cs | 2 +- Assets/Scripts/Player/AbilityKeyBinder.cs | 80 +- Assets/Scripts/UI/AbilityBindInstance.cs | 7 + 48 files changed, 1715 insertions(+), 190 deletions(-) create mode 100644 Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab create mode 100644 Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset.meta rename Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/{1-IceShard_ProjectileAbility.asset => 0-IceShard_ProjectileAbility.asset} (92%) rename Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/{1-IceShard_ProjectileAbility.asset.meta => 0-IceShard_ProjectileAbility.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset.meta create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset.meta create mode 100644 Assets/Scripts/AbilitySystem/ComboAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/ComboAbility.cs.meta diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 96dfe73b..06d5f05e 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -5479,7 +5479,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 168.74998, y: -600} - m_SizeDelta: {x: 450, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2959850296507468170 MonoBehaviour: @@ -7447,9 +7447,9 @@ MonoBehaviour: classBuildLibraries: - characterClass: {fileID: 11400000, guid: 5c805e25513e9734da3920fd1157656c, type: 2} possibleClassAbilities: - - {fileID: 11400000, guid: de3172e441d9dba42bc24b5ecb4d0bf2, type: 2} - - {fileID: 11400000, guid: 4027803ec5dbf5543be72b92a6083b86, type: 2} - - {fileID: 11400000, guid: 45233ddc9683185429ca7af22b3056e1, type: 2} + - {fileID: 11400000, guid: 4d9484f2850f59543b0a489419ca50f8, type: 2} + - {fileID: 11400000, guid: 3cb8d7161315a384586026a48385b0b1, type: 2} + - {fileID: 11400000, guid: 3cb8d7161315a384586026a48385b0b1, type: 2} - {fileID: 11400000, guid: 3cb8d7161315a384586026a48385b0b1, type: 2} - characterClass: {fileID: 11400000, guid: 92dda115d07799a45a507f28944bd7c1, type: 2} possibleClassAbilities: @@ -7467,13 +7467,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 093abebde2ce57648bc676fdedcdd026, type: 2} - characterClass: {fileID: 11400000, guid: 8dffc501620b33a45b2aef5527d400bf, type: 2} possibleClassAbilities: - - {fileID: 11400000, guid: bb4727d12833f2749b88b66ee5585e6a, type: 2} - - {fileID: 11400000, guid: 8909ebd83ca05b140b506a197c124582, type: 2} - {fileID: 11400000, guid: 6e6816a87356ed54aa546aefca31e06b, type: 2} + - {fileID: 11400000, guid: 8909ebd83ca05b140b506a197c124582, type: 2} - {fileID: 11400000, guid: e75c893bb94c00f41b9bc6bbea9872d4, type: 2} - {fileID: 11400000, guid: 12447dd4c759d5e40a085a6062af22a4, type: 2} - {fileID: 11400000, guid: d58ac5a6fef83a24e93311b30cc34b0d, type: 2} - - {fileID: 11400000, guid: c3ce7e110eeeebf47b7af8344f0793fa, type: 2} - {fileID: 11400000, guid: b9a421f28b69be7499e354879b040b1f, type: 2} - characterClass: {fileID: 11400000, guid: 0751a225be067c646b9bc92f245d4292, type: 2} possibleClassAbilities: @@ -7485,15 +7483,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 7d49a35055b686649bf20062b02d68cb, type: 2} - characterClass: {fileID: 11400000, guid: 99c760c6691f1ad4eb236e73002266f5, type: 2} possibleClassAbilities: - - {fileID: 11400000, guid: 28ba0b25b8f04354ebc653b15b7f3773, type: 2} - - {fileID: 11400000, guid: b2720497081a6e349a7988604c2376e5, type: 2} - - {fileID: 11400000, guid: f3628bf368b593d488559a00aef758a6, type: 2} - - {fileID: 11400000, guid: 96c81c820f0bfe747af956cccd0f0ba4, type: 2} - - {fileID: 11400000, guid: 1c6b6a2bd824b544dbf8ac2089c92b6a, type: 2} - - {fileID: 11400000, guid: 8b2377c41770ee74190db5c79e53c751, type: 2} - - {fileID: 11400000, guid: 07dbc802df380364e8f2bece0a013586, type: 2} - - {fileID: 11400000, guid: 73dd02ce99b6eb34aafbae7bb339d645, type: 2} - - {fileID: 11400000, guid: 10d87ca2edcf6444797882f22a3404de, type: 2} + - {fileID: 11400000, guid: df076f4a7a2388f46befa78bbb12b44a, type: 2} + - {fileID: 11400000, guid: 89f9b912aab39284d96938388a0e7a4a, type: 2} + - {fileID: 11400000, guid: 61df608056f0b9b46aed454e89c37da7, type: 2} + - {fileID: 11400000, guid: 39dfddb48b4b32149a137e79cc6a320c, type: 2} - characterClass: {fileID: 11400000, guid: 0a3bb425d50c35b409b74a648c994aac, type: 2} possibleClassAbilities: - {fileID: 11400000, guid: 41ce9d138621d414787fd48998b3ad0d, type: 2} @@ -7504,7 +7497,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 445df66fd514f9640b3f2f228a7b4aee, type: 2} - characterClass: {fileID: 11400000, guid: 334f27400a4a01e4caceed2c6b63bee9, type: 2} possibleClassAbilities: - - {fileID: 11400000, guid: 0c191267adf0be840a2ac87dfbcbacc2, type: 2} - {fileID: 11400000, guid: 728e63ccef88b5c46aa51971060c4b14, type: 2} - {fileID: 11400000, guid: 5095271b44cdf9c44a2d72c98a05ec52, type: 2} - {fileID: 11400000, guid: f9662c8eca616b7468e4d8fa659b55a7, type: 2} @@ -7517,7 +7509,7 @@ MonoBehaviour: - {fileID: 11400000, guid: b98492af4276f0c44986d559b5320619, type: 2} - characterClass: {fileID: 11400000, guid: 292f720fb1a62f44c9d54c8ab56bc660, type: 2} possibleClassAbilities: - - {fileID: 11400000, guid: 694d981b2a0eda44cb90aa049d8dbd83, type: 2} + - {fileID: 11400000, guid: 8476123513cabfe4c92edb83943222dd, type: 2} - {fileID: 11400000, guid: fb2829af881bafe4aa4561c2c8edb0fa, type: 2} - {fileID: 11400000, guid: 2b0bbebd842f1d94db336642767e1062, type: 2} - {fileID: 11400000, guid: 3b796291bbf82db4c80fe16058fa90af, type: 2} @@ -11897,6 +11889,13 @@ MonoBehaviour: - {fileID: 11400000, guid: 694d981b2a0eda44cb90aa049d8dbd83, type: 2} - {fileID: 11400000, guid: 0d29f9ee2c0ce2645889ff095d015138, type: 2} - {fileID: 11400000, guid: 3b796291bbf82db4c80fe16058fa90af, type: 2} + - {fileID: 11400000, guid: 4d9484f2850f59543b0a489419ca50f8, type: 2} + - {fileID: 11400000, guid: 8476123513cabfe4c92edb83943222dd, type: 2} + - {fileID: 11400000, guid: df076f4a7a2388f46befa78bbb12b44a, type: 2} + - {fileID: 11400000, guid: 89f9b912aab39284d96938388a0e7a4a, type: 2} + - {fileID: 11400000, guid: 61df608056f0b9b46aed454e89c37da7, type: 2} + - {fileID: 11400000, guid: 39dfddb48b4b32149a137e79cc6a320c, type: 2} + - {fileID: 11400000, guid: 3cfe4199144e60d4ebd43f95df59d6e2, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 @@ -19510,6 +19509,10 @@ PrefabInstance: propertyPath: m_Name value: SpiritPowerBar Variant objectReference: {fileID: 0} + - target: {fileID: 8932045084742871388, guid: e46f385ff61ad5540b19cea37d7a259b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -27532,7 +27535,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.x - value: 450 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index ae4e5ff0..4794cb54 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: 6.6608133 + - _Rotation: 9.860407 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab.prefab b/Assets/Resources/Abilities/BasicMinionPrefab.prefab index af99dabd..a3713e90 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab.prefab @@ -4926,54 +4926,6 @@ MonoBehaviour: - {fileID: 11400000, guid: e2c921ce12afad24f8780b0b7555cb0b, type: 2} nonEquippablesDrops: [] weightedDropLootTable: [] ---- !u!1 &1305128479780010097 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2678635397023861516} - - component: {fileID: 3468905267801056947} - m_Layer: 0 - m_Name: ManaDrainController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2678635397023861516 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1305128479780010097} - 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} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4296156910025484506} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3468905267801056947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1305128479780010097} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2db571c50b3b30f44a9d93c5eb61126f, type: 3} - m_Name: - m_EditorClassIdentifier: - OwnerSpiritPower: {fileID: 0} - spiritPowerReserved: 0 - minionHealth: {fileID: 0} - minionStats: {fileID: 0} --- !u!1 &1773925912441182246 GameObject: m_ObjectHideFlags: 0 @@ -5151,7 +5103,6 @@ Transform: - {fileID: 4844945595640411262} - {fileID: 4844945595650680564} - {fileID: 4844945595746340764} - - {fileID: 2678635397023861516} - {fileID: 7117859781384447843} - {fileID: 7649880826968515420} - {fileID: 636923079769064192} diff --git a/Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab b/Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab new file mode 100644 index 00000000..67dd6a5f --- /dev/null +++ b/Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab @@ -0,0 +1,531 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1288226334316089202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5422913127771496907} + - component: {fileID: 1185461403878660862} + m_Layer: 30 + m_Name: ORbs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5422913127771496907 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288226334316089202} + 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} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8101951651773578010} + - {fileID: 6088291369572549502} + m_Father: {fileID: 6066651261291617429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1185461403878660862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288226334316089202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b50effa256ffa1347ab62872ddb7198c, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 720 + rotationAxis: 1 +--- !u!1 &3561135880710590198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6066651261291617429} + m_Layer: 30 + m_Name: Visuals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6066651261291617429 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3561135880710590198} + 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} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5422913127771496907} + - {fileID: 2466441515779743733} + m_Father: {fileID: 6298629893283075091} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3565839997967106406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6298629893283075091} + - component: {fileID: 7107149012676356572} + - component: {fileID: 3779658119990590041} + m_Layer: 30 + m_Name: EquinoxCore_ProjectilePrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6298629893283075091 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3565839997967106406} + 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} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3629661319462647517} + - {fileID: 6066651261291617429} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &7107149012676356572 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3565839997967106406} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &3779658119990590041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3565839997967106406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce7597ff76d7054badb29dbc478106e, type: 3} + m_Name: + m_EditorClassIdentifier: + hitParticlesPrefab: {fileID: 3781946150010653001, guid: c2c5fb3197925e547819103e162fd848, type: 3} + visuals: {fileID: 3561135880710590198} + ownerTag: {fileID: 0} + ability: {fileID: 0} + speed: 0 + lifeSpan: 0 + canPierce: 0 + canHitSelf: 0 + onTargetHit: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &3596406439501317682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3629661319462647517} + - component: {fileID: 4080194907918390353} + - component: {fileID: 8029073416219775381} + - component: {fileID: 4002485010571592597} + m_Layer: 30 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3629661319462647517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3596406439501317682} + 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} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6298629893283075091} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4080194907918390353 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3596406439501317682} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8029073416219775381 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3596406439501317682} + m_Enabled: 0 + 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: 5a26de236ce89e94b963be8fa2b7ade6, 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!135 &4002485010571592597 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3596406439501317682} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &1965364873318779013 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6066651261291617429} + m_Modifications: + - target: {fileID: 1855011957615299950, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: looping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1855011957708930263, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: looping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalScale.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalScale.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155829, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: m_Name + value: CFXR4 Sword Trail FIRE (360 Thin Spiral) (1) + objectReference: {fileID: 0} + - target: {fileID: 4142449149891155831, guid: adee6806da2db7646b158620c26bf622, type: 3} + propertyPath: looping + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: adee6806da2db7646b158620c26bf622, type: 3} +--- !u!4 &2466441515779743733 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4142449149891155824, guid: adee6806da2db7646b158620c26bf622, type: 3} + m_PrefabInstance: {fileID: 1965364873318779013} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4334413384609956872 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5422913127771496907} + m_Modifications: + - target: {fileID: 1376973198712757489, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 1376973198712757489, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1376973198712757489, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1376973198712757489, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.09803921 + objectReference: {fileID: 0} + - target: {fileID: 1376973198712757489, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.60492593 + objectReference: {fileID: 0} + - target: {fileID: 5862968557325787822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_Name + value: DarkOrb (1) + objectReference: {fileID: 0} + - target: {fileID: 6765464921060359872, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 6765464921060359872, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.047222223 + objectReference: {fileID: 0} + - target: {fileID: 6765464921060359872, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.16921292 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalPosition.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} +--- !u!4 &6088291369572549502 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} + m_PrefabInstance: {fileID: 4334413384609956872} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7307562055072363553 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5422913127771496907} + m_Modifications: + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalPosition.x + value: -0.25 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1514976257877233470, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + propertyPath: m_Name + value: GoldOrb + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} +--- !u!4 &8101951651773578010 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} + m_PrefabInstance: {fileID: 7307562055072363553} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab.meta b/Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab.meta new file mode 100644 index 00000000..2b895707 --- /dev/null +++ b/Assets/Resources/Abilities/EquinoxCore_ProjectilePrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c26679edf0546f428e5abf177386b6f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab index 4f7dfba8..a0f4a9cf 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab @@ -310,7 +310,7 @@ PrefabInstance: - target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: defaultBuildSlots.Array.data[0].ability value: - objectReference: {fileID: 11400000, guid: f35636078aa06a448bead42af714b933, type: 2} + objectReference: {fileID: 11400000, guid: 4d9484f2850f59543b0a489419ca50f8, type: 2} - target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: defaultBuildSlots.Array.data[1].ability value: @@ -443,6 +443,10 @@ PrefabInstance: propertyPath: classTag value: objectReference: {fileID: 11400000, guid: 5c805e25513e9734da3920fd1157656c, type: 2} + - target: {fileID: 7855196656215593047, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8273564744905798527, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: Agility.BaseValue value: 1 diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 0d9611c5..8bff9e27 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -720,7 +720,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 480331571121010796} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 96b7af24550accb4595e004a4977e512, type: 3} m_Name: diff --git a/Assets/Scenes/0-Splash.unity b/Assets/Scenes/0-Splash.unity index a99375cf..f76eb02e 100644 --- a/Assets/Scenes/0-Splash.unity +++ b/Assets/Scenes/0-Splash.unity @@ -2198,6 +2198,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2348969452740985968, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: classBuildLibraries.Array.data[5].possibleClassAbilities.Array.data[4] + value: + objectReference: {fileID: 11400000, guid: 10d87ca2edcf6444797882f22a3404de, type: 2} + - target: {fileID: 2348969452740985968, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: classBuildLibraries.Array.data[5].possibleClassAbilities.Array.data[5] + value: + objectReference: {fileID: 11400000, guid: 10d87ca2edcf6444797882f22a3404de, type: 2} - target: {fileID: 2691090329895250115, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scenes/Dev/Abilities.unity b/Assets/Scenes/Dev/Abilities.unity index 02f45c48..435cb8d2 100644 --- a/Assets/Scenes/Dev/Abilities.unity +++ b/Assets/Scenes/Dev/Abilities.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +127,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1388872548669538631, guid: a164e676dbbd6e54587237e619372c98, type: 3} @@ -183,6 +183,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a164e676dbbd6e54587237e619372c98, type: 3} --- !u!4 &12918766 stripped Transform: @@ -194,6 +197,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 2353600328335836179, guid: ceec7516237b4104b94300043ca39784, type: 3} @@ -249,6 +253,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ceec7516237b4104b94300043ca39784, type: 3} --- !u!4 &22992252 stripped Transform: @@ -282,9 +289,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38219777} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &38219779 @@ -344,13 +359,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38219777} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &118779279 GameObject: @@ -379,9 +394,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 118779279} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &118779281 @@ -441,13 +464,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 118779279} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.009, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &177303969 GameObject: @@ -472,6 +495,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 177303969} + 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} @@ -514,7 +538,6 @@ Transform: - {fileID: 1370732805} - {fileID: 2030342679} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &197525092 GameObject: @@ -546,17 +569,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} m_Name: m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - observableSearch: 2 - ObservedComponents: - - {fileID: 197525095} - sceneViewId: 19 - InstantiationId: 0 - isRuntimeInstantiated: 0 --- !u!4 &197525094 Transform: m_ObjectHideFlags: 0 @@ -564,6 +576,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 197525092} + 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} @@ -571,7 +584,6 @@ Transform: m_Children: - {fileID: 568269827} m_Father: {fileID: 0} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &197525095 MonoBehaviour: @@ -585,15 +597,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} m_Name: m_EditorClassIdentifier: - m_SynchronizePosition: 1 - m_SynchronizeRotation: 1 - m_SynchronizeScale: 1 - m_UseLocal: 1 --- !u!1001 &229576972 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 2740904024514934883, guid: c1f1568424ee50f42854769f3e1ba0b6, type: 3} @@ -653,6 +662,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c1f1568424ee50f42854769f3e1ba0b6, type: 3} --- !u!4 &229576973 stripped Transform: @@ -745,13 +757,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 297491641} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &324773020 GameObject: @@ -776,6 +788,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 324773020} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.33616066, y: 0.3060453, z: 1.296833} m_LocalScale: {x: 1, y: 1, z: 1} @@ -818,13 +831,13 @@ Transform: - {fileID: 1510655189} - {fileID: 1086981691} m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &386476850 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 4638712882946042690, guid: 9029beab0dd9eb84aade1739487ed290, type: 3} @@ -880,6 +893,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9029beab0dd9eb84aade1739487ed290, type: 3} --- !u!4 &386476851 stripped Transform: @@ -926,9 +942,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -962,19 +986,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563890655} + serializedVersion: 2 m_LocalRotation: {x: 0.22729823, y: -0.41959366, z: 0.109376855, w: 0.87195957} m_LocalPosition: {x: 5.53, y: 5.48, z: -4.22} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 13.014, y: -11.866, z: 0} --- !u!1001 &564926371 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 4553287630450876385, guid: 15483e51212e3d74886ea57291f4639a, type: 3} @@ -1042,6 +1067,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15483e51212e3d74886ea57291f4639a, type: 3} --- !u!4 &564926372 stripped Transform: @@ -1071,19 +1099,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 568269826} + 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} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 197525094} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &653775508 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1042269289, guid: 69d8f05fda8421849a84b27b8c0d773d, type: 3} @@ -1155,6 +1184,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 69d8f05fda8421849a84b27b8c0d773d, type: 3} --- !u!4 &653775509 stripped Transform: @@ -1166,6 +1198,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1590415177872986601, guid: da9877ecb91055641b3294fe8d2f0e0a, type: 3} @@ -1221,12 +1254,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da9877ecb91055641b3294fe8d2f0e0a, type: 3} --- !u!1001 &687889790 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 1774113698235428549, guid: f74378889c8fe164791cad5955c21087, type: 3} @@ -1304,8 +1341,11 @@ PrefabInstance: - target: {fileID: 8396114893326427390, guid: f74378889c8fe164791cad5955c21087, type: 3} propertyPath: ObservedComponents.Array.data[5] value: - objectReference: {fileID: 687889793} + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f74378889c8fe164791cad5955c21087, type: 3} --- !u!114 &687889791 stripped MonoBehaviour: @@ -1329,17 +1369,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 389de3cac2aa89247bd947ebc2fb91ac, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &687889793 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2747273072329540181, guid: f74378889c8fe164791cad5955c21087, type: 3} - m_PrefabInstance: {fileID: 687889790} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &687889794 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2979345162832780578, guid: f74378889c8fe164791cad5955c21087, type: 3} @@ -1361,6 +1390,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1898020072, guid: 57a776ff377f3c44e8403e2067a4d41f, type: 3} @@ -1381,7 +1411,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2360655870356088562, guid: 57a776ff377f3c44e8403e2067a4d41f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2360655870356088567, guid: 57a776ff377f3c44e8403e2067a4d41f, type: 3} propertyPath: m_RootOrder @@ -1432,6 +1462,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 57a776ff377f3c44e8403e2067a4d41f, type: 3} --- !u!4 &834610253 stripped Transform: @@ -1443,6 +1476,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 2931298436804964717, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} @@ -1476,7 +1510,7 @@ PrefabInstance: - target: {fileID: 4950587822811020118, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} propertyPath: ObservedComponents.Array.data[5] value: - objectReference: {fileID: 880147632} + objectReference: {fileID: 0} - target: {fileID: 6336150240389630513, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} propertyPath: m_RootOrder value: 22 @@ -1522,6 +1556,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} --- !u!114 &880147630 stripped MonoBehaviour: @@ -1545,17 +1582,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 389de3cac2aa89247bd947ebc2fb91ac, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &880147632 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1788221149024619301, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} - m_PrefabInstance: {fileID: 880147629} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &880147633 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830776764180054666, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} @@ -1577,6 +1603,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2416369861596911939, guid: 3ef3ae421f71c5c4e97fe12dc2fc6312, type: 3} @@ -1656,12 +1683,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ef3ae421f71c5c4e97fe12dc2fc6312, type: 3} --- !u!1001 &970391935 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1429954232896169630, guid: 83036083a4ebcd34f98131bd3cf6f4d2, type: 3} @@ -1729,6 +1760,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83036083a4ebcd34f98131bd3cf6f4d2, type: 3} --- !u!4 &970391936 stripped Transform: @@ -1740,6 +1774,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 6823200998282874672, guid: 8f8fe12323625f5499b2853dd2ad3e58, type: 3} @@ -1808,6 +1843,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114169630031731988, guid: 8f8fe12323625f5499b2853dd2ad3e58, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8f8fe12323625f5499b2853dd2ad3e58, type: 3} --- !u!4 &979976153 stripped Transform: @@ -1819,6 +1857,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 294364003325551376, guid: 99bc28c0d45f51c4fbac01080b73edc7, type: 3} @@ -1905,13 +1944,21 @@ PrefabInstance: propertyPath: m_Name value: CFXR3 Fire Explosion B objectReference: {fileID: 0} + - target: {fileID: 8194992990867289339, guid: 99bc28c0d45f51c4fbac01080b73edc7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99bc28c0d45f51c4fbac01080b73edc7, type: 3} --- !u!1001 &1049168122 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} @@ -1971,6 +2018,9 @@ PrefabInstance: value: 34 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} --- !u!4 &1049168123 stripped Transform: @@ -2004,9 +2054,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076325723} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1076325725 @@ -2066,19 +2124,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076325723} + 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} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1086981690 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 7966731087305637596, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} @@ -2142,6 +2201,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} --- !u!4 &1086981691 stripped Transform: @@ -2153,6 +2215,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3085289069011406714, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} @@ -2222,7 +2285,7 @@ PrefabInstance: - target: {fileID: 4146588718473051677, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} propertyPath: ObservedComponents.Array.data[5] value: - objectReference: {fileID: 1093608730} + objectReference: {fileID: 0} - target: {fileID: 6165904497061590054, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} propertyPath: m_Name value: PlayerPrefab_Mage Variant @@ -2232,6 +2295,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} --- !u!114 &1093608728 stripped MonoBehaviour: @@ -2255,17 +2321,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6cb53fadb6be8254587f5d0ad1c57778, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1093608730 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6192144265892874537, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} - m_PrefabInstance: {fileID: 1093608727} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1093608731 stripped Transform: m_CorrespondingSourceObject: {fileID: 3085289069011406714, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} @@ -2276,6 +2331,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 8389547513526139283, guid: 5f7486bb92c13f348bd565e80594b53f, type: 3} @@ -2335,6 +2391,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5f7486bb92c13f348bd565e80594b53f, type: 3} --- !u!4 &1202012386 stripped Transform: @@ -2346,6 +2405,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 8764043878647920493, guid: 9c8bab1cf41c22d46a6b5ffeac31da2e, type: 3} @@ -2401,6 +2461,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c8bab1cf41c22d46a6b5ffeac31da2e, type: 3} --- !u!4 &1209380960 stripped Transform: @@ -2412,12 +2475,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1216679330454650403, guid: e2d0d1df9480d48499acbbe084af6277, type: 3} propertyPath: m_Name value: PlayerPrefab_Werewolf Variant objectReference: {fileID: 0} + - target: {fileID: 1216679330454650403, guid: e2d0d1df9480d48499acbbe084af6277, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8044013946221086079, guid: e2d0d1df9480d48499acbbe084af6277, type: 3} propertyPath: m_RootOrder value: 32 @@ -2467,6 +2535,9 @@ PrefabInstance: value: 75 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2d0d1df9480d48499acbbe084af6277, type: 3} --- !u!1 &1292426303 stripped GameObject: @@ -2478,6 +2549,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} @@ -2545,6 +2617,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3} --- !u!4 &1370732805 stripped Transform: @@ -2556,6 +2631,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1741693452841693106, guid: c4ed38c72957f2241ad144a1614956d9, type: 3} @@ -2627,6 +2703,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c4ed38c72957f2241ad144a1614956d9, type: 3} --- !u!4 &1384203118 stripped Transform: @@ -2638,6 +2717,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 2826917419588486583, guid: 55ce24071777a5b429f53775f21b20fe, type: 3} @@ -2701,6 +2781,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55ce24071777a5b429f53775f21b20fe, type: 3} --- !u!4 &1423598339 stripped Transform: @@ -2712,6 +2795,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 1000011113172478, guid: 4b9e1e5074422484cb2d2aca777ef525, type: 3} @@ -2767,6 +2851,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b9e1e5074422484cb2d2aca777ef525, type: 3} --- !u!4 &1427546142 stripped Transform: @@ -2778,6 +2865,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4140946375438375885, guid: 3b687161522a23a438352ab6bdc46f03, type: 3} @@ -2837,12 +2925,16 @@ PrefabInstance: value: 68 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b687161522a23a438352ab6bdc46f03, type: 3} --- !u!1001 &1510655188 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 7019588642006521011, guid: 8ef9f57cf557f2a43bff9ba38a049455, type: 3} @@ -2910,6 +3002,9 @@ PrefabInstance: value: objectReference: {fileID: 4553287630450876385, guid: 7cc1346fa829cb444884e4b457066868, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ef9f57cf557f2a43bff9ba38a049455, type: 3} --- !u!4 &1510655189 stripped Transform: @@ -2921,6 +3016,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 6823200998282874673, guid: 8f8fe12323625f5499b2853dd2ad3e58, type: 3} @@ -2984,6 +3080,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8f8fe12323625f5499b2853dd2ad3e58, type: 3} --- !u!4 &1522628683 stripped Transform: @@ -2995,6 +3094,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 8389547513526139283, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} @@ -3049,13 +3149,21 @@ PrefabInstance: propertyPath: m_Name value: SimpleSlashPrefab objectReference: {fileID: 0} + - target: {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} --- !u!1001 &1639382110 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3247173884719685732, guid: b4680987bc8bc994ba9ce6e1333dad18, type: 3} @@ -3115,6 +3223,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4680987bc8bc994ba9ce6e1333dad18, type: 3} --- !u!4 &1639382111 stripped Transform: @@ -3126,6 +3237,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 309908454665629572, guid: effb650189dc5714e9e9801b1cfb3991, type: 3} @@ -3217,6 +3329,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: effb650189dc5714e9e9801b1cfb3991, type: 3} --- !u!4 &1679648351 stripped Transform: @@ -3228,6 +3343,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 725748389098120094, guid: 4bda94453d2ca7444a0fff05b2d425f5, type: 3} @@ -3299,12 +3415,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4bda94453d2ca7444a0fff05b2d425f5, type: 3} --- !u!1001 &1755518104 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3711506224383633021, guid: e0f3d3b10867c1645ac6576a69e1796e, type: 3} @@ -3364,12 +3484,16 @@ PrefabInstance: value: 61 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0f3d3b10867c1645ac6576a69e1796e, type: 3} --- !u!1001 &1866046038 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3071203166238714258, guid: 3407e378c048bb5438424b28c7740b48, type: 3} @@ -3425,12 +3549,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3407e378c048bb5438424b28c7740b48, type: 3} --- !u!1001 &1935359882 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 524572398670386221, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} @@ -3562,12 +3690,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} --- !u!1001 &1949878977 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 4553287630450876385, guid: 15483e51212e3d74886ea57291f4639a, type: 3} @@ -3635,6 +3767,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15483e51212e3d74886ea57291f4639a, type: 3} --- !u!4 &1949878978 stripped Transform: @@ -3646,6 +3781,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3280519133223516628, guid: 9f7aafe98aa4dba41a583f3da601708e, type: 3} @@ -3849,6 +3985,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f7aafe98aa4dba41a583f3da601708e, type: 3} --- !u!4 &1951068305 stripped Transform: @@ -3860,6 +3999,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 8764043878647920493, guid: c4ed38c72957f2241ad144a1614956d9, type: 3} @@ -3927,6 +4067,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c4ed38c72957f2241ad144a1614956d9, type: 3} --- !u!4 &1969193999 stripped Transform: @@ -3938,6 +4081,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 6703250321131892297, guid: 2b987d41506d172419fa18578f6ac380, type: 3} @@ -3997,6 +4141,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b987d41506d172419fa18578f6ac380, type: 3} --- !u!4 &2030342679 stripped Transform: @@ -4008,6 +4155,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 4425544509863617626, guid: d552e90926df03a4596ccf40851b2dce, type: 3} @@ -4079,6 +4227,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d552e90926df03a4596ccf40851b2dce, type: 3} --- !u!4 &2076077016 stripped Transform: @@ -4090,6 +4241,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1443053970693627874, guid: b3416c8b2e3c7804b8c061dc4a36fc43, type: 3} @@ -4161,6 +4313,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3416c8b2e3c7804b8c061dc4a36fc43, type: 3} --- !u!4 &2106120545 stripped Transform: @@ -4172,6 +4327,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 8389547513526139283, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} @@ -4231,6 +4387,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} --- !u!4 &186318874114278864 stripped Transform: @@ -4242,6 +4401,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3585669007807271135, guid: f7ae8e940cc0cd749a09f991e072fcda, type: 3} @@ -4297,12 +4457,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7ae8e940cc0cd749a09f991e072fcda, type: 3} --- !u!1001 &577690166311392033 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 4802261089321297624, guid: 4c8bfa1dbb78e2d45a4648b8750382c7, type: 3} @@ -4362,6 +4526,9 @@ PrefabInstance: value: 52 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8bfa1dbb78e2d45a4648b8750382c7, type: 3} --- !u!4 &577690166311392034 stripped Transform: @@ -4373,6 +4540,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 242799163458536464, guid: 1f4bc3f1d82c9554486c4e7e3bde86fc, type: 3} @@ -4432,6 +4600,9 @@ PrefabInstance: value: 13 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f4bc3f1d82c9554486c4e7e3bde86fc, type: 3} --- !u!4 &660047856679618356 stripped Transform: @@ -4443,6 +4614,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 3969133658185728132, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} @@ -4506,6 +4678,9 @@ PrefabInstance: value: 12 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} --- !u!4 &895984163485890851 stripped Transform: @@ -4517,6 +4692,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 5321330941649581311, guid: f0e06c1149ef5f441ad257ddc26cb318, type: 3} @@ -4572,6 +4748,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f0e06c1149ef5f441ad257ddc26cb318, type: 3} --- !u!4 &988779368023975161 stripped Transform: @@ -4583,6 +4762,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} @@ -4642,6 +4822,9 @@ PrefabInstance: value: 21 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} --- !u!4 &1405724117663239871 stripped Transform: @@ -4653,6 +4836,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4159951584211507969, guid: 311178c751a5e74418f877b9077997d7, type: 3} @@ -4712,12 +4896,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 311178c751a5e74418f877b9077997d7, type: 3} --- !u!1001 &1576307491027164950 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3740678194898045931, guid: b347988a444ef2a4aabcc7394add4db2, type: 3} @@ -4777,6 +4965,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b347988a444ef2a4aabcc7394add4db2, type: 3} --- !u!4 &1576307491027164951 stripped Transform: @@ -4788,6 +4979,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4462899224256174354, guid: 4b025381b7a25ed4baeaf9595c84159a, type: 3} @@ -4842,13 +5034,21 @@ PrefabInstance: propertyPath: m_Name value: SimpleClawSlashPrefab objectReference: {fileID: 0} + - target: {fileID: 4462899224256174359, guid: 4b025381b7a25ed4baeaf9595c84159a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b025381b7a25ed4baeaf9595c84159a, type: 3} --- !u!1001 &1906656274819909640 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 7687237107928750432, guid: e7044fbd0b009dd47994ea761fd094d8, type: 3} @@ -4908,6 +5108,9 @@ PrefabInstance: value: 47 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e7044fbd0b009dd47994ea761fd094d8, type: 3} --- !u!4 &1906656274819909641 stripped Transform: @@ -4919,6 +5122,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 8654493186987980828, guid: 7b00a5e4fcb04994190ef797dfb61e95, type: 3} @@ -4978,6 +5182,9 @@ PrefabInstance: value: 57 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7b00a5e4fcb04994190ef797dfb61e95, type: 3} --- !u!4 &2150745757727967514 stripped Transform: @@ -4989,6 +5196,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} @@ -5048,6 +5256,9 @@ PrefabInstance: value: 25 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} --- !u!4 &2275885020835014822 stripped Transform: @@ -5059,6 +5270,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3047327856582476133, guid: 8e0bcede9087257488737827f06dad09, type: 3} @@ -5118,6 +5330,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e0bcede9087257488737827f06dad09, type: 3} --- !u!4 &2322773292303647678 stripped Transform: @@ -5129,6 +5344,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 2367156134396898723, guid: 93e50ad2ae70b89479572eed104bd198, type: 3} @@ -5188,6 +5404,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93e50ad2ae70b89479572eed104bd198, type: 3} --- !u!4 &2367156134494431537 stripped Transform: @@ -5199,6 +5418,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 5268821355948254241, guid: c99d6894fce8883469721499b7647b19, type: 3} @@ -5258,6 +5478,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c99d6894fce8883469721499b7647b19, type: 3} --- !u!4 &2571573462061840780 stripped Transform: @@ -5269,6 +5492,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 2740904024514934883, guid: 83e773f9d0c689f45a54b8eaf5727aa5, type: 3} @@ -5328,6 +5552,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83e773f9d0c689f45a54b8eaf5727aa5, type: 3} --- !u!4 &2740904024270206703 stripped Transform: @@ -5339,6 +5566,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 482914955127851234, guid: d16d48fd289401c44980d410c522b025, type: 3} @@ -5398,6 +5626,9 @@ PrefabInstance: value: 7 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d16d48fd289401c44980d410c522b025, type: 3} --- !u!4 &2768160580949971551 stripped Transform: @@ -5409,6 +5640,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 4547055273174472749, guid: 4979f41a1f79dc94682524b11303b49f, type: 3} @@ -5468,6 +5700,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4979f41a1f79dc94682524b11303b49f, type: 3} --- !u!4 &3119086481078164035 stripped Transform: @@ -5479,6 +5714,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 758050341675869816, guid: 5245a1dc9755eec42adf1f51b0c52d08, type: 3} @@ -5538,6 +5774,9 @@ PrefabInstance: value: 16 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5245a1dc9755eec42adf1f51b0c52d08, type: 3} --- !u!4 &3305348038826615218 stripped Transform: @@ -5549,6 +5788,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 1898899935370880001, guid: bbbaaefc9ddce094685b896db44b14bb, type: 3} @@ -5608,6 +5848,9 @@ PrefabInstance: value: 39 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bbbaaefc9ddce094685b896db44b14bb, type: 3} --- !u!4 &3321488230113764907 stripped Transform: @@ -5670,13 +5913,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -5691,12 +5936,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2490494820205918377, guid: f532516d94f2f9240bffafcc613ccd87, type: 3} propertyPath: m_Name value: SimplePunchAPrefab objectReference: {fileID: 0} + - target: {fileID: 2490494820205918377, guid: f532516d94f2f9240bffafcc613ccd87, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3} propertyPath: m_RootOrder value: 25 @@ -5746,12 +5996,16 @@ PrefabInstance: value: 72 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f532516d94f2f9240bffafcc613ccd87, type: 3} --- !u!1001 &4020380891132381204 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 4772960342460004092, guid: 261989bc4bda3d14eab63b1b4072d1e4, type: 3} @@ -5811,6 +6065,9 @@ PrefabInstance: value: 44 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 261989bc4bda3d14eab63b1b4072d1e4, type: 3} --- !u!4 &4020380891132381205 stripped Transform: @@ -5822,6 +6079,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4117085477522148337, guid: 71f8f31539e61b84bb2fa8ad6759aaae, type: 3} @@ -5877,12 +6135,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71f8f31539e61b84bb2fa8ad6759aaae, type: 3} --- !u!1001 &4146817702332829155 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 3137079318612183360, guid: 1643126616a6c8846b968fd839416bfe, type: 3} @@ -5942,6 +6204,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1643126616a6c8846b968fd839416bfe, type: 3} --- !u!4 &4146817702332829156 stripped Transform: @@ -6004,13 +6269,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 1} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 0 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -6025,6 +6292,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 4739689218961410417, guid: 73e61ff014ba7e04a86695d37f1eb8ce, type: 3} @@ -6084,6 +6352,9 @@ PrefabInstance: value: 23 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73e61ff014ba7e04a86695d37f1eb8ce, type: 3} --- !u!4 &4161430360852151972 stripped Transform: @@ -6095,6 +6366,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 5451622410603664852, guid: 809a86c29a3c0b44494abd9499db909a, type: 3} @@ -6154,6 +6426,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 809a86c29a3c0b44494abd9499db909a, type: 3} --- !u!4 &4169522845880344319 stripped Transform: @@ -6183,6 +6458,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} @@ -6242,6 +6518,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} --- !u!4 &4737951026541685887 stripped Transform: @@ -6253,6 +6532,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 5286231604687820132, guid: e6bc5808d58f0ba4fbe3d5674f60b526, type: 3} @@ -6312,6 +6592,9 @@ PrefabInstance: value: 15 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e6bc5808d58f0ba4fbe3d5674f60b526, type: 3} --- !u!4 &4839708417611160024 stripped Transform: @@ -6323,6 +6606,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 7439981529531237109, guid: d37ff5fcc9b2b67418d3ea2da233a7e0, type: 3} @@ -6386,6 +6670,9 @@ PrefabInstance: value: 54 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d37ff5fcc9b2b67418d3ea2da233a7e0, type: 3} --- !u!4 &4965738088152964211 stripped Transform: @@ -6610,6 +6897,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -6639,6 +6927,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -6960,6 +7249,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -7698,6 +7988,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -7727,6 +8018,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -9947,6 +10239,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9976,6 +10269,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -10353,6 +10647,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -10395,6 +10690,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10424,6 +10720,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -10511,6 +10808,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10540,6 +10838,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -10578,6 +10877,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10607,6 +10907,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -10860,6 +11161,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10889,6 +11191,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -11108,11 +11411,69 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1001 &5093193206872369483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3565839997967106406, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_Name + value: EquinoxCore_ProjectilePrefab + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} --- !u!1001 &5201447013207790221 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 73626096745920581, guid: 4311ded97b4a0bf4c99266e185db2e6e, type: 3} @@ -11168,12 +11529,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4311ded97b4a0bf4c99266e185db2e6e, type: 3} --- !u!1001 &5217334912004299673 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3230252606085961008, guid: 81f80e448d5c4ed448291a9bacf175c1, type: 3} @@ -11233,6 +11598,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 81f80e448d5c4ed448291a9bacf175c1, type: 3} --- !u!4 &5217334912004299674 stripped Transform: @@ -11244,6 +11612,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 5379347897197585763, guid: 09c66242fa5447748a9f1bce9bc9b73e, type: 3} @@ -11303,6 +11672,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09c66242fa5447748a9f1bce9bc9b73e, type: 3} --- !u!4 &5690284243055545216 Transform: @@ -11311,13 +11683,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9033113502102568443} + 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} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7361029984360205433} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!199 &5770179063948267645 ParticleSystemRenderer: @@ -11376,13 +11748,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -11397,12 +11771,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7964726221679715409, guid: d7fefa4247bdcb542ba696f2a3640dfe, type: 3} propertyPath: m_Name value: TearDownSlashPrefab objectReference: {fileID: 0} + - target: {fileID: 7964726221679715409, guid: d7fefa4247bdcb542ba696f2a3640dfe, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7964726221679715411, guid: d7fefa4247bdcb542ba696f2a3640dfe, type: 3} propertyPath: m_RootOrder value: 34 @@ -11452,12 +11831,16 @@ PrefabInstance: value: 77 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7fefa4247bdcb542ba696f2a3640dfe, type: 3} --- !u!1001 &6020846819865614714 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 3918030657813494484, guid: 7cc6413b4cb439e4f806ecb6b7ff8223, type: 3} @@ -11517,6 +11900,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7cc6413b4cb439e4f806ecb6b7ff8223, type: 3} --- !u!4 &6020846819865614715 stripped Transform: @@ -11528,6 +11914,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7681102451873883168, guid: 873be9a67eca9f34492e05e6045fde4a, type: 3} @@ -11587,12 +11974,16 @@ PrefabInstance: value: 59 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 873be9a67eca9f34492e05e6045fde4a, type: 3} --- !u!1001 &6155740289818612024 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1101416328258701941, guid: dd16ca8a2d6bfa346a09bb53c54b0b6b, type: 3} @@ -11603,6 +11994,10 @@ PrefabInstance: propertyPath: m_Name value: SwordArt_AreaOfEffectPrefab Variant objectReference: {fileID: 0} + - target: {fileID: 1101416328258701942, guid: dd16ca8a2d6bfa346a09bb53c54b0b6b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1101416328258701943, guid: dd16ca8a2d6bfa346a09bb53c54b0b6b, type: 3} propertyPath: m_RootOrder value: 23 @@ -11648,6 +12043,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dd16ca8a2d6bfa346a09bb53c54b0b6b, type: 3} --- !u!198 &6325649047930655120 ParticleSystem: @@ -11867,6 +12265,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -11896,6 +12295,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -12217,6 +12617,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 12 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -12955,6 +13356,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -12984,6 +13386,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -15204,6 +15607,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15233,6 +15637,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -15610,6 +16015,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -15652,6 +16058,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15681,6 +16088,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -15768,6 +16176,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15797,6 +16206,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -15835,6 +16245,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15864,6 +16275,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -16117,6 +16529,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -16146,6 +16559,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -16370,6 +16784,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 5722141525147731704, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3} @@ -16380,6 +16795,10 @@ PrefabInstance: propertyPath: m_Name value: SimplePunchBPrefab objectReference: {fileID: 0} + - target: {fileID: 5722141525147731709, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3} propertyPath: m_RootOrder value: 26 @@ -16425,12 +16844,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3} --- !u!1001 &6545462103452042218 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 8571073935089530154, guid: cc37e1a5634a23e42a03303f977dd323, type: 3} @@ -16490,12 +16913,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc37e1a5634a23e42a03303f977dd323, type: 3} --- !u!1001 &6635164382637221918 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 6635164380670150480, guid: e83334d94a254f14ea4935beb7fdd3c1, type: 3} @@ -16551,12 +16978,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e83334d94a254f14ea4935beb7fdd3c1, type: 3} --- !u!1001 &6660974608414628975 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 790418086816466244, guid: 40d74aa2e3764cf41b7562c2f9b35399, type: 3} @@ -16648,6 +17079,9 @@ PrefabInstance: value: 12 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 40d74aa2e3764cf41b7562c2f9b35399, type: 3} --- !u!4 &6660974608414628976 stripped Transform: @@ -16659,6 +17093,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 7508320818388856468, guid: 48613b5baff23204f81934dfdf802387, type: 3} @@ -16718,6 +17153,9 @@ PrefabInstance: value: 38 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48613b5baff23204f81934dfdf802387, type: 3} --- !u!4 &6750081478064970298 stripped Transform: @@ -16729,6 +17167,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 6784991138375241358, guid: c00bb65def0c7fb4aba71cee7e206d96, type: 3} @@ -16784,6 +17223,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c00bb65def0c7fb4aba71cee7e206d96, type: 3} --- !u!4 &6833310984866459181 Transform: @@ -16792,19 +17234,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4554868228098566540} + 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} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7361029984360205433} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1001 &7116996884322360766 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 307408380521002485, guid: 263ed363454525d46aefa46b653b419d, type: 3} @@ -16960,6 +17403,9 @@ PrefabInstance: value: 39 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 263ed363454525d46aefa46b653b419d, type: 3} --- !u!4 &7116996884322360767 stripped Transform: @@ -16971,6 +17417,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 832940102972879186, guid: 7203e05cc2a811c4aa394ab6d30102c0, type: 3} @@ -17025,13 +17472,21 @@ PrefabInstance: propertyPath: m_Name value: RakeSlashPrefab objectReference: {fileID: 0} + - target: {fileID: 832940102972879191, guid: 7203e05cc2a811c4aa394ab6d30102c0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7203e05cc2a811c4aa394ab6d30102c0, type: 3} --- !u!1001 &7349733992727686197 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 7611295262132244937, guid: 85a2162510ed2a74cb6cd8c05187d28b, type: 3} @@ -17091,6 +17546,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85a2162510ed2a74cb6cd8c05187d28b, type: 3} --- !u!4 &7349733992727686198 stripped Transform: @@ -17104,6 +17562,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7639868926421062572} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.33616066, y: -0.3060453, z: -1.296833} m_LocalScale: {x: 1, y: 1, z: 1} @@ -17112,13 +17571,13 @@ Transform: - {fileID: 5690284243055545216} - {fileID: 6833310984866459181} m_Father: {fileID: 324773021} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1001 &7518525670175012109 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2243483364195524042, guid: 110303f5465936d498288246496a184b, type: 3} @@ -17190,6 +17649,9 @@ PrefabInstance: value: 67 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 110303f5465936d498288246496a184b, type: 3} --- !u!1 &7639868926421062572 GameObject: @@ -17427,6 +17889,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -17456,6 +17919,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -17777,6 +18241,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -18515,6 +18980,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -18544,6 +19010,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -20764,6 +21231,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20793,6 +21261,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -21170,6 +21639,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -21212,6 +21682,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -21241,6 +21712,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -21328,6 +21800,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -21357,6 +21830,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -21395,6 +21869,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -21424,6 +21899,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -21677,6 +22153,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -21706,6 +22183,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -21930,12 +22408,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4233591871518015728, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3} propertyPath: m_Name value: SimpleKickPrefab objectReference: {fileID: 0} + - target: {fileID: 4233591871518015728, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3} propertyPath: m_RootOrder value: 27 @@ -21985,12 +22468,16 @@ PrefabInstance: value: 74 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3} --- !u!1001 &7798416473136312074 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 2263027287439817283, guid: 15b7bc6597eaf3c48a39f36fcb469757, type: 3} @@ -22050,6 +22537,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15b7bc6597eaf3c48a39f36fcb469757, type: 3} --- !u!4 &7798416473136312075 stripped Transform: @@ -22061,6 +22551,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 8042391599351516396, guid: 4343cc0fa85d19f4d803136253b94238, type: 3} @@ -22120,6 +22611,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4343cc0fa85d19f4d803136253b94238, type: 3} --- !u!4 &7837046210318564955 stripped Transform: @@ -22131,6 +22625,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 7455199422598815824, guid: b1f35b67c9e638443a850c78c0f87ac5, type: 3} @@ -22190,6 +22685,9 @@ PrefabInstance: value: 14 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b1f35b67c9e638443a850c78c0f87ac5, type: 3} --- !u!4 &7854382111657606679 stripped Transform: @@ -22201,6 +22699,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 5409629005393311441, guid: 1cb3e6e45ad6615448f1a968b89c84e8, type: 3} @@ -22260,6 +22759,9 @@ PrefabInstance: value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1cb3e6e45ad6615448f1a968b89c84e8, type: 3} --- !u!4 &7862011006676081908 stripped Transform: @@ -22271,6 +22773,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7678187128050361980, guid: 93cab8bcf2d72eb43ba7c70d0d61720c, type: 3} @@ -22330,12 +22833,16 @@ PrefabInstance: value: 71 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93cab8bcf2d72eb43ba7c70d0d61720c, type: 3} --- !u!1001 &8283457331678448648 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 6063651656755616563, guid: a89ee7eec16b2bc44aa4d4e85f9e9e47, type: 3} @@ -22395,6 +22902,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a89ee7eec16b2bc44aa4d4e85f9e9e47, type: 3} --- !u!4 &8283457331678448649 stripped Transform: @@ -22406,6 +22916,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 8058865113381185808, guid: 992bd86877d93794fa4c04824808f2a7, type: 3} @@ -22465,6 +22976,9 @@ PrefabInstance: value: 56 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 992bd86877d93794fa4c04824808f2a7, type: 3} --- !u!4 &8324248370617784091 stripped Transform: @@ -22476,6 +22990,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 6744685881493449316, guid: e8d140a8b81d1a54babce1a327614447, type: 3} @@ -22535,6 +23050,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e8d140a8b81d1a54babce1a327614447, type: 3} --- !u!4 &8507533993034978494 stripped Transform: @@ -22564,6 +23082,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 9043445715802431073, guid: 222e283b3616ff84f9094c92c14fce24, type: 3} @@ -22623,6 +23142,9 @@ PrefabInstance: value: 17 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 222e283b3616ff84f9094c92c14fce24, type: 3} --- !u!4 &9043445715939327476 stripped Transform: @@ -22634,6 +23156,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 324773021} m_Modifications: - target: {fileID: 1844807267285195553, guid: cf63080a3060bb8409b45a47842d60e8, type: 3} @@ -22693,6 +23216,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf63080a3060bb8409b45a47842d60e8, type: 3} --- !u!4 &9060912976968288182 stripped Transform: @@ -22704,6 +23230,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 177303970} m_Modifications: - target: {fileID: 10360235494502058, guid: 0d6eeddca319b1b4b90000c7ae2779b6, type: 3} @@ -22767,9 +23294,53 @@ PrefabInstance: value: 20 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d6eeddca319b1b4b90000c7ae2779b6, type: 3} --- !u!4 &9127896785285240003 stripped Transform: m_CorrespondingSourceObject: {fileID: 752672217636848573, guid: 0d6eeddca319b1b4b90000c7ae2779b6, type: 3} m_PrefabInstance: {fileID: 9127896785285240002} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 563890658} + - {fileID: 297491643} + - {fileID: 177303970} + - {fileID: 1866046038} + - {fileID: 1935359882} + - {fileID: 1039697285} + - {fileID: 324773021} + - {fileID: 118779283} + - {fileID: 1076325727} + - {fileID: 673009636} + - {fileID: 197525094} + - {fileID: 38219781} + - {fileID: 6150788514946546613} + - {fileID: 6784991137677520910} + - {fileID: 5527894167094644665} + - {fileID: 1755518104} + - {fileID: 1544510706581098781} + - {fileID: 6545462103452042218} + - {fileID: 7518525670175012109} + - {fileID: 1483268165} + - {fileID: 1569104425} + - {fileID: 942386134} + - {fileID: 1736196846} + - {fileID: 6155740289818612024} + - {fileID: 7947669011099703232} + - {fileID: 3686794269069733087} + - {fileID: 6464489653909956038} + - {fileID: 7708175618554638597} + - {fileID: 5201447013207790221} + - {fileID: 4117085478594719014} + - {fileID: 6635164382637221918} + - {fileID: 441887942937359658} + - {fileID: 1239658160} + - {fileID: 1636586087396296534} + - {fileID: 6009776067855226766} + - {fileID: 7279882778023531380} + - {fileID: 5093193206872369483} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset index b8271fdb..0398b3a8 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset @@ -23,9 +23,12 @@ MonoBehaviour: - {fileID: 11400000, guid: ead0b5de8c069ca45b35ab71dca914e9, type: 2} - {fileID: 11400000, guid: b49cc0fb89f894a42981c649afd98030, type: 2} castTime: 0.5 - manaCost: 10 + manaCost: 8 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 @@ -39,6 +42,7 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 0 + rotateOnSpawn: 0 projectileAbility: {fileID: 11400000, guid: 7a897d8de80bb6c4b9f888c0121a7d59, type: 2} duration: 6 followUser: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset new file mode 100644 index 00000000..3bd6e5fe --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.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-HitCombo + m_EditorClassIdentifier: + displayName: Hit Combo + Icon: {fileID: 21300000, guid: eecb85004343b0e4d8b78fd7f9877b32, type: 3} + targettingTags: [] + tags: [] + abilityEffects: [] + castTime: 0 + manaCost: 0 + healthCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 2 + comboChain: + - {fileID: 11400000, guid: de3172e441d9dba42bc24b5ecb4d0bf2, type: 2} + - {fileID: 11400000, guid: 4027803ec5dbf5543be72b92a6083b86, type: 2} + - {fileID: 11400000, guid: 45233ddc9683185429ca7af22b3056e1, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset.meta new file mode 100644 index 00000000..1edaf876 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/0-HitCombo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d9484f2850f59543b0a489419ca50f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_FrontalPunch_SlashAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_FrontalPunch_SlashAbility.asset index 5b6ea92b..cf829d2c 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_FrontalPunch_SlashAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_FrontalPunch_SlashAbility.asset @@ -23,18 +23,19 @@ MonoBehaviour: - {fileID: 11400000, guid: 4f41c3d578dc61f4baae79373a297c8b, type: 2} - {fileID: 11400000, guid: 012e2e4ba1a64a44ca16016d040e6b25, type: 2} castTime: 0.5 - manaCost: 0 + manaCost: 1 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 percentMaxManaCost: 0 percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 9 slashPrefab: {fileID: 2490494820205918377, guid: f532516d94f2f9240bffafcc613ccd87, type: 3} - regenHealthOnHit: 1 + regenHealthOnHit: 0 regenManaOnHit: 1 - healthOnHit: 2 + healthOnHit: 1 manaOnHit: 1 lifeSpan: 0.5 range: 2 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Kick_SlashAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Kick_SlashAbility.asset index 4387455f..59c3655e 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Kick_SlashAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Kick_SlashAbility.asset @@ -26,15 +26,16 @@ MonoBehaviour: manaCost: 1 healthCost: 0 classResourceCost: 0 - percentMaxManaCost: 0.08 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.01 percentMaxHealthCost: 0 - cooldown: 1 + cooldown: 0 castableWhileMoving: 0 animationType: 11 slashPrefab: {fileID: 4233591871518015728, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3} regenHealthOnHit: 1 regenManaOnHit: 0 - healthOnHit: 2 + healthOnHit: 1 manaOnHit: 1 lifeSpan: 0.5 range: 2 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Uppercut_SlashAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Uppercut_SlashAbility.asset index d3e4b7c5..7612c774 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Uppercut_SlashAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Uppercut_SlashAbility.asset @@ -23,18 +23,19 @@ MonoBehaviour: - {fileID: 11400000, guid: 128816df89922a54a89d3e8b3d0e27b9, type: 2} - {fileID: 11400000, guid: 012e2e4ba1a64a44ca16016d040e6b25, type: 2} castTime: 0.5 - manaCost: 2 + manaCost: 1 healthCost: 0 classResourceCost: 0 - percentMaxManaCost: 0.1 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.02 percentMaxHealthCost: 0 - cooldown: 1.5 + cooldown: 0 castableWhileMoving: 0 animationType: 10 slashPrefab: {fileID: 5722141525147731709, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3} regenHealthOnHit: 1 - regenManaOnHit: 0 - healthOnHit: 2 + regenManaOnHit: 1 + healthOnHit: 1 manaOnHit: 1 lifeSpan: 0.5 range: 2 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset similarity index 92% rename from Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset rename to Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset index d5aca7ac..77bc4906 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} - m_Name: 1-IceShard_ProjectileAbility + m_Name: 0-IceShard_ProjectileAbility m_EditorClassIdentifier: displayName: Ice Shard Icon: {fileID: 21300000, guid: 50a820d3228a2bf4da98a6e769e90f12, type: 3} @@ -29,9 +29,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 7b7a9c9ae4b8ece4eb680f621937c58a, type: 2} - {fileID: 11400000, guid: 127f92fd14a21174695a692c0cf18746, type: 2} castTime: 0.5 - manaCost: 1 + manaCost: 5 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset.meta rename to Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset.meta diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/1-ShadowOrb_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/1-ShadowOrb_ProjectileAbility.asset index f7f9f450..206f68a4 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/1-ShadowOrb_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/1-ShadowOrb_ProjectileAbility.asset @@ -26,9 +26,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 12d550d1a7bc2af40a57884eb5dfde0a, type: 2} - {fileID: 11400000, guid: 1352e6a940da1004fa4588726581995b, type: 2} castTime: 0.5 - manaCost: 10 + manaCost: 5 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/2-BurstOfCorruption_AoEAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/2-BurstOfCorruption_AoEAbility.asset index 98d3e193..0180ef67 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/2-BurstOfCorruption_AoEAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/2-BurstOfCorruption_AoEAbility.asset @@ -26,9 +26,12 @@ MonoBehaviour: - {fileID: 11400000, guid: af99cef8e7204864b8db8538e972f999, type: 2} - {fileID: 11400000, guid: 690d520585d0dbc43bca8924f5b3d632, type: 2} castTime: 0.5 - manaCost: 25 + manaCost: 10 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.05 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 @@ -42,3 +45,4 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 1 + rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/3-CorruptedGroundsAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/3-CorruptedGroundsAoEOverTimeAbility.asset index 217d9c35..dacf5541 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/3-CorruptedGroundsAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/3-CorruptedGroundsAoEOverTimeAbility.asset @@ -26,9 +26,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 663fd8f1d28ded94cb6cc9a2f50b0a07, type: 2} - {fileID: 11400000, guid: bbfd90d5e711cc84d991e870d6ed7ac4, type: 2} castTime: 1 - manaCost: 70 + manaCost: 30 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.2 + percentMaxHealthCost: 0 cooldown: 3 castableWhileMoving: 0 animationType: 1 @@ -42,8 +45,8 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 1 + rotateOnSpawn: 0 duration: 3 followUser: 0 followTarget: 0 damageFollowingTarget: 0 - rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/C-TaintedStar_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/C-TaintedStar_AoEOverTimeAbility.asset index af17921f..acfc1ca0 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/C-TaintedStar_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/-DarkSide/C-TaintedStar_AoEOverTimeAbility.asset @@ -25,9 +25,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 5e81500988403d8478e4ffdce93d04be, type: 2} - {fileID: 11400000, guid: a2ba43c803e6bf240b54759c46bd76c6, type: 2} castTime: 0.5 - manaCost: 5 + manaCost: 30 healthCost: 0 - classResourceCost: 20 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.2 + percentMaxHealthCost: 0 cooldown: 6 castableWhileMoving: 0 animationType: 1 @@ -41,8 +44,8 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 1 + rotateOnSpawn: 0 duration: 4 followUser: 1 followTarget: 0 damageFollowingTarget: 0 - rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset index 7a24ee51..ec549f9a 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset @@ -27,9 +27,12 @@ MonoBehaviour: - {fileID: 11400000, guid: c11e4e7ebf6d1844ba5825e9014ffbc9, type: 2} - {fileID: 11400000, guid: 5b88d44fe40c77f44b3a469071c32283, type: 2} castTime: 0.5 - manaCost: 10 + manaCost: 5 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset index dd23358a..41e20c6f 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset @@ -25,14 +25,18 @@ MonoBehaviour: - {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} + - {fileID: 11400000, guid: 4242916f0b1bf6e4e8a04bce7028b3f4, type: 2} abilityEffects: - {fileID: 11400000, guid: ca9eaffa6d6eecb48b1e437022dd6f35, type: 2} - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} - {fileID: 11400000, guid: eec4ac25a697ba546842672cfdb1e8fc, type: 2} castTime: 0.5 - manaCost: 25 + manaCost: 10 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.05 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 @@ -46,3 +50,4 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 1 spawnUnderUser: 1 + rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset index ee195565..57407b34 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset @@ -27,9 +27,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 7c93de4abc24c6a42964968d8ed80f69, type: 2} - {fileID: 11400000, guid: 03555354993e8e64c89df953f650e510, type: 2} castTime: 1 - manaCost: 80 + manaCost: 30 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.2 + percentMaxHealthCost: 0 cooldown: 3 castableWhileMoving: 0 animationType: 1 @@ -43,8 +46,8 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 1 spawnUnderUser: 1 + rotateOnSpawn: 0 duration: 3 followUser: 0 followTarget: 0 damageFollowingTarget: 0 - rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/C-ShinningStar_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/C-ShinningStar_AoEOverTimeAbility.asset index 887842fb..a1c3a9ce 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/C-ShinningStar_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/C-ShinningStar_AoEOverTimeAbility.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: C-ShinningStar_AoEOverTimeAbility m_EditorClassIdentifier: displayName: Shinning Star - Icon: {fileID: 0} + Icon: {fileID: 21300000, guid: 9113d706c9b00364994c4bc4c779cc90, type: 3} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} @@ -25,9 +25,12 @@ MonoBehaviour: abilityEffects: - {fileID: 11400000, guid: 72119a30a83feb246a3c70529e61a5a5, type: 2} castTime: 0 - manaCost: 5 + manaCost: 30 healthCost: 0 - classResourceCost: 20 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.2 + percentMaxHealthCost: 0 cooldown: 6 castableWhileMoving: 0 animationType: 1 @@ -41,8 +44,8 @@ MonoBehaviour: telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 1 + rotateOnSpawn: 0 duration: 4 followUser: 1 followTarget: 0 damageFollowingTarget: 0 - rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos.meta new file mode 100644 index 00000000..7e5d2bbd --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9575d9a3f767aac4b82352e5a16177fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset new file mode 100644 index 00000000..6056f65e --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.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: 1-DualityOrbComboAbility + m_EditorClassIdentifier: + displayName: Equinox Core + Icon: {fileID: 21300000, guid: ee34195976181ef4b83f98f5034ab668, 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: 8b2377c41770ee74190db5c79e53c751, type: 2} + - {fileID: 11400000, guid: b2720497081a6e349a7988604c2376e5, type: 2} + - {fileID: 11400000, guid: 3cfe4199144e60d4ebd43f95df59d6e2, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset.meta new file mode 100644 index 00000000..31d1e02f --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-DualityOrbComboAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df076f4a7a2388f46befa78bbb12b44a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset new file mode 100644 index 00000000..4d9070a8 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset @@ -0,0 +1,46 @@ +%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: 1-EquinoxCore_ProjectileAbility + m_EditorClassIdentifier: + displayName: Holy Ball + Icon: {fileID: 21300000, guid: 2d0997ac1b1fd664e98202450e7ea2d7, type: 3} + targettingTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + - {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: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + abilityEffects: + - {fileID: 11400000, guid: c11e4e7ebf6d1844ba5825e9014ffbc9, type: 2} + - {fileID: 11400000, guid: 5b88d44fe40c77f44b3a469071c32283, type: 2} + - {fileID: 11400000, guid: 1352e6a940da1004fa4588726581995b, type: 2} + - {fileID: 11400000, guid: 688c38d73d223904f9b1033d239f166e, type: 2} + - {fileID: 11400000, guid: 12d550d1a7bc2af40a57884eb5dfde0a, type: 2} + castTime: 0.75 + manaCost: 10 + healthCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.02 + percentMaxHealthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 1 + projectilePrefab: {fileID: 3565839997967106406, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + projectileSpeed: 5 + lifeSpan: 2 + canPierce: 1 + canHitSelf: 1 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset.meta new file mode 100644 index 00000000..5d612449 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/1-EquinoxCore_ProjectileAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3cfe4199144e60d4ebd43f95df59d6e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset new file mode 100644 index 00000000..097c6564 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset @@ -0,0 +1,32 @@ +%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: 2-ParadoxBurst + m_EditorClassIdentifier: + displayName: Paradox Burst + Icon: {fileID: 21300000, guid: dc90b2c236cbacf47b20a1294efdf59d, 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: 07dbc802df380364e8f2bece0a013586, type: 2} + - {fileID: 11400000, guid: f3628bf368b593d488559a00aef758a6, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset.meta new file mode 100644 index 00000000..95ae704e --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/2-ParadoxBurst.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89f9b912aab39284d96938388a0e7a4a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset new file mode 100644 index 00000000..bdcb054a --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset @@ -0,0 +1,32 @@ +%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: 3-Purgefield + m_EditorClassIdentifier: + displayName: Purgefield + Icon: {fileID: 21300000, guid: 42f6c722ead369b4b934a116b4324a4d, 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: 73dd02ce99b6eb34aafbae7bb339d645, type: 2} + - {fileID: 11400000, guid: 96c81c820f0bfe747af956cccd0f0ba4, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset.meta new file mode 100644 index 00000000..87d7f935 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/3-Purgefield.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61df608056f0b9b46aed454e89c37da7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset new file mode 100644 index 00000000..3e4f48e0 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset @@ -0,0 +1,32 @@ +%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: 4-FallenConstellation + m_EditorClassIdentifier: + displayName: Fallen Constellation + Icon: {fileID: 21300000, guid: d70dd1b9c6ae54448923db5c4924edd5, 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: 10d87ca2edcf6444797882f22a3404de, type: 2} + - {fileID: 11400000, guid: dac2ca4170c153740968a49b4cc85c3a, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset.meta new file mode 100644 index 00000000..4a35828f --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Priest/Combos/4-FallenConstellation.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39dfddb48b4b32149a137e79cc6a320c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset new file mode 100644 index 00000000..10650ea5 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset @@ -0,0 +1,32 @@ +%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-Werewolf_ClawingComboAbility + m_EditorClassIdentifier: + displayName: Claw & Rake + Icon: {fileID: 21300000, guid: 0389074d1deba1c448d45812db40c0df, type: 3} + targettingTags: [] + tags: [] + abilityEffects: [] + castTime: 0 + manaCost: 0 + healthCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 9 + comboChain: + - {fileID: 11400000, guid: 694d981b2a0eda44cb90aa049d8dbd83, type: 2} + - {fileID: 11400000, guid: fb2829af881bafe4aa4561c2c8edb0fa, type: 2} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset.meta new file mode 100644 index 00000000..05d082f6 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/0-Werewolf_ClawingComboAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8476123513cabfe4c92edb83943222dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Claw_SlashAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Claw_SlashAbility.asset index d75e7a6f..7edc65f8 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Claw_SlashAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Claw_SlashAbility.asset @@ -18,26 +18,24 @@ MonoBehaviour: - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} - {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2} abilityEffects: - {fileID: 11400000, guid: 108063d64e2ea214a90c4d67a845b03c, type: 2} - - {fileID: 11400000, guid: 1ca40c4e17062aa41986df2664c20835, type: 2} - {fileID: 11400000, guid: 1b9a46dbd0191614f89da015f8ad0b70, type: 2} castTime: 0.5 manaCost: 0 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 percentMaxManaCost: 0 percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 9 slashPrefab: {fileID: 4462899224256174359, guid: 4b025381b7a25ed4baeaf9595c84159a, type: 3} - regenHealthOnHit: 1 + regenHealthOnHit: 0 regenManaOnHit: 1 - healthOnHit: 2 + healthOnHit: 1 manaOnHit: 1 lifeSpan: 0.5 range: 2 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Rake_SlashAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Rake_SlashAbility.asset index 435005f9..0e563361 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Rake_SlashAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_Rake_SlashAbility.asset @@ -25,11 +25,13 @@ MonoBehaviour: - {fileID: 11400000, guid: 108063d64e2ea214a90c4d67a845b03c, type: 2} - {fileID: 11400000, guid: c659989ccf1402e47ba9da1b39c4b71c, type: 2} - {fileID: 11400000, guid: b120b9c0733609445a67aab250f011e1, type: 2} + - {fileID: 11400000, guid: 1ca40c4e17062aa41986df2664c20835, type: 2} castTime: 0.5 manaCost: 1 healthCost: 0 classResourceCost: 0 - percentMaxManaCost: 0.08 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.01 percentMaxHealthCost: 0 cooldown: 1 castableWhileMoving: 0 @@ -37,7 +39,7 @@ MonoBehaviour: slashPrefab: {fileID: 832940102972879191, guid: 7203e05cc2a811c4aa394ab6d30102c0, type: 3} regenHealthOnHit: 1 regenManaOnHit: 0 - healthOnHit: 2 + healthOnHit: 1 manaOnHit: 1 lifeSpan: 0.5 range: 2 diff --git a/Assets/Scripts/AbilitySystem/AbilityIndexer.cs b/Assets/Scripts/AbilitySystem/AbilityIndexer.cs index a7c535ce..d7bb4051 100644 --- a/Assets/Scripts/AbilitySystem/AbilityIndexer.cs +++ b/Assets/Scripts/AbilitySystem/AbilityIndexer.cs @@ -51,7 +51,7 @@ public class AbilityIndexer : MonoBehaviour { if (Abilities == null) return; - Abilities.Clear(); + //Abilities.Clear(); foreach (BaseAbility ability in Resources.LoadAll("Abilities")) { diff --git a/Assets/Scripts/AbilitySystem/ComboAbility.cs b/Assets/Scripts/AbilitySystem/ComboAbility.cs new file mode 100644 index 00000000..daf686fe --- /dev/null +++ b/Assets/Scripts/AbilitySystem/ComboAbility.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "Combo Ability", menuName = "RiftMayhem/AbilitySystem/Abilities/Combo Ability", order = 0)] +public class ComboAbility : BaseAbility +{ + public List comboChain = new List(); +} + + + +[System.Serializable] +public class ComboState +{ + public int currentComboIndex = 0; +} \ No newline at end of file diff --git a/Assets/Scripts/AbilitySystem/ComboAbility.cs.meta b/Assets/Scripts/AbilitySystem/ComboAbility.cs.meta new file mode 100644 index 00000000..2b108c11 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/ComboAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8d984ee2631747a489cd6d5a31b7c26e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/ChooseClassToggleController.cs b/Assets/Scripts/Game/ChooseClassToggleController.cs index 24427c71..788d6e96 100644 --- a/Assets/Scripts/Game/ChooseClassToggleController.cs +++ b/Assets/Scripts/Game/ChooseClassToggleController.cs @@ -14,7 +14,7 @@ public class ChooseClassToggleController : MonoBehaviour humanToggle.isOn = false; for (int i = 0; i < characterClasses.Count; i++) { - characterClasses[i].characterClassToggle.interactable = PlayerDataHandler.Instance.ClassUnlocked(PlayerDataHandler.Instance.currentPlayerName.Value, characterClasses[i].characterClass.name.ToLower()); + characterClasses[i].characterClassToggle.interactable = true;//PlayerDataHandler.Instance.ClassUnlocked(PlayerDataHandler.Instance.currentPlayerName.Value, characterClasses[i].characterClass.name.ToLower()); characterClasses[i].unlockedLight.SetActive(characterClasses[i].characterClassToggle.interactable); characterClasses[i].border.SetActive(characterClasses[i].characterClassToggle.interactable); } diff --git a/Assets/Scripts/Game/GameConstants.cs b/Assets/Scripts/Game/GameConstants.cs index fecf2121..ae04f9b4 100644 --- a/Assets/Scripts/Game/GameConstants.cs +++ b/Assets/Scripts/Game/GameConstants.cs @@ -222,9 +222,9 @@ public static class GameConstants public const int TotalPagesPerAbilityTome = 1; public const int AbilityTomeDropChance = 5; - public const int AbilitySlot_II_LevelRequired = 5; - public const int AbilitySlot_III_LevelRequired = 10; - public const int AbilitySlot_IV_LevelRequired = 15; + public const int AbilitySlot_II_LevelRequired = 2; + public const int AbilitySlot_III_LevelRequired = 3; + public const int AbilitySlot_IV_LevelRequired = 4; public const float IncreasedCoinDropBasedOnDifficultyMultiplier = 1.66f; public const float IncreasedItemDropBasedOnDifficultyMultiplier = 0.33f; diff --git a/Assets/Scripts/Networking/SpiritPowerAutocast.cs b/Assets/Scripts/Networking/SpiritPowerAutocast.cs index 4283c65f..ca3b4ad0 100644 --- a/Assets/Scripts/Networking/SpiritPowerAutocast.cs +++ b/Assets/Scripts/Networking/SpiritPowerAutocast.cs @@ -26,7 +26,7 @@ public class SpiritPowerAutocast : MonoBehaviour private void Start() { - KeepCasting(); + //KeepCasting(); } public void KeepCasting() diff --git a/Assets/Scripts/Player/AbilityKeyBinder.cs b/Assets/Scripts/Player/AbilityKeyBinder.cs index 4f900091..f3468087 100644 --- a/Assets/Scripts/Player/AbilityKeyBinder.cs +++ b/Assets/Scripts/Player/AbilityKeyBinder.cs @@ -1,5 +1,6 @@ using Kryz.CharacterStats.Examples; using System.Collections; +using System.Collections.Generic; using UnityEngine; public class AbilityKeyBinder : MonoBehaviour @@ -31,6 +32,9 @@ public class AbilityKeyBinder : MonoBehaviour bool isDead = false; bool abilitySlotUnlocked = false; + bool isComboAbility = false; + ComboAbility combo; + ComboState comboState = new ComboState(); float finalHealthCost; float finalManaCost; @@ -96,6 +100,17 @@ public class AbilityKeyBinder : MonoBehaviour } }); } + else if (isComboAbility) + { + if (mana.EnoughMana(GetCurrentAbility().GetFinalManaCost(mana)) && health.EnoughHealth(GetCurrentAbility().GetFinalHealthCost(health))) + { + castingStateController.RequestAbilityCast(GetCurrentAbility(), () => + { + GetCurrentAbility().Execute(userTag); + AdvanceCombo(); + }); + } + } else { castingStateController.RequestAbilityCast(ability, () => @@ -143,18 +158,36 @@ public class AbilityKeyBinder : MonoBehaviour this.abilityBindInstance = abilityBindInstance; mana.onResourceChanged.AddListener(OnManaChanged); health.onResourceChanged.AddListener(OnHealthChanged); + + if (isComboAbility) + abilityBindInstance.ForceUpdateOnComboAbility(GetCurrentAbility()); } public void OnManaChanged(float currentMana) { - finalManaCost = ability.GetFinalManaCost(mana); + if (isComboAbility) + { + finalManaCost = GetCurrentAbility().GetFinalManaCost(mana); + } + else + { + finalManaCost = ability.GetFinalManaCost(mana); + } abilityBindInstance.manaCost.text = finalManaCost.ToString("F0"); abilityBindInstance.noMana.SetActive(!mana.EnoughMana(finalManaCost)); } public void OnHealthChanged(float currentHealth) { - finalHealthCost = ability.GetFinalHealthCost(health); + if (isComboAbility) + { + finalHealthCost = GetCurrentAbility().GetFinalHealthCost(health); + } + else + { + finalHealthCost = ability.GetFinalHealthCost(health); + } + abilityBindInstance.healthCost.text = finalHealthCost.ToString("F0"); abilityBindInstance.healthCostGO.SetActive(finalHealthCost > 0); abilityBindInstance.noHealth.SetActive(!health.EnoughHealth(finalHealthCost)); @@ -168,6 +201,17 @@ public class AbilityKeyBinder : MonoBehaviour public void BindAbility(BaseAbility ability) { this.ability = ability; + if (ability is ComboAbility comboAbility) + { + isComboAbility = true; + combo = comboAbility; + abilityBindInstance.ForceUpdateOnComboAbility(GetCurrentAbility()); + } + else + { + isComboAbility = false; + combo = null; + } onAbilityKeyBinderSpawned.Raise(this); } @@ -177,4 +221,34 @@ public class AbilityKeyBinder : MonoBehaviour abilityBindInstance.SetUnlocked(unlocked); } -} \ No newline at end of file + + private void AdvanceCombo() + { + comboState.currentComboIndex++; + comboState.currentComboIndex %= combo.comboChain.Count; + + 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; + + int index = GetCurrentComboIndex(); + return combo.comboChain[index]; + } + public int GetComboLength() + { + return combo.comboChain.Count; + } + + public List GetComboChain() + { + return new List(combo.comboChain); // Return copy to prevent external modification + } +} diff --git a/Assets/Scripts/UI/AbilityBindInstance.cs b/Assets/Scripts/UI/AbilityBindInstance.cs index b02025b4..147ba4f9 100644 --- a/Assets/Scripts/UI/AbilityBindInstance.cs +++ b/Assets/Scripts/UI/AbilityBindInstance.cs @@ -55,6 +55,13 @@ public class AbilityBindInstance : MonoBehaviour abilityKeyBinder.SetupAbilityBindInstance(this); } + public void ForceUpdateOnComboAbility(BaseAbility currentComboAbility) + { + this.manaCost.text = currentComboAbility.GetFinalManaCost(abilityKeyBinder.Mana).ToString("F0"); + healthCostGO.SetActive(currentComboAbility.GetFinalHealthCost(abilityKeyBinder.Health) > 0); + this.healthCost.text = currentComboAbility.GetFinalHealthCost(abilityKeyBinder.Health).ToString("F0"); + this.icon.sprite = currentComboAbility.Icon; + } public void StartCooldownTrackerUI() {