워리어 - 칼날 폭풍

Assets/Res_Addr/Animations/pcanim_twohand.controller

@@ -167,7 +167,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: MoveAttack1
-  m_Speed: 1
+  m_Speed: 2.5
   m_CycleOffset: 0
   m_Transitions: []
   m_StateMachineBehaviours: []

Assets/Res_Addr/Skill/Skill_Whirlwind.prefab

@@ -9760,7 +9760,7 @@ MonoBehaviour:
   m_Pierce: 1
   str_HitEffect: 
   lifeTime: 3
-  gapTime: 0.1
+  gapTime: 0.3
   m_HitChecker: {fileID: 6054281455070537181}
 --- !u!1 &4019177871371100394
 GameObject:

Assets/Script/Character/Actor.cs

@@ -265,6 +265,7 @@ public class Actor : MyCoroutine
             Play_Idle();
         }
     }
+    public virtual void Set_JoystickStatus(int status) { }
 
     public void Set_Warp(Vector3 _pos)
     {

Assets/Script/Character/PCActor.cs

@@ -16,7 +16,7 @@ public class PCActor : MyActor
     ObscuredFloat[] arr_magicMaxCoolTime = new ObscuredFloat[] { 0f, 0f, 0f, 0f, 0f, 0f };
     SkillListTableData[] arr_magicData = new SkillListTableData[6];
     SkillCard[] arr_PCSkillCard;
-    public bool IsJoystickMove { get; set; }
+    public int JoystickStatus = 0; // 0 조이스틱 x, 1 조이스틱 + run 애님, 2 조이스틱만
     ObscuredFloat m_AvoidCoolTime;
     protected ClassConfigTableData m_ClassData;
 
@@ -85,7 +85,7 @@ public class PCActor : MyActor
 
         Update_Move();
 
-        if (IsJoystickMove || IsStop || IsDead()) return;
+        if (JoystickStatus > 0 || IsStop || IsDead()) return;
 
         base.Update();
 
@@ -341,7 +341,9 @@ public class PCActor : MyActor
             //if (IsDead() || CurAnim >= eAnim.Skill1 || IsCC())
             if (IsDead() || IsCC() || CurAnim == eAnim.Dodge)
                 return;
-            Play_RunAnim();
+
+            if (JoystickStatus != 2)
+                Play_RunAnim();
 
             Del_Magic();
             Del_Target();
@@ -387,6 +389,12 @@ public class PCActor : MyActor
         }
     }
 
+    public override void Set_JoystickStatus(int status)
+    {
+        if (JoystickStatus == 2 && status < 3) return;
+        JoystickStatus = status == 3 ? 0 : status;
+    }
+
     public bool Check_Path(Vector3 pos)
     {
         if (!IsCC())
@@ -405,13 +413,6 @@ public class PCActor : MyActor
         NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.DieOrQuit);
     }
 
-    public override void Stop(bool _stop)
-    {
-        base.Stop(_stop);
-        // 투견장 없음
-        //if (InGameInfo.Ins.Get_CurStageData().Chapter == 105) IsStop = true;
-    }
-
     protected override IEnumerator Co_ScaleControl(bool returntoOriginalScale, float targetscale, Action actComplete = null)
     {
         if (returntoOriginalScale) targetscale = m_ClassData.f_Scale;

Assets/Script/Character/Projectile/Skill/Skill_Whirlwind.cs

@@ -21,16 +21,21 @@ public class Skill_Whirlwind : ProjectileBase
 
     IEnumerator Co_Update()
     {
+        m_ProjectTileData.shooter.Set_JoystickStatus(2);
         m_HitChecker.gameObject.SetActive(false);
         while (m_ProjectTileData.LifeTime > 0f)
         {
             yield return new WaitForSeconds(gapTime);
+            m_ProjectTileData.LifeTime -= gapTime;
             transform.position = m_ProjectTileData.shooter.Get_Center_position();
             m_HitChecker.gameObject.SetActive(true);
+
             yield return new WaitForSeconds(gapTime);
+            m_ProjectTileData.LifeTime -= gapTime;
             m_HitChecker.gameObject.SetActive(false);
         }
         Off(true);
-        // 캐릭터 idle로 만들기
+        m_ProjectTileData.shooter.Set_JoystickStatus(3);
+        m_ProjectTileData.shooter.Play_Idle();
     }
 }

Assets/ThirdParty/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs

@@ -55,7 +55,7 @@ public class FloatingJoystick : Joystick
         if (!DSUtil.CheckNull(MyValue.MyPC) && MyValue.MyPC.CanMove())
         {
             MyValue.MyPC.Set_AutoBraking(false);
-            MyValue.MyPC.IsJoystickMove = true;
+            MyValue.MyPC.Set_JoystickStatus(1);
         }
         base.OnPointerDown(eventData);
     }
@@ -66,7 +66,7 @@ public class FloatingJoystick : Joystick
         base.OnPointerUp(eventData);
         if (!DSUtil.CheckNull(MyValue.MyPC) && MyValue.MyPC.CanMove())
         {
-            MyValue.MyPC.IsJoystickMove = false;
+            MyValue.MyPC.Set_JoystickStatus(0);
             MyValue.MyPC.Set_AutoBraking(true);
             MyValue.m_RealCamera.Set_DistanceUp(false);
             MyValue.m_RealCamera.m_BackMove = false;