From 81d4e85d5a3004d11e48cb0c6e4d21efc8174e96 Mon Sep 17 00:00:00 2001 From: cd <-> Date: Sat, 10 Jun 2023 01:49:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BB=E5=87=BB=E6=A1=86=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Scripts/ECS/System/SettleSystem.cs | 2 +- .../Timeline/TimelineClip/ClipAttack.cs | 42 ++- client/Assets/Game/Scripts/_Define/Enum.cs | 12 + .../effect_skill_hero01_short_attack04.prefab | 8 +- .../Timeline/bullet_hero0102.playable | 6 +- .../Timeline/bullet_hero01_ms01.playable | 15 +- .../skill_hero01_long_air_attack01.playable | 17 +- .../skill_hero01_long_air_attack02.playable | 13 +- .../skill_hero01_long_air_attack03.playable | 15 +- .../skill_hero01_long_air_skill01.playable | 156 ++++++---- .../skill_hero01_long_air_skill02.playable | 38 ++- .../skill_hero01_long_attack01.playable | 11 +- .../skill_hero01_long_attack02.playable | 15 +- .../skill_hero01_long_attack03.playable | 30 +- .../skill_hero01_long_attack04.playable | 28 +- .../skill_hero01_long_skill01.playable | 17 +- .../skill_hero01_long_skill02.playable | 17 +- .../skill_hero01_long_skill0301.playable | 17 +- .../skill_hero01_long_skill0302.playable | 13 +- .../skill_hero01_long_skill0303.playable | 13 +- .../skill_hero01_short_attack01.playable | 57 +++- .../skill_hero01_short_attack02.playable | 17 +- .../skill_hero01_short_attack03.playable | 58 ++-- .../skill_hero01_short_attack04.playable | 292 ++++++++++++------ .../skill_hero01_short_skill01.playable | 31 +- .../skill_hero01_short_skill02.playable | 37 ++- .../TimelineCustom/Attack/AttackBehaviour.cs | 8 +- 27 files changed, 654 insertions(+), 331 deletions(-) diff --git a/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs b/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs index c0dc98c..6adab43 100644 --- a/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs +++ b/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs @@ -535,7 +535,7 @@ public class SettleSystem : IExecuteSystem, IInitializeSystem private static void SettleShake(EHitLevel hitLevel, GameEntity entity, GameEntity target) { Util.EntityShake(target, 3); - Util.EntityShake(entity, 2); + Util.EntityShake(entity, 1); } private static void SettleScale(Vector3 flowSpeed, GameEntity entity, GameEntity target) diff --git a/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs b/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs index 68f7db4..5e51cd5 100644 --- a/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs +++ b/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs @@ -53,8 +53,8 @@ namespace Game }); _tempTargetList.Sort((l, r) => { - var lRank = GetRank(param.hitDirType, l, castPos, castDir); - var rRank = GetRank(param.hitDirType, r, castPos, castDir); + var lRank = GetRank(param.hitOrderType, l, castPos, castDir); + var rRank = GetRank(param.hitOrderType, r, castPos, castDir); return lRank.CompareTo(rRank); }); var hitNum = _tempTargetList.Count; @@ -90,11 +90,12 @@ namespace Game } } - private Vector3 GetHitDir(EHitDirType hitDirType, GameEntity target, Vector3 castPos, Vector3 castDir) + private Vector3 GetHitDir(EHitDirType hitOrderType, GameEntity target, Vector3 castPos, Vector3 castDir) { var targetPos = target.Pos(); var targetDir = targetPos - castPos; - switch (hitDirType) + targetDir.y = 0; + switch (hitOrderType) { case EHitDirType.Center: //从中心到外围 @@ -107,35 +108,50 @@ namespace Game return castDir; case EHitDirType.Clockwise: //顺时针 - return Vector3.Cross(targetDir, Vector3.down * (Owner.move.IsRight ? 1 : -1)); + return GetDirRot(targetDir, true); case EHitDirType.CounterClockwise: //逆时针 - return Vector3.Cross(targetDir, Vector3.up * (Owner.move.IsRight ? 1 : -1)); + return GetDirRot(targetDir, false); + case EHitDirType.CenterForward: + //中心向前 + return targetDir + castDir; + case EHitDirType.ClockwiseForward: + //顺时针向前 + return GetDirRot(targetDir, true) + castDir; + case EHitDirType.CounterClockwiseForward: + //逆时针向前 + return GetDirRot(targetDir, false) + castDir; } return targetDir; } - private float GetRank(EHitDirType hitDirType, GameEntity target, Vector3 castPos, Vector3 castDir) + private Vector3 GetDirRot(Vector3 targetDir, bool isClockwise) + { + var sub = (Owner.move.IsRight ? -1 : 1) * (isClockwise ? 1 : -1); + return Vector3.Cross(targetDir, Vector3.up * sub).normalized; + } + + private float GetRank(EHitOrderType hitOrderType, GameEntity target, Vector3 castPos, Vector3 castDir) { //小在前 var targetPos = target.Pos(); var targetDir = targetPos - castPos; - switch (hitDirType) + switch (hitOrderType) { - case EHitDirType.Center: + case EHitOrderType.Center: //按距离 return Vector3.Distance(targetPos, castPos); - case EHitDirType.Backward: + case EHitOrderType.Backward: //从前往后 return -Vector3.Dot(targetDir, castDir); - case EHitDirType.Forward: + case EHitOrderType.Forward: //从后往前 return Vector3.Dot(targetDir, castDir); - case EHitDirType.Clockwise: + case EHitOrderType.Clockwise: //顺时针 return -GetRankRot(castDir, targetDir); - case EHitDirType.CounterClockwise: + case EHitOrderType.CounterClockwise: //逆时针 return GetRankRot(castDir, targetDir); } diff --git a/client/Assets/Game/Scripts/_Define/Enum.cs b/client/Assets/Game/Scripts/_Define/Enum.cs index aba423a..208a2dd 100644 --- a/client/Assets/Game/Scripts/_Define/Enum.cs +++ b/client/Assets/Game/Scripts/_Define/Enum.cs @@ -154,6 +154,15 @@ namespace Game Blunt, } + public enum EHitOrderType + { + Center, + Forward, + Backward, + Clockwise, + CounterClockwise, + } + public enum EHitDirType { Center, @@ -161,5 +170,8 @@ namespace Game Backward, Clockwise, CounterClockwise, + CenterForward, + ClockwiseForward, + CounterClockwiseForward, } } \ No newline at end of file diff --git a/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_short_attack04.prefab b/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_short_attack04.prefab index fb2db83..065cb4f 100644 --- a/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_short_attack04.prefab +++ b/client/Assets/Resources/Prefab/Effect/effect_skill_hero01_short_attack04.prefab @@ -4832,7 +4832,7 @@ PrefabInstance: - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856, type: 3} propertyPath: m_LocalScale.z - value: 0.5 + value: 1.4 objectReference: {fileID: 0} - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856, type: 3} @@ -4842,12 +4842,12 @@ PrefabInstance: - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856, type: 3} propertyPath: m_LocalRotation.w - value: 0.38268343 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856, type: 3} propertyPath: m_LocalRotation.x - value: 0.92387956 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856, type: 3} @@ -4862,7 +4862,7 @@ PrefabInstance: - target: {fileID: 1591769590674358874, guid: 33da377d65010f8468eb462b6c382856, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 135 + value: 180 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 33da377d65010f8468eb462b6c382856, type: 3} diff --git a/client/Assets/Resources/Timeline/bullet_hero0102.playable b/client/Assets/Resources/Timeline/bullet_hero0102.playable index c6606f0..7b8abf2 100644 --- a/client/Assets/Resources/Timeline/bullet_hero0102.playable +++ b/client/Assets/Resources/Timeline/bullet_hero0102.playable @@ -244,12 +244,14 @@ MonoBehaviour: damageRate: 1 stunRate: 0 staggerLevel: 2 - pauseTime: 0.02 + pauseTime: 0 hitId: 0 hitType: 0 + hitOrderType: 1 + hitDirType: 1 Type: 1 Offset: {x: 0, y: 0, z: 0} - Height: 2 + Height: 4 SizeX: 0 SizeY: 0 Radius: 3 diff --git a/client/Assets/Resources/Timeline/bullet_hero01_ms01.playable b/client/Assets/Resources/Timeline/bullet_hero01_ms01.playable index cc83804..5feb3d5 100644 --- a/client/Assets/Resources/Timeline/bullet_hero01_ms01.playable +++ b/client/Assets/Resources/Timeline/bullet_hero01_ms01.playable @@ -239,17 +239,24 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 1 - center: {x: 0, y: 0, z: 0} - halfExtents: {x: 0, y: 0, z: 0} flowSpeed: {x: 0, y: 2, z: 0} flowTime: 0 isFlow: 0 damageRate: 1 stunRate: 0 staggerLevel: 2 - pauseTime: 0.15 + pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 1 + hitDirType: 1 + Type: 0 + Offset: {x: 0, y: 0, z: 0} + Height: 0 + SizeX: 0 + SizeY: 0 + Radius: 0 + Angle: 0 --- !u!114 &2359698281133013487 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_air_attack01.playable b/client/Assets/Resources/Timeline/skill_hero01_long_air_attack01.playable index 846a8c4..bed24bc 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_air_attack01.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_attack01.playable @@ -645,17 +645,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 1, y: 1, z: 0} flowTime: 0 isFlow: 0 - damageRate: 0.5 - stunRate: 0 + damageRate: 1 + stunRate: 1 staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 3 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 3 + SizeX: 0 + SizeY: 0 + Radius: 2.5 + Angle: 180 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_air_attack02.playable b/client/Assets/Resources/Timeline/skill_hero01_long_air_attack02.playable index 227c219..e366ab6 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_air_attack02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_attack02.playable @@ -582,9 +582,6 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 1, y: 1, z: 0} flowTime: 0 isFlow: 0 @@ -593,6 +590,16 @@ MonoBehaviour: staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 3.5 + SizeX: 0 + SizeY: 0 + Radius: 2.5 + Angle: 270 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_air_attack03.playable b/client/Assets/Resources/Timeline/skill_hero01_long_air_attack03.playable index faf58ce..5012d03 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_air_attack03.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_attack03.playable @@ -651,17 +651,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} flowSpeed: {x: 10, y: -10, z: 0} flowTime: 0 isFlow: 1 damageRate: 0 stunRate: 0 staggerLevel: 2 - pauseTime: 0.05 + pauseTime: 10 hitId: 0 + hitType: 0 + hitOrderType: 3 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 3.5 + SizeX: 0 + SizeY: 0 + Radius: 3 + Angle: 270 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill01.playable b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill01.playable index 9e6d38e..1b5a53c 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill01.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill01.playable @@ -37,6 +37,37 @@ MonoBehaviour: m_EditorClassIdentifier: template: stance: 0 +--- !u!114 &-5651395640113423993 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5193488e49d4746a0c9c840edd5e84, type: 3} + m_Name: AttackClip(Clone)(Clone) + m_EditorClassIdentifier: + template: + flowSpeed: {x: 1, y: 2, z: 0} + flowTime: 0 + isFlow: 0 + damageRate: 0.5 + stunRate: 1 + staggerLevel: 2 + pauseTime: 0 + hitId: 1 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: -1.5, z: 0} + Height: 6 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &-5493165062151283881 MonoBehaviour: m_ObjectHideFlags: 1 @@ -434,7 +465,7 @@ MonoBehaviour: - m_Version: 1 m_Start: 0.25 m_ClipIn: 0 - m_Asset: {fileID: -1302627539353015110} + m_Asset: {fileID: -5651395640113423993} m_Duration: 0.04999999999999999 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} @@ -503,8 +534,8 @@ MonoBehaviour: - m_Version: 1 m_Start: 0.3333333333333333 m_ClipIn: 0 - m_Asset: {fileID: 2914315655706815150} - m_Duration: 0.04999999999999993 + m_Asset: {fileID: -3452047000690312495} + m_Duration: 0.04999999999999999 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} m_EaseInDuration: 0 @@ -572,7 +603,7 @@ MonoBehaviour: - m_Version: 1 m_Start: 0.4166666666666667 m_ClipIn: 0 - m_Asset: {fileID: 4446513949259157190} + m_Asset: {fileID: 4073313782629639773} m_Duration: 0.04999999999999993 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} @@ -662,6 +693,37 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-3452047000690312495 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5193488e49d4746a0c9c840edd5e84, type: 3} + m_Name: AttackClip(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + template: + flowSpeed: {x: -1, y: 2, z: 0} + flowTime: 0 + isFlow: 0 + damageRate: 0.5 + stunRate: 1 + staggerLevel: 2 + pauseTime: 0 + hitId: 2 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: -1.5, z: 0} + Height: 6 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &-1704311901145742241 MonoBehaviour: m_ObjectHideFlags: 1 @@ -769,30 +831,6 @@ MonoBehaviour: template: stepType: 2 value: {x: 0, y: 2, z: 0} ---- !u!114 &-1302627539353015110 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e5193488e49d4746a0c9c840edd5e84, type: 3} - m_Name: AttackClip(Clone)(Clone)(Clone)(Clone) - m_EditorClassIdentifier: - template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} - flowSpeed: {x: -1, y: 2, z: 0} - flowTime: 0 - isFlow: 0 - damageRate: 0.5 - stunRate: 0 - staggerLevel: 2 - pauseTime: 0 - hitId: 2 --- !u!114 &-1234742085176691606 MonoBehaviour: m_ObjectHideFlags: 1 @@ -863,30 +901,6 @@ MonoBehaviour: template: stepType: 2 value: {x: 0, y: 1, z: 0} ---- !u!114 &2914315655706815150 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e5193488e49d4746a0c9c840edd5e84, type: 3} - m_Name: AttackClip(Clone)(Clone)(Clone)(Clone) - m_EditorClassIdentifier: - template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} - flowSpeed: {x: 1, y: 2, z: 0} - flowTime: 0 - isFlow: 0 - damageRate: 0.5 - stunRate: 0 - staggerLevel: 2 - pauseTime: 0 - hitId: 3 --- !u!114 &3753689292486213037 MonoBehaviour: m_ObjectHideFlags: 1 @@ -908,7 +922,7 @@ MonoBehaviour: offset: {x: 0, y: 0, z: 0} rotAdd: 0 rotAddRandom: 0 ---- !u!114 &4446513949259157190 +--- !u!114 &4073313782629639773 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -921,17 +935,24 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} - flowSpeed: {x: 0, y: 4, z: 0} + flowSpeed: {x: 1, y: 4, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.5 - stunRate: 0 + stunRate: 1 staggerLevel: 2 - pauseTime: 0 - hitId: 4 + pauseTime: 1 + hitId: 3 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: -1.5, z: 0} + Height: 6 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &4898924959087489963 MonoBehaviour: m_ObjectHideFlags: 1 @@ -945,17 +966,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} flowSpeed: {x: -1, y: 2, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.5 - stunRate: 0 + stunRate: 1 staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: -1.5, z: 0} + Height: 6 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable index d6918db..b6acffb 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable @@ -363,10 +363,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.18333333333333335 + m_Start: 0.18333333333333332 m_ClipIn: 0 m_Asset: {fileID: 4898924959087489963} - m_Duration: 0.11666666666666664 + m_Duration: 0.033333333333333354 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} m_EaseInDuration: 0 @@ -432,10 +432,10 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: AttackClip - m_Version: 1 - m_Start: 0.35 + m_Start: 0.4 m_ClipIn: 0 m_Asset: {fileID: 2914315655706815150} - m_Duration: 0.15000000000000002 + m_Duration: 0.09999999999999998 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} m_EaseInDuration: 0 @@ -804,17 +804,24 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone)(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} flowSpeed: {x: 10, y: -10, z: 0} flowTime: 0 isFlow: 1 damageRate: 0.5 stunRate: 0 staggerLevel: 2 - pauseTime: 0.05 + pauseTime: 3 hitId: 3 + hitType: 0 + hitOrderType: 3 + hitDirType: 5 + Type: 3 + Offset: {x: 0, y: -1.5, z: 0} + Height: 6 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &3753689292486213037 MonoBehaviour: m_ObjectHideFlags: 1 @@ -849,17 +856,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} flowSpeed: {x: 3, y: -3, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.5 stunRate: 0 staggerLevel: 2 - pauseTime: 0 + pauseTime: 1 hitId: 0 + hitType: 0 + hitOrderType: 3 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: -1.5, z: 0} + Height: 6 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable b/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable index 788f2ab..995df6c 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable @@ -712,23 +712,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - flowSpeed: {x: 10, y: 5, z: 0} + flowSpeed: {x: 2, y: 1, z: 0} flowTime: 0 isFlow: 0 damageRate: 1 stunRate: 1 staggerLevel: 2 - pauseTime: 5 + pauseTime: 3 hitId: 0 hitType: 0 - hitDirType: 3 - Type: 1 + hitOrderType: 3 + hitDirType: 1 + Type: 2 Offset: {x: 0, y: 0, z: 0} Height: 2 SizeX: 2 SizeY: 2 Radius: 2.5 - Angle: 180 + Angle: 120 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_attack02.playable b/client/Assets/Resources/Timeline/skill_hero01_long_attack02.playable index 9c3ea7b..bc8126a 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_attack02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_attack02.playable @@ -689,17 +689,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 3, y: 1, z: 0} flowTime: 0 isFlow: 0 damageRate: 1 stunRate: 1 staggerLevel: 2 - pauseTime: 0.01 + pauseTime: 2 hitId: 0 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 2.5 + Angle: 180 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_attack03.playable b/client/Assets/Resources/Timeline/skill_hero01_long_attack03.playable index 48a6dbe..4d11dde 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_attack03.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_attack03.playable @@ -50,17 +50,24 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 2} flowSpeed: {x: 4, y: 2, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.8 stunRate: 0.6 staggerLevel: 2 - pauseTime: 0.01 + pauseTime: 2 hitId: 1 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: 0, z: 0} + Height: 4 + SizeX: 4.5 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &-7034069076294384367 MonoBehaviour: m_ObjectHideFlags: 1 @@ -893,17 +900,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 2} flowSpeed: {x: 3, y: 2, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.8 stunRate: 0.6 staggerLevel: 2 - pauseTime: 0.01 + pauseTime: 2 hitId: 0 + hitType: 0 + hitOrderType: 3 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: 0, z: 0} + Height: 4 + SizeX: 4.5 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_attack04.playable b/client/Assets/Resources/Timeline/skill_hero01_long_attack04.playable index 40eac68..9d4a8af 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_attack04.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_attack04.playable @@ -811,18 +811,24 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 1.5, z: 0} - halfExtents: {x: 1, y: 1.5, z: 1} flowSpeed: {x: 5, y: 0, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.2 stunRate: 0 staggerLevel: 2 - pauseTime: 0.15 + pauseTime: 5 hitId: 0 hitType: 1 + hitOrderType: 1 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: 0, z: 0} + Height: 3 + SizeX: 2 + SizeY: 2 + Radius: 0 + Angle: 0 --- !u!114 &1677907268480028979 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1049,18 +1055,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 2, y: 1, z: 0} - halfExtents: {x: 3, y: 1.5, z: 2} flowSpeed: {x: 10, y: 2, z: 0} flowTime: 0 isFlow: 1 damageRate: 2 stunRate: 3 staggerLevel: 3 - pauseTime: 0.2 + pauseTime: 10 hitId: 5 hitType: 0 + hitOrderType: 1 + hitDirType: 1 + Type: 3 + Offset: {x: 2, y: 0, z: 0} + Height: 3 + SizeX: 6 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_skill01.playable b/client/Assets/Resources/Timeline/skill_hero01_long_skill01.playable index 7eb8638..6215ddb 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_skill01.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill01.playable @@ -750,17 +750,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 0, y: 1, z: 0} flowTime: 0 isFlow: 0 - damageRate: 0.5 - stunRate: 0 + damageRate: 1 + stunRate: 1 staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 1 + hitDirType: 1 + Type: 3 + Offset: {x: 2, y: 0, z: 0} + Height: 2.5 + SizeX: 4 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable b/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable index b731fa9..2173fcb 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable @@ -57,7 +57,7 @@ MonoBehaviour: m_Name: BreakClip m_EditorClassIdentifier: template: - stance: 0 + stance: 10 --- !u!114 &-6000804246123853921 MonoBehaviour: m_ObjectHideFlags: 1 @@ -834,17 +834,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} flowSpeed: {x: 1.5, y: 6, z: 0} flowTime: 0.1 isFlow: 1 damageRate: 1 stunRate: 1 staggerLevel: 2 - pauseTime: 0.1 + pauseTime: 5 hitId: 0 + hitType: 0 + hitOrderType: 1 + hitDirType: 1 + Type: 3 + Offset: {x: 0, y: 0, z: 0} + Height: 3 + SizeX: 4 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_skill0301.playable b/client/Assets/Resources/Timeline/skill_hero01_long_skill0301.playable index a3c83cf..99c4c9e 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_skill0301.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill0301.playable @@ -582,17 +582,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 3, y: 1, z: 0} flowTime: 0 isFlow: 0 - damageRate: 0.5 - stunRate: 0 + damageRate: 1 + stunRate: 1 staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 3 + hitDirType: 5 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 3.5 + Angle: 270 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_skill0302.playable b/client/Assets/Resources/Timeline/skill_hero01_long_skill0302.playable index fb2d71a..f19cae4 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_skill0302.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill0302.playable @@ -660,9 +660,6 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 2, y: 5, z: 0} flowTime: 0 isFlow: 1 @@ -671,6 +668,16 @@ MonoBehaviour: staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 0 + hitDirType: 0 + Type: 1 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 3.5 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_skill0303.playable b/client/Assets/Resources/Timeline/skill_hero01_long_skill0303.playable index be7cb19..8207712 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_skill0303.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill0303.playable @@ -52,9 +52,6 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 2} flowSpeed: {x: 0, y: 0, z: 0} flowTime: 0 isFlow: 0 @@ -63,6 +60,16 @@ MonoBehaviour: staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 1 + hitDirType: 1 + Type: 0 + Offset: {x: 0, y: 0, z: 0} + Height: 0 + SizeX: 0 + SizeY: 0 + Radius: 0 + Angle: 0 --- !u!114 &-7238521331727081598 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_short_attack01.playable b/client/Assets/Resources/Timeline/skill_hero01_short_attack01.playable index 0a082c0..5f9b171 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_short_attack01.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_short_attack01.playable @@ -168,8 +168,8 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -3813374883878662106} - m_Duration: 0.15 - m_TimeScale: 2 + m_Duration: 0.32 + m_TimeScale: 1 m_ParentTrack: {fileID: -4824941642191393376} m_EaseInDuration: 0 m_EaseOutDuration: 0 @@ -201,7 +201,25 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: [] + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -216,7 +234,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: attack0-1 - m_Version: 1 - m_Start: 0.15000000000000002 + m_Start: 0.32 m_ClipIn: 0.16666666666666674 m_Asset: {fileID: 6393506803891717977} m_Duration: 0.25 @@ -308,7 +326,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.08333333333333333 + m_Start: 0.18333333333333332 m_ClipIn: 0 m_Asset: {fileID: 4898924959087489963} m_Duration: 0.09999999999999995 @@ -400,7 +418,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.06666666666666667 + m_Start: 0.16666666666666666 m_ClipIn: 0 m_Asset: {fileID: -5427372598898556759} m_Duration: 0.1 @@ -514,7 +532,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.06666666666666667 + m_Start: 0.16666666666666666 m_ClipIn: 0 m_Asset: {fileID: 3296761848602947503} m_Duration: 0.10000000000000002 @@ -689,17 +707,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} - flowSpeed: {x: 2, y: 0, z: 0} + flowSpeed: {x: 2, y: 1, z: 0} flowTime: 0 isFlow: 0 - damageRate: 0.5 - stunRate: 0.1 + damageRate: 1 + stunRate: 1 staggerLevel: 2 - pauseTime: 0.03 + pauseTime: 2 hitId: 0 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 2.5 + Angle: 90 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 @@ -736,7 +761,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.15000000000000002 + m_Start: 0.32 m_ClipIn: 0 m_Asset: {fileID: -6273397637765869395} m_Duration: 0.25000000000000006 @@ -958,7 +983,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.15000000000000002 + m_Start: 0.32 m_ClipIn: 0 m_Asset: {fileID: 6199748208544002356} m_Duration: 0.25000000000000006 diff --git a/client/Assets/Resources/Timeline/skill_hero01_short_attack02.playable b/client/Assets/Resources/Timeline/skill_hero01_short_attack02.playable index c5aed1e..7e334ba 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_short_attack02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_short_attack02.playable @@ -689,17 +689,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} - flowSpeed: {x: 2, y: 0, z: 0} + flowSpeed: {x: 2, y: 1, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.5 stunRate: 0.1 staggerLevel: 2 - pauseTime: 0.03 + pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 3 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 2.5 + Angle: 180 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/client/Assets/Resources/Timeline/skill_hero01_short_attack03.playable b/client/Assets/Resources/Timeline/skill_hero01_short_attack03.playable index 2ff0b52..f54718d 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_short_attack03.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_short_attack03.playable @@ -57,17 +57,24 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} - flowSpeed: {x: 4, y: 0, z: 0} + flowSpeed: {x: 4, y: 1, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.5 stunRate: 0.1 staggerLevel: 3 - pauseTime: 0.03 + pauseTime: 0 hitId: 1 + hitType: 0 + hitOrderType: 3 + hitDirType: 7 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 3 + Angle: 270 --- !u!114 &-6273397637765869395 MonoBehaviour: m_ObjectHideFlags: 1 @@ -297,7 +304,7 @@ MonoBehaviour: m_Start: 0.000000000000000013877787807814457 m_ClipIn: 0 m_Asset: {fileID: -3813374883878662106} - m_Duration: 0.5833333333333334 + m_Duration: 0.6 m_TimeScale: 1 m_ParentTrack: {fileID: -4824941642191393376} m_EaseInDuration: 0 @@ -345,7 +352,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0.000000000000000013877787807814457 m_DisplayName: attack0-1 - m_Version: 1 - m_Start: 0.5833333333333334 + m_Start: 0.6 m_ClipIn: 0.16666666666666674 m_Asset: {fileID: 6393506803891717977} m_Duration: 0.4166666666666667 @@ -437,10 +444,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.16666666666666663 + m_Start: 0.2 m_ClipIn: 0 m_Asset: {fileID: 4898924959087489963} - m_Duration: 0.09999999999999998 + m_Duration: 0.03333333333333327 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} m_EaseInDuration: 0 @@ -506,10 +513,10 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: AttackClip - m_Version: 1 - m_Start: 0.41666666666666663 + m_Start: 0.5 m_ClipIn: 0 m_Asset: {fileID: -8119105558653064946} - m_Duration: 0.09999999999999995 + m_Duration: 0.033333333333333326 m_TimeScale: 1 m_ParentTrack: {fileID: -4750574827767443630} m_EaseInDuration: 0 @@ -781,7 +788,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.15 + m_Start: 0.18333333333333326 m_ClipIn: 0 m_Asset: {fileID: 3296761848602947503} m_Duration: 0.08333333333333334 @@ -850,7 +857,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: EffectClip - m_Version: 1 - m_Start: 0.4 + m_Start: 0.4666666666666667 m_ClipIn: 0 m_Asset: {fileID: -8451767964503661210} m_Duration: 0.08333333333333334 @@ -1025,17 +1032,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} - flowSpeed: {x: 2, y: 0, z: 0} + flowSpeed: {x: 2, y: 1, z: 0} flowTime: 0 isFlow: 0 damageRate: 0.5 stunRate: 0.1 staggerLevel: 2 - pauseTime: 0.03 + pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 3 + Angle: 270 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1072,10 +1086,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.5833333333333334 + m_Start: 0.6666666666666666 m_ClipIn: 0 m_Asset: {fileID: -6273397637765869395} - m_Duration: 0.4166666666666667 + m_Duration: 0.35000000000000003 m_TimeScale: 1 m_ParentTrack: {fileID: 5466744683385811380} m_EaseInDuration: 0 @@ -1308,10 +1322,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.5833333333333334 + m_Start: 0.6666666666666666 m_ClipIn: 0 m_Asset: {fileID: 6199748208544002356} - m_Duration: 0.4166666666666667 + m_Duration: 0.35000000000000003 m_TimeScale: 1 m_ParentTrack: {fileID: 8065103114700200184} m_EaseInDuration: 0 diff --git a/client/Assets/Resources/Timeline/skill_hero01_short_attack04.playable b/client/Assets/Resources/Timeline/skill_hero01_short_attack04.playable index 31b9e3c..d34131d 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_short_attack04.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_short_attack04.playable @@ -74,7 +74,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.21666666666666667 + m_Start: 0.36666666666666675 m_ClipIn: 0 m_Asset: {fileID: 2737164138792252920} m_Duration: 0.09999999999999999 @@ -143,7 +143,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: MovestepClip - m_Version: 1 - m_Start: 0.3166666666666666 + m_Start: 0.4666666666666667 m_ClipIn: 0 m_Asset: {fileID: -8130290148127641786} m_Duration: 0.033333333333333326 @@ -211,6 +211,144 @@ MonoBehaviour: m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 m_DisplayName: MovestepClip + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 715873601853412666} + m_Duration: 0.1 + m_TimeScale: 1 + m_ParentTrack: {fileID: -5493165062151283881} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: MovestepClip + - m_Version: 1 + m_Start: 0.1 + m_ClipIn: 0 + m_Asset: {fileID: -269371127701821151} + m_Duration: 0.2666666666666667 + m_TimeScale: 1 + m_ParentTrack: {fileID: -5493165062151283881} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: MovestepClip m_Markers: m_Objects: [] --- !u!114 &-5427372598898556759 @@ -252,7 +390,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -3813374883878662106} - m_Duration: 0.4666666666666667 + m_Duration: 0.75 m_TimeScale: 0.8 m_ParentTrack: {fileID: -4824941642191393376} m_EaseInDuration: 0 @@ -300,7 +438,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: attack0-1 - m_Version: 1 - m_Start: 0.4666666666666667 + m_Start: 0.75 m_ClipIn: 0.16666666666666674 m_Asset: {fileID: 6393506803891717977} m_Duration: 0.3333333333333333 @@ -392,7 +530,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.39999999999999974 + m_Start: 0.5333333333333332 m_ClipIn: 0 m_Asset: {fileID: 4898924959087489963} m_Duration: 0.06666666666666679 @@ -484,7 +622,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.3000000000000001 + m_Start: 0.46666666666666673 m_ClipIn: 0 m_Asset: {fileID: -5427372598898556759} m_Duration: 0.1 @@ -598,7 +736,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.36666666666666653 + m_Start: 0.5 m_ClipIn: 0 m_Asset: {fileID: 3296761848602947503} m_Duration: 0.10000000000000003 @@ -682,6 +820,21 @@ MonoBehaviour: m_EditorClassIdentifier: template: moveSpeedScale: -0.5 +--- !u!114 &-269371127701821151 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccdf4176012dbd6488d44300bc484b91, type: 3} + m_Name: MovestepClip(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + template: + stepType: 2 + value: {x: 0, y: 0, z: 0} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -724,6 +877,21 @@ MonoBehaviour: m_EditorClassIdentifier: template: moveSpeedScale: 0 +--- !u!114 &715873601853412666 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccdf4176012dbd6488d44300bc484b91, type: 3} + m_Name: MovestepClip(Clone)(Clone) + m_EditorClassIdentifier: + template: + stepType: 2 + value: {x: -10, y: 0, z: 0} --- !u!114 &2737164138792252920 MonoBehaviour: m_ObjectHideFlags: 1 @@ -738,7 +906,7 @@ MonoBehaviour: m_EditorClassIdentifier: template: stepType: 2 - value: {x: 10, y: 0, z: 0} + value: {x: 15, y: 0, z: 0} --- !u!114 &3296761848602947503 MonoBehaviour: m_ObjectHideFlags: 1 @@ -773,31 +941,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 10, y: 4, z: 0} flowTime: 0 isFlow: 1 damageRate: 0.5 stunRate: 0.1 staggerLevel: 2 - pauseTime: 0.3 + pauseTime: 15 hitId: 0 ---- !u!114 &5178577764301111608 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fdf2cb1599fe81f429a605a2282e5721, type: 3} - m_Name: SlideClip - m_EditorClassIdentifier: - template: - moveSpeedScale: -0.5 + hitType: 0 + hitOrderType: 4 + hitDirType: 5 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 4 + Angle: 270 --- !u!114 &5466744683385811380 MonoBehaviour: m_ObjectHideFlags: 1 @@ -820,10 +981,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.4666666666666667 + m_Start: 0.8666666666666667 m_ClipIn: 0 m_Asset: {fileID: -6273397637765869395} - m_Duration: 0.3333333333333333 + m_Duration: 0.21666666666666656 m_TimeScale: 1 m_ParentTrack: {fileID: 5466744683385811380} m_EaseInDuration: 0 @@ -948,76 +1109,7 @@ MonoBehaviour: m_Curves: {fileID: 0} m_Parent: {fileID: 11400000} m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 0.00000000000000006938893903907228 - m_ClipIn: 0 - m_Asset: {fileID: 5178577764301111608} - m_Duration: 0.0666666666666666 - m_TimeScale: 1 - m_ParentTrack: {fileID: 6690682390998089378} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: 0 - m_BlendOutDuration: 0 - m_MixInCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: SlideClip + m_Clips: [] m_Markers: m_Objects: [] --- !u!114 &8065103114700200184 @@ -1042,10 +1134,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.4666666666666667 + m_Start: 0.75 m_ClipIn: 0 m_Asset: {fileID: 6199748208544002356} - m_Duration: 0.3333333333333333 + m_Duration: 0.33333333333333326 m_TimeScale: 1 m_ParentTrack: {fileID: 8065103114700200184} m_EaseInDuration: 0 diff --git a/client/Assets/Resources/Timeline/skill_hero01_short_skill01.playable b/client/Assets/Resources/Timeline/skill_hero01_short_skill01.playable index 2803736..1d3a1d8 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_short_skill01.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_short_skill01.playable @@ -226,7 +226,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: MovestepClip - m_Version: 1 - m_Start: 0.4666666666666667 + m_Start: 0.5166666666666667 m_ClipIn: 0 m_Asset: {fileID: -4884960160254047825} m_Duration: 0.08333333333333337 @@ -295,7 +295,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: MovestepClip - m_Version: 1 - m_Start: 0.55 + m_Start: 0.6 m_ClipIn: 0 m_Asset: {fileID: 6022319710499769027} m_Duration: 0.025000000000000022 @@ -367,7 +367,7 @@ MonoBehaviour: m_Start: 0.3333333333333333 m_ClipIn: 0 m_Asset: {fileID: 4122853195007931045} - m_Duration: 0.13333333333333336 + m_Duration: 0.1833333333333334 m_TimeScale: 1 m_ParentTrack: {fileID: -5493165062151283881} m_EaseInDuration: 0 @@ -474,7 +474,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -3813374883878662106} - m_Duration: 0.5750000000000002 + m_Duration: 0.7200000000000002 m_TimeScale: 0.9999999999999999 m_ParentTrack: {fileID: -4824941642191393376} m_EaseInDuration: 0 @@ -522,7 +522,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: skill01 - m_Version: 1 - m_Start: 0.5750000000000002 + m_Start: 0.7200000000000002 m_ClipIn: 0.16666666666666674 m_Asset: {fileID: 6393506803891717977} m_Duration: 0.25 @@ -614,7 +614,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.5166666666666667 + m_Start: 0.6000000000000001 m_ClipIn: 0 m_Asset: {fileID: 4898924959087489963} m_Duration: 0.05833333333333346 @@ -706,7 +706,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.5 + m_Start: 0.55 m_ClipIn: 0 m_Asset: {fileID: -1034616549192481941} m_Duration: 0.13333333333333336 @@ -918,9 +918,6 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 1.5, y: 1, z: 0.5} flowSpeed: {x: 2, y: 1, z: 0} flowTime: 0 isFlow: 0 @@ -929,6 +926,16 @@ MonoBehaviour: staggerLevel: 2 pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 1 + hitDirType: 1 + Type: 2 + Offset: {x: 0, y: 0, z: 0} + Height: 2.5 + SizeX: 0 + SizeY: 0 + Radius: 2.5 + Angle: 180 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 @@ -965,7 +972,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.5750000000000002 + m_Start: 0.7200000000000002 m_ClipIn: 0 m_Asset: {fileID: -6273397637765869395} m_Duration: 0.25000000000000006 @@ -1294,7 +1301,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.5750000000000002 + m_Start: 0.7200000000000002 m_ClipIn: 0 m_Asset: {fileID: 6199748208544002356} m_Duration: 0.25000000000000006 diff --git a/client/Assets/Resources/Timeline/skill_hero01_short_skill02.playable b/client/Assets/Resources/Timeline/skill_hero01_short_skill02.playable index ca9caef..f0cf187 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_short_skill02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_short_skill02.playable @@ -94,7 +94,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.2833333333333333 + m_Start: 0.25 m_ClipIn: 0 m_Asset: {fileID: 2737164138792252920} m_Duration: 0.06666666666666665 @@ -235,7 +235,7 @@ MonoBehaviour: m_Start: 0.2 m_ClipIn: 0 m_Asset: {fileID: 4512695939630794149} - m_Duration: 0.08333333333333331 + m_Duration: 0.04999999999999999 m_TimeScale: 1 m_ParentTrack: {fileID: -5493165062151283881} m_EaseInDuration: 0 @@ -327,7 +327,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -3813374883878662106} - m_Duration: 0.35 + m_Duration: 0.4 m_TimeScale: 1.2 m_ParentTrack: {fileID: -4824941642191393376} m_EaseInDuration: 0 @@ -375,7 +375,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: skill02 - m_Version: 1 - m_Start: 0.35 + m_Start: 0.4 m_ClipIn: 0.16666666666666674 m_Asset: {fileID: 6393506803891717977} m_Duration: 0.16666666666666663 @@ -467,7 +467,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.2666666666666667 + m_Start: 0.25 m_ClipIn: 0 m_Asset: {fileID: 4898924959087489963} m_Duration: 0.08333333333333329 @@ -559,7 +559,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.25 + m_Start: 0.23333333333333334 m_ClipIn: 0 m_Asset: {fileID: -7578270908074388285} m_Duration: 0.11666666666666664 @@ -809,17 +809,24 @@ MonoBehaviour: m_Name: AttackClip m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 1, y: 1, z: 0} - halfExtents: {x: 2, y: 2, z: 1} flowSpeed: {x: 4, y: 8, z: 0} flowTime: 0 isFlow: 1 damageRate: 0 stunRate: 0 staggerLevel: 2 - pauseTime: 0.15 + pauseTime: 0 hitId: 0 + hitType: 0 + hitOrderType: 4 + hitDirType: 1 + Type: 3 + Offset: {x: 1, y: 0, z: 0} + Height: 4.5 + SizeX: 5 + SizeY: 2.5 + Radius: 0 + Angle: 0 --- !u!114 &5178577764301111608 MonoBehaviour: m_ObjectHideFlags: 1 @@ -856,7 +863,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.4 + m_Start: 0.45000000000000007 m_ClipIn: 0 m_Asset: {fileID: -6273397637765869395} m_Duration: 0.1166666666666667 @@ -1081,7 +1088,7 @@ MonoBehaviour: m_Start: 0.0033333333333333028 m_ClipIn: 0 m_Asset: {fileID: 5178577764301111608} - m_Duration: 0.1966666666666667 + m_Duration: 0.1466666666666667 m_TimeScale: 1 m_ParentTrack: {fileID: 6690682390998089378} m_EaseInDuration: 0 @@ -1170,7 +1177,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.2833333333333333 + m_Start: 0.24999999999999994 m_ClipIn: 0 m_Asset: {fileID: 3958005857307287008} m_Duration: 0.10000000000000003 @@ -1262,7 +1269,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.4 + m_Start: 0.45000000000000007 m_ClipIn: 0 m_Asset: {fileID: 6199748208544002356} m_Duration: 0.1166666666666667 @@ -1354,7 +1361,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.2833333333333333 + m_Start: 0.24999999999999994 m_ClipIn: 0 m_Asset: {fileID: 100926549614713125} m_Duration: 0.10000000000000003 diff --git a/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs b/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs index 160405a..c9d52e4 100644 --- a/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs +++ b/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs @@ -2,6 +2,7 @@ using System; using Game; using UnityEngine; using UnityEngine.Playables; +using UnityEngine.Serialization; [Serializable] public class AttackBehaviour : PlayableBehaviour @@ -9,13 +10,14 @@ public class AttackBehaviour : PlayableBehaviour [Rename("强制位移方向")] public Vector3 flowSpeed; [Rename("强制位移持续时间")] public float flowTime; [Rename("可以从地面击飞")] public bool isFlow; - [Rename("伤害修正")] public float damageRate; - [Rename("眩晕修正")] public float stunRate; + [Rename("伤害修正")] public float damageRate = 1; + [Rename("眩晕修正")] public float stunRate = 1; [Rename("硬直等级")] public int staggerLevel = 2; [Rename("卡帧时间(帧)")] public int pauseTime; [Rename("命中id")] public int hitId; //同一hitId视为一段伤害 [Rename("伤害类型")] public EHitType hitType; - [Rename("攻击方向")] public EHitDirType hitDirType; + [Rename("结算顺序")] public EHitOrderType hitOrderType = EHitOrderType.Forward; + [Rename("命中方向")] public EHitDirType hitDirType = EHitDirType.Forward; [Rename("命中形状")] public EShapeType Type; [Rename("偏移(格)")] public Vector3 Offset; [Rename("高度(格)")] public float Height;