diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 98d99377a..93fad634d 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Animations/pcanim_archer.controller b/Assets/Res_Addr/Animations/pcanim_archer.controller index 91401a529..fae546644 100644 --- a/Assets/Res_Addr/Animations/pcanim_archer.controller +++ b/Assets/Res_Addr/Animations/pcanim_archer.controller @@ -436,7 +436,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: archer_skill3 - m_Speed: 1 + m_Speed: 0.3 m_CycleOffset: 0 m_Transitions: - {fileID: 972797023798679901} diff --git a/Assets/Res_Addr/Skill/Skill_ArrowRain.prefab b/Assets/Res_Addr/Skill/Skill_ArrowRain.prefab index e9f514873..38ccd3989 100644 --- a/Assets/Res_Addr/Skill/Skill_ArrowRain.prefab +++ b/Assets/Res_Addr/Skill/Skill_ArrowRain.prefab @@ -31,7 +31,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4136742659422398755} + - {fileID: 6195061006339948957} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1210862221287417213 @@ -46,12 +46,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b4966d14a53d2d046b60cae7e6e24269, type: 3} m_Name: m_EditorClassIdentifier: + ColliderLayer: Actor m_Pierce: 1 str_HitEffect: + m_ShowTimeOverEffect: 1 m_Collider: {fileID: 3877254532724485144} Loop: 15 - DelayTime: 0.15 + DelayTime: 0.005 ColliderActiveFrame: 1 + lifetime: 2 --- !u!65 &3877254532724485144 BoxCollider: m_ObjectHideFlags: 0 @@ -71,9 +74,9 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 10, y: 10, z: 10} + m_Size: {x: 12, y: 10, z: 12} m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &4141565058658184683 +--- !u!1001 &5133336534223147877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -81,79 +84,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3809575434196242508} m_Modifications: - - target: {fileID: 1701074268541622, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} - propertyPath: m_Name - value: Magic attack - objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalPosition.y - value: -5 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + - target: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 199019743312160056, guid: ec40dcc0df25c9c44bb4f938a05e1482, + - target: {fileID: 1352207200325702395, guid: f59565eba1dcc67408eb1c473a217923, type: 3} - propertyPath: m_Materials.Array.size - value: 1 + propertyPath: m_Name + value: FX_splash_arrow_floor objectReference: {fileID: 0} - - target: {fileID: 199029111368862752, guid: ec40dcc0df25c9c44bb4f938a05e1482, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199276795878250424, guid: ec40dcc0df25c9c44bb4f938a05e1482, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199817319516983914, guid: ec40dcc0df25c9c44bb4f938a05e1482, - type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114228352284236026, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ec40dcc0df25c9c44bb4f938a05e1482, type: 3} ---- !u!4 &4136742659422398755 stripped + m_SourcePrefab: {fileID: 100100000, guid: f59565eba1dcc67408eb1c473a217923, type: 3} +--- !u!4 &6195061006339948957 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4893867491853512, guid: ec40dcc0df25c9c44bb4f938a05e1482, + m_CorrespondingSourceObject: {fileID: 1352207200325702392, guid: f59565eba1dcc67408eb1c473a217923, type: 3} - m_PrefabInstance: {fileID: 4141565058658184683} + m_PrefabInstance: {fileID: 5133336534223147877} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Script/Character/Projectile/Skill/Skill_ArrowRain.cs b/Assets/Script/Character/Projectile/Skill/Skill_ArrowRain.cs index 379eb8227..f73850427 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_ArrowRain.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_ArrowRain.cs @@ -17,7 +17,7 @@ public class Skill_ArrowRain : Projectile_StopAndColliderControl IEnumerator Co_Update() { - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(0.1f); StartCoroutine(Co_Collider()); } } \ No newline at end of file