diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test_SJ2.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test_SJ2.unity index fda61904c..ab3aa5558 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test_SJ2.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test_SJ2.unity @@ -3682,7 +3682,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fbb68ccbcfcf4c4c9f4304a726038e3, type: 3} m_Name: m_EditorClassIdentifier: - activeSkillDataSo: {fileID: 11400000, guid: 97ebd289c10598a458425fbefd7db39f, type: 2} + activeSkillSo: {fileID: 11400000, guid: 97ebd289c10598a458425fbefd7db39f, type: 2} --- !u!1 &1037586753 GameObject: m_ObjectHideFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/FieldBoss01.prefab b/BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/FieldBoss01.prefab index c2cfbd93e..ad88b2065 100644 --- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/FieldBoss01.prefab +++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/FieldBoss01.prefab @@ -5041,7 +5041,7 @@ MonoBehaviour: byteDataArray: Version: 1.7.7 gizmoViewMode: 2 - showBehaviorDesignerGizmo: 0 + showBehaviorDesignerGizmo: 1 --- !u!114 &7556135373767129943 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5065,3 +5065,5 @@ MonoBehaviour: hpSlider: {fileID: 0} damageEffectSlider: {fileID: 0} damageEffectSpeed: 0.1 + lavaNumber: 8 + volcanicNumber: 20 diff --git a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/BigLavaEruption.prefab b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/BigLavaEruption.prefab index af2ff9ed1..a82b77483 100644 --- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/BigLavaEruption.prefab +++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/BigLavaEruption.prefab @@ -84,7 +84,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 1} + m_LocalScale: {x: 12, y: 12, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4051035783022543630} @@ -110,9 +110,9 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 1 k__BackingField: 0 - k__BackingField: 4 + k__BackingField: 15 k__BackingField: 30 - k__BackingField: 5 + k__BackingField: 6 k__BackingField: 10 k__BackingField: {fileID: 19806542, guid: 0763c01217b286640aa3ac83d44fafaa, type: 3} @@ -120,7 +120,7 @@ MonoBehaviour: k__BackingField: 0 followMouse: 0 randomRadius: 0 - projectileDelay: 1 + projectileDelay: 0.2 damageDelay: 0.5 lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2} lavaEffect: {fileID: 8069353124720114776} diff --git a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaEruption.prefab b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaEruption.prefab index ce9bdd80e..3127c4fe7 100644 --- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaEruption.prefab +++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaEruption.prefab @@ -108,9 +108,9 @@ MonoBehaviour: k__BackingField: k__BackingField: k__BackingField: 0 - k__BackingField: 1 + k__BackingField: 0.5 k__BackingField: 0 - k__BackingField: 4 + k__BackingField: 12 k__BackingField: 15 k__BackingField: 1.5 k__BackingField: 10 @@ -119,8 +119,8 @@ MonoBehaviour: indicator: {fileID: 6177466515962511305} k__BackingField: 0 followMouse: 0 - randomRadius: 6 - projectileDelay: 2 + randomRadius: 9 + projectileDelay: 0.5 damageDelay: 0.5 lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2} lavaEffect: {fileID: 2337368552254942646} diff --git a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LineRush.prefab b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LineRush.prefab index 4ff0b6bc0..79ca71be3 100644 --- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LineRush.prefab +++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LineRush.prefab @@ -106,7 +106,7 @@ MonoBehaviour: k__BackingField: k__BackingField: k__BackingField: 0 - k__BackingField: 1 + k__BackingField: 0.6 k__BackingField: 0 k__BackingField: 0 k__BackingField: 10 @@ -116,6 +116,6 @@ MonoBehaviour: indicator: {fileID: 6177466515962511305} k__BackingField: 0 followMouse: 0 - rushOffset: 10 - rushSpeed: 30 - ghost: {fileID: 0} + rushOffset: 15 + rushSpeed: 40 + doubleRushDelay: 0.5 diff --git a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/VolcanicEruption.prefab b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/VolcanicEruption.prefab index d4adb0b1b..db1bd980b 100644 --- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/VolcanicEruption.prefab +++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/VolcanicEruption.prefab @@ -108,9 +108,9 @@ MonoBehaviour: k__BackingField: k__BackingField: k__BackingField: 0 - k__BackingField: 1 + k__BackingField: 0.5 k__BackingField: 0 - k__BackingField: 4 + k__BackingField: 12 k__BackingField: 15 k__BackingField: 1.5 k__BackingField: 10 @@ -119,8 +119,8 @@ MonoBehaviour: indicator: {fileID: 0} k__BackingField: 0 followMouse: 0 - randomRadius: 12 - projectileDelay: 1 + randomRadius: 15 + projectileDelay: 0.5 damageDelay: 0.5 lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2} lavaEffect: {fileID: 5178252110406326737}