修改bug

Assets/Art/ArtHero/Guixiu01.prefab

@@ -1212,6 +1212,7 @@ Transform:
   - {fileID: 7314545036509322813}
   - {fileID: 8807355335296103306}
   - {fileID: 7504899610413469283}
+  - {fileID: 2918780800185193696}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4519616590784572839
@@ -1495,6 +1496,38 @@ Transform:
   - {fileID: 8988297207857264158}
   m_Father: {fileID: 8942306492644828821}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5581271625416331488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2918780800185193696}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2918780800185193696
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5581271625416331488}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 2.01, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8899381552991161340}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5588227524264275179
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/ArtHero/Nanzhu.prefab

@@ -1545,6 +1545,7 @@ Transform:
   - {fileID: 5857502490606678529}
   - {fileID: 2179347405586335515}
   - {fileID: 7138274267145577638}
+  - {fileID: 2084110603412516017}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4003951984861419984
@@ -3123,6 +3124,38 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3563316907850986015}
   m_LocalEulerAnglesHint: {x: 0.0000015474562, y: 0.0000025614527, z: -16.170298}
+--- !u!1 &7266971181550505288
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2084110603412516017}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2084110603412516017
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7266971181550505288}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.802, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5226940908611843665}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7390676203228307514
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_mozhan.prefab

@@ -4915,8 +4915,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 0.42749792, y: 0.33754444, z: 0.3201725}
-  m_Center: {x: -0.019077606, y: -0.011964202, z: -0.07578561}
+  m_Size: {x: 0.58567464, y: 0.23420966, z: 0.3201725}
+  m_Center: {x: 0.06001073, y: 0.045087516, z: -0.07578561}
 --- !u!114 &2147806076643717786
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Guixiu01.prefab

@@ -1556,6 +1556,7 @@ Transform:
   - {fileID: 4892451167953402893}
   - {fileID: 774881355960454443}
   - {fileID: 7508470614555230924}
+  - {fileID: 7257332083816463963}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4035212543723624584
@@ -2477,6 +2478,38 @@ Transform:
   - {fileID: 8240487038123615471}
   m_Father: {fileID: 3880410557132924801}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8103723988568438598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7257332083816463963}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7257332083816463963
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8103723988568438598}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 2.01, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5253628818678954455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8123436420997924794
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Nanzhu.prefab

@@ -71,6 +71,7 @@ Transform:
   - {fileID: 322632003636689912}
   - {fileID: 1187838730353272687}
   - {fileID: 2662654692604703939}
+  - {fileID: 3451499639865654928}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5142883770047668829
@@ -1322,6 +1323,38 @@ Transform:
   - {fileID: 6523499261097251122}
   m_Father: {fileID: 8379563877869805008}
   m_LocalEulerAnglesHint: {x: 12.170791, y: 3.2188106, z: -17.59956}
+--- !u!1 &2727274317679981531
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3451499639865654928}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3451499639865654928
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2727274317679981531}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.802, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7980208121730886396}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2819664155657093707
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/fb_dao1.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &809572923017224122
+--- !u!1 &558147470157951354
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,47 +8,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3906682033092909940}
-  - component: {fileID: 4234352655561077539}
+  - component: {fileID: 5325025415588804644}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: pengpos
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3906682033092909940
+--- !u!4 &5325025415588804644
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 809572923017224122}
+  m_GameObject: {fileID: 558147470157951354}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.015, z: 0.782}
+  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: 25656997809885723}
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4234352655561077539
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 809572923017224122}
-  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 &1197942244180523888
+--- !u!1 &809572923017224122
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -56,55 +40,47 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3762066587073657769}
-  - component: {fileID: 1164658870965195}
+  - component: {fileID: 3906682033092909940}
+  - component: {fileID: 4234352655561077539}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbdao1run
+  m_Name: pengpos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3762066587073657769
+--- !u!4 &3906682033092909940
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1197942244180523888}
+  m_GameObject: {fileID: 809572923017224122}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.189}
+  m_LocalPosition: {x: 0, y: 0.015, z: 0.782}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3562723674201918496}
-  - {fileID: 6553826512275635386}
+  m_Children: []
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &1164658870965195
-Animator:
-  serializedVersion: 5
+--- !u!114 &4234352655561077539
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1197942244180523888}
+  m_GameObject: {fileID: 809572923017224122}
   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 &3354276703214414614
+  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 &925340386716163884
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,8 +88,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1022405033971170949}
-  - component: {fileID: 7705414849688836523}
+  - component: {fileID: 3261955100367052469}
+  - component: {fileID: 2380093427392102959}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbdao1
@@ -122,28 +98,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1022405033971170949
+--- !u!4 &3261955100367052469
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3354276703214414614}
+  m_GameObject: {fileID: 925340386716163884}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
   m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8565182548359739858}
+  m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7705414849688836523
+--- !u!137 &2380093427392102959
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3354276703214414614}
+  m_GameObject: {fileID: 925340386716163884}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -160,7 +136,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
@@ -187,16 +163,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 2943180459306909343}
+  - {fileID: 3562723674201918496}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2943180459306909343}
+  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 &3368977622504917241
+--- !u!1 &1197942244180523888
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -204,33 +180,55 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8565182548359739858}
+  - component: {fileID: 3762066587073657769}
+  - component: {fileID: 1164658870965195}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbdao1run (1)
+  m_Name: fbdao1run
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8565182548359739858
+--- !u!4 &3762066587073657769
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3368977622504917241}
+  m_GameObject: {fileID: 1197942244180523888}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.4986345, y: -0.50136185, z: -0.50136185, w: 0.4986345}
-  m_LocalPosition: {x: -0.004, y: -0, z: -0.002}
-  m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
+  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: 2943180459306909343}
-  - {fileID: 1022405033971170949}
-  m_Father: {fileID: 3562723674201918496}
+  - {fileID: 3562723674201918496}
+  - {fileID: 3261955100367052469}
+  m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4779180015342945448
+--- !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
   m_CorrespondingSourceObject: {fileID: 0}
@@ -238,29 +236,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2943180459306909343}
+  - component: {fileID: 8565182548359739858}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fbdao1run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2943180459306909343
+--- !u!4 &8565182548359739858
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4779180015342945448}
+  m_GameObject: {fileID: 3368977622504917241}
   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_LocalRotation: {x: 0.4986345, y: -0.50136185, z: -0.50136185, w: 0.4986345}
+  m_LocalPosition: {x: -0.004, y: -0, z: -0.002}
+  m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
+  m_Children:
+  - {fileID: 5325025415588804644}
+  - {fileID: 5597037911562708323}
+  m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
 GameObject:
@@ -461,7 +461,7 @@ Transform:
   - {fileID: 8565182548359739858}
   m_Father: {fileID: 3762066587073657769}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6964248469380345709
+--- !u!1 &8186722342043849031
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -469,8 +469,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6553826512275635386}
-  - component: {fileID: 8073781002527313440}
+  - component: {fileID: 5597037911562708323}
+  - component: {fileID: 1744608353802514277}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbdao1
@@ -479,28 +479,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6553826512275635386
+--- !u!4 &5597037911562708323
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6964248469380345709}
+  m_GameObject: {fileID: 8186722342043849031}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
   m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3762066587073657769}
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8073781002527313440
+--- !u!137 &1744608353802514277
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6964248469380345709}
+  m_GameObject: {fileID: 8186722342043849031}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -517,7 +517,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, type: 2}
+  - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 3562723674201918496}
+  - {fileID: 5325025415588804644}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
+  m_RootBone: {fileID: 5325025415588804644}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}

Assets/Res/CombatHero/fb_ding1.prefab

@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &381800408758739012
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8939609991258154816}
+  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 &8939609991258154816
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 381800408758739012}
+  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 &1623525566636903651
 GameObject:
   m_ObjectHideFlags: 0
@@ -80,41 +112,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2538381807794004556
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8990132256551677773}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbding1run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8990132256551677773
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2538381807794004556}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.0000034666066, y: 0.0000034454445, z: 0.7092684, w: 0.7049386}
-  m_LocalPosition: {x: 0.27, y: 0.003, z: -0}
-  m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7113462739802565253}
-  - {fileID: 5167189725569177422}
-  m_Father: {fileID: 8679617179344489080}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3939859743415189373
+--- !u!1 &2393791984490224259
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -122,8 +120,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6179119327567515893}
-  - component: {fileID: 2240523489087406326}
+  - component: {fileID: 524041973763158377}
+  - component: {fileID: 8070402762927843443}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbding1
@@ -132,13 +130,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6179119327567515893
+--- !u!4 &524041973763158377
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3939859743415189373}
+  m_GameObject: {fileID: 2393791984490224259}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
   m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
@@ -147,13 +145,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1894970939113486830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2240523489087406326
+--- !u!137 &8070402762927843443
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3939859743415189373}
+  m_GameObject: {fileID: 2393791984490224259}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -206,6 +204,40 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
+--- !u!1 &2538381807794004556
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8990132256551677773}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbding1run (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8990132256551677773
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2538381807794004556}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.0000034666066, y: 0.0000034454445, z: 0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: 0.27, y: 0.003, z: -0}
+  m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8939609991258154816}
+  - {fileID: 7984458150681727936}
+  m_Father: {fileID: 8679617179344489080}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4033669629132829777
 GameObject:
   m_ObjectHideFlags: 0
@@ -286,7 +318,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 6179119327567515893}
+  - {fileID: 524041973763158377}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -310,39 +342,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &5978135591687887836
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7113462739802565253}
-  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 &7113462739802565253
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5978135591687887836}
-  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 &7170540255234685507
+--- !u!1 &5584041906982033538
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -350,8 +350,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5167189725569177422}
-  - component: {fileID: 6588153771377172287}
+  - component: {fileID: 7984458150681727936}
+  - component: {fileID: 5375221616874603853}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbding1
@@ -360,13 +360,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5167189725569177422
+--- !u!4 &7984458150681727936
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7170540255234685507}
+  m_GameObject: {fileID: 5584041906982033538}
   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}
@@ -375,13 +375,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6588153771377172287
+--- !u!137 &5375221616874603853
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7170540255234685507}
+  m_GameObject: {fileID: 5584041906982033538}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -425,9 +425,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 7113462739802565253}
+  - {fileID: 8939609991258154816}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7113462739802565253}
+  m_RootBone: {fileID: 8939609991258154816}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}

Assets/Res/CombatHero/fb_huohulu.prefab

@@ -65,7 +65,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 182559092131439419}
+  - {fileID: 858800514818609066}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -151,11 +151,11 @@ Transform:
   m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 9011111800937724847}
-  - {fileID: 1911057432920996047}
+  - {fileID: 8715568911793545506}
+  - {fileID: 1421700847451682984}
   m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3782825515860694114
+--- !u!1 &3845302492866382522
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -163,7 +163,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 9011111800937724847}
+  - component: {fileID: 8715568911793545506}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -172,13 +172,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &9011111800937724847
+--- !u!4 &8715568911793545506
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3782825515860694114}
+  m_GameObject: {fileID: 3845302492866382522}
   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}
@@ -187,6 +187,98 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4143911082196843799
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1421700847451682984}
+  - component: {fileID: 5555610576379097043}
+  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 &1421700847451682984
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4143911082196843799}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8763248839805234681}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &5555610576379097043
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4143911082196843799}
+  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: 8715568911793545506}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8715568911793545506}
+  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 &4967031559869244623
 GameObject:
   m_ObjectHideFlags: 0
@@ -321,55 +413,7 @@ 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 &7053293013541296252
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3146966691021036876}
-  - component: {fileID: 5296103357367706842}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: pengpos
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3146966691021036876
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7053293013541296252}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.034, z: 0.202}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6709539860230415573}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5296103357367706842
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7053293013541296252}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DotName: pengpos
-  followSkeleton: 0
-  myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &7147155438434380334
+--- !u!1 &6194576984318845612
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -377,8 +421,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1911057432920996047}
-  - component: {fileID: 4031485132346694164}
+  - component: {fileID: 858800514818609066}
+  - component: {fileID: 5424028383363787029}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_hulu
@@ -387,28 +431,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1911057432920996047
+--- !u!4 &858800514818609066
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7147155438434380334}
+  m_GameObject: {fileID: 6194576984318845612}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8763248839805234681}
+  m_Father: {fileID: 5315834147508480038}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4031485132346694164
+--- !u!137 &5424028383363787029
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7147155438434380334}
+  m_GameObject: {fileID: 6194576984318845612}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -425,7 +469,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
+  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -452,16 +496,16 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9011111800937724847}
+  - {fileID: 9160172853801646544}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9011111800937724847}
+  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 &7554328747120582276
+--- !u!1 &7053293013541296252
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -469,87 +513,43 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 182559092131439419}
-  - component: {fileID: 4026388484746261112}
+  - component: {fileID: 3146966691021036876}
+  - component: {fileID: 5296103357367706842}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_hulu
+  m_Name: pengpos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &182559092131439419
+--- !u!4 &3146966691021036876
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7554328747120582276}
+  m_GameObject: {fileID: 7053293013541296252}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.034, z: 0.202}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5315834147508480038}
+  m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4026388484746261112
-SkinnedMeshRenderer:
+--- !u!114 &5296103357367706842
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7554328747120582276}
+  m_GameObject: {fileID: 7053293013541296252}
   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
+  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}

Assets/Res/CombatHero/fb_jian1.prefab

@@ -78,42 +78,10 @@ Transform:
   m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6032745452416371609}
-  - {fileID: 1525634938503862427}
+  - {fileID: 1466641303974437742}
+  - {fileID: 1543321523703594991}
   m_Father: {fileID: 7466859698293448862}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2024454904940886627
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6032745452416371609}
-  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 &6032745452416371609
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2024454904940886627}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
-  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1439812933337521677}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2778996064610124439
 GameObject:
   m_ObjectHideFlags: 0
@@ -146,7 +114,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 1090395781247428181}
+  - {fileID: 2621102206427217714}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -170,6 +138,98 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &3381466308560309700
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2621102206427217714}
+  - component: {fileID: 843069954200866167}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_jian1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2621102206427217714
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3381466308560309700}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1028615347405319678}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &843069954200866167
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3381466308560309700}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
+  m_Bones:
+  - {fileID: 7466859698293448862}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7466859698293448862}
+  m_AABB:
+    m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
+    m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &3749266543314816333
 GameObject:
   m_ObjectHideFlags: 0
@@ -304,40 +364,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &5182842215280330390
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7466859698293448862}
-  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 &7466859698293448862
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  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:
-  - {fileID: 1439812933337521677}
-  m_Father: {fileID: 1028615347405319678}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5974188163596052733
+--- !u!1 &4270719810448631583
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -345,8 +372,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1090395781247428181}
-  - component: {fileID: 255425175697479892}
+  - component: {fileID: 1543321523703594991}
+  - component: {fileID: 2622134306898760078}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -355,28 +382,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1090395781247428181
+--- !u!4 &1543321523703594991
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5974188163596052733}
+  m_GameObject: {fileID: 4270719810448631583}
   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 &255425175697479892
+--- !u!137 &2622134306898760078
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5974188163596052733}
+  m_GameObject: {fileID: 4270719810448631583}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -393,7 +420,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
@@ -420,15 +447,48 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 7466859698293448862}
+  - {fileID: 1466641303974437742}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
+  m_RootBone: {fileID: 1466641303974437742}
   m_AABB:
     m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
     m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
+--- !u!1 &5182842215280330390
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7466859698293448862}
+  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 &7466859698293448862
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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:
+  - {fileID: 1439812933337521677}
+  m_Father: {fileID: 1028615347405319678}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7849891338208220805
 GameObject:
   m_ObjectHideFlags: 0
@@ -461,7 +521,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8151411080291406354
+--- !u!1 &9134061256713417921
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -469,87 +529,27 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1525634938503862427}
-  - component: {fileID: 4244846351153078089}
+  - component: {fileID: 1466641303974437742}
   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 &1525634938503862427
+--- !u!4 &1466641303974437742
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8151411080291406354}
+  m_GameObject: {fileID: 9134061256713417921}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4244846351153078089
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8151411080291406354}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
-  m_Bones:
-  - {fileID: 6032745452416371609}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6032745452416371609}
-  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

Assets/Res/CombatHero/fb_jian2.prefab

@@ -1,97 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &788887625678481061
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3945353691057656919}
-  - component: {fileID: 5449845432020339476}
-  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 &3945353691057656919
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 788887625678481061}
-  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 &5449845432020339476
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 788887625678481061}
-  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
@@ -226,6 +134,130 @@ 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 &3338431573842585933
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5013185721652675401}
+  - component: {fileID: 6457157761746434874}
+  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 &5013185721652675401
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3338431573842585933}
+  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 &6457157761746434874
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3338431573842585933}
+  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: 6237508137163546713}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6237508137163546713}
+  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 &3427457991048160814
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6237508137163546713}
+  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 &6237508137163546713
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427457991048160814}
+  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
@@ -256,8 +288,8 @@ Transform:
   m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2389150485496332826}
-  - {fileID: 7595873360321458462}
+  - {fileID: 6237508137163546713}
+  - {fileID: 5013185721652675401}
   m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6360724120513573557
@@ -405,7 +437,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 3945353691057656919}
+  - {fileID: 8738717545328619799}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082
@@ -429,7 +461,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &8427788771193385652
+--- !u!1 &8553350037749681380
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -437,40 +469,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2389150485496332826}
-  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 &2389150485496332826
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8427788771193385652}
-  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 &8673557861955137068
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7595873360321458462}
-  - component: {fileID: 1537092095147214101}
+  - component: {fileID: 8738717545328619799}
+  - component: {fileID: 2541302800089787918}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fbjian2
@@ -479,28 +479,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7595873360321458462
+--- !u!4 &8738717545328619799
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8673557861955137068}
+  m_GameObject: {fileID: 8553350037749681380}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
   m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6865594351597376310}
+  m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1537092095147214101
+--- !u!137 &2541302800089787918
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8673557861955137068}
+  m_GameObject: {fileID: 8553350037749681380}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -517,7 +517,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
+  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 2389150485496332826}
+  - {fileID: 7074505583183483981}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2389150485496332826}
+  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}

Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &1777467053814289557
+--- !u!1 &966329709723218601
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,7 +8,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6617105143483196895}
+  - component: {fileID: 2980203232940561759}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -17,13 +17,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6617105143483196895
+--- !u!4 &2980203232940561759
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1777467053814289557}
+  m_GameObject: {fileID: 966329709723218601}
   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}
@@ -150,7 +150,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2413911441450593003
+--- !u!1 &2567737453772689932
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -158,8 +158,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 595741611000363797}
-  - component: {fileID: 7153072677284467074}
+  - component: {fileID: 5409860526676515362}
+  - component: {fileID: 3465620171131222290}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun
@@ -168,13 +168,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &595741611000363797
+--- !u!4 &5409860526676515362
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2413911441450593003}
+  m_GameObject: {fileID: 2567737453772689932}
   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}
@@ -183,13 +183,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7153072677284467074
+--- !u!137 &3465620171131222290
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2413911441450593003}
+  m_GameObject: {fileID: 2567737453772689932}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -323,7 +323,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &6952388984376574804
+--- !u!1 &3780292175115716521
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -331,8 +331,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6106955999836816506}
-  - component: {fileID: 807330046930338871}
+  - component: {fileID: 2567757214340720338}
+  - component: {fileID: 8076212291344523950}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun2
@@ -341,13 +341,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6106955999836816506
+--- !u!4 &2567757214340720338
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6952388984376574804}
+  m_GameObject: {fileID: 3780292175115716521}
   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}
@@ -356,13 +356,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &807330046930338871
+--- !u!137 &8076212291344523950
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6952388984376574804}
+  m_GameObject: {fileID: 3780292175115716521}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -406,9 +406,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
   m_Bones:
-  - {fileID: 6617105143483196895}
+  - {fileID: 2980203232940561759}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6617105143483196895}
+  m_RootBone: {fileID: 2980203232940561759}
   m_AABB:
     m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
     m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
@@ -445,8 +445,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6617105143483196895}
-  - {fileID: 6106955999836816506}
+  - {fileID: 2980203232940561759}
+  - {fileID: 2567757214340720338}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -529,7 +529,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 595741611000363797}
+  - {fileID: 5409860526676515362}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242

Assets/Res/CombatHero/fb_yuping.prefab

@@ -32,7 +32,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1311805975106037949
+--- !u!1 &989503364408286333
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -40,8 +40,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1437697919105406732}
-  - component: {fileID: 6006019706946542092}
+  - component: {fileID: 1793166314385833304}
+  - component: {fileID: 9089609472938103781}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: yuping
@@ -50,30 +50,30 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1437697919105406732
+--- !u!4 &1793166314385833304
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1311805975106037949}
+  m_GameObject: {fileID: 989503364408286333}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 3394277555418167472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6006019706946542092
+--- !u!137 &9089609472938103781
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1311805975106037949}
+  m_GameObject: {fileID: 989503364408286333}
   m_Enabled: 1
-  m_CastShadows: 0
+  m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -88,7 +88,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
@@ -115,9 +115,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 6598966518811955930}
+  - {fileID: 6682350096462781277}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
+  m_RootBone: {fileID: 6682350096462781277}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
@@ -172,99 +172,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &2161098187590247170
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4444751518792377996}
-  - component: {fileID: 8316902535332636950}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: yuping
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4444751518792377996
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2161098187590247170}
-  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: 1539066851328591154}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8316902535332636950
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2161098187590247170}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 4957e5184678c2d459ca5718cf85db80, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
-  m_Bones:
-  - {fileID: 5380171625309246820}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 5380171625309246820}
-  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 &2911841452077310572
+--- !u!1 &2503799671700664962
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -272,7 +180,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5380171625309246820}
+  - component: {fileID: 6682350096462781277}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -281,20 +189,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5380171625309246820
+--- !u!4 &6682350096462781277
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2911841452077310572}
+  m_GameObject: {fileID: 2503799671700664962}
   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: 1539066851328591154}
+  m_Father: {fileID: 3394277555418167472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3027240060212061077
 GameObject:
@@ -415,7 +323,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 1437697919105406732}
+  - {fileID: 9109152844184970844}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -454,7 +362,7 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &6642471949105620041
+--- !u!1 &5500551397172131952
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -462,47 +370,91 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6761480731968705934}
-  - component: {fileID: 5388655931286758072}
+  - component: {fileID: 9109152844184970844}
+  - component: {fileID: 4126995420846251416}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: pengpos
+  m_Name: yuping
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6761480731968705934
+--- !u!4 &9109152844184970844
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6642471949105620041}
+  m_GameObject: {fileID: 5500551397172131952}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.015, z: 0.277}
+  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: 2307709339058834475}
+  m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5388655931286758072
-MonoBehaviour:
+--- !u!137 &4126995420846251416
+SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6642471949105620041}
+  m_GameObject: {fileID: 5500551397172131952}
   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 &7997042951999966635
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+  m_Bones:
+  - {fileID: 6598966518811955930}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6598966518811955930}
+  m_AABB:
+    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
+    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &5562811692315558638
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -510,7 +462,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1539066851328591154}
+  - component: {fileID: 3394277555418167472}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_yuping_show
@@ -519,23 +471,71 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1539066851328591154
+--- !u!4 &3394277555418167472
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7997042951999966635}
+  m_GameObject: {fileID: 5562811692315558638}
   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: 5380171625309246820}
-  - {fileID: 4444751518792377996}
+  - {fileID: 6682350096462781277}
+  - {fileID: 1793166314385833304}
   m_Father: {fileID: 6598966518811955930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6642471949105620041
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6761480731968705934}
+  - component: {fileID: 5388655931286758072}
+  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 &6761480731968705934
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6642471949105620041}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.015, z: 0.277}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2307709339058834475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5388655931286758072
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6642471949105620041}
+  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 &8219916005125797274
 GameObject:
   m_ObjectHideFlags: 0
@@ -566,6 +566,6 @@ Transform:
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1539066851328591154}
+  - {fileID: 3394277555418167472}
   m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/Config/HeroModelConfig.json

@@ -23,7 +23,10 @@
       "range_atk": 3,
       "skillID": [
         1001,
-        2001
+        2001,
+        3001,
+        4001,
+        5001
       ],
       "heroStory": null
     },
@@ -49,7 +52,11 @@
       "speed_atk": 1.0,
       "range_atk": 3,
       "skillID": [
-        81001
+        81001,
+        82001,
+        83001,
+        84001,
+        85001
       ],
       "heroStory": null
     }

Assets/Res/Config/SkillConfig.json

@@ -2,6 +2,7 @@
   "configList": [
     {
       "ID": 10011,
+      "attribute": 1,
       "icon": "",
       "scriptName": "S1001",
       "IDGroup": 1001,
@@ -17,6 +18,7 @@
     },
     {
       "ID": 20011,
+      "attribute": 2,
       "icon": "",
       "scriptName": "S2001",
       "IDGroup": 2001,
@@ -30,8 +32,57 @@
         100.0
       ]
     },
+    {
+      "ID": 30011,
+      "attribute": 4,
+      "icon": "",
+      "scriptName": "S1001",
+      "IDGroup": 3001,
+      "timelineName": "jianjue_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
+    {
+      "ID": 40011,
+      "attribute": 1,
+      "icon": "",
+      "scriptName": "S1001",
+      "IDGroup": 4001,
+      "timelineName": "jianjue_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
+    {
+      "ID": 50011,
+      "attribute": 2,
+      "icon": "",
+      "scriptName": "S2001",
+      "IDGroup": 5001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
     {
       "ID": 810011,
+      "attribute": 1,
       "icon": "",
       "scriptName": "S2001",
       "IDGroup": 81001,
@@ -45,8 +96,73 @@
         100.0
       ]
     },
+    {
+      "ID": 820011,
+      "attribute": 2,
+      "icon": "",
+      "scriptName": "S2001",
+      "IDGroup": 82001,
+      "timelineName": "gf_mozhan_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
+    {
+      "ID": 830011,
+      "attribute": 8,
+      "icon": "",
+      "scriptName": "S2001",
+      "IDGroup": 83001,
+      "timelineName": "gf_mozhan_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
+    {
+      "ID": 840011,
+      "attribute": 16,
+      "icon": "",
+      "scriptName": "S2001",
+      "IDGroup": 84001,
+      "timelineName": "gf_mozhan_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
+    {
+      "ID": 850011,
+      "attribute": 1,
+      "icon": "",
+      "scriptName": "S2001",
+      "IDGroup": 85001,
+      "timelineName": "gf_mozhan_timeline_TD",
+      "cd": null,
+      "SkillType": 1,
+      "level": 1,
+      "name": 405077,
+      "desc": null,
+      "effectValue": [
+        100.0
+      ]
+    },
     {
       "ID": 9010011,
+      "attribute": 1,
       "icon": "",
       "scriptName": "S901001",
       "IDGroup": 901001,

Assets/Res/HeroAnimtion/Guixiu01.asset

@@ -1,5 +1,33 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-7587810941454656574
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: idle
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298803958120448
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298803958120448
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 35d2038b6aec5ce4d8e1dbd9cbe41328, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -15,7 +43,20 @@ MonoBehaviour:
   _Definition:
     _Transitions:
     - {fileID: 7727764457144862361}
-    _Modifiers: []
+    - {fileID: -7587810941454656574}
+    _Modifiers:
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &6039137609317899203

Assets/Res/UI/CombatShowTextPanel.prefab

@@ -92,6 +92,7 @@ GameObject:
   - component: {fileID: 5992236143456252937}
   - component: {fileID: 2102639180733592827}
   - component: {fileID: 4924577550452129423}
+  - component: {fileID: 7299417871956762076}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (TMP) (2)
@@ -116,7 +117,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 50}
   m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2102639180733592827
@@ -216,6 +217,18 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!225 &7299417871956762076
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4917272975779495115}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &5029639117996355141
 GameObject:
   m_ObjectHideFlags: 0
@@ -225,8 +238,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 7655382758854234836}
-  - component: {fileID: 772081489340255699}
   - component: {fileID: 2048004779254015637}
+  - component: {fileID: 5934180181281131826}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ShowTextWidget
@@ -256,27 +269,6 @@ RectTransform:
   m_AnchoredPosition: {x: 160.27, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!95 &772081489340255699
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5029639117996355141}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 3c91826ef943c154eae9ee16d745531b, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 2
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &2048004779254015637
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -295,7 +287,105 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: anim
+    gameObject: {fileID: 5934180181281131826}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &5934180181281131826
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5029639117996355141}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0.5044075
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 4917272975779495115}
+    - {fileID: 4917272975779495115}
+    TweenAssetInfo: {fileID: 11400000, guid: 5eb4a0bd4a9aecb4dba323a55f14c860, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.5
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
 --- !u!1 &5248772643244312436
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ZhuanPanPanel.prefab

@@ -0,0 +1,1325 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2021569241214217953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4531068912135041688}
+  - component: {fileID: 3209261268768878472}
+  - component: {fileID: 7965147970704103323}
+  - component: {fileID: 2893872050855149675}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: jin
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4531068912135041688
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021569241214217953}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2, y: 95.8}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3209261268768878472
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021569241214217953}
+  m_CullTransparentMesh: 1
+--- !u!114 &7965147970704103323
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021569241214217953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.9476305, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u91D1"
+--- !u!114 &2893872050855149675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021569241214217953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0.17250729
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 2021569241214217953}
+    TweenAssetInfo: {fileID: 11400000, guid: e2f2ed860d177554f8bf96670a4a99f1, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.15
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!1 &2321659853550357760
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8510026615150398487}
+  - component: {fileID: 3529685096879894903}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ZhuanPanPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8510026615150398487
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2321659853550357760}
+  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: 4882569991845363983}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3529685096879894903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2321659853550357760}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: gf_widget
+    gameObject: {fileID: 3303599496785488472}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Gf_root
+    gameObject: {fileID: 2805882514726104012}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: jin
+    gameObject: {fileID: 2893872050855149675}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: mu
+    gameObject: {fileID: 4063371721268946589}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: shui
+    gameObject: {fileID: 4099129060491662501}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: huo
+    gameObject: {fileID: 3794857031158152411}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: tu
+    gameObject: {fileID: 221198375431787835}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: lanLiang
+    gameObject: {fileID: 2560936016900566509}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &3303599496785488472
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1378560640225611002}
+  - component: {fileID: 8930191388674924154}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: gf_widget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1378560640225611002
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3303599496785488472}
+  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: 1915380660050661243}
+  m_Father: {fileID: 2805882514726104012}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 60}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8930191388674924154
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3303599496785488472}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: gf_icon
+    gameObject: {fileID: 9076139423511717541}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &3559130978032858191
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6272335172427140078}
+  - component: {fileID: 9066316208657124279}
+  - component: {fileID: 7431404412629253057}
+  - component: {fileID: 4063371721268946589}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: mu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6272335172427140078
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559130978032858191}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -80.4, y: 44.4}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9066316208657124279
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559130978032858191}
+  m_CullTransparentMesh: 1
+--- !u!114 &7431404412629253057
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559130978032858191}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 1, b: 0.116532326, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6728"
+--- !u!114 &4063371721268946589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559130978032858191}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0.1739813
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 3559130978032858191}
+    TweenAssetInfo: {fileID: 11400000, guid: e2f2ed860d177554f8bf96670a4a99f1, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.15
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!1 &4262349429609714494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4882569991845363983}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: pan
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4882569991845363983
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4262349429609714494}
+  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: 6731311925923818131}
+  - {fileID: 4805835675193359467}
+  - {fileID: 4531068912135041688}
+  - {fileID: 6272335172427140078}
+  - {fileID: 3633468771912715879}
+  - {fileID: 8175119252316326709}
+  - {fileID: 140958885858697692}
+  - {fileID: 2805882514726104012}
+  m_Father: {fileID: 8510026615150398487}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -678}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5024599011792226539
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1915380660050661243}
+  - component: {fileID: 8746166038539313339}
+  - component: {fileID: 9076139423511717541}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: gf_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1915380660050661243
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5024599011792226539}
+  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: 1378560640225611002}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8746166038539313339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5024599011792226539}
+  m_CullTransparentMesh: 1
+--- !u!114 &9076139423511717541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5024599011792226539}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5225019547480790860
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3633468771912715879}
+  - component: {fileID: 284945356985338255}
+  - component: {fileID: 638797065766270913}
+  - component: {fileID: 4099129060491662501}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: shui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3633468771912715879
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5225019547480790860}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -81.6, y: -52.1}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &284945356985338255
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5225019547480790860}
+  m_CullTransparentMesh: 1
+--- !u!114 &638797065766270913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5225019547480790860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.6770034, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6C34"
+--- !u!114 &4099129060491662501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5225019547480790860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 5225019547480790860}
+    TweenAssetInfo: {fileID: 11400000, guid: e2f2ed860d177554f8bf96670a4a99f1, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.15
+    isUpdate: 0
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!1 &5550399307068722793
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4805835675193359467}
+  - component: {fileID: 8567711071786173408}
+  - component: {fileID: 4004482785154964125}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4805835675193359467
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5550399307068722793}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8567711071786173408
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5550399307068722793}
+  m_CullTransparentMesh: 1
+--- !u!114 &4004482785154964125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5550399307068722793}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5602896484361805010
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2805882514726104012}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Gf
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2805882514726104012
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5602896484361805010}
+  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: 1378560640225611002}
+  m_Father: {fileID: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6735197145713446479
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8175119252316326709}
+  - component: {fileID: 7706194672437430238}
+  - component: {fileID: 6585753715417016422}
+  - component: {fileID: 3794857031158152411}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: huo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8175119252316326709
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6735197145713446479}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 79, y: -45.9}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7706194672437430238
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6735197145713446479}
+  m_CullTransparentMesh: 1
+--- !u!114 &6585753715417016422
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6735197145713446479}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.2304774, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u706B"
+--- !u!114 &3794857031158152411
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6735197145713446479}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 6735197145713446479}
+    TweenAssetInfo: {fileID: 11400000, guid: e2f2ed860d177554f8bf96670a4a99f1, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.15
+    isUpdate: 0
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!1 &7209734432264056556
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 140958885858697692}
+  - component: {fileID: 858544132487791049}
+  - component: {fileID: 6879188651704276882}
+  - component: {fileID: 221198375431787835}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: tu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &140958885858697692
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7209734432264056556}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 84.9, y: 40.8}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &858544132487791049
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7209734432264056556}
+  m_CullTransparentMesh: 1
+--- !u!114 &6879188651704276882
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7209734432264056556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.61737454, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u571F"
+--- !u!114 &221198375431787835
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7209734432264056556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 7209734432264056556}
+    TweenAssetInfo: {fileID: 11400000, guid: e2f2ed860d177554f8bf96670a4a99f1, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.15
+    isUpdate: 0
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!1 &7964504113151296646
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6731311925923818131}
+  - component: {fileID: 832521873555878584}
+  - component: {fileID: 2560936016900566509}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: lanLiang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6731311925923818131
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7964504113151296646}
+  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: 4882569991845363983}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 120, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &832521873555878584
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7964504113151296646}
+  m_CullTransparentMesh: 1
+--- !u!114 &2560936016900566509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7964504113151296646}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.8575511, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Res/UI/ZhuanPanPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wn9KvCqlB3Ppz0wgAMWvzZYatxbz/3b3ECIhgxyaws3QfSdeub3rfxszXbBi
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoShowTextWidget.asset

@@ -0,0 +1,184 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoShowTextWidget
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 0
+        TweenLerpType: 1
+        Start: {x: 0, y: 0, z: 0}
+        End: {x: 0, y: 20, z: 0}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 0
+            inSlope: 73.58491
+            outSlope: 73.58491
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.083333336
+          - serializedVersion: 3
+            time: 1
+            value: 50
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+  - Foldout: 1
+    TweenType: 1
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 1
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: -0.019639678
+          outSlope: -0.019639678
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0.25836584
+        - serializedVersion: 3
+          time: 0.9335078
+          value: 0.82238233
+          inSlope: -0.5701334
+          outSlope: -0.5701334
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.16533463
+          outWeight: 0.5158001
+        - serializedVersion: 3
+          time: 1
+          value: 0
+          inSlope: -3.3962235
+          outSlope: -3.3962235
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.12912008
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0

Assets/Res/UIAnimRes/TweenAssetInfoShowTextWidget.asset.meta

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

Assets/Res/UIAnimRes/TweenAssetInfoText (Legacy).asset

@@ -0,0 +1,151 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoText (Legacy)
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 0.15
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 0.15
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 2
+        TweenLerpType: 1
+        Start: {x: 0, y: 0, z: 0}
+        End: {x: 0, y: 0, z: 0}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 1.025641
+            outSlope: 1.025641
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.4875
+            value: 1.5
+            inSlope: 0.025015593
+            outSlope: 0.025015593
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -0.9756098
+            outSlope: -0.9756098
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 1.0169492
+            outSlope: 1.0169492
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.49166667
+            value: 1.5
+            inSlope: 0.0166713
+            outSlope: 0.0166713
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -0.9836066
+            outSlope: -0.9836066
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0

Assets/Res/UIAnimRes/TweenAssetInfoText (Legacy).asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WnhJt3/5W30j74y+og2zE6gxi8dL60z8hQuDrMsdqd1L+8U0uYwZSPfp/RQQ
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -734,6 +734,11 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!224 &244605564 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+  m_PrefabInstance: {fileID: 5010228618609493054}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &293130736
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -788,11 +793,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
@@ -2293,7 +2298,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 1217261034}
-  - component: {fileID: 1217261035}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: CombatPanel
@@ -2323,25 +2327,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1217261035
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1217261033}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: bnt_shengShi
-    gameObject: {fileID: 1833694914}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
 --- !u!1 &1312762638
 GameObject:
   m_ObjectHideFlags: 0
@@ -2820,6 +2805,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1217261034}
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 244605564}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
 --- !u!224 &1663534287 stripped
@@ -3994,6 +3982,103 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1001 &5010228618609493054
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1663534287}
+    m_Modifications:
+    - target: {fileID: 2321659853550357760, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_Name
+      value: ZhuanPanPanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1624
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
 --- !u!4 &5102730602139337721
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/Core/Pool/GPool/ParticleSystemPool.cs

@@ -14,6 +14,7 @@ namespace Fort23.UTool
 #if !COMBAT_SERVER
 
         public string fxName;
+
         //public string endPlayerPartic;
         protected ParticleSystem[] m_particles;
         protected RenderSetting[] m_renderSetting;
@@ -40,6 +41,7 @@ namespace Fort23.UTool
 
         private TrailRenderer[] _trailRenderers;
         protected bool isInit;
+
         public ParticleSystem[] Particles
         {
             get
@@ -104,6 +106,8 @@ namespace Fort23.UTool
 
         private float m_duration = -1f;
 
+        protected float trailTime = 0.1f;
+        protected bool isUpdateTrail = false;
 
         protected override void ProResetData()
         {
@@ -118,7 +122,7 @@ namespace Fort23.UTool
 
                 if (_trailRenderers == null)
                 {
-                    _trailRenderers= gameObject.GetComponentsInChildren<TrailRenderer>(false);
+                    _trailRenderers = gameObject.GetComponentsInChildren<TrailRenderer>(false);
                 }
 
                 if (_trailRenderers != null)
@@ -126,7 +130,11 @@ namespace Fort23.UTool
                     for (int i = 0; i < _trailRenderers.Length; i++)
                     {
                         _trailRenderers[i].Clear();
+                        _trailRenderers[i].gameObject.SetActive(false);
                     }
+
+                    trailTime = 0;
+                    isUpdateTrail = true;
                 }
 
                 if (Particles != null)
@@ -217,6 +225,22 @@ namespace Fort23.UTool
         protected virtual void UpdatePool()
         {
             currDelayTime += Time.deltaTime;
+
+            if (isUpdateTrail)
+            {
+                trailTime += Time.deltaTime;
+                if (trailTime > 0.1f)
+                {
+                    for (int i = 0; i < _trailRenderers.Length; i++)
+                    {
+                        _trailRenderers[i].Clear();
+                        _trailRenderers[i].gameObject.SetActive(true);
+                    }
+
+                    isUpdateTrail = false;
+                }
+            }
+
             if (IsFinish())
             {
                 OnDurationUp();

Assets/Scripts/Core/Triiger/OnTriggerEnterEventTrigger.cs

@@ -17,6 +17,14 @@ namespace Core.Triiger
         public readonly EasyEvent<Collider,ITriggerEntity> OnTriggerEnterEvent = new EasyEvent<Collider,ITriggerEntity>();
         private void OnTriggerEnter(Collider collider)
         {
+            OnTriggerEnterEventTrigger onTriggerEnterEventTrigger=   collider.GetComponent<OnTriggerEnterEventTrigger>();
+            ITriggerEntity triggerEntity = null;
+            if(onTriggerEnterEventTrigger!=null)
+            {
+                 triggerEntity=  collider.GetComponent<OnTriggerEnterEventTrigger>().triggerEntity;
+               
+            }
+            
             OnTriggerEnterEvent.Trigger(collider,triggerEntity);         
         }
     }

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -21,6 +21,12 @@ public int ID;
 
 
 
+		/// <summary>
+		///技能属性 1=金 2=木 4=水 8=火 16=土
+		/// </summary>
+public int attribute;
+
+
 		/// <summary>
 		///图标
 		/// </summary>

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -34,5 +34,9 @@
         /// </summary>
         CombatExpAlter,
         UseMagicWeapon,
+        /// <summary>
+        /// 功法改变
+        /// </summary>
+        ExercisesAlter,
     }
 }

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -15,11 +15,13 @@ namespace GameLogic.Combat.CombatState
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.CombatHeroController.playerHeroEntity;
             CombatController.CombatCameraControllder.SetPos(playerHeroEntity.combatHeroGameObject.transform);
             CombatController.CombatCameraControllder.isStop = true;
+            CombatController.IsFightState = true;
         }
 
         protected override void ProExit()
         {
             CombatController.CombatCameraControllder.isStop = false;
+           
         }
 
         protected override void ProUpdate(float t)

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -4,16 +4,22 @@ using UnityEngine;
 
 namespace GameLogic.Combat.CombatState
 {
-    public class CombatUpdateState:CombatStateBasic
+    public class CombatUpdateState : CombatStateBasic
     {
         public CombatUpdateState(CombatController combatController) : base(combatController)
         {
-            
         }
 
         protected override void ProEnter()
         {
             CombatController.CombatCameraControllder.isStop = false;
+            CombatController.IsFightState = false;
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.CombatHeroController.playerHeroEntity;
+            if (playerHeroEntity != null)
+            {
+                playerHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Flight);
+            }
+            CombatController.MagicWeaponCombatSence.CloseSecene();
         }
 
         protected override void ProUpdate(float t)
@@ -38,7 +44,7 @@ namespace GameLogic.Combat.CombatState
             Vector3 dir = Vector3.zero;
             float fx = 1;
 
-            pos = CombatController.currActiveCombat.CombatSenceController.Move(0.005f);
+            pos = CombatController.currActiveCombat.CombatSenceController.Move(30*t);
             float lt = CombatController.currActiveCombat.CombatSenceController.currTime - 0.01f;
             Vector3 p = CombatController.currActiveCombat.CombatSenceController.GetTarget(lt);
             dir = (pos - p).normalized;
@@ -73,7 +79,7 @@ namespace GameLogic.Combat.CombatState
 
                 float distance = Vector3.SqrMagnitude(hero.combatHeroGameObject.position -
                                                       playerHeroEntity.combatHeroGameObject.position);
-                if (distance < minDistance)
+                if (distance < minDistance && distance < 225f)
                 {
                     // if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDisTo + 100)
                     {

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -79,15 +79,8 @@ namespace GameLogic.Combat.CombatTool
                 return harmReturnInfo;
             }
 
-            long k = target.combatHeroEntity.This<CombatHeroEntity>().CurrCombatHeroInfo.defK;
-            float ms = 100 - (k * 100.0f / (k + target.combatHeroEntity.This<CombatHeroEntity>().CurrCombatHeroInfo.defense.Value));
-            att = GetVlaueRatioForLong(att, 100 - ms);
-            int odd = GetOdd(0, 100);
-            if (odd <= source.CurrCombatHeroInfo.crit + 5)
-            {
-                harmReturnInfo.harmType |= HarmType.BaoJi;
-                att += GetVlaueRatioForLong(att, source.CurrCombatHeroInfo.critDamage.Value);
-            }
+           
+         
 
             harmReturnInfo.att = att;
             target.combatHeroEntity.This<CombatHeroEntity>().HeroHurt(harmReturnInfo);

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs

@@ -72,7 +72,7 @@ namespace GameLogic.Combat.CombatTool
                 Vector3 p = combatHeroEntities.GameObject.transform.TransformPoint(new Vector3(0, 8, -10));
                 root.rotation = Quaternion.Lerp(root.rotation, combatHeroEntities.GameObject.transform.rotation,
                     1);
-                root.position = Vector3.Lerp(root.position, p, 0.9f);
+                root.position = Vector3.Lerp(root.position, p, 1);
             }
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -42,6 +42,7 @@ namespace GameLogic.Combat.CombatTool
         private bool _isFullUIShow;
 
         public bool IsGameOver;
+        public bool IsFightState;
 
         public CombatStateBasic CurrState
         {

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -93,9 +93,9 @@ namespace GameLogic.Combat.CombatTool
             combatHeroEntity.MaxCombatHeroInfo.hp = combatHeroInfo.hp;
             combatHeroEntity.MaxCombatHeroInfo.defense = combatHeroInfo.defense;
             combatHeroEntity.MaxCombatHeroInfo.attack = combatHeroInfo.attack;
-            combatHeroEntity.MaxCombatHeroInfo.defK = combatHeroInfo.defK;
+         
             combatHeroEntity.CurrCombatHeroInfo.defense = combatHeroInfo.defense;
-            combatHeroEntity.CurrCombatHeroInfo.defK = combatHeroInfo.defK;
+       
             combatHeroEntity.CurrCombatHeroInfo.attack = combatHeroInfo.attack;
             combatHeroEntity.CurrCombatHeroInfo.unLockSkills = combatHeroInfo.unLockSkills;
             combatHeroEntity.MaxCombatHeroInfo.unLockSkills = combatHeroInfo.unLockSkills;

Assets/Scripts/GameLogic/Combat/CombatTool/CombatSenceController.cs

@@ -28,7 +28,8 @@ namespace GameLogic.Combat.CombatTool
         public float currTime;
         public Transform moveRoot;
 
-        private List<CombatSencePath> reclaimSence=new List<CombatSencePath>();
+        private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
+
         public async CTask InitScenes()
         {
             GameObject gameObject = new GameObject("mvoeRoot");
@@ -102,7 +103,7 @@ namespace GameLogic.Combat.CombatTool
                 GameObject g = gameObjectPool.own;
                 g.SetActive(true);
                 besselPath.allPool.Add(gameObjectPool);
-                g.transform.position = new Vector3(p.x,0, p.z) + new Vector3(0, Random.Range(-4, -1), 0);
+                g.transform.position = new Vector3(p.x, 0, p.z) + new Vector3(0, Random.Range(-4, -1), 0);
                 g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
             }
         }
@@ -125,9 +126,22 @@ namespace GameLogic.Combat.CombatTool
             }
         }
 
-        public Vector3 Move(float speedTime)
+        public Vector3 GetNextPoint(float time)
+        {
+            if (NextBesselPath == null)
+            {
+                NextBesselPath = InitBesselPath(currBesselPath.b, 0);
+            }
+
+            return NextBesselPath.GetValue(time);
+        }
+
+        public Vector3 Move(float dis)
         {
-            currTime += speedTime;
+            float t = dis / currBesselPath.len;
+            currTime += t;
+            // Debug.Log("移动速度" + t + "/" + currBesselPath.len);
+
             Vector3 targetPos = Vector3.zero;
             if (currTime > 0.2f)
             {
@@ -136,7 +150,7 @@ namespace GameLogic.Combat.CombatTool
                     int odds = Random.Range(0, 100);
                     if (odds < 50)
                     {
-                        NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100)<50?-1:1);
+                        NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
                     }
                     else
                     {
@@ -149,11 +163,11 @@ namespace GameLogic.Combat.CombatTool
             {
                 if (NextBesselPath == null)
                 {
-                    NextBesselPath = InitBesselPath(currBesselPath.b,  Random.Range(0, 100)<50?-1:1);
+                    NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
                 }
 
                 currTime = currTime % 1;
-                targetPos = NextBesselPath.GetValue(currTime);
+                // targetPos = NextBesselPath.GetValue(currTime);
                 currBesselPath.reclaimTime = 3;
                 reclaimSence.Add(currBesselPath);
                 currBesselPath = NextBesselPath;
@@ -161,9 +175,9 @@ namespace GameLogic.Combat.CombatTool
             }
             else
             {
-                targetPos = currBesselPath.GetValue(currTime);
             }
 
+            targetPos = currBesselPath.GetValue(currTime);
             moveRoot.transform.position = targetPos;
             return targetPos;
         }
@@ -172,7 +186,7 @@ namespace GameLogic.Combat.CombatTool
         {
             for (int i = 0; i < reclaimSence.Count; i++)
             {
-                CombatSencePath sencePath=  reclaimSence[i];
+                CombatSencePath sencePath = reclaimSence[i];
                 sencePath.reclaimTime -= t;
                 if (sencePath.reclaimTime < 0)
                 {

Assets/Scripts/GameLogic/Combat/CombatTool/CombatSencePath.cs

@@ -1,5 +1,3 @@
-
-
 using System;
 using System.Collections.Generic;
 using Fort23.Core;
@@ -9,7 +7,7 @@ using UnityEngine;
 namespace GameLogic.Combat.CombatTool
 {
     [Serializable]
-    public class CombatSencePath: CObject
+    public class CombatSencePath : CObject
     {
         public Vector3 a;
         public Vector3 b;
@@ -18,12 +16,16 @@ namespace GameLogic.Combat.CombatTool
 
         public float reclaimTime;
 
-        public List<GameObjectPool>allPool = new List<GameObjectPool>();
+        public List<GameObjectPool> allPool = new List<GameObjectPool>();
+
+        public float len;
+
         public void SetPos(Vector3 startPos, Vector3 target)
         {
             a = startPos;
             b = target;
             isCentre = false;
+            SetLen();
         }
 
         public void SetPos(Vector3 startPos, Vector3 centre, Vector3 target)
@@ -32,9 +34,21 @@ namespace GameLogic.Combat.CombatTool
             Centre = centre;
             b = target;
             isCentre = true;
+            SetLen();
         }
 
-       
+
+        private void SetLen()
+        {
+            float a = 1 / 100f;
+            len = 0;
+            for (int i = 0; i < 100; i++)
+            {
+                Vector3 p = GetValue(i * a);
+                Vector3 p2 = GetValue((i + 1) * a);
+                len += Vector3.Distance(p, p2);
+            }
+        }
 
         public Vector3 GetValue(float t)
         {
@@ -64,7 +78,6 @@ namespace GameLogic.Combat.CombatTool
 
         public override void ActiveObj()
         {
-            
         }
 
         public override void DormancyObj()
@@ -73,6 +86,7 @@ namespace GameLogic.Combat.CombatTool
             {
                 GObjectPool.Instance.Recycle(allPool[i]);
             }
+
             allPool.Clear();
         }
     }

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCombatSence.cs

@@ -36,6 +36,21 @@ namespace GameLogic.Combat.CombatTool
             new Map<int, MagicWeaponCollisionInfo>();
 
         private int MagicWeaponCollisionID;
+        
+        public void CloseSecene()
+        {
+            magicWeaponCollisionInfoList.Clear();
+            for (int i = 0; i < _enemyMagicWeaponList.Count; i++)
+            {
+                _enemyMagicWeaponList[i].CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
+            }
+            for (int i = 0; i < _playerMagicWeaponList.Count; i++)
+            {
+                _playerMagicWeaponList[i].CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
+            }
+            _playerMagicWeaponList.Clear();
+            _enemyMagicWeaponList.Clear();
+        }
 
         public void Init()
         {

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Core.Utility;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
@@ -34,8 +35,6 @@ namespace GameLogic.Combat.CombatType
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
 
 
-         
-
             ShowTextEventData showTextEventData = ShowTextEventData.Create();
             showTextEventData.text = "+金币 20";
             showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
@@ -69,7 +68,7 @@ namespace GameLogic.Combat.CombatType
 
         private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
-           // return;
+            // return;
             _currBoChi += 1;
 
             for (int i = 0; i < enemyHeroInfo.Count; i++)
@@ -83,14 +82,13 @@ namespace GameLogic.Combat.CombatType
                 testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
                 // index %= nextConfig.monsterPoint.Length;
                 Vector3 pos =
-                    CombatController.currActiveCombat.CombatSenceController.GetTarget(
-                        CombatController.currActiveCombat.CombatSenceController.currTime + 0.15f)+new Vector3(0,1,0);
+                    CombatController.currActiveCombat.CombatSenceController.GetNextPoint(0.8f) + new Vector3(0, 1, 0);
 
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
+                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(2000);
                         combatController.CombatHeroController.AddHero(entity);
-                       
                     }));
             }
         }
@@ -113,10 +111,10 @@ namespace GameLogic.Combat.CombatType
             {
                 for (int i = 0; i < testCombatHeroConfig.myHeroInfo.Length; i++)
                 {
-                  
                     int index = i;
                     TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[i];
                     CombatHeroEntity heroEntity = new CombatHeroEntity();
+                    CombatController.currActiveCombat.CombatHeroController.playerHeroEntity = heroEntity;
                     heroEntity.IsEnemy = false;
                     heroEntity.number = i;
                     CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
@@ -125,7 +123,7 @@ namespace GameLogic.Combat.CombatType
                     cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
                         delegate(CombatHeroEntity entity)
                         {
-                            CombatController.currActiveCombat.CombatHeroController.playerHeroEntity = entity;
+                            entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
                             combatController.CombatHeroController.AddHero(entity);
                         }));
                 }

Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs

@@ -15,12 +15,12 @@ using UnityEngine.AI;
 public class CombatAIBasic : IDisposable
 {
     public StateControl stateControl;
-   
+
 
     protected BetterList<SubStatusBasic> _subStatusList = new BetterList<SubStatusBasic>();
 
     // public NavMeshObstacle NavMeshObstacle;
-  
+
     protected CombatHeroEntity _showBaiscEntity;
 
     public CombatHeroStateBasic CurrState
@@ -34,31 +34,25 @@ public class CombatAIBasic : IDisposable
     public virtual IHero currFocusTarget
     {
         get { return _currFocusTarget; }
-        set
-        {
-          
-            _currFocusTarget = value;
-        }
+        set { _currFocusTarget = value; }
     }
 
     protected IHero _currFocusTarget;
 
- 
+
     private float _t;
 
     public virtual void Init(CombatHeroEntity combatHeroEntity)
     {
-        
         _showBaiscEntity = combatHeroEntity;
         stateControl = new StateControl();
-     
+
 
         ProInitState();
         ProInit();
     }
 
 
-
     protected virtual void ProInit()
     {
     }
@@ -72,7 +66,7 @@ public class CombatAIBasic : IDisposable
         }
     }
 
-    public  virtual T GetSubStatus<T>() where T : SubStatusBasic
+    public virtual T GetSubStatus<T>() where T : SubStatusBasic
     {
         for (int i = 0; i < _subStatusList.Count; i++)
         {
@@ -93,12 +87,21 @@ public class CombatAIBasic : IDisposable
         }
     }
 
+    public virtual void RemoveSubStatus<T>()
+    {
+        for (int i = 0; i < _subStatusList.Count; i++)
+        {
+            if (_subStatusList[i] is T)
+            {
+                _subStatusList.RemoveAt(i);
+                i--;
+            }
+        }
+    }
 
 
     protected virtual void ProInitState()
     {
-        
-        
     }
 
     public virtual void ChangeState(string name, IStateEnterData iStateEnterData = null, bool isQiangZhi = false)
@@ -118,7 +121,6 @@ public class CombatAIBasic : IDisposable
             return;
         }
 
-     
 
         for (int i = 0; i < _subStatusList.Count; i++)
         {
@@ -132,22 +134,19 @@ public class CombatAIBasic : IDisposable
             _subStatusList[i].Update(t);
         }
 
-      
 
         stateControl.Update(t);
-       
 
-      
+
         ProUpdate();
     }
 
-   
 
     protected virtual void ProUpdate()
     {
     }
 
-  
+
     public void Dispose()
     {
         ProDispose();
@@ -158,6 +157,5 @@ public class CombatAIBasic : IDisposable
 
     protected virtual void ProDispose()
     {
-     
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroAi.cs

@@ -1,9 +1,11 @@
 using Common.Utility.CombatEvent;
 using Core.State;
 using Fort23.Core;
+using GameLogic.Combat.CombatState;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero.State;
 using GameLogic.Combat.Hero.SubStatus;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 
 namespace GameLogic.Combat.Hero
@@ -86,6 +88,7 @@ namespace GameLogic.Combat.Hero
             stateControl.AddState(CombatHeroStateType.XiuMian, new CombatHeroXiuMianState(_combatHeroEntity));
             stateControl.AddState(CombatHeroStateType.Resurrection, new CombatResurrectionState(_combatHeroEntity));
             stateControl.AddState(CombatHeroStateType.PickUp, new CombatHeroPickUpState(_combatHeroEntity));
+            stateControl.AddState(CombatHeroStateType.Flight, new CombatHeroFlightState(_combatHeroEntity));
             stateControl.AddState(CombatHeroStateType.Disappear, new CombatHeroDisappearState(_combatHeroEntity));
         }
 
@@ -125,19 +128,25 @@ namespace GameLogic.Combat.Hero
                 _subStatusList[i].Update(t);
             }
 
-            if (currFocusTarget == null || currFocusTarget.isDie ||
-                (currFocusTarget is BannerHero && !_combatHeroEntity.IsEnemy) ||
-                !_combatHeroEntity.IsAttDis(currFocusTarget.dotPos))
+            if (CombatController.currActiveCombat.IsFightState)
             {
-                CombatHeroEntity[] allHero =
-                    CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
-                IHero minDistanceHero = FindMinDixtance(allHero);
-                currFocusTarget = minDistanceHero;
-                if (!_combatHeroEntity.IsEnemy && currFocusTarget == null)
+                if (currFocusTarget == null || currFocusTarget.isDie ||
+                    (currFocusTarget is BannerHero && !_combatHeroEntity.IsEnemy))
                 {
-                    currFocusTarget = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero;
+                    CombatHeroEntity[] allHero =
+                        CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
+                    IHero minDistanceHero = FindMinDixtance(allHero);
+                    currFocusTarget = minDistanceHero;
+                    if (!_combatHeroEntity.IsEnemy && currFocusTarget == null)
+                    {
+                        currFocusTarget = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero;
+                    }
                 }
             }
+            else
+            {
+                currFocusTarget = null;
+            }
 
 
             stateControl.Update(t);
@@ -149,56 +158,17 @@ namespace GameLogic.Combat.Hero
                 if (p.sqrMagnitude > 0.00001)
                 {
                     _combatHeroEntity.combatHeroGameObject.rotation = Quaternion.Lerp(
-                        _combatHeroEntity.combatHeroGameObject.rotation, Quaternion.LookRotation(p.normalized), 0.5f);
+                        _combatHeroEntity.combatHeroGameObject.rotation, Quaternion.LookRotation(p.normalized),
+                        0.5f);
                 }
             }
 
-            AreaUpdate();
+
             ProUpdate();
             if (currFocusTarget != null)
             {
-                _combatHeroEntity.GameObject.transform.rotation = Quaternion.LookRotation(currFocusTarget.dotPos-_combatHeroEntity.dotPos);
-            }
-          
-        }
-
-        private void AreaUpdate()
-        {
-            GameObject[] b = AreaList;
-            if (b == null)
-            {
-                return;
-            }
-
-            BetterList<GameObject> currArea = new BetterList<GameObject>();
-            for (int i = 0; i < b.Length; i++)
-            {
-                if (!_HindAreaList.Contains(AreaList[i]))
-                {
-                    currArea.Add(AreaList[i]);
-                    _HindAreaList.Add(AreaList[i]);
-                }
-            }
-
-            if (currArea != null && currArea.Count > 0)
-            {
-                float dodge = _combatHeroEntity.CurrCombatHeroInfo.dodge;
-                int odds = CombatCalculateTool.Instance.GetOdd();
-                if (odds < dodge)
-                {
-                    CombatHeroRollingState.RollingStateData rollingStateData =
-                        CObjectPool.Instance.Fetch<CombatHeroRollingState.RollingStateData>();
-                    Vector3 pos = Vector3.zero;
-                    for (int i = 0; i < b.Length; i++)
-                    {
-                        pos += b[i].transform.position;
-                    }
-
-                    pos /= b.Length;
-                    Vector3 dir = pos - _combatHeroEntity.combatHeroGameObject.position;
-                    rollingStateData.dir = new Vector3(dir.x, _combatHeroEntity.dotPos.y, dir.z).normalized;
-                    _combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.rolling, rollingStateData);
-                }
+                _combatHeroEntity.GameObject.transform.rotation =
+                    Quaternion.LookRotation(currFocusTarget.dotPos - _combatHeroEntity.dotPos);
             }
         }
 

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -243,7 +243,12 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         CombatHeroSkillControl combatHeroSkillControl= CombatHeroSkillControl as CombatHeroSkillControl;
         if (combatHeroSkillControl != null)
         {
-            return combatHeroSkillControl.NormalAttSpeedScale;
+            if (combatHeroSkillControl.useSkillCount > 1)
+            {
+                return 4;
+            }
+
+            return CurrCombatHeroInfo.attSpeed.Value;
         }
         return 1;
     }
@@ -277,6 +282,11 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
     public void HeroHurt(HarmReturnInfo harmReturnInfo)
     {
+        if (isDie)
+        {
+            return;
+        }
+
         CurrCombatHeroInfo.hp -= harmReturnInfo.att;
         UpdateHarmText(harmReturnInfo);
         if (combatHeroGameObject.HeroGPUMono != null)
@@ -331,10 +341,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         heroLoopParticle.Clear();
     }
 
-    public bool IsAttDis(Vector3 pos)
-    {
-        return Vector3.SqrMagnitude(pos - combatHeroGameObject.transform.position) < CurrCombatHeroInfo.maxDisTo;
-    }
+
 
     public void Dispose()
     {

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -26,38 +26,25 @@ public class CombatHeroInfo
     public EncryptionLong attack = new EncryptionLong();
 
 
-    public EncryptionFloat attSpeed = new EncryptionFloat();
-    public EncryptionFloat crit = new EncryptionFloat();
-    public EncryptionFloat critDamage = new EncryptionFloat();
-    // public EncryptionFloat dodge = new EncryptionFloat();
+    public EncryptionFloat attSpeed = (EncryptionFloat)2;
 
     public EncryptionInt level;
-
+    public EncryptionFloat exp = new EncryptionFloat();
 
     public HeroModelConfig modelConfig;
 
     public HeroPowerUpConfig powerUpConfig;
     public MonsterPowerUpConfig MonsterPowerUpConfig;
     public HeroPromoteConfig promoteConfig;
-    public HeroBasicEquipConfig basicEquipConfig;
-
-    public long defK;
-
-   
-    /// <summary>
-    /// 闪避 默认10%的几率
-    /// </summary>
-    public float dodge = 5;
 
+    
     /// <summary>
     /// 1=英雄 2=小怪 3=精英怪 4=boss
     /// </summary>
     public int heroType;
 
     public string modelName;
-    public float maxDis = 2;
-
-    public float maxDisTo = 2 * 2;
+   
 
     public bool isMonster;
 
@@ -80,25 +67,10 @@ public class CombatHeroInfo
 
 
 
-    private float rarityFactor;
-    private float starFactor;
 
-    private float factor;
 
     protected Map<AttributeType, int> _AttributeCacheValue = new Map<AttributeType, int>();
 
-    /// <summary>
-    /// 计算影响基础属性的参数
-    /// （稀有度、星级）
-    /// </summary>
-    protected void CalFactor()
-    {
-        rarityFactor = PlayerManager.Instance.gameConstantConfig.monsterRarityAttributeFactor[modelConfig.rarity - 1]
-                       / 100f;
-        starFactor = promoteConfig.star_Power / 100f;
-
-        factor = rarityFactor * starFactor;
-    }
 
     public void AddAttributeValueToCache(AttributeType attributeType, int value)
     {
@@ -115,20 +87,19 @@ public class CombatHeroInfo
         _AttributeCacheValue.Clear();
         if (isMonster)
         {
-            hp = (EncryptionLong)(modelConfig.hp * MonsterPowerUpConfig.HPFactor * factor);
-            defense = (EncryptionLong)(modelConfig.def * MonsterPowerUpConfig.DEFFactor * factor);
-            attack = (EncryptionLong)(modelConfig.attack * MonsterPowerUpConfig.ATKFactor * factor);
+            hp = (EncryptionLong)(modelConfig.hp * MonsterPowerUpConfig.HPFactor );
+            defense = (EncryptionLong)(modelConfig.def * MonsterPowerUpConfig.DEFFactor );
+            attack = (EncryptionLong)(modelConfig.attack * MonsterPowerUpConfig.ATKFactor );
 
-            defK = MonsterPowerUpConfig.defK;
-            // expGain = (EncryptionLong)(modelConfig.expGain * MonsterPowerUpConfig.EXPFactor * factor);
+         
         }
         else
         {
-            hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor * factor);
-            defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor * factor);
-            attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor * factor);
+            hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor );
+            defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor );
+            attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor );
 
-            defK = powerUpConfig.defK;
+          
 
             //职业装备提供的属性
             hp += PlayerManager.Instance.eqController.zyEqAddAttributeDic[modelConfig.profession].hp;
@@ -182,12 +153,11 @@ public class CombatHeroInfo
         CalBasicAttribute();
 
         attSpeed = (EncryptionFloat)modelConfig.speed_atk;
-        crit = (EncryptionFloat)modelConfig.crit;
+     
         // skillId = modelConfig.skillID;
         modelName = modelConfig.model;
         isGpu = modelConfig.isUseGpu;
-        maxDis = modelConfig.range_atk;
-        maxDisTo = maxDis * maxDis;
+     
         heroType = modelConfig.heroType;
     }
 
@@ -246,7 +216,7 @@ public class CombatHeroInfo
     {
         isMonster = true;
         SetDataConfig(modelID, level, star);
-        CalFactor();
+       
         CalAttribute();
        
     }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -18,26 +18,35 @@ namespace GameLogic.Combat.Hero
         /// </summary>
         private BetterList<SkillBasic> SkillCommands = new BetterList<SkillBasic>();
 
+        public int useSkillCount
+        {
+            get { return SkillCommands.size; }
+        }
+
         /// <summary>
         /// 当前能使用的技能
         /// </summary>
         public SkillBasic currUseSkill;
 
 
+        // public float NormalAttSpeedScale;
 
 
-        public float NormalAttSpeedScale;
-
-  
-
-        private BetterList<SkillBasic> _skillQueue = new BetterList<SkillBasic>();
+        public BetterList<SkillBasic> _skillQueue = new BetterList<SkillBasic>();
+        public float skillQueueTime = 5f;
 
         // private BetterList<SkillBasic> _skillQueue = new BetterList<SkillBasic>();
         private int _currUseQueueIndex = 0;
 
+        public float allMagic = 500;
+        protected float addMaicSpeed = 5000;
+        public float addChongNeng;
+        public bool isKuoLiQuanKai;
+        protected float qiankaiTime;
+
         protected override async CTask ProInit()
         {
-            NormalAttSpeedScale = 2;
+            // NormalAttSpeedScale = 2;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
 
             List<int> skillId = _combatHeroEntity.CurrCombatHeroInfo.unLockSkills;
@@ -73,6 +82,12 @@ namespace GameLogic.Combat.Hero
             }
 
             await cTaskAwaitBuffer.WaitAll();
+            for (int i = 0; i < _skillQueue.Count; i++)
+            {
+                _skillQueue[i].angle -= i * 25;
+            }
+
+            CombatEventManager.Instance.Dispatch(CombatEventType.ExercisesAlter, null);
         }
 
 
@@ -169,27 +184,76 @@ namespace GameLogic.Combat.Hero
 
         protected override void ProUpdate(float t)
         {
-            if (currUseSkill == null && SkillCommands.Count <= 0)
+            if (CombatController.currActiveCombat.IsFightState)
             {
-                while (_currUseQueueIndex < _skillQueue.Count && SkillCommands.Count <= 0)
+                float speed = _combatHeroEntity.CurrCombatHeroInfo.attSpeed.Value * (isKuoLiQuanKai ? 3 : 1f);
+                for (int i = 0; i < _skillQueue.Count; i++)
                 {
-                    SkillBasic skillBasic = _skillQueue[_currUseQueueIndex];
-                    if (skillBasic.SelfSkillConfig.SkillType == 1)
+                    SkillBasic skillBasic = _skillQueue[i];
+                    skillBasic.angle += 1 * speed;
+                    float jd = skillBasic.angle % 360;
+                    if (jd > skillBasic.useAngle && skillBasic.angle > skillBasic.lasetAngle)
                     {
-                        if (skillBasic.IsCanUse())
+                        skillBasic.lasetAngle += 360;
+                        if (allMagic > 30)
                         {
+                            allMagic -= 30;
+                            skillBasic.useCount++;
+                            if (!isKuoLiQuanKai)
+                            {
+                                addChongNeng += 10;
+                                if (addChongNeng >= 150)
+                                {
+                                    isKuoLiQuanKai = true;
+
+                                }
+                            }
+
                             AddCommandSkill(skillBasic);
+                            // Debug.Log("旋转一圈");
                         }
                     }
+                }
+            }
 
-                    _currUseQueueIndex++;
+            if (isKuoLiQuanKai)
+            {
+                qiankaiTime += t;
+                if (qiankaiTime > 3)
+                {
+                    isKuoLiQuanKai = false;
+                    qiankaiTime = 0;
+                    addChongNeng = 0;
                 }
             }
 
-            if (_currUseQueueIndex >= _skillQueue.Count)
+            allMagic += t * addMaicSpeed;
+            if (allMagic > 500)
             {
-                StartPolling();
+                allMagic = 500;
             }
+
+            // if (currUseSkill == null && SkillCommands.Count <= 0)
+            // {
+            //     while (_currUseQueueIndex < _skillQueue.Count && SkillCommands.Count <= 0)
+            //     {
+            //         SkillBasic skillBasic = _skillQueue[_currUseQueueIndex];
+            //         if (skillBasic.SelfSkillConfig.SkillType == 1)
+            //         {
+            //             if (skillBasic.IsCanUse())
+            //             {
+            //                 AddCommandSkill(skillBasic);
+            //             }
+            //         }
+            //
+            //         _currUseQueueIndex++;
+            //     }
+            // }
+
+            // if (_currUseQueueIndex >= _skillQueue.Count)
+            // {
+            //     StartPolling();
+            // }
         }
 
 

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroStateType.cs

@@ -19,6 +19,8 @@ namespace GameLogic.Combat.Hero
         public static readonly string PickUp= "PickUp";//拾取状态
         public static readonly string Disappear= "disappear";//消失状态
         public static readonly string MagicWeaponPingDou= "MagicWeaponPingDou";//法宝碰撞
+        public static readonly string Flight= "flight";
+        
         
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroTimeLineControl.cs

@@ -26,6 +26,11 @@ namespace GameLogic.Combat.Hero
 
         public void AddTimeLienData(TimeLienData timeLienData)
         {
+            if (_addTimeLienDatas.ContainsKey(timeLienData.timeLineName))
+            {
+                return;
+            }
+
             _addTimeLienDatas.Add(timeLienData.timeLineName, timeLienData);
         }
 

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroFlightState.cs

@@ -0,0 +1,26 @@
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero.SubStatus;
+
+namespace GameLogic.Combat.Hero.State
+{
+    public class CombatHeroFlightState : CombatHeroStateBasic
+    {
+        public CombatHeroFlightState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
+        {
+        }
+
+        protected override void ProEnter()
+        {
+            combatHeroEntity.combatHeroAnimtion.Play("idle");
+            combatHeroEntity.CombatAIBasic.RemoveSubStatus<FightIdleSubState>();
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            if (CombatController.currActiveCombat.IsFightState)
+            {
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroFlightState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5be36d6ca4d843ca8f20708943115f2d
+timeCreated: 1742968590

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroIdleState.cs

@@ -1,3 +1,4 @@
+using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero.SubStatus;
 using UnityEngine;
 using UnityEngine.AI;
@@ -19,7 +20,10 @@ namespace GameLogic.Combat.Hero.State
         {
             if (combatHeroEntity.CombatAIBasic.currFocusTarget == null)
             {
-                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.move);
+                if (!CombatController.currActiveCombat.IsFightState)
+                {
+                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Flight);
+                }
                 return;
             }
 

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeapomDormancyState.cs

@@ -10,7 +10,10 @@ namespace GameLogic.Combat.Hero.State
         }
 
         protected override void ProEnter()
-        {
+        {  
+            CombatMagicWeaponEntity     myCombatMagicWeaponEntity = combatHeroEntity as CombatMagicWeaponEntity;
+            myCombatMagicWeaponEntity.MagicWeaponCollisionId = -1;
+            
             combatHeroEntity.GameObject.SetActive(false);
         }
     }

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -64,6 +64,7 @@ namespace GameLogic.Combat.Hero.State
                 {
                     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate()
                     {
+                      
                         timeLineEventLogicGroup.CloseLoopFx();
                         myCombatMagicWeaponEntity.isCombatState = true;
                         myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
@@ -79,6 +80,8 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProExit()
         {
+            timeLineEventLogicGroup?.BreakTimeLine(myCombatMagicWeaponEntity);
+            timeLineEventLogicGroup = null;
         }
 
         public override bool IsUpdateLockTarget()

Assets/Scripts/GameLogic/Combat/Hero/SubStatus/FightIdleSubState.cs

@@ -22,6 +22,8 @@ namespace GameLogic.Combat.Hero.SubStatus
         protected override void ProInit()
         {
             initPos = CombatHeroEntity.dotPos;
+            allTimeX=Mathf.PI / 2;
+            allTime = 0;
         }
 
 

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901001.cs

@@ -1,4 +1,6 @@
+using Fort23.Core;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -33,10 +35,26 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             Debug.Log("法宝对敌人照成伤害");
             ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            if (lifetCycleHitPoint == null)
+            {
+                return;
+            }
+
             BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
             cBetterList.Add(lifetCycleHitPoint);
             ActivationTimeLineData("gongji", currTarget: cBetterList);
             SkillPlayFinish();
+            
+            HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
+            harmReturnInfo.source = CombatHeroEntity;
+            harmReturnInfo.target = target.GetMainHotPoin<CombatHeroHitPoint>();
+            harmReturnInfo.att = 200;
+            harmReturnInfo.attType = AttType.Normal;
+            harmReturnInfo.harmType = HarmType.Default;
+            harmReturnInfo.triggerData = triggerData;
+            target.HeroHurt(harmReturnInfo);
+            // CombatCalculateTool.Instance.Harm(CombatHeroEntity, lifetCycleHitPoint as CombatHeroHitPoint, 200, AttType.Normal, triggerData,
+            //     HarmType.Default);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S1001.cs

@@ -1,4 +1,6 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
@@ -17,5 +19,12 @@ namespace GameLogic.Combat.Skill
         {
           
         }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, 100, AttType.Normal, triggerData,
+                HarmType.Default);
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S2001.cs

@@ -1,4 +1,6 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
@@ -14,5 +16,12 @@ namespace GameLogic.Combat.Skill
         {
           
         }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, 100, AttType.Normal, triggerData,
+                HarmType.Default);
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -16,6 +16,7 @@ using UnityEngine;
 using Utility;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
+using Random = UnityEngine.Random;
 
 namespace GameLogic.Combat.Skill
 {
@@ -44,7 +45,11 @@ namespace GameLogic.Combat.Skill
         }
 
         private bool _isDis;
-
+     
+        public float angle=180;
+        public float useAngle;
+        public float lasetAngle=360;
+        public int useCount;
         /// <summary>
         /// 当前激活技能的TimeLine数据
         /// </summary>
@@ -126,7 +131,8 @@ namespace GameLogic.Combat.Skill
         {
             SkillFeaturesData = new SkillFeaturesData();
             SkillFeaturesData.SkillFeaturesType = SkillFeaturesType.Earth;
-            SkillFeaturesData.hp = 100;
+            SkillFeaturesData.hp = Random.Range(100,200);
+            SkillFeaturesData.isEnemy= combatHeroEntity.IsEnemy;
             _combatHeroEntity = combatHeroEntity;
             ProInitSkill();
         }
@@ -235,6 +241,26 @@ namespace GameLogic.Combat.Skill
             {
                 SkillIntensifierData = new SkillIntensifierData();
             }
+
+            switch (skillConfig.attribute)
+            {
+                case 1:
+                    useAngle = 0;
+                    break;
+                case 2:
+                    useAngle = 72;
+                    break;
+                case 4:
+                    useAngle = 144;
+                    break;
+                case 8:
+                    useAngle = 216;
+                    break;
+                case 16:
+                    useAngle = 288;
+                    break;
+                
+            }
             ProInitSkillConfig();
             // LogTool.Log("初始化技能"+skillConfig.scriptName);
         }

Assets/Scripts/GameLogic/Combat/Skill/SkillFeaturesData.cs

@@ -36,6 +36,8 @@ namespace GameLogic.Combat.Skill
         /// </summary>
         public int hp;
 
+        public bool isEnemy;
+
 
         public SkillFeaturesType SkillFeaturesType;
 
@@ -90,6 +92,7 @@ namespace GameLogic.Combat.Skill
             SkillFeaturesData skillFeaturesData = CObjectPool.Instance.Fetch<SkillFeaturesData>();
             skillFeaturesData.hp = hp;
             skillFeaturesData.def = def;
+            skillFeaturesData.isEnemy = isEnemy;
             skillFeaturesData.SkillFeaturesType = SkillFeaturesType;
             return skillFeaturesData;
         }

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -86,7 +86,7 @@ namespace GameLogic.Hero
             SetDataConfig(modelID, 
                 powerID, 
                 promoteID);
-            CalFactor();
+          
             CalAttribute();
             SkillData = new SkillData(this);
             SkillData.InitSkills();
@@ -95,7 +95,7 @@ namespace GameLogic.Hero
         {
             level.Value++;
             powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level.Value);
-            CalFactor();
+            
             CalBasicAttribute();
             return this;
         }

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAIBeelineBulletLogic.cs

@@ -102,15 +102,7 @@ namespace Common.Combat.FxAILogic
             }
         }
 
-        private void FinishHit(Vector3 pos, string hitFxName)
-        {
-            if (!string.IsNullOrEmpty(hitFxName))
-            {
-                CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle(hitFxName,
-                    pos, null, false, null, null);
-            }
-        }
-
+      
         protected override void ProCombatUpdate(float time)
         {
             Vector3 lastPos = _currPos;

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -22,6 +22,7 @@ namespace Common.Combat.FxAILogic
         private ILifetCycleHitPoint _attTarget;
 
         public SkillFeaturesData SkillFeaturesData;
+        [Header("延迟时间发射")] public float delayTime;
         [Header("碰撞时的特效")] public string hitFxName;
         [Header("碰撞音效")] public string hitAudioName;
 
@@ -76,6 +77,7 @@ namespace Common.Combat.FxAILogic
 
         protected bool _isUpdateBasic;
 
+        private float _currDelayTime;
         public void Init(Vector3 startPos,
             TimeLineEventParticleLogicBasic timeLineEventParticleLogicBasic, ILifetCycleHitPoint attTarget,
             SpecialDotInfo specialDotInfo = null)
@@ -86,6 +88,7 @@ namespace Common.Combat.FxAILogic
                 return;
             }
 
+            _currDelayTime = 0;
             _currPos = startPos;
             this.startPos = startPos;
             this._timeLineEventParticleLogicBasic = timeLineEventParticleLogicBasic;
@@ -131,6 +134,19 @@ namespace Common.Combat.FxAILogic
         // protected virtual void ProDetection()
         // {
         // }
+        public void PlayHit()
+        {
+            FinishHit(CurrPos,hitFxName);
+        }
+
+        protected void FinishHit(Vector3 pos, string hitFxName)
+        {
+            if (!string.IsNullOrEmpty(hitFxName))
+            {
+                CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle(hitFxName,
+                    pos, null, false, null, null);
+            }
+        }
 
 
         protected void Hit(string fxName, Vector3 startPos, ILifetCycleHitPoint fxTarget, bool isRotate,
@@ -170,7 +186,11 @@ namespace Common.Combat.FxAILogic
             {
                 return;
             }
-
+            _currDelayTime+=time;
+            if (_currDelayTime < delayTime)
+            {
+                return;
+            }
 
             ProCombatUpdate(time);
             if (_timeLineEventParticleLogicBasic == null)

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -17,6 +17,7 @@ namespace Common.Combat.FxAILogic
 
         [Header("释放碰撞到地面时结束")] public bool isTriggerGroundEnd;
         [Header("碰撞到地面时的特效")] public string GroundHitFxName;
+      
         private Vector3 endPos;
         private Vector3 dir;
         public float maxDis = 20;
@@ -48,8 +49,9 @@ namespace Common.Combat.FxAILogic
             Vector3 off = _currPos - CombatHeroEntity.GameObject.transform.position;
             startDir = CombatHeroEntity.GameObject.transform.TransformPoint(off +
                                                                             new Vector3(
-                                                                                Mathf.Sign(Random.Range(-1, 1) * 0.5f),
-                                                                                Random.Range(0.1f, 0.3f), 0));
+                                                                                Mathf.Sign(Random.Range(-1, 1)),
+                                                                                Random.Range(0.1f, 1f),
+                                                                                Random.Range(0.1f, 5f)));
 
             startDir = (startDir - _currPos).normalized;
             dirLerpTime = 0;
@@ -104,6 +106,11 @@ namespace Common.Combat.FxAILogic
             if (fxAILogicBasic != null) //击中其他的功法
             {
                 SkillFeaturesData skillFeaturesData = fxAILogicBasic.SkillFeaturesData;
+                if (skillFeaturesData.isEnemy == SkillFeaturesData.isEnemy)
+                {
+                    return;
+                }
+
                 int myRestrained = SkillFeaturesData.GetRestrained(skillFeaturesData.SkillFeaturesType);
                 int targetRestrained = skillFeaturesData.GetRestrained(SkillFeaturesData.SkillFeaturesType);
                 int c = myRestrained - targetRestrained;
@@ -122,6 +129,7 @@ namespace Common.Combat.FxAILogic
                 {
                     myHp -= targetHp;
                     SkillFeaturesData.hp = myHp;
+                    fxAILogicBasic.PlayHit();
                     fxAILogicBasic.Dispose();
                 }
                 else if (myHp < targetHp)
@@ -129,12 +137,15 @@ namespace Common.Combat.FxAILogic
                     targetHp -= myHp;
                     skillFeaturesData.hp = targetHp;
                     Dispose();
+                    PlayHit();
                 }
                 else if (myHp == targetHp)
                 {
                     myHp = 0;
+                    fxAILogicBasic.PlayHit();
                     fxAILogicBasic.Dispose();
                     Dispose();
+                    PlayHit();
                 }
 
                 return;
@@ -154,8 +165,14 @@ namespace Common.Combat.FxAILogic
             }
 
             CombatHeroEntity target = heroEntityMono.combatHeroEntity;
-            if (target.IsEnemy == CombatHeroEntity.IsEnemy)
+            if (target.IsEnemy == CombatHeroEntity.IsEnemy||target is CombatMagicWeaponEntity)
+            {
+                return;
+            }
+
+            if (TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName == null)
             {
+                Dispose();
                 return;
             }
 
@@ -206,10 +223,10 @@ namespace Common.Combat.FxAILogic
             gameObject.transform.position = _currPos;
 
             gameObject.transform.rotation = Quaternion.LookRotation(dir);
-            if (Vector3.Distance(endPos, _currPos) < 0.5f)
-            {
-                Dispose();
-            }
+            // if (Vector3.Distance(endPos, _currPos) < 0.5f)
+            // {
+            //     Dispose();
+            // }
         }
 
         protected override void ProDispose()

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -38,10 +38,11 @@ namespace GameLogic.Combat
             CombatEquipFallManager.Instance.Init();
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
 
-     
+             CombatShowTextPanel.OpenCombatShowTextPanel(cTaskAwaitBuffer);
             cTaskAwaitBuffer.AddTask(combatMonoBaisc.Init(CombatController));
             await cTaskAwaitBuffer.WaitAll();
-
+            await ZhuanPanPanel.OpenZhuanPanPanel();
+          
             LogTool.Log("战斗逻辑自己写");
             await CombatController.InitCombat(startCombatInfo);
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);

Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -1,3 +1,5 @@
+using Common.Utility.CombatEvent;
+
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "CombatPanel")]
@@ -9,20 +11,27 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            StaticUpdater.Instance.AddLateUpdateCallBack(Update);
+          
         }
 
         protected override void DelEvent()
         {
+            StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
         }
 
         public override void AddButtonEvent()
         {
             bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
         }
+        
 
         private void Bnt_shengShi_onClick()
         {
-       
+        }
+
+        public void Update()
+        {
         }
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanel.cs

@@ -0,0 +1,78 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using UnityEngine;
+using Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "CombatShowTextPanel")]
+    public partial class CombatShowTextPanel : UIPanel
+    {
+        // public static Font huiFuFont;
+        // public static Font shangHai;
+
+
+        public static void OpenCombatShowTextPanel(CTaskAwaitBuffer cTaskAwaitBuffer)
+        {
+            cTaskAwaitBuffer.AddTask(UIManager.Instance.LoadAndOpenPanel<CombatShowTextPanel>(null, UILayer.Middle));
+            // cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("hd_0.fontsettings",
+            //     delegate(AssetHandle handle) { huiFuFont = handle.AssetObject<Font>(); }));
+            //
+            // cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("Zhanli_0.fontsettings",
+            //     delegate(AssetHandle handle) { shangHai = handle.AssetObject<Font>(); }));
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HarmUpdate, HarmUpdate);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.RecoverUpdate, RecoverUpdate);
+        }
+
+        protected override void DelEvent()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HarmUpdate, HarmUpdate);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.RecoverUpdate, RecoverUpdate);
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public override async CTask Open()
+        {
+            await base.Open();
+            transform.SetSiblingIndex(0);
+        }
+
+        private async void RecoverUpdate(IEventData iEventData)
+        {
+            HarmUpdateEventData harmUpdateEventData = iEventData as HarmUpdateEventData;
+            HarmReturnInfo harmReturnInfo = harmUpdateEventData.HarmReturnInfo;
+            CombatHeroEntity heroEntity = harmReturnInfo.target.combatHeroEntity as CombatHeroEntity;
+            long att = harmReturnInfo.att;
+            HarmType harmType = harmReturnInfo.harmType;
+            ShowTextWidget widget =
+                await UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(ShowTextWidget, null, transform,
+                    isInstance: true);
+            widget.ShowUI(heroEntity, att, harmType, false);
+        }
+
+        private async void HarmUpdate(IEventData iEventData)
+        {
+            HarmUpdateEventData harmUpdateEventData = iEventData as HarmUpdateEventData;
+            HarmReturnInfo harmReturnInfo = harmUpdateEventData.HarmReturnInfo;
+            CombatHeroEntity heroEntity = harmReturnInfo.target.combatHeroEntity as CombatHeroEntity;
+            long att = harmReturnInfo.att;
+            HarmType harmType = harmReturnInfo.harmType;
+            ShowTextWidget widget =
+                await UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(ShowTextWidget, null, transform,
+                    isInstance: true);
+            widget.ShowUI(heroEntity, att, harmType, true);
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DClJ4X6sAXpNhVzcrOQDAxrGyzWtfue9o7ci8woKXAznmgV8lxYq/ak=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanelData.cs

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class CombatShowTextPanel 
+	{
+	  #region 自定义数据 
+	  private GameObject _ShowTextWidget;
+	  public GameObject ShowTextWidget
+	   {
+	   get{
+	      if (_ShowTextWidget == null)
+	       {
+	         _ShowTextWidget  = GetUIUnit<GameObject>("ShowTextWidget"); 
+	       }
+	      return _ShowTextWidget;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XHwfsSypU3+wM1L6z4UVkxUMHIAvP0k+U40H1g4CvHwYZ7oRneiarsg=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/ShowTextWidget.cs

@@ -0,0 +1,63 @@
+using Common.Utility.CombatTimer;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "ShowTextWidget")]
+    public partial class ShowTextWidget : UIComponent
+    {
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void ShowUI(CombatHeroEntity heroEntity,long att , HarmType harmType, bool isHarm)
+        {
+            Vector3 worldPos =heroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
+            Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            transform.position = p2;
+            if (isHarm)
+            {
+                text.color=heroEntity.IsEnemy?Color.white:Color.red;
+            }
+            else
+            {
+                text.color=Color.green;
+            }
+
+            text.text = att.ToString();
+            anim.Play("show",false);
+            // if (Animator != null)
+            // {
+            //     if (harmType.HasFlag(HarmType.BaoJi))
+            //     {
+            //         Animator.Play("ShowTextWidgetBaoji");
+            //     }
+            //     else
+            //     {
+            //         Animator.Play("ShowTextWidgetShow");
+            //     }
+            // }
+
+            CombatTimerManager.Instance.AddTimer(1, delegate
+            {
+                GObjectPool.Instance.Recycle(this);
+            });
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/ShowTextWidget.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WXgft36vAXoqqprApZZyzHuJhjQhQFHbGTny0Rrkam4uwydxXk4gQFHG1RXQ
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/ShowTextWidgetData.cs

@@ -0,0 +1,43 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+using Core.UI.UTool.UITween;
+using TMPro;
+
+namespace Fort23.Mono
+{
+	public partial class ShowTextWidget 
+	{
+	  #region 自定义数据 
+	  private TextMeshProUGUI _text;
+	  public TextMeshProUGUI text
+	   {
+	   get{
+	      if (_text == null)
+	       {
+	         _text  = GetUIUnit<TextMeshProUGUI>("text"); 
+	       }
+	      return _text;
+	     }
+	   }
+	  private UITweenController _anim;
+	  public UITweenController anim
+	   {
+	   get{
+	      if (_anim == null)
+	       {
+	         _anim  = GetUIUnit<UITweenController>("anim"); 
+	       }
+	      return _anim;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/ShowTextWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DH4dsS2pW3g4speFP6wX104Tl8AI9KYNytmTlT8Q4MSwWMlZ5VYiaLrU2uoc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanel.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using GameLogic.Combat.Skill;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "ZhuanPanPanel")]
+    public partial class ZhuanPanPanel : UIPanel
+    {
+        private List<gf_widget> _gfWidgets = new List<gf_widget>();
+
+        public static async CTask OpenZhuanPanPanel()
+        {
+            await UIManager.Instance.LoadAndOpenPanel<ZhuanPanPanel>(null, UILayer.Bottom);
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+            StaticUpdater.Instance.AddLateUpdateCallBack(Update);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.ExercisesAlter, ExercisesAlter);
+        }
+
+        protected override void DelEvent()
+        {
+            StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+
+        private async void ExercisesAlter(IEventData iEventData)
+        {
+            CombatHeroSkillControl combatHeroSkillControl = CombatController.currActiveCombat.CombatHeroController
+                .playerHeroEntity.CombatHeroSkillControl
+                .This<CombatHeroSkillControl>();
+            for (int i = 0; i < combatHeroSkillControl._skillQueue.Count; i++)
+            {
+                SkillBasic skillBasic = combatHeroSkillControl._skillQueue[i];
+                gf_widget gfWidget = await UIManager.Instance.CreateGComponentForObject<gf_widget>(this.gf_widget, null,
+                    Gf_root, isInstance: true, poolName: "gf_widget");
+                gfWidget.SkillBasic = skillBasic;
+                gfWidget.InitWidget(skillBasic);
+                _gfWidgets.Add(gfWidget);
+            }
+        }
+
+        public void Update()
+        {
+            if (CombatController.currActiveCombat==null||CombatController.currActiveCombat.CombatHeroController==null||CombatController.currActiveCombat.CombatHeroController.playerHeroEntity == null||CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.CombatHeroSkillControl==null)
+            {
+                return;
+            }
+
+            CombatHeroSkillControl combatHeroSkillControl    =CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.CombatHeroSkillControl
+                .This<CombatHeroSkillControl>();
+            lanLiang.fillAmount=combatHeroSkillControl.addChongNeng/150f;
+            lanLiang.color=!combatHeroSkillControl.isKuoLiQuanKai? new Color(0f, 0.84f, 1f):Color.red;
+            for (int i = 0; i < _gfWidgets.Count; i++)
+            {
+                gf_widget gfWidget = _gfWidgets[i];
+                // gfWidget.SkillBasic.angle += 1;
+                // float jd = gfWidget.SkillBasic.angle % 360;
+                // if (jd > gfWidget.SkillBasic.useAngle && gfWidget.SkillBasic.angle > gfWidget.SkillBasic.lasetAngle)
+                // {
+                //     gfWidget.SkillBasic.lasetAngle += 360;
+                //     Debug.Log("旋转一圈");
+                // }
+
+                if (gfWidget.useCount != gfWidget.SkillBasic.useCount)
+                {
+                    gfWidget.useCount = gfWidget.SkillBasic.useCount;
+                    switch (gfWidget.SkillBasic.SelfSkillConfig.attribute)
+                    {
+                        case 1: 
+                            jin.Play("show",false);
+                            break;
+                        case 2: 
+                            mu.Play("show",false);
+                            break;
+                        case 4: 
+                            shui.Play("show",false);
+                            break;
+                        case 8: 
+                            huo.Play("show",false);
+                            break;
+                        case 16: 
+                            tu.Play("show",false);
+                            break;
+                    }
+                }
+
+                
+                double hd = gfWidget.SkillBasic.angle * Math.PI / 180f;
+                double a = Math.Cos(hd);
+                double b = -Math.Sin(hd);
+                double c = Math.Sin(hd);
+                double d = a;
+                double x = a * 0 + b * 60;
+                double y = c * 0 + d * 60;
+
+                gfWidget.transform.anchoredPosition = new Vector2((float)x, (float)y);
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: D30b5yiuAXMrBe3mnIsS8qdgJ+/HcEs5rJRor+fsOojRqLWNHlj0ee/6xRtu
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanelData.cs

@@ -0,0 +1,108 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+using Core.UI.UTool.UITween;
+
+namespace Fort23.Mono
+{
+	public partial class ZhuanPanPanel 
+	{
+	  #region 自定义数据 
+	  private GameObject _gf_widget;
+	  public GameObject gf_widget
+	   {
+	   get{
+	      if (_gf_widget == null)
+	       {
+	         _gf_widget  = GetUIUnit<GameObject>("gf_widget"); 
+	       }
+	      return _gf_widget;
+	     }
+	   }
+	  private RectTransform _Gf_root;
+	  public RectTransform Gf_root
+	   {
+	   get{
+	      if (_Gf_root == null)
+	       {
+	         _Gf_root  = GetUIUnit<RectTransform>("Gf_root"); 
+	       }
+	      return _Gf_root;
+	     }
+	   }
+	  private UITweenController _jin;
+	  public UITweenController jin
+	   {
+	   get{
+	      if (_jin == null)
+	       {
+	         _jin  = GetUIUnit<UITweenController>("jin"); 
+	       }
+	      return _jin;
+	     }
+	   }
+	  private UITweenController _mu;
+	  public UITweenController mu
+	   {
+	   get{
+	      if (_mu == null)
+	       {
+	         _mu  = GetUIUnit<UITweenController>("mu"); 
+	       }
+	      return _mu;
+	     }
+	   }
+	  private UITweenController _shui;
+	  public UITweenController shui
+	   {
+	   get{
+	      if (_shui == null)
+	       {
+	         _shui  = GetUIUnit<UITweenController>("shui"); 
+	       }
+	      return _shui;
+	     }
+	   }
+	  private UITweenController _huo;
+	  public UITweenController huo
+	   {
+	   get{
+	      if (_huo == null)
+	       {
+	         _huo  = GetUIUnit<UITweenController>("huo"); 
+	       }
+	      return _huo;
+	     }
+	   }
+	  private UITweenController _tu;
+	  public UITweenController tu
+	   {
+	   get{
+	      if (_tu == null)
+	       {
+	         _tu  = GetUIUnit<UITweenController>("tu"); 
+	       }
+	      return _tu;
+	     }
+	   }
+	  private Image _lanLiang;
+	  public Image lanLiang
+	   {
+	   get{
+	      if (_lanLiang == null)
+	       {
+	         _lanLiang  = GetUIUnit<Image>("lanLiang"); 
+	       }
+	      return _lanLiang;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DH8ds3n8Uy1Sl4twYhFLQjdr6/fjeV7HYI4TXxhbpMhMhbMaoq1j7zYTk3DS
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/gf_widget.cs

@@ -0,0 +1,52 @@
+using GameLogic.Combat.Skill;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "gf_widget")]
+    public partial class gf_widget : UIComponent
+    {
+        public SkillBasic SkillBasic;
+        public float jd;
+        public int useCount;
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void InitWidget( SkillBasic SkillBasic)
+        {
+            this.SkillBasic = SkillBasic;
+            useCount= SkillBasic.UseCount;
+            switch (SkillBasic.SelfSkillConfig.attribute)
+            {
+              case 1: 
+                  gf_icon.color=new Color(1f, 0.98f, 0.09f);
+                  break;
+              case 2: 
+                  gf_icon.color=new Color(0.17f, 1f, 0.35f);
+                  break;
+              case 4: 
+                  gf_icon.color=new Color(0.19f, 0.51f, 1f);
+                  break;
+              case 8: 
+                  gf_icon.color=new Color(1f, 0.19f, 0.04f);
+                  break;
+              case 16: 
+                  gf_icon.color=new Color(1f, 0.65f, 0.17f);
+                  break;
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/gf_widget.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: BnoX4SKkUnxgM3N/Tun02drQtm9aKfdaLhN/Smi4tf4ejESsr7xwUijx4B9r
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/CombatPanel/gf_widgetData.cs

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class gf_widget 
+	{
+	  #region 自定义数据 
+	  private Image _gf_icon;
+	  public Image gf_icon
+	   {
+	   get{
+	      if (_gf_icon == null)
+	       {
+	         _gf_icon  = GetUIUnit<Image>("gf_icon"); 
+	       }
+	      return _gf_icon;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/gf_widgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Di9OvXytBy0OgEPUBdpigRU63MFF78U3APwcXM6D9ReQTDCIhx/fMNlnMF2D
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 3150
+    y: 701
+    width: 1311
+    height: 691
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -19,12 +43,63 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
-  m_RootView: {fileID: 7}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 10}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1311
+    height: 691
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 16}
+  m_Panes:
+  - {fileID: 16}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1311
+    height: 691
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 42662
+  draggingID: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,16 +116,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 553
-    width: 937
+    width: 939
     height: 391
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,16 +142,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 944
-    width: 937
+    width: 939
     height: 355
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 26}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 26}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,21 +164,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 2}
-  - {fileID: 3}
+  - {fileID: 15}
+  - {fileID: 5}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 717
     y: 0
-    width: 937
+    width: 939
     height: 1299
   m_MinSize: {x: 100, y: 150}
   m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
   controlID: 43
   draggingID: 0
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -124,13 +199,13 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 21}
-  - {fileID: 16}
+  - {fileID: 25}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -149,14 +224,14 @@ MonoBehaviour:
     y: 0
     width: 717
     height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 23}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 27}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 27}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -169,9 +244,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 9}
-  - {fileID: 10}
+  - {fileID: 11}
+  - {fileID: 12}
+  - {fileID: 13}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -184,7 +259,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -206,7 +281,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -219,10 +294,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 4}
-  - {fileID: 11}
-  - {fileID: 5}
+  - {fileID: 9}
+  - {fileID: 7}
+  - {fileID: 14}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -232,9 +307,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 150}
   m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 19
+  controlID: 42
   draggingID: 0
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -255,7 +330,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -270,18 +345,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1654
+    x: 1656
     y: 0
-    width: 362
+    width: 360
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 20}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -291,28 +366,62 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TransitionLibraryWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 937
+    width: 939
     height: 553
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 28}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 28}
+  - {fileID: 23}
+  - {fileID: 22}
+  - {fileID: 21}
   - {fileID: 19}
   - {fileID: 18}
-  - {fileID: 17}
-  - {fileID: 15}
-  - {fileID: 14}
-  m_Selected: 5
-  m_LastSelected: 0
---- !u!114 &13
+  m_Selected: 0
+  m_LastSelected: 5
+--- !u!114 &16
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 3150
+    y: 701
+    width: 1311
+    height: 670
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -334,7 +443,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 717
     y: 626
-    width: 935
+    width: 937
     height: 370
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -355,7 +464,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -393,7 +502,20 @@ MonoBehaviour:
   _Data:
     _Transitions:
     - {fileID: 7727764457144862361, guid: 121d2418647c36648a81536ce46be4e3, type: 2}
-    _Modifiers: []
+    - {fileID: -7587810941454656574, guid: 121d2418647c36648a81536ce46be4e3, type: 2}
+    _Modifiers:
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
   _Selection: {fileID: 0}
@@ -414,7 +536,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &15
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -484,7 +606,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &16
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -518,7 +640,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1320,7 +1442,7 @@ MonoBehaviour:
     {\n        \"m_SerializableColors\": []\n    }\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2146,7 +2268,7 @@ MonoBehaviour:
     {\n        \"m_SerializableColors\": []\n    }\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &19
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2448,7 +2570,7 @@ MonoBehaviour:
     true,\n    \"m_ClearCoat\": false\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &20
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2468,9 +2590,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1654
+    x: 1656
     y: 73
-    width: 360
+    width: 358
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2485,25 +2607,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 62d10000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 1a11fcff1c11fcff2211fcff2411fcff2611fcff2811fcff2a11fcff8411fcffe6e2fdffece2fdfff8e2fdfff0b0fefff6b0feff92b2feff3673ffff40f9ffff78faffff18a80000baa80000
+      m_ExpandedIDs: 1aaffbff90b5fbff8ab6fbff92b6fbffd8b6fbffdeb6fbfffab6fbff08b7fbff0cb7fbff5402fdff6202fdffaa43fdffb843fdff0044fdff0e44fdff825afeffba5afefff06dfefffe6dfeffd471feff78fafffff4ffffff90aa0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Guixiu01
-        m_OriginalName: Guixiu01
+        m_Name: hp
+        m_OriginalName: hp
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 201294
+        m_UserData: -260956
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 14}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -2511,7 +2633,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: f7da054d227971a4d8e6d4985252c187
---- !u!114 &21
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2548,7 +2670,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 392
+    m_CachedPref: 454
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -2558,7 +2680,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &22
+--- !u!114 &26
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2580,7 +2702,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 717
     y: 1017
-    width: 935
+    width: 937
     height: 334
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2603,7 +2725,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Character/Guaiwu/Guixiu01
+    - Assets/Art/ArtHero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2611,16 +2733,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Character/Guaiwu/Guixiu01
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 27}
-    m_SelectedIDs: daf90200
-    m_LastClickedID: 195034
-    m_ExpandedIDs: 00000000eaaf0000ecaf0000eeaf0000f0af0000f2af0000f4af0000f6af0000f8af0000faaf0000fcaf0000feaf000088b000008cb0000090b000009ab00000b8b00000c0b00000c4b000005ad1000044f9000006ff000008ff000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 5eb30000
+    m_LastClickedID: 45918
+    m_ExpandedIDs: 00000000b8b20000bab20000bcb20000beb20000c0b20000c2b20000c4b20000c6b20000c8b20000cab20000ccb20000ceb20000d0b20000d2b20000d4b200009ab30000d6b3000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2636,7 +2758,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 3}
+      m_ClientGUIView: {fileID: 6}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -2648,7 +2770,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000eaaf0000ecaf0000eeaf0000f0af0000f2af0000f4af0000f6af0000f8af0000faaf0000fcaf0000feaf0000
+    m_ExpandedIDs: 00000000b8b20000bab20000bcb20000beb20000c0b20000c2b20000c4b20000c6b20000c8b20000cab20000ccb20000ceb20000d0b20000d2b20000d4b20000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2676,23 +2798,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b2000070de000056dc000020af00001cad00001aad000074c8000070c800000eac0000e4f90200ccd70200eaf90200f0f90200f6f902005cd10000
+    m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b2000070de000056dc000020af00001cad00001aad000074c8000070c800000eac0000e4f90200ccd70200eaf90200f0f90200f6f902005cd10000dab300004cb20000d4b30000eab30000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Guixiu01
-      m_OriginalName: Guixiu01
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 195014
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 3}
+      m_ClientGUIView: {fileID: 6}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -2704,7 +2826,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 310
---- !u!114 &23
+--- !u!114 &27
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2802,7 +2924,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 00000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &24
+--- !u!114 &28
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2824,7 +2946,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 717
     y: 73
-    width: 935
+    width: 937
     height: 532
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -3197,9 +3319,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.24331228, y: 7.72599, z: 12.01106}
+    m_Target: {x: 0.7401632, y: 0.23091133, z: 0}
     speed: 2
-    m_Value: {x: -0.24331228, y: 7.72599, z: 12.01106}
+    m_Value: {x: 0.7401632, y: 0.23091133, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -3245,13 +3367,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.067247234, y: -0.9035838, z: 0.3956296, w: 0.15191898}
+    m_Target: {x: 0.17647429, y: -0.13262619, z: 0.022628639, w: 0.9753812}
     speed: 2
-    m_Value: {x: 0.06722747, y: -0.9033183, z: 0.39551336, w: 0.15187433}
+    m_Value: {x: 0.1764202, y: -0.13258554, z: 0.022621702, w: 0.9750822}
   m_Size:
-    m_Target: 4.138896
+    m_Target: 0.8660254
     speed: 2
-    m_Value: 4.138896
+    m_Value: 0.8660254
   m_Ortho:
     m_Target: 0
     speed: 2

XiuXianGame.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F8b_003F8699ce4e_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F78_003F5e834fc5_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F3b_003F1a234af4_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F66_003F966ef437_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>