拳套普通攻击

2 years ago · 9e14c4e222
parent 81d4e85d5a
commit 9e14c4e222
43 changed files with 13226 additions and 9474 deletions
--- a/client/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset
@ -420,7 +420,7 @@ MonoBehaviour:
  m_Script: {fileID: -1676762633, guid: 23cdf4a0ba64c164d8ffb0c744ae259d, type: 3}
  m_Name: ArticyDatabase
  m_EditorClassIdentifier: 
-  mHierarchy: {fileID: 5319978887503100866}
+  mHierarchy: {fileID: 7666937796628045154}
  mLocalization: {fileID: -4256971298007036964}
  mInternalProject:
    mName: touhou
@ -707,6 +707,19 @@ MonoBehaviour:
  m_Name: ArticyScriptFragments
  m_EditorClassIdentifier: 
 --- !u!114 &6880224011786664382
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 1655710724, guid: 23cdf4a0ba64c164d8ffb0c744ae259d, type: 3}
+  m_Name: HierarchyManager
+  m_EditorClassIdentifier: 
+  serializedNodes: []
+--- !u!114 &7666937796628045154
 MonoBehaviour:
  m_ObjectHideFlags: 3
  m_CorrespondingSourceObject: {fileID: 0}
--- a/client/Assets/ArticyImporter/Content/Generated/Resources/gamedata.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/Resources/gamedata.asset
--- a/client/Assets/Game/Driver.unity
+++ b/client/Assets/Game/Driver.unity
@ -1475,7 +1475,7 @@ PlayableDirector:
  m_GameObject: {fileID: 1645380337361164332}
  m_Enabled: 1
  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: 1c56e66a1df59614383a8ea99af21081, type: 2}
+  m_PlayableAsset: {fileID: 11400000, guid: 8e366474e9fd2bd42a7661307d935cd3, type: 2}
  m_InitialState: 0
  m_WrapMode: 2
  m_DirectorUpdateMode: 1
@ -1611,6 +1611,10 @@ PlayableDirector:
    value: {fileID: 1645380337361164335}
  - key: {fileID: 2359698281133013487, guid: cb6c8d06eac093640ad53452562b8da0, type: 2}
    value: {fileID: 1645380337361164335}
+  - key: {fileID: 2359698281133013487, guid: 1600e23825c1b4e42be6ceeb7a4be5c6, type: 2}
+    value: {fileID: 1645380337361164335}
+  - key: {fileID: 2359698281133013487, guid: 8ade9e6ed33a1ba4c895aac2250ea577, type: 2}
+    value: {fileID: 1645380337361164335}
  m_ExposedReferences:
    m_References: []
 --- !u!212 &89448210413526911
--- a/client/Assets/Game/Scripts/ECS/Component/PauseComponent.cs
+++ b/client/Assets/Game/Scripts/ECS/Component/PauseComponent.cs
@ -35,7 +35,7 @@ namespace Game
        public static void EntityPause(GameEntity entity, float pauseTime, bool isTarget = true)
        {
            entity.pause.PauseTime = pauseTime;
-            if (isTarget) entity.pause.PausePreFrame = 1;
+            entity.pause.PausePreFrame = 1;
            EntityStopMove(entity.ID());
        }
    }
--- a/client/Assets/Game/Scripts/ObjectPool/PoolManager/EffectPoolManager/CastShadowPoolManager.cs
+++ b/client/Assets/Game/Scripts/ObjectPool/PoolManager/EffectPoolManager/CastShadowPoolManager.cs
@ -31,7 +31,8 @@ namespace Game

        private readonly Dictionary<ECastShadowType, string> _castShadowMap = new Dictionary<ECastShadowType, string>
        {
-            [ECastShadowType.Player] = "CastShadowPlayer",
+            [ECastShadowType.Common] = "CastShadowCommon",
+            [ECastShadowType.PlayerFlash] = "CastShadowPlayerFlash",
            [ECastShadowType.Monster] = "CastShadowMonster",
            [ECastShadowType.DeadBody] = "CastShadowDeadBody"
        };
@ -78,7 +79,7 @@ namespace Game
        }

        public void CreateCastShadow(Sprite sprite, Vector3 pos, Vector3 scale, float lifeTime = 500,
-            ECastShadowType castShadowType = ECastShadowType.Player)
+            ECastShadowType castShadowType = ECastShadowType.Common)
        {
            if (!_castShadowMap.ContainsKey(castShadowType)) Util.Print("残影类型不存在:", castShadowType);
            var castShadowId = _castShadowMap[castShadowType];
@ -115,8 +116,8 @@ namespace Game
 {
    public abstract partial class Util
    {
-        public static void CastShadow(Sprite sprite, Vector3 pos, Vector3 scale, float lifeTime = 500,
-            ECastShadowType castShadowType = ECastShadowType.Player)
+        public static void CastShadow(Sprite sprite, Vector3 pos, Vector3 scale, float lifeTime,
+            ECastShadowType castShadowType)
        {
            CastShadowPoolManager.Instance.CreateCastShadow(sprite, pos, scale, lifeTime, castShadowType);
        }
@ -130,7 +131,7 @@ namespace Game

 public partial class GameEntity
 {
-    public void CastShadow(float lifeTime = 150, ECastShadowType castShadowType = ECastShadowType.Player)
+    public void CastShadow(float lifeTime = 150, ECastShadowType castShadowType = ECastShadowType.Common)
    {
        Util.CastShadow(view.SpriteRenderer.sprite, view.PositionView, view.TransformViewMain.localScale, lifeTime,
            castShadowType);
--- a/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipCastShadow.cs
+++ b/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipCastShadow.cs
@ -2,7 +2,8 @@ namespace Game
 {
    public enum ECastShadowType
    {
-        Player,
+        Common,
+        PlayerFlash,
        Monster,
        DeadBody,
    }
--- a/client/Assets/Game/Scripts/UI/Sub/PageHeadbar.cs
+++ b/client/Assets/Game/Scripts/UI/Sub/PageHeadbar.cs
@ -97,6 +97,12 @@ namespace Game
            foreach (var entityId in _allTargets)
            {
                var entity = Util.GetEntity(entityId);
+                if (entity is null)
+                {
+                    Util.Print("实体状态错误:", entityId);
+                    continue;
+                }
+
                var posScreen = GetScreenPos(Util.EntityViewPos(entity));
                if (_hpBarDict.TryGetValue(entityId, out var hpBar))
                    hpBar.Component.SetPosition(posScreen.x, posScreen.y - 80, posScreen.z);
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack03.anim
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack03.anim
@ -28,17 +28,8 @@ AnimationClip:
    - time: 0.2
      value: {fileID: -661289926974723502, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
-    - time: 0.3
-      value: {fileID: 4530976701101864107, guid: 1d63c07499ddee94d8b967b31dd9da04,
-        type: 3}
-    - time: 0.4
-      value: {fileID: 1933239772204458355, guid: 1d63c07499ddee94d8b967b31dd9da04,
-        type: 3}
-    - time: 0.5
-      value: {fileID: 563448491438709365, guid: 1d63c07499ddee94d8b967b31dd9da04,
-        type: 3}
-    - time: 0.56
-      value: {fileID: 563448491438709365, guid: 1d63c07499ddee94d8b967b31dd9da04,
+    - time: 0.26000002
+      value: {fileID: -661289926974723502, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    attribute: m_Sprite
    path: 
@ -62,16 +53,13 @@ AnimationClip:
    - {fileID: 5055994612885570779, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
    - {fileID: -6507891709860090608, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
    - {fileID: -661289926974723502, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 4530976701101864107, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 1933239772204458355, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 563448491438709365, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 563448491438709365, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -661289926974723502, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.6
+    m_StopTime: 0.3
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack03_back.anim
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack03_back.anim
@ -20,13 +20,13 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 6256075483326691204, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 4530976701101864107, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.1
-      value: {fileID: 5217242233165601889, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 1933239772204458355, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.16
-      value: {fileID: 5217242233165601889, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 1933239772204458355, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    attribute: m_Sprite
    path: 
@ -47,9 +47,9 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: 6256075483326691204, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 5217242233165601889, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 5217242233165601889, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 4530976701101864107, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 1933239772204458355, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 1933239772204458355, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack04.anim
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack04.anim
@ -20,25 +20,25 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 3367469966936291814, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 563448491438709365, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.1
-      value: {fileID: 7393926969486243784, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 6256075483326691204, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.2
-      value: {fileID: -2109186563944876932, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 5217242233165601889, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.3
-      value: {fileID: -1525976867969996331, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 3367469966936291814, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.4
-      value: {fileID: 4837589319540300196, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 7393926969486243784, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.5
-      value: {fileID: -6588010476992105736, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: -2109186563944876932, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.56
-      value: {fileID: -6588010476992105736, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: -2109186563944876932, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    attribute: m_Sprite
    path: 
@ -59,13 +59,13 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
+    - {fileID: 563448491438709365, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 6256075483326691204, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 5217242233165601889, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
    - {fileID: 3367469966936291814, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
    - {fileID: 7393926969486243784, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
    - {fileID: -2109186563944876932, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: -1525976867969996331, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: 4837589319540300196, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: -6588010476992105736, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: -6588010476992105736, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -2109186563944876932, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack04_back.anim
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack04_back.anim
@ -20,13 +20,13 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 3549403432491994954, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: -1525976867969996331, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.1
-      value: {fileID: -5621871420082264337, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 4837589319540300196, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    - time: 0.16
-      value: {fileID: -5621871420082264337, guid: 1d63c07499ddee94d8b967b31dd9da04,
+      value: {fileID: 4837589319540300196, guid: 1d63c07499ddee94d8b967b31dd9da04,
        type: 3}
    attribute: m_Sprite
    path: 
@ -47,9 +47,9 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: 3549403432491994954, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: -5621871420082264337, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
-    - {fileID: -5621871420082264337, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -1525976867969996331, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 4837589319540300196, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 4837589319540300196, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack05.anim
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack05.anim
@ -0,0 +1,89 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: hero01_fist_attack05
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -6588010476992105736, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.1
+      value: {fileID: 3549403432491994954, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.2
+      value: {fileID: -5621871420082264337, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.3
+      value: {fileID: -8436108819864135497, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.4
+      value: {fileID: 5407329561112976166, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.46
+      value: {fileID: 5407329561112976166, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 25
+  m_WrapMode: 1
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -6588010476992105736, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 3549403432491994954, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -5621871420082264337, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -8436108819864135497, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 5407329561112976166, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: 5407329561112976166, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack05.anim.meta
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack05.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 421f524b7eb849441a9f38ae0c837cda
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack05_back.anim
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack05_back.anim
@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: hero01_fist_attack05_back
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 1115280033404255291, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.1
+      value: {fileID: -1064886249825086757, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    - time: 0.16
+      value: {fileID: -1064886249825086757, guid: 1d63c07499ddee94d8b967b31dd9da04,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 25
+  m_WrapMode: 1
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 1115280033404255291, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -1064886249825086757, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+    - {fileID: -1064886249825086757, guid: 1d63c07499ddee94d8b967b31dd9da04, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.19999999
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/client/Assets/Resources/Character/hero01/hero01_fist_attack05_back.anim.meta
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_attack05_back.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c1ce73393225587489b508f68bd836c5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Character/hero01/hero01_fist_normal_attack.png
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_normal_attack.png
--- a/client/Assets/Resources/Character/hero01/hero01_fist_normal_attack.png.meta
+++ b/client/Assets/Resources/Character/hero01/hero01_fist_normal_attack.png.meta
@ -83,6 +83,18 @@ TextureImporter:
  - first:
      213: -5621871420082264337
    second: hero01_fist_normal_attack26
+  - first:
+      213: -8436108819864135497
+    second: hero01_fist_normal_attack27
+  - first:
+      213: 5407329561112976166
+    second: hero01_fist_normal_attack28
+  - first:
+      213: 1115280033404255291
+    second: hero01_fist_normal_attack29
+  - first:
+      213: -1064886249825086757
+    second: hero01_fist_normal_attack30
  externalObjects: {}
  serializedVersion: 11
  mipmaps:
@ -726,6 +738,90 @@ TextureImporter:
      indices: 
      edges: []
      weights: []
+    - serializedVersion: 2
+      name: hero01_fist_normal_attack27
+      rect:
+        serializedVersion: 2
+        x: 391
+        y: 131
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 7b8557989bbecea80800000000000000
+      internalID: -8436108819864135497
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: hero01_fist_normal_attack28
+      rect:
+        serializedVersion: 2
+        x: 521
+        y: 131
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 62b9b992691ba0b40800000000000000
+      internalID: 5407329561112976166
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: hero01_fist_normal_attack29
+      rect:
+        serializedVersion: 2
+        x: 651
+        y: 131
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: b3c752808454a7f00800000000000000
+      internalID: 1115280033404255291
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: hero01_fist_normal_attack30
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: bd25af80993c831f0800000000000000
+      internalID: -1064886249825086757
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
    outline: []
    physicsShape: []
    bones: []
--- a/client/Assets/Resources/Character/hero01_fist_normal_attack.aseprite
+++ b/client/Assets/Resources/Character/hero01_fist_normal_attack.aseprite
--- a/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowCommon.prefab
+++ b/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowCommon.prefab
@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6608794153274969044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6608794153274969042}
+  - component: {fileID: 6608794153274969045}
+  m_Layer: 0
+  m_Name: CastShadowDeadBody
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6608794153274969042
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6608794153274969044}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 3.581, y: 0.979, z: -1.3772613}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &6608794153274969045
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6608794153274969044}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 673285d80149b5c4e914c503fa048f1b, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -248419617
+  m_SortingLayer: 3
+  m_SortingOrder: -1
+  m_Sprite: {fileID: 9044786021765537137, guid: 8142b0399fe09a14c929e8dfcba09863,
+    type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 2, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
--- a/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowCommon.prefab.meta
+++ b/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowCommon.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c468e35ca71d1cd47802154b1042cdeb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowPlayerFlash.prefab
+++ b/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowPlayerFlash.prefab
@ -11,7 +11,7 @@ GameObject:
  - component: {fileID: 6608794153274969042}
  - component: {fileID: 6608794153274969045}
  m_Layer: 0
-  m_Name: CastShadowPlayer
+  m_Name: CastShadowPlayerFlash
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
--- a/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowPlayerFlash.prefab.meta
+++ b/client/Assets/Resources/Prefab/Effect/CastShadow/CastShadowPlayerFlash.prefab.meta
--- a/client/Assets/Resources/Prefab/Level/level0001.prefab
+++ b/client/Assets/Resources/Prefab/Level/level0001.prefab
--- a/client/Assets/Resources/Timeline/bullet_monster01.playable
+++ b/client/Assets/Resources/Timeline/bullet_monster01.playable
@ -109,9 +109,6 @@ MonoBehaviour:
  m_Name: AttackClip(Clone)(Clone)
  m_EditorClassIdentifier: 
  template:
-    isRaycast: 0
-    center: {x: 0, y: 0, z: 0}
-    halfExtents: {x: 0.5, y: 0.5, z: 0.5}
    flowSpeed: {x: 2, y: 1, z: 0}
    flowTime: 0
    isFlow: 0
@ -120,6 +117,16 @@ MonoBehaviour:
    staggerLevel: 1
    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
--- a/client/Assets/Resources/Timeline/bullet_monster02.playable
+++ b/client/Assets/Resources/Timeline/bullet_monster02.playable
@ -308,17 +308,24 @@ MonoBehaviour:
  m_Name: AttackClip(Clone)(Clone)
  m_EditorClassIdentifier: 
  template:
-    isRaycast: 0
-    center: {x: 0, y: 0, z: 0}
-    halfExtents: {x: 1.5, y: 1.5, z: 1.5}
    flowSpeed: {x: 5, y: 4, z: 0}
    flowTime: 0
    isFlow: 1
    damageRate: 1
    stunRate: 0
    staggerLevel: 2
-    pauseTime: 0.15
+    pauseTime: 0
    hitId: 0
+    hitType: 0
+    hitOrderType: 0
+    hitDirType: 0
+    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
--- a/client/Assets/Resources/Timeline/skill_boss0104.playable
+++ b/client/Assets/Resources/Timeline/skill_boss0104.playable
@ -904,17 +904,24 @@ MonoBehaviour:
  m_Name: AttackClip
  m_EditorClassIdentifier: 
  template:
-    isRaycast: 0
-    center: {x: 1, y: 1, z: 0}
-    halfExtents: {x: 4, y: 1, z: 4}
    flowSpeed: {x: 4, y: 4, z: 0}
    flowTime: 0
    isFlow: 1
    damageRate: 0
    stunRate: 0
    staggerLevel: 2
-    pauseTime: 0.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 &5749363475119900345
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack01.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack01.playable
@ -730,18 +730,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: 1, z: 0}
    flowTime: 0
    isFlow: 0
    damageRate: 1
    stunRate: 1
    staggerLevel: 2
-    pauseTime: 0.1
+    pauseTime: 2
    hitId: 0
    hitType: 1
+    hitOrderType: 1
+    hitDirType: 1
+    Type: 3
+    Offset: {x: 1, y: 0, z: 0}
+    Height: 2.5
+    SizeX: 3
+    SizeY: 2.5
+    Radius: 0
+    Angle: 0
 --- !u!114 &5178577764301111608
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack02.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack02.playable
@ -707,18 +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: 3, y: 1, z: 0}
+    flowSpeed: {x: 2, y: 1, z: 0}
    flowTime: 0
    isFlow: 0
    damageRate: 1
    stunRate: 1
    staggerLevel: 2
-    pauseTime: 0.2
+    pauseTime: 2
    hitId: 0
    hitType: 1
+    hitOrderType: 4
+    hitDirType: 1
+    Type: 3
+    Offset: {x: 1, y: 0, z: 0}
+    Height: 3
+    SizeX: 3
+    SizeY: 2.5
+    Radius: 0
+    Angle: 0
 --- !u!114 &5178577764301111608
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack03.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack03.playable
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack03.playable.meta
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack03.playable.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 43c07429006d87d45bdccfa50b7641b9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack04.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack04.playable
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack04.playable.meta
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack04.playable.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 64536f40264920c45a5087983be0ace7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack05.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack05.playable
--- a/client/Assets/Resources/Timeline/skill_hero01_fist_attack05.playable.meta
+++ b/client/Assets/Resources/Timeline/skill_hero01_fist_attack05.playable.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0e3790cb939be9d41ae7980a540ea01a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/client/Assets/Resources/Timeline/skill_hero01_long_flash.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_long_flash.playable
@ -829,7 +829,7 @@ MonoBehaviour:
  m_Name: CastShadowClip
  m_EditorClassIdentifier: 
  template:
-    castShadowType: 0
+    castShadowType: 1
 --- !u!114 &4060734623337436353
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/client/Assets/Resources/Timeline/skill_hero01_long_skill01.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill01.playable
@ -65,7 +65,7 @@ MonoBehaviour:
  m_Name: CastShadowClip
  m_EditorClassIdentifier: 
  template:
-    castShadowType: 0
+    castShadowType: 1
 --- !u!114 &-5493165062151283881
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_long_skill02.playable
@ -71,7 +71,7 @@ MonoBehaviour:
  m_Name: CastShadowClip
  m_EditorClassIdentifier: 
  template:
-    castShadowType: 0
+    castShadowType: 1
 --- !u!114 &-5493165062151283881
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/client/Assets/Resources/Timeline/skill_hero01_short_attack03.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_short_attack03.playable
@ -57,7 +57,7 @@ MonoBehaviour:
  m_Name: AttackClip(Clone)(Clone)
  m_EditorClassIdentifier: 
  template:
-    flowSpeed: {x: 4, y: 1, z: 0}
+    flowSpeed: {x: 3, y: 1, z: 0}
    flowTime: 0
    isFlow: 0
    damageRate: 0.5
--- a/client/Assets/Resources/Timeline/skill_hero01_short_attack04.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_short_attack04.playable
@ -714,6 +714,20 @@ MonoBehaviour:
  m_Loop: 0
  m_Version: 1
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &-3109894867671269259
+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: c5a9540b4b499b94fa907f7b7bc0de6c, type: 3}
+  m_Name: CastShadowClip
+  m_EditorClassIdentifier: 
+  template:
+    castShadowType: 0
 --- !u!114 &-1704311901145742241
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -806,6 +820,167 @@ MonoBehaviour:
    m_DisplayName: EffectClip
  m_Markers:
    m_Objects: []
+--- !u!114 &-1640663035676538139
+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: 2d5d37f656e7f134998b7e5125f32cf8, type: 3}
+  m_Name: Cast Shadow Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -3109894867671269259}
+    m_Duration: 0.1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1640663035676538139}
+    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: CastShadowClip
+  - m_Version: 1
+    m_Start: 0.36666666666666664
+    m_ClipIn: 0
+    m_Asset: {fileID: 8600402919616909314}
+    m_Duration: 0.1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1640663035676538139}
+    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: CastShadowClip
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-1234742085176691606
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -850,13 +1025,13 @@ MonoBehaviour:
  m_Version: 0
  m_Tracks:
  - {fileID: -4824941642191393376}
-  - {fileID: 6690682390998089378}
  - {fileID: -5493165062151283881}
  - {fileID: 5466744683385811380}
  - {fileID: 8065103114700200184}
  - {fileID: -4750574827767443630}
  - {fileID: -1704311901145742241}
  - {fileID: -4645220259691914875}
+  - {fileID: -1640663035676538139}
  m_FixedDuration: 0.9
  m_EditorSettings:
    m_Framerate: 60
@ -1089,29 +1264,6 @@ MonoBehaviour:
  m_Loop: 0
  m_Version: 1
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &6690682390998089378
-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: d7421195ee91cc94ab16ff867d0fd6db, type: 3}
-  m_Name: Slide Track
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children: []
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
 --- !u!114 &8065103114700200184
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -1204,3 +1356,17 @@ MonoBehaviour:
    m_DisplayName: CancelClip
  m_Markers:
    m_Objects: []
+--- !u!114 &8600402919616909314
+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: c5a9540b4b499b94fa907f7b7bc0de6c, type: 3}
+  m_Name: CastShadowClip(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  template:
+    castShadowType: 1
--- a/client/Assets/TimelineCustom/CastShadow/CastShadowBehaviour.cs
+++ b/client/Assets/TimelineCustom/CastShadow/CastShadowBehaviour.cs
@ -6,7 +6,7 @@ using Game;
 public class CastShadowBehaviour : PlayableBehaviour
 {
    [Rename("残影类型")]
-    public ECastShadowType castShadowType = ECastShadowType.Player;
+    public ECastShadowType castShadowType = ECastShadowType.PlayerFlash;
    public override void OnPlayableCreate(Playable playable)
    {

--- a/client/Assets/gamedata.articyu3d
+++ b/client/Assets/gamedata.articyu3d
@ -10458,6 +10458,192 @@
            }
          }
        },
+        {
+          "Type": "SkillMaster",
+          "Properties": {
+            "TechnicalName": "Ntt_B6789524",
+            "Id": "0x0100000000004C0A",
+            "Parent": "0x01000000000049FA",
+            "Attachments": [],
+            "DisplayName": "普通攻击03",
+            "Color": {
+              "r": 0.5764706,
+              "g": 0.75686276,
+              "b": 0.8
+            },
+            "Text": "",
+            "ExternalId": "",
+            "Position": {
+              "x": 302.0,
+              "y": 673.0
+            },
+            "ZIndex": 0.0,
+            "Size": {
+              "w": 256.0,
+              "h": 196.0
+            },
+            "PreviewImage": {
+              "ViewBox": {
+                "x": 0.0,
+                "y": 0.0,
+                "w": 0.0,
+                "h": 0.0
+              },
+              "Mode": "FromAsset",
+              "Asset": "0x0000000000000000"
+            },
+            "ShortId": 3061355812
+          },
+          "Template": {
+            "SkillCombo": {
+              "StanceStart": 2,
+              "StanceEnd": 3,
+              "TriggerType": 0,
+              "FreeLock": false,
+              "Weapon": "0x010000000000268E",
+              "SkillTrigger": []
+            },
+            "Skill": {
+              "Icon": "0x0000000000000000",
+              "Name": "普通攻击03",
+              "Describe": "",
+              "Timeline": "skill_hero01_fist_attack03",
+              "SoundList": [
+                "0x0100000000001297"
+              ],
+              "AttackType": 0,
+              "AttackRangeType": 0,
+              "AttackInputType": 0,
+              "AttackRate": 1.0,
+              "StunRate": 1.0,
+              "ExecuteRate": 1.0
+            }
+          }
+        },
+        {
+          "Type": "SkillMaster",
+          "Properties": {
+            "TechnicalName": "Ntt_BA7BDDA8",
+            "Id": "0x0100000000004C13",
+            "Parent": "0x01000000000049FA",
+            "Attachments": [],
+            "DisplayName": "普通攻击04",
+            "Color": {
+              "r": 0.5764706,
+              "g": 0.75686276,
+              "b": 0.8
+            },
+            "Text": "",
+            "ExternalId": "",
+            "Position": {
+              "x": 302.0,
+              "y": 673.0
+            },
+            "ZIndex": 0.0,
+            "Size": {
+              "w": 256.0,
+              "h": 196.0
+            },
+            "PreviewImage": {
+              "ViewBox": {
+                "x": 0.0,
+                "y": 0.0,
+                "w": 0.0,
+                "h": 0.0
+              },
+              "Mode": "FromAsset",
+              "Asset": "0x0000000000000000"
+            },
+            "ShortId": 3128679848
+          },
+          "Template": {
+            "SkillCombo": {
+              "StanceStart": 3,
+              "StanceEnd": 4,
+              "TriggerType": 0,
+              "FreeLock": false,
+              "Weapon": "0x010000000000268E",
+              "SkillTrigger": []
+            },
+            "Skill": {
+              "Icon": "0x0000000000000000",
+              "Name": "普通攻击04",
+              "Describe": "",
+              "Timeline": "skill_hero01_fist_attack04",
+              "SoundList": [
+                "0x0100000000001297"
+              ],
+              "AttackType": 0,
+              "AttackRangeType": 0,
+              "AttackInputType": 0,
+              "AttackRate": 1.0,
+              "StunRate": 1.0,
+              "ExecuteRate": 1.0
+            }
+          }
+        },
+        {
+          "Type": "SkillMaster",
+          "Properties": {
+            "TechnicalName": "Ntt_A28DE777",
+            "Id": "0x0100000000004C1C",
+            "Parent": "0x01000000000049FA",
+            "Attachments": [],
+            "DisplayName": "普通攻击05",
+            "Color": {
+              "r": 0.5764706,
+              "g": 0.75686276,
+              "b": 0.8
+            },
+            "Text": "",
+            "ExternalId": "",
+            "Position": {
+              "x": 286.0,
+              "y": 687.0
+            },
+            "ZIndex": 0.0,
+            "Size": {
+              "w": 256.0,
+              "h": 196.0
+            },
+            "PreviewImage": {
+              "ViewBox": {
+                "x": 0.0,
+                "y": 0.0,
+                "w": 0.0,
+                "h": 0.0
+              },
+              "Mode": "FromAsset",
+              "Asset": "0x0000000000000000"
+            },
+            "ShortId": 2727208823
+          },
+          "Template": {
+            "SkillCombo": {
+              "StanceStart": 4,
+              "StanceEnd": 5,
+              "TriggerType": 0,
+              "FreeLock": false,
+              "Weapon": "0x010000000000268E",
+              "SkillTrigger": []
+            },
+            "Skill": {
+              "Icon": "0x0000000000000000",
+              "Name": "普通攻击05",
+              "Describe": "",
+              "Timeline": "skill_hero01_fist_attack05",
+              "SoundList": [
+                "0x0100000000001297"
+              ],
+              "AttackType": 0,
+              "AttackRangeType": 0,
+              "AttackInputType": 0,
+              "AttackRate": 1.0,
+              "StunRate": 1.0,
+              "ExecuteRate": 1.0
+            }
+          }
+        },
        {
          "Type": "SkillMonster",
          "Properties": {
@ -20868,6 +21054,21 @@
                            "Id": "0x0100000000004A05",
                            "TechnicalName": "Ntt_0D6FD504",
                            "Type": "Entity"
+                          },
+                          {
+                            "Id": "0x0100000000004C0A",
+                            "TechnicalName": "Ntt_B6789524",
+                            "Type": "Entity"
+                          },
+                          {
+                            "Id": "0x0100000000004C13",
+                            "TechnicalName": "Ntt_BA7BDDA8",
+                            "Type": "Entity"
+                          },
+                          {
+                            "Id": "0x0100000000004C1C",
+                            "TechnicalName": "Ntt_A28DE777",
+                            "Type": "Entity"
                          }
                        ]
                      }
--- a/config/Partitions/'Entities'-TypedPartition(65471dbc-8598-4c8f-b7d5-a524fe2e9dd6).adpd
+++ b/config/Partitions/'Entities'-TypedPartition(65471dbc-8598-4c8f-b7d5-a524fe2e9dd6).adpd
--- a/config/Sessions/SessionData_LocalUser.adpd
+++ b/config/Sessions/SessionData_LocalUser.adpd