pc 애님 수정, bead 스킬 크기 0.1 줄임

Assets/Ino_nerdnavis.txt

@@ -44,7 +44,7 @@ classconfig 에 의해 정해짐
 
 스킬 미리 로드
 
-1. 로비에 벽 추가 (추가 후 컬링 적용)
+//1. 로비에 벽 추가 (추가 후 컬링 적용)
 //2. 기본 스킬 구성 변경 및 펫(박쥐) 변경
 3. 조작 관련 버그 수정
 

Assets/Res_Addr/Animations/Animation/skill4.fbx.meta

@@ -60,14 +60,7 @@ ModelImporter:
       bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
       curves: []
       events:
-      - time: 0.6858006
+      - time: 0.685295
-        functionName: skill3_end
-        data: 
-        objectReferenceParameter: {instanceID: 0}
-        floatParameter: 0
-        intParameter: 0
-        messageOptions: 0
-      - time: 0.6873112
         functionName: SkillEvent
         data: 
         objectReferenceParameter: {instanceID: 0}

Assets/Res_Addr/Animations/pcanim_bluntshield.controller

@@ -22,6 +22,34 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &-8555701642663518885
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: skill4
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 3391588151088731830}
+  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: 1827226128182048838, guid: afd472c1ebdd3de47ac567f9d45e335a,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-6725469328595531331
 AnimatorState:
   serializedVersion: 6
@@ -289,7 +317,7 @@ AnimatorStateTransition:
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
-  m_ExitTime: 0.8557693
+  m_ExitTime: 1
   m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
@@ -391,7 +419,7 @@ AnimatorStateTransition:
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
-  m_ExitTime: 0.765625
+  m_ExitTime: 1
   m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
@@ -2132,16 +2160,19 @@ AnimatorStateMachine:
     m_Position: {x: 330, y: -590, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -3672313944669895854}
-    m_Position: {x: 330, y: -220, z: 0}
+    m_Position: {x: 290, y: -200, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5069386720096686000}
-    m_Position: {x: 430, y: -320, z: 0}
+    m_Position: {x: 500, y: -270, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 4977824145023039540}
     m_Position: {x: 550, y: -120, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 7096369400295471796}
-    m_Position: {x: 583.81665, y: -539.2338, z: 0}
+    m_Position: {x: 490, y: -430, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8555701642663518885}
+    m_Position: {x: 450, y: -40, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -2424,6 +2455,28 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &3391588151088731830
+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: 110222392}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8333334
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &4204748091047769646
 AnimatorStateTransition:
   m_ObjectHideFlags: 1

Assets/Res_Addr/Effect/Effect_Hit_Bead.prefab

@@ -61,17 +61,17 @@ PrefabInstance:
     - target: {fileID: 82855965759615310, guid: adba7694712da2b499b4bc4728de865f,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.3
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 82855965759615310, guid: adba7694712da2b499b4bc4728de865f,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.3
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 82855965759615310, guid: adba7694712da2b499b4bc4728de865f,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.3
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 82855965759615310, guid: adba7694712da2b499b4bc4728de865f,
         type: 3}

Assets/Res_Addr/Skill/Skill_Bead.prefab

@@ -70,8 +70,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 0.5904268, y: 0.6150998, z: 0.5558845}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0.017271176, y: 0.029607713, z: -0.009869218}
 --- !u!1001 &1055510018664997146
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -88,17 +88,17 @@ PrefabInstance:
     - target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.3
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.3
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.3
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
         type: 3}

Assets/Script/Character/Actor.cs

@@ -1608,15 +1608,17 @@ public class Actor : MyCoroutine
             m_NavMeshAgent.isStopped = true;
         Set_RunSmoke(false);
 
-        if (motion.Equals("casting"))
-        {
-            co_casting = StartCoroutine(Co_Casting(m_Magic.m_SkillTableData.f_CastingTime));
-            m_NavMeshAgent.ResetPath();
-        }
         if (!DSUtil.CheckNull(m_Magic))
         {
+            if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_NextAnimation))
+            {
+                co_casting = StartCoroutine(Co_Casting(m_Magic.m_SkillTableData.f_CastingTime));
+                m_NavMeshAgent.ResetPath();
+            }
+
             if (m_Magic.m_SkillTableData.e_Skill == eEffect.Skill_JumpAttack)
                 StartCoroutine(Co_JumpAttack());
+
             if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_CastingEffect))
                 InGameInfo.Ins.Show_Effect(m_Magic.m_SkillTableData.s_CastingEffect, Get_position());
         }
@@ -1626,7 +1628,7 @@ public class Actor : MyCoroutine
     IEnumerator Co_Casting(float castTime)
     {
         yield return new WaitForSeconds(castTime);
-        if (!DSUtil.CheckNull(m_Magic) && !string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_NextAnimation))
+        if (!DSUtil.CheckNull(m_Magic))
             AnimationPlay(m_Magic.m_SkillTableData.s_NextAnimation);
         else
             AnimationPlay("casting_end");