소스 검색

修改bug

DESKTOP-FB72PO8\Administrator 19 시간 전
부모
커밋
18c5cda3e6

+ 15 - 15
Assets/Art/ArtHero/FaBao/fb_3202.prefab

@@ -70,13 +70,13 @@ Transform:
   - {fileID: 6422743017604668250}
   - {fileID: 7614762704955392673}
   - {fileID: 8589047560166541975}
-  - {fileID: 6552438602395505552}
+  - {fileID: 5163758353211348122}
   - {fileID: 4377303949247565765}
   - {fileID: 4523842266669883232}
   - {fileID: 8945408503953364139}
-  - {fileID: 7380140243929478845}
+  - {fileID: 588068065676805014}
   - {fileID: 4907884234678145963}
-  - {fileID: 6864869616679616107}
+  - {fileID: 7793721025748924058}
   m_Father: {fileID: 3267849608093012952}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1394266880918357115
@@ -331,11 +331,11 @@ PlayableDirector:
     - 2820b2085f57c41488400dc1f02017f3: {fileID: 1481263372234677043}
     - 5aaade8730dc32949a07dbdd56e87565: {fileID: 3133641608670323969}
     - e09eb03a40934fc4aad0c938c961932f: {fileID: 3133641608670323969}
-    - 2ecb826e4625459428c45aa1b78005ef: {fileID: 2464976669618923592}
-    - 2970d7955fe85ca4a901875300e566b2: {fileID: 8512827147558199802}
+    - 2ecb826e4625459428c45aa1b78005ef: {fileID: 4571982468144164674}
+    - 2970d7955fe85ca4a901875300e566b2: {fileID: 4994371321884092683}
     - 23d78beed6bb3364b93e6b017db41910: {fileID: 2778255166904603080}
     - 8e45c6601e86261469d4da532a6c0453: {fileID: 2162497702539734490}
-    - 97d69c4843153cd46ac2896f8761eff8: {fileID: 2464976669618923592}
+    - 97d69c4843153cd46ac2896f8761eff8: {fileID: 4571982468144164674}
     - 1d30d80212af7ea4ab8a1de8419b3a9b: {fileID: 7539165857944935409}
     - 8f4afe1992ed43640872dbaa60713fe9: {fileID: 2306514172670675016}
     - 5397c4924c3fec0459b837dbe4a1d757: {fileID: 2162497702539734490}
@@ -788,7 +788,7 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 606c22d91be554f4bbd7217954e40c6e, type: 3}
---- !u!4 &7380140243929478845 stripped
+--- !u!4 &588068065676805014 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 771732347823712355, guid: 606c22d91be554f4bbd7217954e40c6e, type: 3}
   m_PrefabInstance: {fileID: 188168983241763829}
@@ -1322,12 +1322,12 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3fccf585fc8eefb4eb0fe351b8708d1a, type: 3}
---- !u!1 &2464976669618923592 stripped
+--- !u!1 &4571982468144164674 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8421464430216129840, guid: 3fccf585fc8eefb4eb0fe351b8708d1a, type: 3}
   m_PrefabInstance: {fileID: 5453292432619029106}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &6552438602395505552 stripped
+--- !u!4 &5163758353211348122 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 865999882627520232, guid: 3fccf585fc8eefb4eb0fe351b8708d1a, type: 3}
   m_PrefabInstance: {fileID: 5453292432619029106}
@@ -1527,16 +1527,16 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 19704cba69545da48ace5d14426d9562, type: 3}
---- !u!4 &6864869616679616107 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3718515902593999029, guid: 19704cba69545da48ace5d14426d9562, type: 3}
-  m_PrefabInstance: {fileID: 6895584398704399919}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &8512827147558199802 stripped
+--- !u!1 &4994371321884092683 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1944881280773324580, guid: 19704cba69545da48ace5d14426d9562, type: 3}
   m_PrefabInstance: {fileID: 6895584398704399919}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &7793721025748924058 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3718515902593999029, guid: 19704cba69545da48ace5d14426d9562, type: 3}
+  m_PrefabInstance: {fileID: 6895584398704399919}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7844769209988865758
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 18 - 18
Assets/Art/ArtHero/FaBao/fb_3302.prefab

@@ -6033,14 +6033,14 @@ Transform:
   - {fileID: 2693951699679194972}
   - {fileID: 1313718375853580334}
   - {fileID: 8107014398072230395}
-  - {fileID: 1611464837243161306}
+  - {fileID: 7859002084480267373}
   - {fileID: 9187130094585036349}
   - {fileID: 1127158346073803287}
   - {fileID: 2120962693092956201}
   - {fileID: 5268295163160827845}
   - {fileID: 7045384924395031480}
-  - {fileID: 2281910733000761616}
-  - {fileID: 5478985294092096888}
+  - {fileID: 2016774713407604242}
+  - {fileID: 6631718738612112430}
   - {fileID: 5697457459357096913}
   - {fileID: 7190544249274630473}
   - {fileID: 311942630583539567}
@@ -23674,19 +23674,19 @@ PlayableDirector:
     - d4fc1ec3b24009c4f96fe610eb65b484: {fileID: 2800964805746707681}
     - 7bbfbdabf79b23649bf2ea641db23905: {fileID: 6236549458854973694}
     - 602bca6a965c6e34591d1bca04dd4a65: {fileID: 5421387306801045495}
-    - 510073d11a064b44b81d5efc39bc6cae: {fileID: 8030887368669677652}
+    - 510073d11a064b44b81d5efc39bc6cae: {fileID: 1458792417964799715}
     - 0779f8ebdc082844baa1cf3b6ae7812b: {fileID: 6236549458854973694}
     - 2820b2085f57c41488400dc1f02017f3: {fileID: 178684164667906588}
     - 5aaade8730dc32949a07dbdd56e87565: {fileID: 6533152670911111600}
     - e09eb03a40934fc4aad0c938c961932f: {fileID: 6533152670911111600}
-    - 2ecb826e4625459428c45aa1b78005ef: {fileID: 4381484384641351420}
+    - 2ecb826e4625459428c45aa1b78005ef: {fileID: 4078524615833950718}
     - 2970d7955fe85ca4a901875300e566b2: {fileID: 6786215858772819125}
     - 23d78beed6bb3364b93e6b017db41910: {fileID: 861782064748786357}
-    - 8e45c6601e86261469d4da532a6c0453: {fileID: 3297657204638013125}
-    - 97d69c4843153cd46ac2896f8761eff8: {fileID: 4381484384641351420}
+    - 8e45c6601e86261469d4da532a6c0453: {fileID: 4450256646395973523}
+    - 97d69c4843153cd46ac2896f8761eff8: {fileID: 4078524615833950718}
     - 1d30d80212af7ea4ab8a1de8419b3a9b: {fileID: 8591902828195738328}
     - 8f4afe1992ed43640872dbaa60713fe9: {fileID: 2478608331483500547}
-    - 5397c4924c3fec0459b837dbe4a1d757: {fileID: 3297657204638013125}
+    - 5397c4924c3fec0459b837dbe4a1d757: {fileID: 4450256646395973523}
 --- !u!1 &6913035703784911454
 GameObject:
   m_ObjectHideFlags: 0
@@ -35303,16 +35303,16 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 410302bdfb343dc4c9692efdfaff21e3, type: 3}
---- !u!4 &1611464837243161306 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3002443157020184299, guid: 410302bdfb343dc4c9692efdfaff21e3, type: 3}
-  m_PrefabInstance: {fileID: 4952300311214406278}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &8030887368669677652 stripped
+--- !u!1 &1458792417964799715 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5801956956582087781, guid: 410302bdfb343dc4c9692efdfaff21e3, type: 3}
   m_PrefabInstance: {fileID: 4952300311214406278}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &7859002084480267373 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3002443157020184299, guid: 410302bdfb343dc4c9692efdfaff21e3, type: 3}
+  m_PrefabInstance: {fileID: 4952300311214406278}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5661030410177658868
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -35394,12 +35394,12 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
---- !u!1 &3297657204638013125 stripped
+--- !u!1 &4450256646395973523 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8309838391102566503, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
   m_PrefabInstance: {fileID: 5661030410177658868}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &5478985294092096888 stripped
+--- !u!4 &6631718738612112430 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
   m_PrefabInstance: {fileID: 5661030410177658868}
@@ -35528,12 +35528,12 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d0aec74860dbff242a9d92df8cc5e700, type: 3}
---- !u!4 &2281910733000761616 stripped
+--- !u!4 &2016774713407604242 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4700387488962693042, guid: d0aec74860dbff242a9d92df8cc5e700, type: 3}
   m_PrefabInstance: {fileID: 6540955567339946400}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &4381484384641351420 stripped
+--- !u!1 &4078524615833950718 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7088649224917702750, guid: d0aec74860dbff242a9d92df8cc5e700, type: 3}
   m_PrefabInstance: {fileID: 6540955567339946400}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 580 - 234
Assets/Res/CombatHero/Boss01.prefab


+ 84 - 84
Assets/Res/CombatHero/fb_3101.prefab

@@ -73,6 +73,86 @@ MonoBehaviour:
   _Animator: {fileID: 6919295934107179613}
   _Transitions: {fileID: 11400000, guid: 230f24058e9f56b42ad6a34f9a45652d, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &678936289936158255
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1028994635943055001}
+  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 &1028994635943055001
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 678936289936158255}
+  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: 1419627869443203312}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1020436064925361037
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9107076678043194223}
+  - component: {fileID: 389054111554026061}
+  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 &9107076678043194223
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1020436064925361037}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.21}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2566871063108411739}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &389054111554026061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1020436064925361037}
+  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 &2913977674401134542
 GameObject:
   m_ObjectHideFlags: 0
@@ -180,7 +260,7 @@ Transform:
   m_GameObject: {fileID: 3583914498595981896}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.21}
+  m_LocalPosition: {x: 0, y: 0.034, z: 0.247}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -234,38 +314,6 @@ Transform:
   - {fileID: 1419627869443203312}
   m_Father: {fileID: 1367215891999932367}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4217871582857686030
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2089669128036018395}
-  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 &2089669128036018395
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4217871582857686030}
-  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: 1419627869443203312}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4451722197817941589
 GameObject:
   m_ObjectHideFlags: 0
@@ -5130,7 +5178,7 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2089669128036018395}
+  - {fileID: 1028994635943055001}
   m_Father: {fileID: 327998283763961317}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5707983376449416818
@@ -19773,54 +19821,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!1 &6698746874094658648
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8995649273946503779}
-  - component: {fileID: 6943742971365277766}
-  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 &8995649273946503779
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6698746874094658648}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.034, z: 0.247}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2566871063108411739}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6943742971365277766
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6698746874094658648}
-  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 &7441149924877091988
 GameObject:
   m_ObjectHideFlags: 0
@@ -29615,10 +29615,10 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3342101726137091350}
-  - {fileID: 8995649273946503779}
+  - {fileID: 740734103836660017}
   - {fileID: 1136834368834043035}
   - {fileID: 1367215891999932367}
-  - {fileID: 740734103836660017}
+  - {fileID: 9107076678043194223}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &3322395613801196915

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

@@ -31,7 +31,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 &8267813360648318927
 SkinnedMeshRenderer:
@@ -56,7 +56,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
@@ -83,9 +83,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 3562723674201918496}
+  - {fileID: 7124132450970813238}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
+  m_RootBone: {fileID: 7124132450970813238}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
@@ -140,7 +140,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &1197942244180523888
+--- !u!1 &987551543117940896
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -148,64 +148,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3762066587073657769}
-  - component: {fileID: 1164658870965195}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbdao1run
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3762066587073657769
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1197942244180523888}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.189}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3562723674201918496}
-  - {fileID: 7352778897228510174}
-  m_Father: {fileID: 25656997809885723}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &1164658870965195
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1197942244180523888}
-  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!1 &3164431111027973511
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 601811901477423718}
-  - component: {fileID: 1779933295515535634}
+  - component: {fileID: 9126014978238945748}
+  - component: {fileID: 5669630056575547650}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbdao1
@@ -214,28 +158,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &601811901477423718
+--- !u!4 &9126014978238945748
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3164431111027973511}
+  m_GameObject: {fileID: 987551543117940896}
   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_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1779933295515535634
+--- !u!137 &5669630056575547650
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3164431111027973511}
+  m_GameObject: {fileID: 987551543117940896}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -252,7 +196,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
+  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -279,15 +223,71 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 2562323534951575804}
+  - {fileID: 3562723674201918496}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2562323534951575804}
+  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 &1197942244180523888
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3762066587073657769}
+  - component: {fileID: 1164658870965195}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbdao1run
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3762066587073657769
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1197942244180523888}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.189}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3562723674201918496}
+  - {fileID: 9126014978238945748}
+  m_Father: {fileID: 25656997809885723}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &1164658870965195
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1197942244180523888}
+  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!1 &3368977622504917241
 GameObject:
   m_ObjectHideFlags: 0
@@ -318,8 +318,8 @@ Transform:
   m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2562323534951575804}
-  - {fileID: 601811901477423718}
+  - {fileID: 7124132450970813238}
+  - {fileID: 7352778897228510174}
   m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
@@ -488,7 +488,7 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.79, y: 0.27, z: 1.2742763}
   m_Center: {x: 0, y: 0, z: 0.05511415}
---- !u!1 &6658396058874626014
+--- !u!1 &6825548459275086116
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -496,7 +496,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2562323534951575804}
+  - component: {fileID: 3562723674201918496}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -505,22 +505,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2562323534951575804
+--- !u!4 &3562723674201918496
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6658396058874626014}
+  m_GameObject: {fileID: 6825548459275086116}
   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_Children:
+  - {fileID: 8565182548359739858}
+  m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6825548459275086116
+--- !u!1 &8227792505840844588
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -528,7 +529,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3562723674201918496}
+  - component: {fileID: 7124132450970813238}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -537,19 +538,18 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3562723674201918496
+--- !u!4 &7124132450970813238
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6825548459275086116}
+  m_GameObject: {fileID: 8227792505840844588}
   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:
-  - {fileID: 8565182548359739858}
-  m_Father: {fileID: 3762066587073657769}
+  m_Children: []
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

@@ -70,7 +70,7 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 2.5
   m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &1000003110746296334
+--- !u!1 &827686900384659517
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -78,90 +78,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4283941168110694291}
-  - component: {fileID: 273685937043501695}
+  - component: {fileID: 5046818559361011619}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbding1
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4283941168110694291
+--- !u!4 &5046818559361011619
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1000003110746296334}
+  m_GameObject: {fileID: 827686900384659517}
   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_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: 1894970939113486830}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &273685937043501695
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1000003110746296334}
-  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 &1623525566636903651
 GameObject:
   m_ObjectHideFlags: 0
@@ -272,7 +212,7 @@ Transform:
   m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3768430319336427256}
+  - {fileID: 5046818559361011619}
   - {fileID: 742765548502941160}
   m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -356,7 +296,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 4283941168110694291}
+  - {fileID: 8041454808692999180}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -463,47 +403,15 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 3768430319336427256}
+  - {fileID: 5046818559361011619}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3768430319336427256}
+  m_RootBone: {fileID: 5046818559361011619}
   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 &6737398412297110095
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3768430319336427256}
-  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 &3768430319336427256
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6737398412297110095}
-  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 &7964700976913853489
 GameObject:
   m_ObjectHideFlags: 0
@@ -624,3 +532,95 @@ Transform:
   - {fileID: 8990132256551677773}
   m_Father: {fileID: 1894970939113486830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8888601171320492781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8041454808692999180}
+  - component: {fileID: 3119126369036650966}
+  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 &8041454808692999180
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8888601171320492781}
+  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 &3119126369036650966
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8888601171320492781}
+  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

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

@@ -135,7 +135,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 6486377088042566867}
+  - {fileID: 6503508685725245786}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -159,7 +159,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &1347416257711000452
+--- !u!1 &2590654586827996216
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -167,31 +167,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 9185556413083587089}
+  - component: {fileID: 1957552434230211680}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_huohulu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &9185556413083587089
+--- !u!4 &1957552434230211680
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1347416257711000452}
+  m_GameObject: {fileID: 2590654586827996216}
   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_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: 8763248839805234681}
+  m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1473017722456019213
+--- !u!1 &3395690793032451430
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -199,91 +199,33 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3464866868538408919}
-  - component: {fileID: 3495373967239725054}
+  - component: {fileID: 8763248839805234681}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_hulu
+  m_Name: hulu1run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3464866868538408919
+--- !u!4 &8763248839805234681
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1473017722456019213}
+  m_GameObject: {fileID: 3395690793032451430}
   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_LocalRotation: {x: -0.000000054321042, y: 0.000000054323817, z: 0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.108, y: -0.002, z: -0}
+  m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
+  m_Children:
+  - {fileID: 6582447792772318980}
+  - {fileID: 6486377088042566867}
+  m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3495373967239725054
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1473017722456019213}
-  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: d5464f0ff5f42434898b4ca5e0f3a3b9, 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: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
-  m_Bones:
-  - {fileID: 9185556413083587089}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9185556413083587089}
-  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 &2590654586827996216
+--- !u!1 &3495029633808940444
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -291,63 +233,29 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1957552434230211680}
+  - component: {fileID: 6582447792772318980}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_huohulu
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1957552434230211680
+--- !u!4 &6582447792772318980
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2590654586827996216}
+  m_GameObject: {fileID: 3495029633808940444}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  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: 6709539860230415573}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3395690793032451430
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8763248839805234681}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: hulu1run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8763248839805234681
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3395690793032451430}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.000000054321042, y: 0.000000054323817, z: 0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.108, y: -0.002, z: -0}
-  m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 9185556413083587089}
-  - {fileID: 3464866868538408919}
-  m_Father: {fileID: 9160172853801646544}
+  m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4967031559869244623
 GameObject:
@@ -484,6 +392,98 @@ 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 &6826915329355320516
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6503508685725245786}
+  - component: {fileID: 6978485134248099122}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_hulu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6503508685725245786
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6826915329355320516}
+  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: 5315834147508480038}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &6978485134248099122
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6826915329355320516}
+  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: f3d79fc4671836747af1c04171aec002, 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: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
+  m_Bones:
+  - {fileID: 9160172853801646544}
+  m_BlendShapeWeights: []
+  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
@@ -563,7 +563,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 &2298935317500467403
 SkinnedMeshRenderer:
@@ -588,7 +588,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
@@ -615,9 +615,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 6582447792772318980}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 6582447792772318980}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}

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

@@ -48,41 +48,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &1047511870456823630
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1439812933337521677}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbjian1_run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1439812933337521677
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1047511870456823630}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.00269293, y: -0.70710176, z: -0.00269293, w: 0.70710164}
-  m_LocalPosition: {x: 0.005, y: -0.008, z: -0}
-  m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3651288287727249709}
-  - {fileID: 3049608503172282656}
-  m_Father: {fileID: 7466859698293448862}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1154065796768346190
+--- !u!1 &743919557591032457
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -90,8 +56,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3049608503172282656}
-  - component: {fileID: 2245446464678621762}
+  - component: {fileID: 7492702991873437347}
+  - component: {fileID: 5991903254007160068}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -100,28 +66,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3049608503172282656
+--- !u!4 &7492702991873437347
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1154065796768346190}
+  m_GameObject: {fileID: 743919557591032457}
   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_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2245446464678621762
+--- !u!137 &5991903254007160068
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1154065796768346190}
+  m_GameObject: {fileID: 743919557591032457}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -138,7 +104,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -165,16 +131,50 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 3651288287727249709}
+  - {fileID: 7466859698293448862}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3651288287727249709}
+  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 &1165994684943764448
+--- !u!1 &1047511870456823630
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1439812933337521677}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbjian1_run (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1439812933337521677
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1047511870456823630}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.00269293, y: -0.70710176, z: -0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: 0.005, y: -0.008, z: -0}
+  m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1604565517854025165}
+  - {fileID: 3142767444016704293}
+  m_Father: {fileID: 7466859698293448862}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1690804742975212685
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -182,8 +182,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3062858612183585758}
-  - component: {fileID: 8876841970266847792}
+  - component: {fileID: 3142767444016704293}
+  - component: {fileID: 8691552044166435378}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -192,28 +192,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3062858612183585758
+--- !u!4 &3142767444016704293
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1165994684943764448}
+  m_GameObject: {fileID: 1690804742975212685}
   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_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8876841970266847792
+--- !u!137 &8691552044166435378
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1165994684943764448}
+  m_GameObject: {fileID: 1690804742975212685}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -230,7 +230,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
+  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -257,9 +257,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 7466859698293448862}
+  - {fileID: 1604565517854025165}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
+  m_RootBone: {fileID: 1604565517854025165}
   m_AABB:
     m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
     m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
@@ -298,7 +298,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 3062858612183585758}
+  - {fileID: 7492702991873437347}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -456,7 +456,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5070102757452015435
+--- !u!1 &5182842215280330390
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -464,7 +464,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3651288287727249709}
+  - component: {fileID: 7466859698293448862}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -473,22 +473,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3651288287727249709
+--- !u!4 &7466859698293448862
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5070102757452015435}
+  m_GameObject: {fileID: 5182842215280330390}
   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_Children:
+  - {fileID: 1439812933337521677}
+  m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5182842215280330390
+--- !u!1 &7849891338208220805
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -496,32 +497,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7466859698293448862}
+  - component: {fileID: 5973240175850598617}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_jian1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7466859698293448862
+--- !u!4 &5973240175850598617
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5182842215280330390}
+  m_GameObject: {fileID: 7849891338208220805}
   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_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1439812933337521677}
-  m_Father: {fileID: 1028615347405319678}
+  m_Children: []
+  m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7849891338208220805
+--- !u!1 &9044518452432988885
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -529,27 +529,27 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5973240175850598617}
+  - component: {fileID: 1604565517854025165}
   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 &5973240175850598617
+--- !u!4 &1604565517854025165
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7849891338208220805}
+  m_GameObject: {fileID: 9044518452432988885}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, 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: 2850277934501199321}
+  m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

@@ -1,5 +1,97 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &268051021693511432
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4855682620463343737}
+  - component: {fileID: 2832533047149141642}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbjian2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4855682620463343737
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 268051021693511432}
+  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: 3525720028267400576}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2832533047149141642
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 268051021693511432}
+  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: 8420e942e81a291449164dc3c4f357f3, 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: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
+  m_Bones:
+  - {fileID: 7074505583183483981}
+  m_BlendShapeWeights: []
+  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}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &1943758829950784143
 GameObject:
   m_ObjectHideFlags: 0
@@ -134,6 +226,38 @@ 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 &4839042212097452887
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8082654501384427431}
+  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 &8082654501384427431
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4839042212097452887}
+  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 &5291855315857285515
 GameObject:
   m_ObjectHideFlags: 0
@@ -164,8 +288,8 @@ Transform:
   m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8852068339429225660}
-  - {fileID: 64828878555111520}
+  - {fileID: 8082654501384427431}
+  - {fileID: 3691111229450823700}
   m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6360724120513573557
@@ -312,7 +436,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 &259623105186345364
 SkinnedMeshRenderer:
@@ -337,7 +461,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
@@ -364,9 +488,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 7074505583183483981}
+  - {fileID: 8082654501384427431}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7074505583183483981}
+  m_RootBone: {fileID: 8082654501384427431}
   m_AABB:
     m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
     m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
@@ -405,7 +529,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 3691111229450823700}
+  - {fileID: 4855682620463343737}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082
@@ -429,127 +553,3 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &8840341749305326412
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 64828878555111520}
-  - component: {fileID: 451815570830318593}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbjian2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &64828878555111520
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8840341749305326412}
-  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &451815570830318593
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8840341749305326412}
-  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: ec89875f45618634691f6e7faf52ae06, 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: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
-  m_Bones:
-  - {fileID: 8852068339429225660}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8852068339429225660}
-  m_AABB:
-    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
-    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
---- !u!1 &8937287009002058098
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8852068339429225660}
-  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 &8852068339429225660
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8937287009002058098}
-  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}

+ 171 - 171
Assets/Res/CombatHero/fb_linglongta.prefab

@@ -1,37 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &2291039110478642405
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1763019269246464033}
-  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 &1763019269246464033
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2291039110478642405}
-  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}
 --- !u!1 &2853221564033797514
 GameObject:
   m_ObjectHideFlags: 0
@@ -198,6 +166,98 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5174932574442691741
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5356075788065938174}
+  - component: {fileID: 9100998687719186614}
+  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 &5356075788065938174
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5174932574442691741}
+  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 &9100998687719186614
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5174932574442691741}
+  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 &6069193922456573349
 GameObject:
   m_ObjectHideFlags: 0
@@ -228,8 +288,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1763019269246464033}
-  - {fileID: 4063296274027650811}
+  - {fileID: 6845193968892187948}
+  - {fileID: 863970886148803287}
   m_Father: {fileID: 4887794763406024427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6525093672149038688
@@ -280,7 +340,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &7493868076058049960
+--- !u!1 &7193420594878725320
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -288,41 +348,8 @@ GameObject:
   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 &7763230478118363831
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5975393219257055395}
-  - component: {fileID: 6659884166006867709}
+  - component: {fileID: 863970886148803287}
+  - component: {fileID: 5148794049797004082}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -331,28 +358,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5975393219257055395
+--- !u!4 &863970886148803287
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7763230478118363831}
+  m_GameObject: {fileID: 7193420594878725320}
   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_Father: {fileID: 589998100047264782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6659884166006867709
+--- !u!137 &5148794049797004082
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7763230478118363831}
+  m_GameObject: {fileID: 7193420594878725320}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -369,7 +396,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
+  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -396,15 +423,80 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
   m_Bones:
-  - {fileID: 4887794763406024427}
+  - {fileID: 6845193968892187948}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4887794763406024427}
+  m_RootBone: {fileID: 6845193968892187948}
   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 &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 &8274507065241936611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6845193968892187948}
+  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 &6845193968892187948
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8274507065241936611}
+  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}
 --- !u!1 &8833322958098411812
 GameObject:
   m_ObjectHideFlags: 0
@@ -438,7 +530,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4887794763406024427}
-  - {fileID: 5975393219257055395}
+  - {fileID: 5356075788065938174}
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8112392103606109572
@@ -477,95 +569,3 @@ MonoBehaviour:
   _Animator: {fileID: 8112392103606109572}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &9163229485728084927
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4063296274027650811}
-  - component: {fileID: 8877869810720570268}
-  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 &4063296274027650811
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9163229485728084927}
-  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 &8877869810720570268
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9163229485728084927}
-  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: 1763019269246464033}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 1763019269246464033}
-  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

+ 59 - 59
Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &794075418527211559
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2200174236328489759}
+  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 &2200174236328489759
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 794075418527211559}
+  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: []
+  m_Father: {fileID: 8019158978286339551}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2106655689270820769
 GameObject:
   m_ObjectHideFlags: 0
@@ -151,38 +183,6 @@ Transform:
   - {fileID: 8019158978286339551}
   m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3370324831030889604
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 892179960580792401}
-  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 &892179960580792401
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3370324831030889604}
-  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: []
-  m_Father: {fileID: 8019158978286339551}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3398165251034620908
 GameObject:
   m_ObjectHideFlags: 0
@@ -231,7 +231,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &4931174833750232630
+--- !u!1 &4255498644852547622
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -239,38 +239,38 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6677864607851000338}
-  - component: {fileID: 6747719691175408690}
+  - component: {fileID: 6229430003599879119}
+  - component: {fileID: 1905573846331093161}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: wulonglun
+  m_Name: wulonglun2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6677864607851000338
+--- !u!4 &6229430003599879119
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4931174833750232630}
+  m_GameObject: {fileID: 4255498644852547622}
   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_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2106735808395853295}
+  m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6747719691175408690
+--- !u!137 &1905573846331093161
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4931174833750232630}
+  m_GameObject: {fileID: 4255498644852547622}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -287,7 +287,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a78f967665a433842a8fa465bd7675d2, type: 2}
+  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -314,9 +314,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
   m_Bones:
-  - {fileID: 8985698407474411210}
+  - {fileID: 2200174236328489759}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8985698407474411210}
+  m_RootBone: {fileID: 2200174236328489759}
   m_AABB:
     m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
     m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
@@ -353,8 +353,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 892179960580792401}
-  - {fileID: 8254636069082504365}
+  - {fileID: 2200174236328489759}
+  - {fileID: 6229430003599879119}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -438,7 +438,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 6677864607851000338}
+  - {fileID: 9170246600198239819}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242
@@ -477,7 +477,7 @@ MonoBehaviour:
   _Animator: {fileID: 852375880241615242}
   _Transitions: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
   _ActionOnDisable: 0
---- !u!1 &8791618913766558586
+--- !u!1 &7378096372778396127
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -485,38 +485,38 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8254636069082504365}
-  - component: {fileID: 9075949572634654291}
+  - component: {fileID: 9170246600198239819}
+  - component: {fileID: 2824031357367664550}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: wulonglun2
+  m_Name: wulonglun
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8254636069082504365
+--- !u!4 &9170246600198239819
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8791618913766558586}
+  m_GameObject: {fileID: 7378096372778396127}
   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_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8019158978286339551}
+  m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &9075949572634654291
+--- !u!137 &2824031357367664550
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8791618913766558586}
+  m_GameObject: {fileID: 7378096372778396127}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -533,7 +533,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: fbaa3d8e57dad6d4f92978954632c928, type: 2}
+  - {fileID: 2100000, guid: a78f967665a433842a8fa465bd7675d2, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -560,9 +560,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
   m_Bones:
-  - {fileID: 892179960580792401}
+  - {fileID: 8985698407474411210}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 892179960580792401}
+  m_RootBone: {fileID: 8985698407474411210}
   m_AABB:
     m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
     m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}

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

@@ -32,40 +32,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1318322496446082653
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5208885372425635837}
-  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 &5208885372425635837
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1318322496446082653}
-  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: 5614361202340812523}
-  - {fileID: 3563114715767637197}
-  m_Father: {fileID: 6598966518811955930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1753474551093225905
 GameObject:
   m_ObjectHideFlags: 0
@@ -233,7 +199,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 8540994765029789769}
+  - {fileID: 8570721680238106085}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -272,7 +238,7 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &3879621058924093421
+--- !u!1 &5815321883806176202
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -280,29 +246,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5614361202340812523}
+  - component: {fileID: 1004414448351577483}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fb_yuping_show
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5614361202340812523
+--- !u!4 &1004414448351577483
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3879621058924093421}
+  m_GameObject: {fileID: 5815321883806176202}
   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_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: []
-  m_Father: {fileID: 5208885372425635837}
+  m_Children:
+  - {fileID: 2930359736285235812}
+  - {fileID: 8540994765029789769}
+  m_Father: {fileID: 6598966518811955930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6642471949105620041
 GameObject:
@@ -352,40 +320,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &8219916005125797274
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6598966518811955930}
-  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 &6598966518811955930
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8219916005125797274}
-  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:
-  - {fileID: 5208885372425635837}
-  m_Father: {fileID: 8974866603299107661}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8334080262958574248
+--- !u!1 &7660936226239921582
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -393,8 +328,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3563114715767637197}
-  - component: {fileID: 1773669288481986371}
+  - component: {fileID: 8570721680238106085}
+  - component: {fileID: 108142719947825256}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: yuping
@@ -403,30 +338,30 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3563114715767637197
+--- !u!4 &8570721680238106085
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8334080262958574248}
+  m_GameObject: {fileID: 7660936226239921582}
   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: 5208885372425635837}
+  m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1773669288481986371
+--- !u!137 &108142719947825256
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8334080262958574248}
+  m_GameObject: {fileID: 7660936226239921582}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -441,7 +376,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, type: 2}
+  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -468,15 +403,80 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 5614361202340812523}
+  - {fileID: 6598966518811955930}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 5614361202340812523}
+  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 &8098147739759077235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2930359736285235812}
+  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 &2930359736285235812
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8098147739759077235}
+  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: 1004414448351577483}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8219916005125797274
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6598966518811955930}
+  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 &6598966518811955930
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8219916005125797274}
+  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:
+  - {fileID: 1004414448351577483}
+  m_Father: {fileID: 8974866603299107661}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &9146730722358197222
 GameObject:
   m_ObjectHideFlags: 0
@@ -508,7 +508,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 1004414448351577483}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &1533382306985861776
 SkinnedMeshRenderer:
@@ -518,7 +518,7 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9146730722358197222}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -533,7 +533,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
@@ -560,9 +560,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 2930359736285235812}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 2930359736285235812}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}

+ 20 - 0
Assets/Res/Config/FabaoConfig.json

@@ -54,6 +54,16 @@
       ],
       "SkillGroupID": 3202
     },
+    {
+      "ID": 10005,
+      "ItemID": 10005,
+      "name": "绝脉瓶",
+      "Type": 1,
+      "magicAttribute": 2,
+      "model": "fb_3203",
+      "fragmentID": 11005,
+      "SkillGroupID": 3203
+    },
     {
       "ID": 10006,
       "ItemID": 10006,
@@ -72,6 +82,16 @@
       ],
       "SkillGroupID": 3301
     },
+    {
+      "ID": 10007,
+      "ItemID": 10007,
+      "name": "玉莲守心灯",
+      "Type": 1,
+      "magicAttribute": 4,
+      "model": "fb_3302",
+      "fragmentID": 11007,
+      "SkillGroupID": 3302
+    },
     {
       "ID": 10008,
       "ItemID": 10008,

+ 174 - 0
Assets/Res/Config/SkillConfig.json

@@ -6247,6 +6247,156 @@
       ],
       "PromoteLan": 1284
     },
+    {
+      "ID": 32030,
+      "PieceID": 11002,
+      "power": 100.0,
+      "name": 520,
+      "dec": 943,
+      "attribute": 2,
+      "icon": "icon_s3203",
+      "scriptName": "S3203",
+      "IDGroup": 3203,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 1,
+      "effectValue": [
+        30.0,
+        1.0,
+        5.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": -1
+    },
+    {
+      "ID": 32031,
+      "PieceID": 11002,
+      "power": 150.0,
+      "name": 521,
+      "dec": 944,
+      "attribute": 2,
+      "icon": "icon_s3203",
+      "scriptName": "S3203",
+      "IDGroup": 3203,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 2,
+      "effectValue": [
+        40.0,
+        1.0,
+        5.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1285
+    },
+    {
+      "ID": 32032,
+      "PieceID": 11002,
+      "power": 225.0,
+      "name": 522,
+      "dec": 945,
+      "attribute": 2,
+      "icon": "icon_s3203",
+      "scriptName": "S3203",
+      "IDGroup": 3203,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 3,
+      "effectValue": [
+        50.0,
+        1.0,
+        5.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1286
+    },
+    {
+      "ID": 32033,
+      "PieceID": 11002,
+      "power": 337.5,
+      "name": 523,
+      "dec": 946,
+      "attribute": 2,
+      "icon": "icon_s3203",
+      "scriptName": "S3203",
+      "IDGroup": 3203,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 4,
+      "effectValue": [
+        60.0,
+        1.0,
+        5.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1287
+    },
+    {
+      "ID": 32034,
+      "PieceID": 11002,
+      "power": 506.25,
+      "name": 524,
+      "dec": 947,
+      "attribute": 2,
+      "icon": "icon_s3203",
+      "scriptName": "S3203",
+      "IDGroup": 3203,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 5,
+      "effectValue": [
+        70.0,
+        1.0,
+        5.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1288
+    },
+    {
+      "ID": 32035,
+      "PieceID": 11002,
+      "power": 759.375,
+      "name": 525,
+      "dec": 948,
+      "attribute": 2,
+      "icon": "icon_s3203",
+      "scriptName": "S3203",
+      "IDGroup": 3203,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 6,
+      "effectValue": [
+        80.0,
+        1.0,
+        5.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1289
+    },
     {
       "ID": 33010,
       "PieceID": 11004,
@@ -6445,6 +6595,10 @@
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
+      "effectValue": [
+        10.0,
+        1.0
+      ],
       "intensifierIndex": [
         1
       ],
@@ -6465,6 +6619,10 @@
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
+      "effectValue": [
+        11.0,
+        1.0
+      ],
       "intensifierIndex": [
         1
       ],
@@ -6485,6 +6643,10 @@
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
+      "effectValue": [
+        12.0,
+        1.0
+      ],
       "intensifierIndex": [
         1
       ],
@@ -6505,6 +6667,10 @@
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
+      "effectValue": [
+        13.0,
+        1.0
+      ],
       "intensifierIndex": [
         1
       ],
@@ -6525,6 +6691,10 @@
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
+      "effectValue": [
+        14.0,
+        1.0
+      ],
       "intensifierIndex": [
         1
       ],
@@ -6545,6 +6715,10 @@
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
+      "effectValue": [
+        15.0,
+        1.0
+      ],
       "intensifierIndex": [
         1
       ],

+ 4 - 4
Assets/Scenes/testCombat.scene

@@ -2254,7 +2254,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.size
-      value: 3
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
@@ -2366,7 +2366,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 4
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
@@ -2374,7 +2374,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10010
+      value: 10004
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 1 - 0
Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -19,6 +19,7 @@ namespace GameLogic.Combat.Hero
     /// </summary>
     public class CombatMagicWeaponEntity : CombatHeroEntity
     {
+        public System.Func<Vector3> CustomizeShowTarget;
         public int MagicWeaponCollisionId = -1;
         protected FabaoConfig _magicWeaponConfig;
         public float cd = 2;

+ 14 - 6
Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -11,6 +11,7 @@ namespace GameLogic.Combat.Hero.State
     {
         private CombatMagicWeaponEntity myCombatMagicWeaponEntity;
 
+
         private Vector3 startPos;
         private Vector3 endPos;
         private float _addTime;
@@ -38,21 +39,28 @@ namespace GameLogic.Combat.Hero.State
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
             startPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.dotPos;
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 5;
-            float x = xOff[myCombatMagicWeaponEntity.useIndex%xOff.Length];
+            float x = xOff[myCombatMagicWeaponEntity.useIndex % xOff.Length];
+
+            if (myCombatMagicWeaponEntity.CustomizeShowTarget != null)
+            {
+                endPos = myCombatMagicWeaponEntity.CustomizeShowTarget();
+            }
+            else
+            {
+                endPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform
+                    .TransformPoint(
+                        new Vector3(x, y, 0));
+            }
 
-            endPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform
-                .TransformPoint(
-                    new Vector3(x, y, 0));
             // endPos = startPos +  Vector3(x-3, y, 0);
             _addTime = 1.0f / (Vector3.Distance(startPos, endPos) /
                                CustomTweenManager.AnimationCurveLibrary.fabaoMoveTopSpeed);
-          
+
             isUpdate = true;
 
             if (myCombatMagicWeaponEntity.isMagicWeaponTreasureBook)
             {
                 _currTime = 1;
-              
             }
             else
             {

+ 12 - 1
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3202.cs

@@ -1,6 +1,7 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
+using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill.MagicSkill
@@ -17,6 +18,16 @@ namespace GameLogic.Combat.Skill.MagicSkill
         private float _currTime;
         private int _useCount;
 
+        protected override void ProInitSkill()
+        {
+            CombatMagicWeaponEntity.CustomizeShowTarget = GetTargetPos;
+        }
+
+        private Vector3 GetTargetPos()
+        {
+            SpecialDotInfo specialDotInfo = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GetSpecialDotInfo("toupos1");
+            return specialDotInfo.GetWorlPos();
+        }
 
         protected override void ProMagicUseSkill()
         {
@@ -29,7 +40,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.Water += v;
             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.Fire += v;
             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.Earth += v;
-            ActivationTimeLineData("sk1_xiaoshi");
+            ActivationTimeLineData("die");
             SkillPlayFinish();
         }
 

+ 81 - 0
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3203.cs

@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill.MagicSkill
+{
+    /// <summary>
+    /// 绝脉瓶
+    /// 对敌人照成水系伤害,封锁敌人筋脉随机{0}个格子流动{1}秒
+    /// </summary>
+    public class S3203 : MagicSkillBasic
+    {
+        private CombatHeroEntity target;
+
+
+        protected override void ProMagicUseSkill()
+        {
+            // StraightLineShow straightLineShow = new StraightLineShow();
+            // straightLineShow.Init(this);
+            CombatHeroEntity[] allHero =
+                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+            if (allHero == null || allHero.Length <= 0)
+            {
+                SkillPlayFinish();
+                return;
+            }
+
+            target = allHero[0];
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+
+            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("法宝对敌人照成伤害");
+            ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            if (lifetCycleHitPoint == null)
+            {
+                SkillPlayFinish();
+                return;
+            }
+
+            BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
+            cBetterList.Add(lifetCycleHitPoint);
+            ActivationTimeLineData("gongji", currTarget: cBetterList);
+            SkillPlayFinish();
+
+
+            List<int> buffId = new List<int>() { 10191, 10201, 10211, 10221, 10231 };
+            for (int i = 0; i < effectValue[1]; i++)
+            {
+                int index = CombatCalculateTool.Instance.GetOdd(0, buffId.Count);
+                int id = buffId[index];
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(id, effectValue[2], 1);
+                BuffBasic buffBasic = target.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+                buffId.RemoveAt(index);
+            }
+
+            long att = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.attack.Value;
+            long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, effectValue[0]);
+
+
+            CombatCalculateTool.Instance.Harm(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity,
+                lifetCycleHitPoint as CombatHeroHitPoint, harm, AttType.FaBao, triggerData, wuXingType, null,
+                HarmType.Default);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3203.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 74217f57d14f4017ab643fc52a20166b
+timeCreated: 1751526753

+ 17 - 12
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3302.cs

@@ -30,16 +30,19 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         protected override void ProMagicUseSkill()
         {
-            TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic = ActivationTimeLineData("sk1_xiaoshi");
-            timeLineEventLogicGroupBasic.TimeLineUpdateEnd = delegate()
-            {
-                root = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform;
-                _dir = Vector3.forward * 3;
-                Vector3 d = root.rotation * _dir;
-                CombatHeroEntity.GameObject.transform.position = d + root.position;
-                TimeLineEventLogicGroupBasic sk1_show = ActivationTimeLineData("sk1_show");
-                sk1_show.TimeLineUpdateEnd = ShowFinish;
-            };
+            TimeLineEventLogicGroupBasic sk1_show = ActivationTimeLineData("sk1_show");
+            sk1_show.TimeLineUpdateEnd = ShowFinish;
+            root = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform;
+            _dir = Vector3.forward * 1;
+            Vector3 d = root.rotation * _dir;
+            CombatHeroEntity.GameObject.transform.position = d + root.position;
+            // TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic = ActivationTimeLineData("sk1_xiaoshi");
+            // timeLineEventLogicGroupBasic.TimeLineUpdateEnd = delegate()
+            // {
+            //   
+            //    
+            //  
+            // };
             CombatEventManager.Instance.AddEventListener(CombatEventType.StartAddBuff, StartAddBuff);
         }
 
@@ -74,6 +77,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         private void ShowFinish()
         {
+            ActivationTimeLineData("sk1");
             isUpdate = true;
             _currTime = 0;
         }
@@ -88,14 +92,15 @@ namespace GameLogic.Combat.Skill.MagicSkill
             _currTime += time;
             if (_currTime >= SelfSkillConfig.effectValue[0])
             {
+                ActivationTimeLineData("sk1_xiaoshi");
                 SkillPlayFinish();
                 isUpdate = false;
                 return;
             }
 
-            _jiaoDu += 360 * time * 0.5f;
+            _jiaoDu -= 360 * time * 0.5f;
             Quaternion quaternionY = Quaternion.Euler(0, _jiaoDu, 0);
-            Vector3 d = root.rotation * quaternionY * _dir;
+            Vector3 d = root.rotation * quaternionY * _dir+new Vector3(0,0.5f,0);
             CombatHeroEntity.GameObject.transform.position = d + root.position;
         }
 

BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/skill.xlsx


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.