플라워 드라이어드 스킬1

Assets/ResWork/Suriyun/Monster Pack Forest/Animations/Flower Dryad/Flower Dryad_Animations_Check.controller

@@ -1,5 +1,32 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-5460497693606189660
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: boss_skill1end
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 53004730749802641}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 5c09777ab651ca24bb1abb1d860d8e3b, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-3453034616761492803
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -201,16 +228,19 @@ AnimatorStateMachine:
     m_Position: {x: 410, y: -160, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 110210968}
-    m_Position: {x: 120, y: -30, z: 0}
+    m_Position: {x: 280, y: -10, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102172803570559054}
-    m_Position: {x: 410, y: -30, z: 0}
+    m_Position: {x: 460, y: -60, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2248923555073087816}
     m_Position: {x: 120, y: -150, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 4694226541224844611}
-    m_Position: {x: 120, y: -90, z: 0}
+    m_Position: {x: 70, y: -20, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -5460497693606189660}
+    m_Position: {x: 120, y: -100, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -221,6 +251,28 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 120, y: -200, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 110209958}
+--- !u!1101 &53004730749802641
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110209958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.68421066
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &1102172803570559054
 AnimatorState:
   serializedVersion: 6
@@ -273,11 +325,10 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: boss_skill1
+  m_Name: boss_skill1charging
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
-  m_Transitions:
+  m_Transitions: []
-  - {fileID: 6560194639391205186}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -341,25 +392,3 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &6560194639391205186
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 110209958}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.68421066
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1

Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill1Charging.prefab

@@ -0,0 +1,124 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7986755000810142982
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2392192123454697539}
+  - component: {fileID: -4446986471955739702}
+  m_Layer: 0
+  m_Name: Effect_FlowerDryad_Skill1Charging
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2392192123454697539
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7986755000810142982}
+  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: 951101750124945746}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &-4446986471955739702
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7986755000810142982}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NoUseParticleTime: 1
+  OffTime: 3
+  e_EffectLocation: 2
+--- !u!1001 &9039003106017798876
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2392192123454697539}
+    m_Modifications:
+    - target: {fileID: 8089031658145368973, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_Name
+      value: HCFX_Shine_02
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7ae611719d10a5b489337fcd4622030a, type: 3}
+--- !u!4 &951101750124945746 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8089031658145368974, guid: 7ae611719d10a5b489337fcd4622030a,
+    type: 3}
+  m_PrefabInstance: {fileID: 9039003106017798876}
+  m_PrefabAsset: {fileID: 0}

Assets/Res_Addr/Effect/Effect_FlowerDryad_Skill1Charging.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9e0b05bc547bfc24a890c351599285a3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Character/Actor.cs

@@ -1540,16 +1540,17 @@ public class Actor : MyCoroutine
     #endregion
     #region 상태이상 : 도트 힐
     Coroutine co_dotheal;
-    public void DotHeal(double lifetime, float gaptime, double healhp, double healmp)
+    public void DotHeal(double lifetime, float gaptime, double healhp, double healmp, string effect = "")
     {
         if (healhp < 1) healhp = 1;
         //if (healmp < 1) healmp = 1;
 
         if (!DSUtil.CheckNull(co_dotheal)) StopCoroutine(co_dotheal);
-        co_dotheal = StartCoroutine(Co_DotHeal(lifetime, gaptime, healhp, healmp));
+        co_dotheal = StartCoroutine(Co_DotHeal(lifetime, gaptime, healhp, healmp, effect));
     }
-    IEnumerator Co_DotHeal(double lifetime, float gaptime, double healhp, double healmp)
+    IEnumerator Co_DotHeal(double lifetime, float gaptime, double healhp, double healmp, string effect = "")
     {
+        bool isEffect = !string.IsNullOrEmpty(effect);
         while (lifetime > 0)
         {
             yield return new WaitForSeconds(gaptime);
@@ -1557,6 +1558,8 @@ public class Actor : MyCoroutine
             Heal(healhp);
             Heal_MP(healmp);
 
+            if (isEffect) InGameInfo.Ins.Show_Effect(effect, this, eEffectLocation.Bottom, 1f);
+
             lifetime -= gaptime;
         }
         co_dotheal = null;

Assets/Script/Character/Mob/Boss/Boss_FlowerDryad.cs

@@ -7,6 +7,8 @@ public class Boss_FlowerDryad : BossMobActor
 {
     [Header("스킬1 쿨타임")]
     public float Skill1CoolTime = 20f;
+    [Header("스킬1 차징 시간")]
+    public float Skill1ChargingTime = 3f;
     [Header("스킬1 즉시 회복량")]
     public float Skill1Heal = 0.1f;
     [Header("스킬1 주변 몬스터 찾는 거리")]
@@ -47,7 +49,7 @@ public class Boss_FlowerDryad : BossMobActor
         CoolTime_Skill1 = 1f;
         CoolTime_Skill2 = 2f;
 
-        CoolTime_Skill1 = 10000f;
+        //CoolTime_Skill1 = 10000f;
         CoolTime_Skill2 = 20000f;
     }
 
@@ -72,9 +74,14 @@ public class Boss_FlowerDryad : BossMobActor
     IEnumerator Co_Skill1()
     {
         Change_MobStatus(eMobStatus.Skill);
-        AnimationPlay("boss_skill1");
+        AnimationPlay("boss_skill1charging");
-        InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Skill1", Get_position());
+        InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Skill1Charging", this, eEffectLocation.Mid, Skill1ChargingTime);
+        yield return new WaitForSeconds(Skill1ChargingTime);
+
+        AnimationPlay("boss_skill1end");
         yield return new WaitForSeconds(0.5f);
+
+        InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Skill1", Get_position());
         var actors = ActorInfo.Ins.Get_AlliesActors(m_Enemy, Get_position(), Skill1FindDist);
         for (int i = 0; i < actors.Count; i++)
         {
@@ -84,10 +91,7 @@ public class Boss_FlowerDryad : BossMobActor
 
         yield return new WaitForSeconds(0.5f);
         for (int i = 0; i < actors.Count; i++)
-        {
+            actors[i].DotHeal(Skill1LifeTime, Skill1DelayTime, actors[i].Get_MaxHP() * Skill1PerHeal, 0, "Effect_FlowerDryad_Heal");
-            actors[i].DotHeal(Skill1LifeTime, Skill1DelayTime, actors[i].Get_MaxHP() * Skill1PerHeal, 0);
-            InGameInfo.Ins.Show_Effect("Effect_FlowerDryad_Heal", actors[i], eEffectLocation.Bottom, Skill1LifeTime);
-        }
 
         Check_Battle();
         Init(true, false);