DESKTOP-FB72PO8\Administrator hai 1 mes
pai
achega
d458ea594c
Modificáronse 31 ficheiros con 2596 adicións e 1122 borrados
  1. 16 0
      Assets/Art/ArtHero/FaBao/fb_linglongta.prefab
  2. 16 0
      Assets/Art/ArtHero/FaBao/fb_wulonglun.prefab
  3. 1 1
      Assets/Art/ArtHero/Guixiu01.prefab
  4. 417 147
      Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable
  5. 1 1
      Assets/Art/HeroTimeLine/fb_yupingTimeline.playable
  6. 49 0
      Assets/Res/CombatHero/Guixiu01.prefab
  7. 131 131
      Assets/Res/CombatHero/fb_dao1.prefab
  8. 131 131
      Assets/Res/CombatHero/fb_ding1.prefab
  9. 98 98
      Assets/Res/CombatHero/fb_huohulu.prefab
  10. 195 195
      Assets/Res/CombatHero/fb_jian1.prefab
  11. 50 50
      Assets/Res/CombatHero/fb_jian2.prefab
  12. 571 0
      Assets/Res/CombatHero/fb_linglongta.prefab
  13. 7 0
      Assets/Res/CombatHero/fb_linglongta.prefab.meta
  14. 191 175
      Assets/Res/CombatHero/fb_wulonglun.prefab
  15. 138 138
      Assets/Res/CombatHero/fb_yuping.prefab
  16. 14 0
      Assets/Res/Config/MagicWeaponConfig.json
  17. 147 0
      Assets/Res/HeroAnimtion/fb_linglongta.asset
  18. 8 0
      Assets/Res/HeroAnimtion/fb_linglongta.asset.meta
  19. 197 0
      Assets/Res/HeroAnimtion/fb_wulonglun.asset
  20. 8 0
      Assets/Res/HeroAnimtion/fb_wulonglun.asset.meta
  21. 46 46
      Assets/Res/HeroAnimtion/fb_yuping.asset
  22. 0 0
      Assets/Res/TimeLineAssets/fb_linglongta_TD.txt
  23. 0 0
      Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt
  24. 0 0
      Assets/Res/TimeLineAssets/fb_yuping_TD.txt
  25. 136 4
      Assets/Scenes/testCombat.scene
  26. 2 0
      Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs
  27. 7 0
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901001.cs
  28. 13 5
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/SkillShow/XiaoShiAndShow.cs
  29. 6 0
      Assets/Scripts/GameUI/Editor/SerializationTimeLineTool.cs
  30. 0 0
      Assets/StreamingAssets/assetConfig.txt
  31. BIN=BIN
      Excel2Json/Excel/MagicWeapon.xlsx

+ 16 - 0
Assets/Art/ArtHero/FaBao/fb_linglongta.prefab

@@ -607,6 +607,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6613935423472405420}
   - component: {fileID: 5086437659844747645}
+  - component: {fileID: 6855237917919301779}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta_run
@@ -653,6 +654,21 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &6855237917919301779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7868357502261737964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 5086437659844747645}
+  _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+  _ActionOnDisable: 0
 --- !u!1001 &836779554076029260
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 16 - 0
Assets/Art/ArtHero/FaBao/fb_wulonglun.prefab

@@ -44,6 +44,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5828256341004794286}
   - component: {fileID: 3497124856034794264}
+  - component: {fileID: 3477136138644061699}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun
@@ -90,6 +91,21 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &3477136138644061699
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 805962483237130876}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 3497124856034794264}
+  _Transitions: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
+  _ActionOnDisable: 0
 --- !u!1 &930803022298037591
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Art/ArtHero/Guixiu01.prefab

@@ -1020,7 +1020,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DotName: hitpos
+  DotName: hitpos2
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &4558184596564946871

+ 417 - 147
Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable

@@ -351,6 +351,116 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &-7990616991488039303
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: -2386272951921601838}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.004029042087495327
+    m_ClipIn: 0
+    m_Asset: {fileID: -4790161396510054636}
+    m_Duration: 0.3333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7990616991488039303}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0.004029042087495327
+    m_DisplayName: Take 001
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
 --- !u!114 &-7544242966777951075
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -373,7 +483,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.55
+    m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6585205517704036416}
     m_Duration: 1
@@ -627,7 +737,7 @@ MonoBehaviour:
     m_DisplayName: fx_fb_bao
   m_Markers:
     m_Objects: []
---- !u!114 &-6338035570506245065
+--- !u!114 &-6683161270338213082
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -637,7 +747,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
-  m_Name: Animation Track (1)
+  m_Name: Animation Track
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -645,16 +755,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5875317742908195551}
+  m_Parent: {fileID: -3132860492426191746}
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0
+    m_Start: 0.004029042087495327
     m_ClipIn: 0
-    m_Asset: {fileID: 1955103773411730313}
-    m_Duration: 0.8666666666666667
+    m_Asset: {fileID: -4570304171498953636}
+    m_Duration: 0.5
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -6338035570506245065}
+    m_ParentTrack: {fileID: -6683161270338213082}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -715,8 +825,8 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 0
-    m_DisplayName: sk1
+    m_PreExtrapolationTime: 0.004029042087495327
+    m_DisplayName: show
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -737,33 +847,7 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
---- !u!114 &-5875317742908195551
-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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: sk1
-  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:
-  - {fileID: -6338035570506245065}
-  - {fileID: 212739854551984720}
-  - {fileID: -4563258645991923433}
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
---- !u!114 &-5309653085008744609
+--- !u!114 &-6338035570506245065
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -781,16 +865,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: 4125267898300374450}
+  m_Parent: {fileID: -5875317742908195551}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -3608551095578131316}
-    m_Duration: 1
+    m_Asset: {fileID: 1955103773411730313}
+    m_Duration: 0.8666666666666667
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -5309653085008744609}
+    m_ParentTrack: {fileID: -6338035570506245065}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -852,7 +936,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: run
+    m_DisplayName: sk1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -873,7 +957,7 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
---- !u!114 &-4563258645991923433
+--- !u!114 &-5875317742908195551
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -882,8 +966,8 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3fc2695741642bd42a34534ca2286500, type: 3}
-  m_Name: Customize Track
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: sk1
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -891,16 +975,42 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5875317742908195551}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: -6338035570506245065}
+  - {fileID: 212739854551984720}
+  - {fileID: -2583586318041871126}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-5309653085008744609
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 4125267898300374450}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 7035235217579906038}
-    m_Duration: 0.8666666666666667
+    m_Asset: {fileID: -3608551095578131316}
+    m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -4563258645991923433}
+    m_ParentTrack: {fileID: -5309653085008744609}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -958,14 +1068,32 @@ MonoBehaviour:
     m_ExposedParameterNames: []
     m_AnimationCurves: {fileID: 0}
     m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
+    m_PostExtrapolationMode: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: TimeLineMagicWeaponShowPointAsset
+    m_DisplayName: run
   m_Markers:
     m_Objects: []
---- !u!114 &-4270298856469144039
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &-4790161396510054636
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -974,24 +1102,46 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: show
+  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
   m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 1
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children:
-  - {fileID: -9151128744060106284}
-  - {fileID: -7456703728703065245}
-  - {fileID: -3742689821027064724}
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
---- !u!114 &-4166708294884011128
+  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &-4570304171498953636
+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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 631d581160118a643bdf747b97af7938, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &-4563258645991923433
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1000,8 +1150,8 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (1)
+  m_Script: {fileID: 11500000, guid: 3fc2695741642bd42a34534ca2286500, type: 3}
+  m_Name: Customize Track
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -1009,20 +1159,20 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -2327424553049336028}
+  m_Parent: {fileID: -3132860492426191746}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -1006495927623780658}
-    m_Duration: 1
+    m_Asset: {fileID: 7035235217579906038}
+    m_Duration: 0.33736237542082864
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -4166708294884011128}
+    m_ParentTrack: {fileID: -4563258645991923433}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
     m_MixInCurve:
       serializedVersion: 2
       m_Curve:
@@ -1080,10 +1230,10 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_fb_ta_show
+    m_DisplayName: TimeLineMagicWeaponShowPointAsset
   m_Markers:
     m_Objects: []
---- !u!114 &-3742689821027064724
+--- !u!114 &-4270298856469144039
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1092,8 +1242,34 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
-  m_Name: Animation Track
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: show
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: -9151128744060106284}
+  - {fileID: -7456703728703065245}
+  - {fileID: -3742689821027064724}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-4166708294884011128
+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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (1)
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -1101,20 +1277,20 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -4270298856469144039}
+  m_Parent: {fileID: -2327424553049336028}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -1196483264028893044}
+    m_Asset: {fileID: -1006495927623780658}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -3742689821027064724}
+    m_ParentTrack: {fileID: -4166708294884011128}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
-    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
     m_MixInCurve:
       serializedVersion: 2
       m_Curve:
@@ -1168,32 +1344,14 @@ MonoBehaviour:
     m_ExposedParameterNames: []
     m_AnimationCurves: {fileID: 0}
     m_Recordable: 0
-    m_PostExtrapolationMode: 1
-    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: Infinity
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: show
+    m_DisplayName: fx_fb_ta_show
   m_Markers:
     m_Objects: []
-  m_InfiniteClipPreExtrapolation: 0
-  m_InfiniteClipPostExtrapolation: 0
-  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
-  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
-  m_InfiniteClipTimeOffset: 0
-  m_InfiniteClipRemoveOffset: 0
-  m_InfiniteClipApplyFootIK: 1
-  mInfiniteClipLoop: 0
-  m_MatchTargetFields: 63
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_AvatarMask: {fileID: 0}
-  m_ApplyAvatarMask: 1
-  m_TrackOffset: 0
-  m_InfiniteClip: {fileID: 0}
-  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  m_ApplyOffsets: 0
---- !u!114 &-3618395797516268648
+--- !u!114 &-3742689821027064724
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1203,7 +1361,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
-  m_Name: Animation Track (1)
+  m_Name: Animation Track
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -1211,16 +1369,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -2386272951921601838}
+  m_Parent: {fileID: -4270298856469144039}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 2078934149789831478}
+    m_Asset: {fileID: -1196483264028893044}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: -3618395797516268648}
+    m_ParentTrack: {fileID: -3742689821027064724}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -1282,7 +1440,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: jiuo
+    m_DisplayName: show
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -1384,6 +1542,8 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -6683161270338213082}
+  - {fileID: -4563258645991923433}
   - {fileID: 9170510795377562389}
   m_Clips: []
   m_Markers:
@@ -1406,7 +1566,7 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: 6066816933775845479}
+  m_Parent: {fileID: -5875317742908195551}
   m_Children: []
   m_Clips:
   - m_Version: 1
@@ -1500,9 +1660,9 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -7990616991488039303}
   - {fileID: 6868245914243662454}
   - {fileID: 5275762601570267812}
-  - {fileID: -3618395797516268648}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1526,6 +1686,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: 1501360367786949402}
   - {fileID: -4166708294884011128}
   m_Clips: []
   m_Markers:
@@ -1861,6 +2022,116 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &1501360367786949402
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: -2327424553049336028}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.004029042087495327
+    m_ClipIn: 0
+    m_Asset: {fileID: 8340200925696115098}
+    m_Duration: 0.3333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 1501360367786949402}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0.004029042087495327
+    m_DisplayName: Take 001
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
 --- !u!114 &1628910551090322438
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2001,30 +2272,6 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
---- !u!114 &2078934149789831478
-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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: f538b168f24934d46bd78e03404c196e, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
 --- !u!114 &2827192286868722880
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2190,8 +2437,8 @@ MonoBehaviour:
   isNotRotate: 0
   isFollowRootTarget: 0
   isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
+  isLoop: 1
+  loopAlone: 1
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
@@ -2511,7 +2758,6 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -7544242966777951075}
-  - {fileID: -2583586318041871126}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -2638,7 +2884,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 1698660071088957519}
-    m_Duration: 1
+    m_Duration: 0.33736237542082864
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6868245914243662454}
     m_EaseInDuration: 0
@@ -2720,6 +2966,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   showPointType: 1
   customizePointName: hitpos2
+--- !u!114 &8340200925696115098
+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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &9170510795377562389
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2745,7 +3015,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -801085179303812374}
-    m_Duration: 1
+    m_Duration: 0.5040290420874953
     m_TimeScale: 1
     m_ParentTrack: {fileID: 9170510795377562389}
     m_EaseInDuration: 0

+ 1 - 1
Assets/Art/HeroTimeLine/fb_yupingTimeline.playable

@@ -1908,7 +1908,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 8666738322061625432}
-    m_Duration: 2
+    m_Duration: 1
     m_TimeScale: 1
     m_ParentTrack: {fileID: 5694890609897594120}
     m_EaseInDuration: 0

+ 49 - 0
Assets/Res/CombatHero/Guixiu01.prefab

@@ -1553,6 +1553,7 @@ Transform:
   m_Children:
   - {fileID: 3965317279486869929}
   - {fileID: 6962979753961269573}
+  - {fileID: 7447676878574061612}
   - {fileID: 4892451167953402893}
   - {fileID: 774881355960454443}
   - {fileID: 7508470614555230924}
@@ -2882,6 +2883,54 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1096971842754006168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8927138989218537323
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7447676878574061612}
+  - component: {fileID: 4234541882858168092}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7447676878574061612
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8927138989218537323}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.203, z: 1.001}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4234541882858168092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8927138989218537323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos2
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &8982038733500119066
 GameObject:
   m_ObjectHideFlags: 0

+ 131 - 131
Assets/Res/CombatHero/fb_dao1.prefab

@@ -1,37 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &141386048385065658
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1150173785715196050}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1150173785715196050
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 141386048385065658}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
-  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &809572923017224122
 GameObject:
   m_ObjectHideFlags: 0
@@ -80,98 +48,6 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &925340386716163884
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3261955100367052469}
-  - component: {fileID: 2380093427392102959}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbdao1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3261955100367052469
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 925340386716163884}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
-  m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2380093427392102959
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 925340386716163884}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, 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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
-  m_Bones:
-  - {fileID: 1150173785715196050}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1150173785715196050}
-  m_AABB:
-    m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
-    m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &1197942244180523888
 GameObject:
   m_ObjectHideFlags: 0
@@ -204,7 +80,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3562723674201918496}
-  - {fileID: 9008080792491880227}
+  - {fileID: 7591023246368955457}
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1164658870965195
@@ -228,6 +104,38 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &1480977607144959593
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8093477516719730593}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8093477516719730593
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1480977607144959593}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
+  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8565182548359739858}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3368977622504917241
 GameObject:
   m_ObjectHideFlags: 0
@@ -258,8 +166,8 @@ Transform:
   m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1150173785715196050}
-  - {fileID: 3261955100367052469}
+  - {fileID: 8093477516719730593}
+  - {fileID: 9008080792491880227}
   m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
@@ -461,6 +369,98 @@ Transform:
   - {fileID: 8565182548359739858}
   m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7073165360656030177
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7591023246368955457}
+  - component: {fileID: 6121306334062930883}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbdao1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7591023246368955457
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7073165360656030177}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
+  m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3762066587073657769}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &6121306334062930883
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7073165360656030177}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
+  m_Bones:
+  - {fileID: 3562723674201918496}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 3562723674201918496}
+  m_AABB:
+    m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
+    m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &7254858178270901454
 GameObject:
   m_ObjectHideFlags: 0
@@ -492,7 +492,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3762066587073657769}
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &1710891530179478069
 SkinnedMeshRenderer:
@@ -517,7 +517,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, type: 2}
+  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 3562723674201918496}
+  - {fileID: 8093477516719730593}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
+  m_RootBone: {fileID: 8093477516719730593}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}

+ 131 - 131
Assets/Res/CombatHero/fb_ding1.prefab

@@ -80,98 +80,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2393791984490224259
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 524041973763158377}
-  - component: {fileID: 8070402762927843443}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbding1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &524041973763158377
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2393791984490224259}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
-  m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8990132256551677773}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8070402762927843443
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2393791984490224259}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, 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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
-  m_Bones:
-  - {fileID: 4234833986501869406}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4234833986501869406}
-  m_AABB:
-    m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
-    m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &2538381807794004556
 GameObject:
   m_ObjectHideFlags: 0
@@ -202,8 +110,8 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4234833986501869406}
-  - {fileID: 524041973763158377}
+  - {fileID: 4132060160176276336}
+  - {fileID: 6712685394476199993}
   m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3188345402726710448
@@ -237,7 +145,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1894970939113486830}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &6658487836053436328
 SkinnedMeshRenderer:
@@ -262,7 +170,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, type: 2}
+  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -289,9 +197,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 8679617179344489080}
+  - {fileID: 4132060160176276336}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8679617179344489080}
+  m_RootBone: {fileID: 4132060160176276336}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
@@ -346,6 +254,38 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4249159165507645107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4132060160176276336}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4132060160176276336
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4249159165507645107}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8990132256551677773}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5064081042845336680
 GameObject:
   m_ObjectHideFlags: 0
@@ -378,7 +318,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 6712685394476199993}
+  - {fileID: 2691489221677646519}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -402,6 +342,98 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &5694383398396490978
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2691489221677646519}
+  - component: {fileID: 2666755878192624369}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbding1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2691489221677646519
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5694383398396490978}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
+  m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1894970939113486830}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2666755878192624369
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5694383398396490978}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
+  m_Bones:
+  - {fileID: 8679617179344489080}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8679617179344489080}
+  m_AABB:
+    m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
+    m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &7964700976913853489
 GameObject:
   m_ObjectHideFlags: 0
@@ -488,38 +520,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.51, y: 0.78772473, z: 0.43}
   m_Center: {x: 0, y: 0.34613764, z: 0}
---- !u!1 &8534410636891076050
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4234833986501869406}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4234833986501869406
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8534410636891076050}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
-  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8990132256551677773}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8843384990569662011
 GameObject:
   m_ObjectHideFlags: 0

+ 98 - 98
Assets/Res/CombatHero/fb_huohulu.prefab

@@ -65,7 +65,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 3617502521392103604}
+  - {fileID: 5945462629354462804}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -89,38 +89,6 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &1208908525749620386
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2493923320898620711}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2493923320898620711
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1208908525749620386}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2335015189209719553
 GameObject:
   m_ObjectHideFlags: 0
@@ -152,7 +120,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5315834147508480038}
+  m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &7227534524794343288
 SkinnedMeshRenderer:
@@ -177,7 +145,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
+  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -204,9 +172,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 2584154640569874972}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 2584154640569874972}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
@@ -275,8 +243,8 @@ Transform:
   m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2493923320898620711}
-  - {fileID: 858800514818609066}
+  - {fileID: 2584154640569874972}
+  - {fileID: 3617502521392103604}
   m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4967031559869244623
@@ -413,7 +381,87 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.41, y: 0.60432863, z: 0.43}
   m_Center: {x: 0, y: 0.15330195, z: 0}
---- !u!1 &6194576984318845612
+--- !u!1 &7053293013541296252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3146966691021036876}
+  - component: {fileID: 5296103357367706842}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: pengpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3146966691021036876
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7053293013541296252}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.034, z: 0.202}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6709539860230415573}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5296103357367706842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7053293013541296252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: pengpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &7141250753000517685
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2584154640569874972}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2584154640569874972
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7141250753000517685}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8763248839805234681}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8573372403924348341
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -421,8 +469,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 858800514818609066}
-  - component: {fileID: 5424028383363787029}
+  - component: {fileID: 5945462629354462804}
+  - component: {fileID: 8302346427361666624}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_hulu
@@ -431,28 +479,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &858800514818609066
+--- !u!4 &5945462629354462804
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6194576984318845612}
+  m_GameObject: {fileID: 8573372403924348341}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8763248839805234681}
+  m_Father: {fileID: 5315834147508480038}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5424028383363787029
+--- !u!137 &8302346427361666624
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6194576984318845612}
+  m_GameObject: {fileID: 8573372403924348341}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -469,7 +517,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
+  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -496,60 +544,12 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 2493923320898620711}
+  - {fileID: 9160172853801646544}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2493923320898620711}
+  m_RootBone: {fileID: 9160172853801646544}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &7053293013541296252
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3146966691021036876}
-  - component: {fileID: 5296103357367706842}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: pengpos
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3146966691021036876
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7053293013541296252}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.034, z: 0.202}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6709539860230415573}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5296103357367706842
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7053293013541296252}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DotName: pengpos
-  followSkeleton: 0
-  myRotation: {x: 0, y: 0, z: 0}

+ 195 - 195
Assets/Res/CombatHero/fb_jian1.prefab

@@ -78,10 +78,194 @@ Transform:
   m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 9167117417134368453}
-  - {fileID: 8803337265928277015}
+  - {fileID: 7087496007493957674}
+  - {fileID: 5405213676776398865}
   m_Father: {fileID: 7466859698293448862}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1650330202808175606
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3937788777129149132}
+  - component: {fileID: 2464030059168441475}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_jian1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3937788777129149132
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1650330202808175606}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1028615347405319678}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2464030059168441475
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1650330202808175606}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
+  m_Bones:
+  - {fileID: 7466859698293448862}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7466859698293448862}
+  m_AABB:
+    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
+    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &1805901791400093830
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5405213676776398865}
+  - component: {fileID: 1472619206768845198}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_jian1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5405213676776398865
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805901791400093830}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1439812933337521677}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &1472619206768845198
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805901791400093830}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
+  m_Bones:
+  - {fileID: 7087496007493957674}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7087496007493957674}
+  m_AABB:
+    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
+    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &2778996064610124439
 GameObject:
   m_ObjectHideFlags: 0
@@ -114,7 +298,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 6144115779445979028}
+  - {fileID: 3937788777129149132}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -224,38 +408,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.34, y: 0.36, z: 1.3845047}
   m_Center: {x: 0, y: 0, z: 0.10598475}
---- !u!1 &3845651329315582297
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 9167117417134368453}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9167117417134368453
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3845651329315582297}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
-  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1439812933337521677}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4062744336325871813
 GameObject:
   m_ObjectHideFlags: 0
@@ -304,7 +456,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &4278999536356704679
+--- !u!1 &4341059381557959903
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -312,90 +464,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6144115779445979028}
-  - component: {fileID: 4003051513033673227}
+  - component: {fileID: 7087496007493957674}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_jian1
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6144115779445979028
+--- !u!4 &7087496007493957674
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4278999536356704679}
+  m_GameObject: {fileID: 4341059381557959903}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1028615347405319678}
+  m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4003051513033673227
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4278999536356704679}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, 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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
-  m_Bones:
-  - {fileID: 7466859698293448862}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
-  m_AABB:
-    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
-    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &5182842215280330390
 GameObject:
   m_ObjectHideFlags: 0
@@ -429,98 +521,6 @@ Transform:
   - {fileID: 1439812933337521677}
   m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7562668552269356356
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8803337265928277015}
-  - component: {fileID: 1904525047264618244}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_jian1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8803337265928277015
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7562668552269356356}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1439812933337521677}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1904525047264618244
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7562668552269356356}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, 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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
-  m_Bones:
-  - {fileID: 9167117417134368453}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9167117417134368453}
-  m_AABB:
-    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
-    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &7849891338208220805
 GameObject:
   m_ObjectHideFlags: 0

+ 50 - 50
Assets/Res/CombatHero/fb_jian2.prefab

@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1167176959741050178
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2197045431213786766}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2197045431213786766
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1167176959741050178}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
+  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6865594351597376310}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1943758829950784143
 GameObject:
   m_ObjectHideFlags: 0
@@ -164,8 +196,8 @@ Transform:
   m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1237226486994214307}
-  - {fileID: 8738717545328619799}
+  - {fileID: 2197045431213786766}
+  - {fileID: 6726553265601841411}
   m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5695866277527572638
@@ -199,7 +231,7 @@ Transform:
   m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3525720028267400576}
+  m_Father: {fileID: 6865594351597376310}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &8622739340240625013
 SkinnedMeshRenderer:
@@ -224,7 +256,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
+  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -251,9 +283,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 7074505583183483981}
+  - {fileID: 2197045431213786766}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7074505583183483981}
+  m_RootBone: {fileID: 2197045431213786766}
   m_AABB:
     m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
     m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
@@ -308,38 +340,6 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &6646074752758015265
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1237226486994214307}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1237226486994214307
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6646074752758015265}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
-  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6865594351597376310}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6776823676485762230
 GameObject:
   m_ObjectHideFlags: 0
@@ -437,7 +437,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 6726553265601841411}
+  - {fileID: 5543557565221737433}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082
@@ -461,7 +461,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &8553350037749681380
+--- !u!1 &7456051293248757285
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -469,8 +469,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8738717545328619799}
-  - component: {fileID: 2541302800089787918}
+  - component: {fileID: 5543557565221737433}
+  - component: {fileID: 2636380103424717117}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbjian2
@@ -479,28 +479,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8738717545328619799
+--- !u!4 &5543557565221737433
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8553350037749681380}
+  m_GameObject: {fileID: 7456051293248757285}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
   m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6865594351597376310}
+  m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2541302800089787918
+--- !u!137 &2636380103424717117
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8553350037749681380}
+  m_GameObject: {fileID: 7456051293248757285}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -517,7 +517,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
+  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 1237226486994214307}
+  - {fileID: 7074505583183483981}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1237226486994214307}
+  m_RootBone: {fileID: 7074505583183483981}
   m_AABB:
     m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
     m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}

+ 571 - 0
Assets/Res/CombatHero/fb_linglongta.prefab

@@ -0,0 +1,571 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1660625026029973378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8570373653050028974}
+  - component: {fileID: 3775664911318318538}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8570373653050028974
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1660625026029973378}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 589998100047264782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &3775664911318318538
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1660625026029973378}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 6318980446073838052}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6318980446073838052}
+  m_AABB:
+    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
+    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &2853221564033797514
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3229702076746228403}
+  - component: {fileID: 3808244328899282246}
+  - component: {fileID: 8374485055632873607}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3229702076746228403
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2853221564033797514}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.13, y: 7.46, z: 1.97}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4724784017856295453}
+  - {fileID: 1831017494247033119}
+  - {fileID: 6835743044111215408}
+  - {fileID: 120756530494083055}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &3808244328899282246
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2853221564033797514}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &8374485055632873607
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2853221564033797514}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.5, y: 0.9786749, z: 0.51}
+  m_Center: {x: 0, y: 0.09983301, z: 0}
+--- !u!1 &4020983649939190267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1831017494247033119}
+  - component: {fileID: 7365029092108843876}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: pengpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1831017494247033119
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4020983649939190267}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.015, z: 0.39}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3229702076746228403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7365029092108843876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4020983649939190267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: pengpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4440905463427676986
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4724784017856295453}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4724784017856295453
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4440905463427676986}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3229702076746228403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6069193922456573349
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 589998100047264782}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta_run (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &589998100047264782
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6069193922456573349}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.0000008506696, y: 0.00000077682074, z: 0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.3101634, y: -0.0069049597, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6318980446073838052}
+  - {fileID: 8570373653050028974}
+  m_Father: {fileID: 4887794763406024427}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6525093672149038688
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6835743044111215408}
+  - component: {fileID: 7237669560436834374}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6835743044111215408
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6525093672149038688}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.047, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3229702076746228403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7237669560436834374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6525093672149038688}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &7493868076058049960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4887794763406024427}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4887794763406024427
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7493868076058049960}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 589998100047264782}
+  m_Father: {fileID: 120756530494083055}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8117117223482470946
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6576967559216710953}
+  - component: {fileID: 4954707728321180533}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6576967559216710953
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8117117223482470946}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 120756530494083055}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &4954707728321180533
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8117117223482470946}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 4887794763406024427}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 4887794763406024427}
+  m_AABB:
+    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
+    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &8833322958098411812
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 120756530494083055}
+  - component: {fileID: 8112392103606109572}
+  - component: {fileID: 8331917867035701909}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta_run
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &120756530494083055
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8833322958098411812}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.378, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4887794763406024427}
+  - {fileID: 6576967559216710953}
+  m_Father: {fileID: 3229702076746228403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &8112392103606109572
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8833322958098411812}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &8331917867035701909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8833322958098411812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 8112392103606109572}
+  _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+  _ActionOnDisable: 0
+--- !u!1 &8854775904126252572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6318980446073838052}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6318980446073838052
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8854775904126252572}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
+  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 589998100047264782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 7 - 0
Assets/Res/CombatHero/fb_linglongta.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CS8c4yivWi+hBI61k3oNtH9/D2S8lcnkDXlhvKuI2LO4jzBOYkrGJoYXkxz+
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 191 - 175
Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &122840131851855959
+--- !u!1 &2106655689270820769
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,91 +8,117 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7057863707000159883}
-  - component: {fileID: 1916479658305868940}
+  - component: {fileID: 7320365188319078122}
+  - component: {fileID: 7811160945716219044}
+  - component: {fileID: 8093247382280963787}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: wulonglun2
+  m_Name: fb_wulonglun
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7057863707000159883
+--- !u!4 &7320365188319078122
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 122840131851855959}
+  m_GameObject: {fileID: 2106655689270820769}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.488, y: 9.998, z: 4.81}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8019158978286339551}
+  m_Children:
+  - {fileID: 5430698486928798206}
+  - {fileID: 376580140852992892}
+  - {fileID: 5389170507604786277}
+  - {fileID: 2106735808395853295}
+  m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1916479658305868940
-SkinnedMeshRenderer:
+--- !u!54 &7811160945716219044
+Rigidbody:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 122840131851855959}
+  m_GameObject: {fileID: 2106655689270820769}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &8093247382280963787
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2106655689270820769}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, 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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  serializedVersion: 3
+  m_Size: {x: 0.5, y: 0.86799335, z: 0.91047573}
+  m_Center: {x: 0, y: 0.044492245, z: 0.009610653}
+--- !u!1 &2161800469378632090
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5430698486928798206}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_wulonglun
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5430698486928798206
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2161800469378632090}
   serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
-  m_Bones:
-  - {fileID: 18791642066124229}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 18791642066124229}
-  m_AABB:
-    m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
-    m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
---- !u!1 &1233878557644768076
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7320365188319078122}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2765884690952921055
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -100,8 +126,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1982735767033287012}
-  - component: {fileID: 4105429390217586487}
+  - component: {fileID: 3343722168943612468}
+  - component: {fileID: 9081341001646215678}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun
@@ -110,13 +136,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1982735767033287012
+--- !u!4 &3343722168943612468
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1233878557644768076}
+  m_GameObject: {fileID: 2765884690952921055}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
@@ -125,13 +151,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4105429390217586487
+--- !u!137 &9081341001646215678
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1233878557644768076}
+  m_GameObject: {fileID: 2765884690952921055}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -184,7 +210,7 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &2106655689270820769
+--- !u!1 &3217099317692552822
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,85 +218,32 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7320365188319078122}
-  - component: {fileID: 7811160945716219044}
-  - component: {fileID: 8093247382280963787}
+  - component: {fileID: 8985698407474411210}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_wulonglun
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7320365188319078122
+--- !u!4 &8985698407474411210
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2106655689270820769}
+  m_GameObject: {fileID: 3217099317692552822}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.488, y: 9.998, z: 4.81}
+  m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
+  m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5430698486928798206}
-  - {fileID: 376580140852992892}
-  - {fileID: 5389170507604786277}
-  - {fileID: 2106735808395853295}
-  m_Father: {fileID: 0}
+  - {fileID: 8019158978286339551}
+  m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!54 &7811160945716219044
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2106655689270820769}
-  serializedVersion: 4
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 1
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
---- !u!65 &8093247382280963787
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2106655689270820769}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.5, y: 0.86799335, z: 0.91047573}
-  m_Center: {x: 0, y: 0.044492245, z: 0.009610653}
---- !u!1 &2161800469378632090
+--- !u!1 &3304795313112564774
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -278,63 +251,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5430698486928798206}
+  - component: {fileID: 6719616111229695996}
+  - component: {fileID: 157108464823508807}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_wulonglun
+  m_Name: wulonglun2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5430698486928798206
+--- !u!4 &6719616111229695996
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2161800469378632090}
+  m_GameObject: {fileID: 3304795313112564774}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7320365188319078122}
+  m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3217099317692552822
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8985698407474411210}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8985698407474411210
-Transform:
+--- !u!137 &157108464823508807
+SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3217099317692552822}
+  m_GameObject: {fileID: 3304795313112564774}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
-  m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8019158978286339551}
-  m_Father: {fileID: 2106735808395853295}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
+  m_Bones:
+  - {fileID: 8460482785759891620}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8460482785759891620}
+  m_AABB:
+    m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
+    m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &3398165251034620908
 GameObject:
   m_ObjectHideFlags: 0
@@ -383,7 +383,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5929480748275474722
+--- !u!1 &4875691851651969941
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -391,7 +391,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 18791642066124229}
+  - component: {fileID: 8460482785759891620}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -400,13 +400,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &18791642066124229
+--- !u!4 &8460482785759891620
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5929480748275474722}
+  m_GameObject: {fileID: 4875691851651969941}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
   m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
@@ -445,8 +445,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 18791642066124229}
-  - {fileID: 7057863707000159883}
+  - {fileID: 8460482785759891620}
+  - {fileID: 6719616111229695996}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -507,6 +507,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2106735808395853295}
   - component: {fileID: 852375880241615242}
+  - component: {fileID: 6546381582101370204}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun
@@ -529,7 +530,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 1982735767033287012}
+  - {fileID: 3343722168943612468}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242
@@ -553,3 +554,18 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &6546381582101370204
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7256712158636762597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 852375880241615242}
+  _Transitions: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
+  _ActionOnDisable: 0

+ 138 - 138
Assets/Res/CombatHero/fb_yuping.prefab

@@ -1,5 +1,131 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &249648919915554140
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6771881079622904718}
+  - component: {fileID: 3507355564131952769}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yuping
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6771881079622904718
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 249648919915554140}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8974866603299107661}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &3507355564131952769
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 249648919915554140}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+  m_Bones:
+  - {fileID: 6598966518811955930}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6598966518811955930}
+  m_AABB:
+    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
+    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &325623607481822929
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3645249824464222405}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping_show
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3645249824464222405
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 325623607481822929}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.0000054429547, y: 0.0000054203256, z: 0.70370746, w: 0.7104899}
+  m_LocalPosition: {x: 0.079, y: -0.024, z: -0}
+  m_LocalScale: {x: 3.6666656, y: 3.6666656, z: 3.6666665}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2992720160335178309}
+  - {fileID: 2497305786436552913}
+  m_Father: {fileID: 6598966518811955930}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &400955788230969046
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,7 +157,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 3645249824464222405}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &3340404091903741625
 SkinnedMeshRenderer:
@@ -41,7 +167,7 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 400955788230969046}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -56,7 +182,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, type: 2}
+  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -83,9 +209,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 2992720160335178309}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 2992720160335178309}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
@@ -291,7 +417,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 2497305786436552913}
+  - {fileID: 6771881079622904718}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -330,133 +456,7 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &4842390649401549549
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8417374282418898035}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_yuping_show
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8417374282418898035
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4842390649401549549}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.0000054429547, y: 0.0000054203256, z: 0.70370746, w: 0.7104899}
-  m_LocalPosition: {x: 0.079, y: -0.024, z: -0}
-  m_LocalScale: {x: 3.6666656, y: 3.6666656, z: 3.6666665}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2278749005281580153}
-  - {fileID: 9109152844184970844}
-  m_Father: {fileID: 6598966518811955930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5500551397172131952
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 9109152844184970844}
-  - component: {fileID: 4126995420846251416}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: yuping
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9109152844184970844
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5500551397172131952}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8417374282418898035}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4126995420846251416
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5500551397172131952}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, 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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
-  m_Bones:
-  - {fileID: 2278749005281580153}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2278749005281580153}
-  m_AABB:
-    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
-    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
---- !u!1 &6052499019540024466
+--- !u!1 &5395222643259688964
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -464,7 +464,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2278749005281580153}
+  - component: {fileID: 2992720160335178309}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -473,20 +473,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2278749005281580153
+--- !u!4 &2992720160335178309
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6052499019540024466}
+  m_GameObject: {fileID: 5395222643259688964}
   serializedVersion: 2
   m_LocalRotation: {x: 0.0000054902584, y: -0.0000053734734, z: -0.70370746, w: 0.7104899}
   m_LocalPosition: {x: 0.0068355557, y: 0.011254414, z: 4.9194604e-10}
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8417374282418898035}
+  m_Father: {fileID: 3645249824464222405}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6642471949105620041
 GameObject:
@@ -566,6 +566,6 @@ Transform:
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8417374282418898035}
+  - {fileID: 3645249824464222405}
   m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 14 - 0
Assets/Res/Config/MagicWeaponConfig.json

@@ -97,6 +97,20 @@
         901001
       ],
       "heroStory": null
+    },
+    {
+      "ID": 10008,
+      "nickName": -1,
+      "magicAttribute": 1,
+      "name": 5,
+      "headicon": "icon_tx10008",
+      "model": "fb_linglongta",
+      "cd": 7.0,
+      "att": 100,
+      "skillID": [
+        901001
+      ],
+      "heroStory": null
     }
   ]
 }

+ 147 - 0
Assets/Res/HeroAnimtion/fb_linglongta.asset

@@ -0,0 +1,147 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-6430102396614945439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: jiuo
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298739367936000
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298739367936000
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: f538b168f24934d46bd78e03404c196e, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &-5287561629531185777
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: show
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298718926209025
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298718926209025
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 6f08fdd50e79d0c4bb235a5c2696516d, type: 3}
+  m_Name: fb_linglongta
+  m_EditorClassIdentifier: 
+  _Definition:
+    _Transitions:
+    - {fileID: 5519247924259519141}
+    - {fileID: -5287561629531185777}
+    - {fileID: -6430102396614945439}
+    _Modifiers:
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 1
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 1
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
+    _Aliases: []
+    _AliasAllTransitions: 0
+--- !u!114 &5519247924259519141
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: run
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298718926209024
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298718926209024
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: c38110db927930649a5e70cb4a3282fd, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &6039137609317899203
+MonoBehaviour:
+  m_ObjectHideFlags: 17
+  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: f04d4a67566152e40aaa01b8b745ff6b, type: 3}
+  m_Name: Editor Data
+  m_EditorClassIdentifier: 
+  _Library: {fileID: 11400000}
+  _TransitionSortMode: 0

+ 8 - 0
Assets/Res/HeroAnimtion/fb_linglongta.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DnNN5n/+UC8P97efofP0zlSJLQrI4Z5xraI78BZFBda4vYGVUABcpDeN8s4A
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 197 - 0
Assets/Res/HeroAnimtion/fb_wulonglun.asset

@@ -0,0 +1,197 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-7185268523185464614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Take 001
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298967125196806
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298967125196806
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &-822125633454001215
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: run
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298967125196807
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298967125196807
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 6f08fdd50e79d0c4bb235a5c2696516d, type: 3}
+  m_Name: fb_wulonglun
+  m_EditorClassIdentifier: 
+  _Definition:
+    _Transitions:
+    - {fileID: 8413550133293145741}
+    - {fileID: -7185268523185464614}
+    - {fileID: -822125633454001215}
+    - {fileID: 4545472588857971225}
+    _Modifiers:
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 1
+      _Fade: 0
+    - _From: 2
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 3
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 1
+      _To: 3
+      _Fade: 0
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    _Aliases: []
+    _AliasAllTransitions: 0
+--- !u!114 &4545472588857971225
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: show
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298967125196808
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298967125196808
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 631d581160118a643bdf747b97af7938, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &6039137609317899203
+MonoBehaviour:
+  m_ObjectHideFlags: 17
+  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: f04d4a67566152e40aaa01b8b745ff6b, type: 3}
+  m_Name: Editor Data
+  m_EditorClassIdentifier: 
+  _Library: {fileID: 11400000}
+  _TransitionSortMode: 0
+--- !u!114 &8413550133293145741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: sk1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298967125196803
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298967125196803
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 318390a2b1237d54fb7599b2e4ac44a0, type: 3}
+        _NormalizedStartTime: NaN

+ 8 - 0
Assets/Res/HeroAnimtion/fb_wulonglun.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W30esCusAnzWBGs3ve9CX1TLo1qsKzYLSdFfOpx05s1rXYo6FBTNEmz8XxLk
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 46 - 46
Assets/Res/HeroAnimtion/fb_yuping.asset

@@ -1,34 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-6430102396614945439
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
-  m_Name: jiuo
-  m_EditorClassIdentifier: 
-  _Transition:
-    rid: 616298739367936000
-  references:
-    version: 2
-    RefIds:
-    - rid: 616298739367936000
-      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
-      data:
-        _FadeDuration: 0.25
-        _Speed: 1
-        _Events:
-          _NormalizedTimes: []
-          _Callbacks: []
-          _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: f538b168f24934d46bd78e03404c196e, type: 3}
-        _NormalizedStartTime: NaN
---- !u!114 &-5287561629531185777
+--- !u!114 &-2440678509617739100
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,11 +13,11 @@ MonoBehaviour:
   m_Name: show
   m_EditorClassIdentifier: 
   _Transition:
-    rid: 616298718926209025
+    rid: 616298967125196801
   references:
     version: 2
     RefIds:
-    - rid: 616298718926209025
+    - rid: 616298967125196801
       type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
       data:
         _FadeDuration: 0.25
@@ -54,7 +26,7 @@ MonoBehaviour:
           _NormalizedTimes: []
           _Callbacks: []
           _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+        _Clip: {fileID: 1827226128182048838, guid: aa6ec723e855dd543a987d23dceca2cd, type: 3}
         _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
@@ -70,22 +42,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _Definition:
     _Transitions:
-    - {fileID: 5519247924259519141}
-    - {fileID: -5287561629531185777}
-    - {fileID: -6430102396614945439}
+    - {fileID: 1960536608677527924}
+    - {fileID: -2440678509617739100}
+    - {fileID: 6984342804156779359}
     _Modifiers:
     - _From: 0
       _To: 0
       _Fade: 0
-    - _From: 1
-      _To: 0
-      _Fade: 0
     - _From: 0
       _To: 1
       _Fade: 0
-    - _From: 1
-      _To: 1
-      _Fade: 0
     - _From: 0
       _To: 2
       _Fade: 0
@@ -98,12 +64,18 @@ MonoBehaviour:
     - _From: 2
       _To: 1
       _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
     - _From: 2
       _To: 0
       _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
---- !u!114 &5519247924259519141
+--- !u!114 &1960536608677527924
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -113,14 +85,14 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
-  m_Name: run
+  m_Name: jihuo
   m_EditorClassIdentifier: 
   _Transition:
-    rid: 616298718926209024
+    rid: 616298967125196800
   references:
     version: 2
     RefIds:
-    - rid: 616298718926209024
+    - rid: 616298967125196800
       type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
       data:
         _FadeDuration: 0.25
@@ -129,7 +101,7 @@ MonoBehaviour:
           _NormalizedTimes: []
           _Callbacks: []
           _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: c38110db927930649a5e70cb4a3282fd, type: 3}
+        _Clip: {fileID: 1827226128182048838, guid: 42fb071004e4e4f47a6c48c0dc8e7fbe, type: 3}
         _NormalizedStartTime: NaN
 --- !u!114 &6039137609317899203
 MonoBehaviour:
@@ -145,3 +117,31 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _Library: {fileID: 11400000}
   _TransitionSortMode: 0
+--- !u!114 &6984342804156779359
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: run
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298967125196802
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298967125196802
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+        _NormalizedStartTime: NaN

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
Assets/Res/TimeLineAssets/fb_linglongta_TD.txt


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
Assets/Res/TimeLineAssets/fb_yuping_TD.txt


+ 136 - 4
Assets/Scenes/testCombat.scene

@@ -442,6 +442,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   massgeText: {fileID: 773560731}
   loadSlider: {fileID: 1324294698}
+--- !u!4 &156078686 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5857502490606678529, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+  m_PrefabInstance: {fileID: 1856735312}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &164319092
 GameObject:
   m_ObjectHideFlags: 0
@@ -988,7 +993,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].magicWeaponId.Array.size
@@ -996,15 +1001,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10001
+      value: 10007
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
-      value: 10002
+      value: 10008
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
-      value: 10003
+      value: 10008
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
@@ -1134,6 +1139,63 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+--- !u!1001 &356856622
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 156078686}
+    m_Modifications:
+    - target: {fileID: 2718974786784947163, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_Name
+      value: fx_hudun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
 --- !u!1 &376281604
 GameObject:
   m_ObjectHideFlags: 0
@@ -1969,6 +2031,11 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!4 &768524197 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8385922099534867068, guid: c911f84a302e5fa41b9bacaa1f3ed842, type: 3}
+  m_PrefabInstance: {fileID: 356856622}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &773560728
 GameObject:
   m_ObjectHideFlags: 0
@@ -2942,6 +3009,70 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 1663534286}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1856735312
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_Name
+      value: Nanzhu (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.87
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.027
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.54
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 5857502490606678529, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 768524197}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
 --- !u!1 &1858319897
 GameObject:
   m_ObjectHideFlags: 0
@@ -4974,3 +5105,4 @@ SceneRoots:
   - {fileID: 6603587311896496110}
   - {fileID: 613972499}
   - {fileID: 321407578}
+  - {fileID: 1856735312}

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -28,6 +28,8 @@ namespace GameLogic.Combat.Hero.State
                 combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("jihuo");
 
             myCombatMagicWeaponEntity.GameObject.transform.eulerAngles = Vector3.zero;
+            myCombatMagicWeaponEntity.GameObject.transform.localScale = Vector3.one;
+            
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
             startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5: 5;

+ 7 - 0
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901001.cs

@@ -31,6 +31,13 @@ namespace GameLogic.Combat.Skill.MagicSkill
             SetMagicAttShowBasic(magicAttShowBasic);
         }
 
+        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(TimeLineEventLogicBasic timeLineEventLogicBasic)
+        {
+            ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[1];
+            lifetCycleHitPoints[0] = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            return lifetCycleHitPoints;
+        }
+
         private void Finish()
         {
             Debug.Log("法宝对敌人照成伤害");

+ 13 - 5
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/SkillShow/XiaoShiAndShow.cs

@@ -13,9 +13,10 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         private float currTime;
 
-        private float moveSpeed;
+        private float moveSpeed = 3;
 
         protected bool isUpdateMove;
+        protected float showSizeTime;
 
         protected override void ProInit()
         {
@@ -55,6 +56,9 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 CombatHeroEntity.combatHeroGameObject.SetPosition(headPos);
             }
 
+            CombatHeroEntity.combatHeroGameObject.SetScale(new Vector3(3, 3, 3));
+            CombatHeroEntity.GameObject.transform.eulerAngles =
+                new Vector3(0, target.GameObject.transform.eulerAngles.y + 180, 0);
             TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic =
                 _skillBasic.ActivationTimeLineData("sk1_show");
             timeLineEventLogicGroupBasic.TimeLineUpdateEnd = ShowFinish;
@@ -70,6 +74,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             }
             else //位移
             {
+                showSizeTime = 0;
                 currSize = Vector3.one;
                 targetSize = Vector3.one * 2f;
                 currPos = CombatHeroEntity.dotPos;
@@ -82,6 +87,8 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         private void AllFinish()
         {
+            TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic =
+                _skillBasic.ActivationTimeLineData("sk1_hit");
             callBack?.Invoke();
         }
 
@@ -92,13 +99,14 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 return;
             }
 
-            currTime += t;
-            Vector3 size = Vector3.Lerp(currSize, targetSize, currTime);
+            currTime += t * moveSpeed;
+            // Vector3 size = Vector3.Lerp(currSize, targetSize, currTime);
             Vector3 pos = Vector3.Lerp(currPos, targetPos, currTime);
             CombatHeroEntity.combatHeroGameObject.SetPosition(pos);
-            CombatHeroEntity.combatHeroGameObject.SetScale(size);
-            if(currTime>1)
+            // CombatHeroEntity.combatHeroGameObject.SetScale(size);
+            if (currTime > 1)
             {
+                isUpdateMove = false;
                 AllFinish();
             }
         }

+ 6 - 0
Assets/Scripts/GameUI/Editor/SerializationTimeLineTool.cs

@@ -358,6 +358,12 @@ public class SerializationTimeLineTool
                             new TimeLineFallSeraliztion(playableDirector, groupTrack, valueClip);
                         timeLienData.key.Add("TimeLineFallSeraliztion");
                     }
+                    else if (asset is TimeLineMagicWeaponShowPointAsset)
+                    {
+                        serialization =
+                            new TimeLineMagicWeaponShowPointSerializtion(playableDirector, groupTrack, valueClip);
+                        timeLienData.key.Add("TimeLineMagicWeaponShowPointSerializtion");
+                    }
                     else
                     {
                         if (!asset.GetType().ToString().Equals("UnityEngine.Timeline.ActivationPlayableAsset"))

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN=BIN
Excel2Json/Excel/MagicWeapon.xlsx


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio