10501 평타콤보

2025-06-21 07:23:07 +09:00 · 2025-06-21 07:23:07 +09:00 · e41ef24731
parent c913b65759
commit e41ef24731
17 changed files with 33640 additions and 56 deletions
--- a/Assets/ResWork/Table/butler.xlsm
+++ b/Assets/ResWork/Table/butler.xlsm
--- a/Assets/Res_Addr/Animations/Animation/10501.meta
+++ b/Assets/Res_Addr/Animations/Animation/10501.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c372b100421728d4b8245e16b14af9c7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack1_S.FBX
+++ b/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack1_S.FBX
--- a/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack1_S.FBX.meta
+++ b/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack1_S.FBX.meta
--- a/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack2_S.FBX
+++ b/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack2_S.FBX
--- a/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack2_S.FBX.meta
+++ b/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack2_S.FBX.meta
--- a/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack3_S.FBX
+++ b/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack3_S.FBX
--- a/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack3_S.FBX.meta
+++ b/Assets/Res_Addr/Animations/Animation/10501/Knight@Attack3_S.FBX.meta
--- a/Assets/Res_Addr/Animations/pcanim_bluntshield.controller
+++ b/Assets/Res_Addr/Animations/pcanim_bluntshield.controller
@ -1,27 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8581291956724290024
-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.9
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &-8555701642663518885
 AnimatorState:
  serializedVersion: 6
@ -176,33 +154,28 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1102 &-4177302407337328582
-AnimatorState:
-  serializedVersion: 6
+--- !u!1101 &-4347225539155235556
+AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: attack
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -8581291956724290024}
-  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: e926077eba5f2034499fb0f5fee0b287, type: 3}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
+  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.765625
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-3672313944669895854
 AnimatorState:
  serializedVersion: 6
@ -230,6 +203,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-3055149366964312981
+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: 4461428989869137638}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.70000005
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-2242026176269797008
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -2092,15 +2087,12 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 8958909966057575806}
    m_Position: {x: 310, y: -120, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -4177302407337328582}
-    m_Position: {x: -40, y: -210, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 4804184176358769930}
    m_Position: {x: -30, y: -550, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 2485565729275281912}
-    m_Position: {x: -40, y: -110, z: 0}
+    m_Position: {x: -270, y: -30, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 6195859188340975679}
    m_Position: {x: 210, y: -30, z: 0}
@ -2140,6 +2132,15 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: -8555701642663518885}
    m_Position: {x: 450, y: -40, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5762165277071601499}
+    m_Position: {x: -40, y: -230, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4461428989869137638}
+    m_Position: {x: -40, y: -160, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4663193439759760311}
+    m_Position: {x: -20, y: -90, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@ -2444,6 +2445,60 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &4461428989869137638
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Attack2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 5238331462133421289}
+  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: db8320dcdfa333c4792d870234191eb2, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &4663193439759760311
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Attack3
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -4347225539155235556}
+  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: b1c149f564b40ec499fc9051e840f8a7, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &4804184176358769930
 AnimatorState:
  serializedVersion: 6
@ -2526,6 +2581,55 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &5238331462133421289
+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: 4663193439759760311}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.71153843
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &5762165277071601499
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: attack
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3055149366964312981}
+  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: 08a96c56aa810cf4bb0a8288a2d136c4, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &6195859188340975679
 AnimatorState:
  serializedVersion: 6
--- a/Assets/Res_Addr/Effect/Effect_Slash_10501_1.prefab
+++ b/Assets/Res_Addr/Effect/Effect_Slash_10501_1.prefab
@ -11,7 +11,7 @@ GameObject:
  - component: {fileID: 1025451156603284880}
  - component: {fileID: 8558499595176826072}
  m_Layer: 0
-  m_Name: Effect_Slash_10501
+  m_Name: Effect_Slash_10501_1
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
--- a/Assets/Res_Addr/Effect/Effect_Slash_10501_1.prefab.meta
+++ b/Assets/Res_Addr/Effect/Effect_Slash_10501_1.prefab.meta
--- a/Assets/Res_Addr/Effect/Effect_Slash_10501_2.prefab
+++ b/Assets/Res_Addr/Effect/Effect_Slash_10501_2.prefab
--- a/Assets/Res_Addr/Effect/Effect_Slash_10501_2.prefab.meta
+++ b/Assets/Res_Addr/Effect/Effect_Slash_10501_2.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4725ecc968ef0ae4ab13d0e2bed4d56a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/Effect/Effect_Slash_10501_3.prefab
+++ b/Assets/Res_Addr/Effect/Effect_Slash_10501_3.prefab
@ -0,0 +1,124 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5164807117813024258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1025451156603284880}
+  - component: {fileID: 8558499595176826072}
+  m_Layer: 0
+  m_Name: Effect_Slash_10501_3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1025451156603284880
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5164807117813024258}
+  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: 2176211100115031897}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8558499595176826072
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5164807117813024258}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NoUseParticleTime: 1
+  OffTime: 1
+  e_EffectLocation: 0
+--- !u!1001 &4778320750145570577
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1025451156603284880}
+    m_Modifications:
+    - target: {fileID: 4130671758024245483, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_Name
+      value: Blue_Sword
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.171
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.656
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.89774686
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.17631759
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.38158566
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.13173896
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 12.476
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -48.528
+      objectReference: {fileID: 0}
+    - target: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -22.338
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: df658a8f5659e3845aa38812182dbac1, type: 3}
+--- !u!4 &2176211100115031897 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6657293390021939272, guid: df658a8f5659e3845aa38812182dbac1,
+    type: 3}
+  m_PrefabInstance: {fileID: 4778320750145570577}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Res_Addr/Effect/Effect_Slash_10501_3.prefab.meta
+++ b/Assets/Res_Addr/Effect/Effect_Slash_10501_3.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dc26a8097aad1c246b00d57b88eb5def
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/PC/Ai01.prefab
+++ b/Assets/Res_Addr/PC/Ai01.prefab
@ -7948,7 +7948,7 @@ Animator:
  m_GameObject: {fileID: 1996061924472238}
  m_Enabled: 1
  m_Avatar: {fileID: 9000000, guid: e5326b54f49cc50479cbf8508dc0e805, type: 3}
-  m_Controller: {fileID: 9100000, guid: 6febc7f686bdf2548a2da7524ba3d184, type: 2}
+  m_Controller: {fileID: 9100000, guid: 1c6db4fa620781947a116d69785fc547, type: 2}
  m_CullingMode: 1
  m_UpdateMode: 0
  m_ApplyRootMotion: 0
--- a/Assets/Script/Character/PCActor.cs
+++ b/Assets/Script/Character/PCActor.cs
@ -470,11 +470,12 @@ public class PCActor : MyActor
    {
        base.Play_Attack(_attack, _as, () =>
        {
-            if (!string.IsNullOrEmpty(m_ClassData.s_SlashPrefab))
-                Set_Coroutine(() =>
-                {
-                    InGameInfo.Ins.Show_Effect(m_ClassData.s_SlashPrefab, Get_position(), transform.eulerAngles);
-                }, m_ClassData.f_SlashStartDelay);
+            // 애니메이션 Event ShowEffect 로 변경 (확장성 및 공격 속도 고려)
+            //if (!string.IsNullOrEmpty(m_ClassData.s_SlashPrefab))
+            //    Set_Coroutine(() =>
+            //    {
+            //        InGameInfo.Ins.Show_Effect(m_ClassData.s_SlashPrefab, Get_position(), transform.eulerAngles);
+            //    }, m_ClassData.f_SlashStartDelay);
                
        });
    }