修改bug

Assets/Art/ArtHero/FaBao/fb_yuping.prefab

@@ -44,7 +44,7 @@ GameObject:
   - component: {fileID: 620852127044963718}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_yuping_time
+  m_Name: fb_yuping
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -102,6 +102,7 @@ PlayableDirector:
     value: {fileID: 0}
   m_ExposedReferences:
     m_References:
+    - d4fc1ec3b24009c4f96fe610eb65b484: {fileID: 5880232043378550821}
     - 7bbfbdabf79b23649bf2ea641db23905: {fileID: 6901757044084833302}
     - 510073d11a064b44b81d5efc39bc6cae: {fileID: 4285674574323255737}
     - 2820b2085f57c41488400dc1f02017f3: {fileID: 3984845751815806333}
@@ -505,6 +506,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6629848115157710336}
   - component: {fileID: 6000184822688310587}
+  - component: {fileID: 4036878826457337380}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_yuping_show
@@ -551,6 +553,21 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &4036878826457337380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8874976825627156828}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 6000184822688310587}
+  _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+  _ActionOnDisable: 0
 --- !u!1 &9218637542153191202
 GameObject:
   m_ObjectHideFlags: 0
@@ -834,6 +851,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1848716642415766029, guid: 93f95ebb1f1e6754c8617a38aa94644a, type: 3}
   m_PrefabInstance: {fileID: 1099783612329559903}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5880232043378550821 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6834758604734705530, guid: 93f95ebb1f1e6754c8617a38aa94644a, type: 3}
+  m_PrefabInstance: {fileID: 1099783612329559903}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3035174960923672029
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Art/FaBaoMesh/1/fb_yuping_show.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-3083364758768103211
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 1827226128182048838, guid: c38110db927930649a5e70cb4a3282fd, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &-2715424807863267536
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -3083364758768103211}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -3083364758768103211}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fb_yuping_show
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -2715424807863267536}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}

Assets/Art/FaBaoMesh/1/fb_yuping_show.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: C3xNsnmtUyh2/HKOAbVTXUUTk461CgwbgZjmCWiHPAP0o2DQ7/063VIC82ei
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/HeroTimeLine/fb_yupingTimeline.playable

@@ -314,6 +314,18 @@ MonoBehaviour:
     m_DisplayName: fx_fb_duipin_hit
   m_Markers:
     m_Objects: []
+--- !u!114 &-8034426028797582310
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset(Clone)(Clone)
+  m_EditorClassIdentifier: 
 --- !u!114 &-7456703728703065245
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -430,6 +442,43 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &-7318954900099684309
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: d4fc1ec3b24009c4f96fe610eb65b484
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 2612
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 0
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 1
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 1
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &-6951305898938573898
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -632,6 +681,31 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &-4687955152404988062
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "jihuo@\u6FC0\u6D3B"
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 9066145812921407553}
+  - {fileID: 1694455292385061155}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-4270298856469144039
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -873,6 +947,7 @@ MonoBehaviour:
   - {fileID: 621060365187866526}
   - {fileID: -1981172447982138619}
   - {fileID: 6100511837078271690}
+  - {fileID: -4687955152404988062}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
@@ -940,6 +1015,98 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset(Clone)(Clone)
   m_EditorClassIdentifier: 
+--- !u!114 &1694455292385061155
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -4687955152404988062}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7318954900099684309}
+    m_Duration: 1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 1694455292385061155}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_fb_show_jin_bd
+  m_Markers:
+    m_Objects: []
 --- !u!114 &1738373741265469993
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1182,8 +1349,8 @@ MonoBehaviour:
   isNotRotate: 0
   isFollowRootTarget: 0
   isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
+  isLoop: 1
+  loopAlone: 1
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
@@ -1437,7 +1604,7 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 0
+  targetType: 1
   LocationType: 0
   targetSpecialDotName: 
   hitPointGroupName: 
@@ -1451,3 +1618,96 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &9066145812921407553
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -4687955152404988062}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -8034426028797582310}
+    m_Duration: 1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 9066145812921407553}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3

Assets/Res/CombatHero/Nanzhu.prefab

@@ -43,6 +43,8 @@ GameObject:
   - component: {fileID: 7980208121730886396}
   - component: {fileID: 5142883770047668829}
   - component: {fileID: 5738773654925509212}
+  - component: {fileID: 5061261229871728231}
+  - component: {fileID: 6710509252217246157}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Nanzhu
@@ -106,6 +108,54 @@ MonoBehaviour:
   _Animator: {fileID: 5142883770047668829}
   _Transitions: {fileID: 11400000, guid: 8a18e10aaf4ea994e9e39fa8b79d5fbd, type: 2}
   _ActionOnDisable: 0
+--- !u!65 &5061261229871728231
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 187875078543710220}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.46, y: 1, z: 0.44}
+  m_Center: {x: 0, y: 0.85, z: 0}
+--- !u!54 &6710509252217246157
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 187875078543710220}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1 &233421258018094110
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/fb_huohulu.prefab

@@ -119,7 +119,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2642531690415634390
+--- !u!1 &2626454800492613785
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -127,9 +127,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4284192025192678772}
-  - component: {fileID: 470218498366294842}
-  - component: {fileID: 4509429131234625316}
+  - component: {fileID: 1382848038107191687}
+  - component: {fileID: 8476729749211684222}
+  - component: {fileID: 251414550099652730}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Particle System
@@ -138,29 +138,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4284192025192678772
+--- !u!4 &1382848038107191687
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2642531690415634390}
+  m_GameObject: {fileID: 2626454800492613785}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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: 4585611635076190542}
-  m_Father: {fileID: 2024737807476548603}
+  m_Children: []
+  m_Father: {fileID: 4284192025192678772}
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
---- !u!198 &470218498366294842
+--- !u!198 &8476729749211684222
 ParticleSystem:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2642531690415634390}
+  m_GameObject: {fileID: 2626454800492613785}
   serializedVersion: 8
   lengthInSec: 1
   simulationSpeed: 1
@@ -344,7 +343,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.9411765, g: 0.3102914, b: 0, a: 1}
+      maxColor: {r: 1, g: 0.29000002, b: 0.30113712, a: 0.4862745}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -408,7 +407,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.2
+      scalar: 9.9
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -566,7 +565,7 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotationX:
       serializedVersion: 2
-      minMaxState: 3
+      minMaxState: 0
       scalar: 0
       minScalar: 0
       maxCurve:
@@ -619,7 +618,7 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotationY:
       serializedVersion: 2
-      minMaxState: 3
+      minMaxState: 0
       scalar: 0
       minScalar: 0
       maxCurve:
@@ -672,8 +671,8 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotation:
       serializedVersion: 2
-      minMaxState: 3
-      scalar: 6.283185
+      minMaxState: 0
+      scalar: 0
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -725,7 +724,7 @@ ParticleSystem:
         m_RotationOrder: 4
     randomizeRotationDirection: 0
     gravitySource: 0
-    maxNumParticles: 30
+    maxNumParticles: 1000
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
     rotation3D: 0
@@ -991,7 +990,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3
+      scalar: 2
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -1429,7 +1428,7 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 0, g: 0, b: 0, a: 1}
+        key0: {r: 1, g: 1, b: 1, a: 0}
         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}
@@ -1438,16 +1437,16 @@ ParticleSystem:
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 0
-        ctime1: 32768
-        ctime2: 65535
+        ctime1: 65535
+        ctime2: 0
         ctime3: 0
         ctime4: 0
         ctime5: 0
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 65535
-        atime2: 0
+        atime1: 34497
+        atime2: 65535
         atime3: 0
         atime4: 0
         atime5: 0
@@ -1455,8 +1454,8 @@ ParticleSystem:
         atime7: 0
         m_Mode: 0
         m_ColorSpace: -1
-        m_NumColorKeys: 3
-        m_NumAlphaKeys: 2
+        m_NumColorKeys: 2
+        m_NumAlphaKeys: 3
       minGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -4877,15 +4876,15 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!199 &4509429131234625316
+--- !u!199 &251414550099652730
 ParticleSystemRenderer:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2642531690415634390}
-  m_Enabled: 0
+  m_GameObject: {fileID: 2626454800492613785}
+  m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -4901,7 +4900,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 18a15239d7d33da45824e985083dba45, type: 2}
+  - {fileID: 2100000, guid: d77c340f992a29241a3bef40e21918e6, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4921,12 +4920,12 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
-  m_RenderMode: 4
+  m_SortingOrder: 0
+  m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
   m_MinParticleSize: 0
-  m_MaxParticleSize: 5
+  m_MaxParticleSize: 3
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
   m_LengthScale: 2
@@ -4945,7 +4944,7 @@ ParticleSystemRenderer:
   m_VertexStreams: 00010304
   m_UseCustomTrailVertexStreams: 0
   m_TrailVertexStreams: 00010304
-  m_Mesh: {fileID: 7450741763379908841, guid: e7c680f0c8279b34eb656e9dfeb8f6ca, type: 3}
+  m_Mesh: {fileID: 0}
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
@@ -4954,7 +4953,7 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!1 &3888431065509214147
+--- !u!1 &2642531690415634390
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4962,259 +4961,54 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8755402052827223262}
-  - component: {fileID: 7986526188632678007}
-  - component: {fileID: 8990230759763842204}
+  - component: {fileID: 4284192025192678772}
+  - component: {fileID: 470218498366294842}
+  - component: {fileID: 4509429131234625316}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_jinhulu2
+  m_Name: Particle System
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8755402052827223262
+--- !u!4 &4284192025192678772
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3888431065509214147}
+  m_GameObject: {fileID: 2642531690415634390}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2024737807476548603}
-  m_LocalEulerAnglesHint: {x: -103.812, y: 0, z: 0}
---- !u!33 &7986526188632678007
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3888431065509214147}
-  m_Mesh: {fileID: 1116850374654134119, guid: 9397f393520d9844e9c2dd7621826ff9, type: 3}
---- !u!23 &8990230759763842204
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3888431065509214147}
-  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: 2
-  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
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &4308151666775858040
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2024737807476548603}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: root
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2024737807476548603
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4308151666775858040}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3243294651818848173}
-  - {fileID: 8755402052827223262}
-  - {fileID: 4284192025192678772}
-  m_Father: {fileID: 6709539860230415573}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5946700858606240778
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6709539860230415573}
-  - component: {fileID: 4584476487471584154}
-  - component: {fileID: 2714522920527061815}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_huohulu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6709539860230415573
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5946700858606240778}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.59, y: 0, z: -0.02}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1957552434230211680}
-  - {fileID: 2024737807476548603}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &4584476487471584154
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5946700858606240778}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.65468293, y: 0.6474176, z: 1.087989}
-  m_Center: {x: 0.000034451485, y: -0.000022992497, z: 0.060668066}
---- !u!54 &2714522920527061815
-Rigidbody:
+  - {fileID: 1382848038107191687}
+  m_Father: {fileID: 2024737807476548603}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!198 &470218498366294842
+ParticleSystem:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5946700858606240778}
-  serializedVersion: 4
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 1
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
---- !u!1 &6683449150773131998
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4585611635076190542}
-  - component: {fileID: 6164958756771378230}
-  - component: {fileID: 6135960970550342453}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Particle System
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4585611635076190542
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6683449150773131998}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4284192025192678772}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
---- !u!198 &6164958756771378230
-ParticleSystem:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6683449150773131998}
-  serializedVersion: 8
-  lengthInSec: 1
-  simulationSpeed: 1
-  stopAction: 0
-  cullingMode: 0
-  ringBufferMode: 0
-  ringBufferLoopRange: {x: 0, y: 1}
-  emitterVelocityMode: 1
-  looping: 1
-  prewarm: 1
-  playOnAwake: 1
-  useUnscaledTime: 0
-  autoRandomSeed: 1
-  startDelay:
+  m_GameObject: {fileID: 2642531690415634390}
+  serializedVersion: 8
+  lengthInSec: 1
+  simulationSpeed: 1
+  stopAction: 0
+  cullingMode: 0
+  ringBufferMode: 0
+  ringBufferLoopRange: {x: 0, y: 1}
+  emitterVelocityMode: 1
+  looping: 1
+  prewarm: 1
+  playOnAwake: 1
+  useUnscaledTime: 0
+  autoRandomSeed: 1
+  startDelay:
     serializedVersion: 2
     minMaxState: 0
     scalar: 0
@@ -5384,7 +5178,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0.29000002, b: 0.30113712, a: 0.4862745}
+      maxColor: {r: 0.9411765, g: 0.3102914, b: 0, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5448,7 +5242,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 9.9
+      scalar: 1.2
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -5606,7 +5400,7 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotationX:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 0
       minScalar: 0
       maxCurve:
@@ -5659,7 +5453,7 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotationY:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 0
       minScalar: 0
       maxCurve:
@@ -5712,8 +5506,8 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotation:
       serializedVersion: 2
-      minMaxState: 0
-      scalar: 0
+      minMaxState: 3
+      scalar: 6.283185
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -5765,7 +5559,7 @@ ParticleSystem:
         m_RotationOrder: 4
     randomizeRotationDirection: 0
     gravitySource: 0
-    maxNumParticles: 1000
+    maxNumParticles: 30
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
     rotation3D: 0
@@ -6031,7 +5825,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 2
+      scalar: 3
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -6469,7 +6263,7 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 1, g: 1, b: 1, a: 0}
+        key0: {r: 0, g: 0, b: 0, 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}
@@ -6478,16 +6272,16 @@ ParticleSystem:
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 0
-        ctime1: 65535
-        ctime2: 0
+        ctime1: 32768
+        ctime2: 65535
         ctime3: 0
         ctime4: 0
         ctime5: 0
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 34497
-        atime2: 65535
+        atime1: 65535
+        atime2: 0
         atime3: 0
         atime4: 0
         atime5: 0
@@ -6495,8 +6289,8 @@ ParticleSystem:
         atime7: 0
         m_Mode: 0
         m_ColorSpace: -1
-        m_NumColorKeys: 2
-        m_NumAlphaKeys: 3
+        m_NumColorKeys: 3
+        m_NumAlphaKeys: 2
       minGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -9917,15 +9711,15 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!199 &6135960970550342453
+--- !u!199 &4509429131234625316
 ParticleSystemRenderer:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6683449150773131998}
-  m_Enabled: 1
+  m_GameObject: {fileID: 2642531690415634390}
+  m_Enabled: 0
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -9941,7 +9735,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d77c340f992a29241a3bef40e21918e6, type: 2}
+  - {fileID: 2100000, guid: 18a15239d7d33da45824e985083dba45, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -9961,12 +9755,12 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_RenderMode: 0
+  m_SortingOrder: 1
+  m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
   m_MinParticleSize: 0
-  m_MaxParticleSize: 3
+  m_MaxParticleSize: 5
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
   m_LengthScale: 2
@@ -9985,7 +9779,7 @@ ParticleSystemRenderer:
   m_VertexStreams: 00010304
   m_UseCustomTrailVertexStreams: 0
   m_TrailVertexStreams: 00010304
-  m_Mesh: {fileID: 0}
+  m_Mesh: {fileID: 7450741763379908841, guid: e7c680f0c8279b34eb656e9dfeb8f6ca, type: 3}
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
@@ -9994,3 +9788,209 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &3888431065509214147
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8755402052827223262}
+  - component: {fileID: 7986526188632678007}
+  - component: {fileID: 8990230759763842204}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_jinhulu2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8755402052827223262
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888431065509214147}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2024737807476548603}
+  m_LocalEulerAnglesHint: {x: -103.812, y: 0, z: 0}
+--- !u!33 &7986526188632678007
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888431065509214147}
+  m_Mesh: {fileID: 1116850374654134119, guid: 9397f393520d9844e9c2dd7621826ff9, type: 3}
+--- !u!23 &8990230759763842204
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888431065509214147}
+  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: 2
+  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
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &4308151666775858040
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2024737807476548603}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2024737807476548603
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4308151666775858040}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3243294651818848173}
+  - {fileID: 8755402052827223262}
+  - {fileID: 4284192025192678772}
+  m_Father: {fileID: 6709539860230415573}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5946700858606240778
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6709539860230415573}
+  - component: {fileID: 4584476487471584154}
+  - component: {fileID: 2714522920527061815}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_huohulu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6709539860230415573
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5946700858606240778}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.59, y: 0, z: -0.02}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1957552434230211680}
+  - {fileID: 2024737807476548603}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4584476487471584154
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5946700858606240778}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.65468293, y: 0.6474176, z: 1.087989}
+  m_Center: {x: 0.000034451485, y: -0.000022992497, z: 0.060668066}
+--- !u!54 &2714522920527061815
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5946700858606240778}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0

Assets/Res/CombatHero/fb_yuping.prefab

@@ -0,0 +1,571 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &479660773456776045
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6118111684376426531}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6118111684376426531
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479660773456776045}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2307709339058834475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1425576839777708491
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8272954613787388890}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping_show
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8272954613787388890
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425576839777708491}
+  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: 2262178797407764652}
+  - {fileID: 4698900287781705116}
+  m_Father: {fileID: 6598966518811955930}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1753474551093225905
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6055371569329523591}
+  - component: {fileID: 4052455561168290955}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6055371569329523591
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1753474551093225905}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.047, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2307709339058834475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4052455561168290955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1753474551093225905}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &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: 8974866603299107661}
+  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: 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 &3027240060212061077
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2307709339058834475}
+  - component: {fileID: 8799456137853222753}
+  - component: {fileID: 8378894128623484966}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2307709339058834475
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027240060212061077}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.006, y: 9.998, z: 5.751}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6118111684376426531}
+  - {fileID: 8974866603299107661}
+  - {fileID: 6761480731968705934}
+  - {fileID: 6055371569329523591}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &8799456137853222753
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027240060212061077}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &8378894128623484966
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027240060212061077}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.5, y: 1.0895045, z: 0.51}
+  m_Center: {x: 0, y: 0.15524781, z: 0}
+--- !u!1 &3262139708816251886
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8974866603299107661}
+  - component: {fileID: 8285792300048012968}
+  - component: {fileID: 1124349603685569748}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping_show
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8974866603299107661
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3262139708816251886}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.325, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6598966518811955930}
+  - {fileID: 4444751518792377996}
+  m_Father: {fileID: 2307709339058834475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &8285792300048012968
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3262139708816251886}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &1124349603685569748
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3262139708816251886}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 8285792300048012968}
+  _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+  _ActionOnDisable: 0
+--- !u!1 &4923192773580498066
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4698900287781705116}
+  - component: {fileID: 3007002008819439732}
+  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 &4698900287781705116
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4923192773580498066}
+  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: 8272954613787388890}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &3007002008819439732
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4923192773580498066}
+  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: 2262178797407764652}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 2262178797407764652}
+  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 &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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6598966518811955930}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6598966518811955930
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8219916005125797274}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0000054902584, y: -0.0000053734734, z: -0.70370746, w: 0.7104899}
+  m_LocalPosition: {x: 0.0068355557, y: 0.011254414, z: 4.9194604e-10}
+  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8272954613787388890}
+  m_Father: {fileID: 8974866603299107661}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8319100663424481646
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2262178797407764652}
+  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 &2262178797407764652
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8319100663424481646}
+  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: 8272954613787388890}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/CombatHero/fb_yuping.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C34bsiqsWnsLsqeWmcTTkWjsoN/6iiP2y8VXtOR9pfhZPKWATDjbrVukZpRC
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/MagicWeaponConfig.json

@@ -3,26 +3,39 @@
     {
       "ID": 10001,
       "nickName": -1,
+      "magicAttribute": 1,
       "name": 5,
       "headicon": "icon_tx10001",
       "model": "fb_wulonghuan",
       "att": 100,
       "skillID": [
-        1001,
-        2001
+        91001
       ],
       "heroStory": null
     },
     {
       "ID": 10002,
       "nickName": -1,
+      "magicAttribute": 1,
       "name": 5,
       "headicon": "icon_tx10002",
       "model": "fb_huohulu",
       "att": 100,
       "skillID": [
-        1001,
-        2001
+        91002
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 10003,
+      "nickName": -1,
+      "magicAttribute": 1,
+      "name": 5,
+      "headicon": "icon_tx10003",
+      "model": "fb_yuping",
+      "att": 100,
+      "skillID": [
+        91003
       ],
       "heroStory": null
     }

Assets/Res/HeroAnimtion/fb_yuping.asset

@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-5287561629531185777
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: show
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298718926209025
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298718926209025
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6f08fdd50e79d0c4bb235a5c2696516d, type: 3}
+  m_Name: fb_yuping
+  m_EditorClassIdentifier: 
+  _Definition:
+    _Transitions:
+    - {fileID: 5519247924259519141}
+    - {fileID: -5287561629531185777}
+    _Modifiers:
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    _Aliases: []
+    _AliasAllTransitions: 0
+--- !u!114 &5519247924259519141
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: run
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298718926209024
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298718926209024
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: c38110db927930649a5e70cb4a3282fd, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &6039137609317899203
+MonoBehaviour:
+  m_ObjectHideFlags: 17
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f04d4a67566152e40aaa01b8b745ff6b, type: 3}
+  m_Name: Editor Data
+  m_EditorClassIdentifier: 
+  _Library: {fileID: 11400000}
+  _TransitionSortMode: 0

Assets/Res/HeroAnimtion/fb_yuping.asset.meta

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

Assets/Res/TimeLineAssets/Nanzhu_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"Nanzhu_timeline","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":true,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Nanzhu_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"Nanzhu_timeline","key":["TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"idle\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"idle\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Nanzhu_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/fb_yuping_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DnpOvSv4BX5yl7jcCfab8ssMGKYCJvZ3MBY/JrK7/JEdC96NH3h3K4+nEEsp
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -658,15 +658,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10001
+      value: 10003
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
@@ -674,7 +674,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10001
+      value: 10003
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[1]

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

@@ -13,6 +13,7 @@ namespace Fort23.UTool
     {
 #if !COMBAT_SERVER
 
+        public string fxName;
         //public string endPlayerPartic;
         protected ParticleSystem[] m_particles;
         protected RenderSetting[] m_renderSetting;

Assets/Scripts/GameData/ExcelConfig/MagicWeaponConfig.cs

@@ -26,6 +26,12 @@ public int ID;
 public int nickName;
 
 
+		/// <summary>
+		///法宝类型 1=金 2=木 4=水 =8火 16=土
+		/// </summary>
+public int magicAttribute;
+
+
 		/// <summary>
 		///名字
 		/// </summary>
@@ -51,7 +57,7 @@ public long att;
 
 
 		/// <summary>
-		///技能ID，技能丢列，主角为默认队列
+		///技能Id
 		/// </summary>
 public int[] skillID;
 

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

@@ -238,7 +238,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         return combatHeroGameObject.GetMainHotPoin<CombatHeroHitPoint>(true).GetSpecialDotInfo(specialDotName);
     }
 
-    public float GetAttSpeed()
+    public virtual float GetAttSpeed()
     {
         return CombatHeroSkillControl.NormalAttSpeedScale;
     }

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Fort23.UTool;
 using GameTimeLine.CustomizeTimeLogic;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
@@ -13,6 +14,7 @@ namespace GameLogic.Combat.Hero
 
         public SpecialDotInfo MinSpecialDotInfo;
 
+        private List<ParticleSystemPool> _loopFx = new List<ParticleSystemPool>();
         public bool IsHide { get; set; }
 
         public ILifeCycle IfLifeCycle
@@ -89,5 +91,29 @@ namespace GameLogic.Combat.Hero
             }
             return specialDotInfo;
         }
+
+        public void AddLoopFx(ParticleSystemPool particleSystemPool)
+        {
+            
+            _loopFx.Add(particleSystemPool);
+        }
+
+        public bool IsLoopFx(string fxName)
+        {
+            for (int i = 0; i < _loopFx.Count; i++)
+            {
+                if(_loopFx[i].fxName.Equals(fxName))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void RemoveLoopFx(ParticleSystemPool particleSystemPool)
+        {
+            _loopFx.Remove(particleSystemPool);
+        }
     }
 }

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

@@ -116,7 +116,7 @@ namespace GameLogic.Combat.Hero
             CombatAIBasic.Init(this);
 
 
-            AnimancerComponent animancerComponent = poolInterface.own.GetComponent<AnimancerComponent>();
+            // AnimancerComponent animancerComponent = poolInterface.own.GetComponentInChildren<AnimancerComponent>();
             combatHeroAnimtion = new CombatHeroAnimtion();
 
             poolInterface.own.SetActive(true);
@@ -127,6 +127,11 @@ namespace GameLogic.Combat.Hero
             return this;
         }
 
+        public override float GetAttSpeed()
+        {
+            return 1;
+        }
+
         public override void Update(float t)
         {
             combatHeroTimeLineControl.Update(t);

Assets/Scripts/GameLogic/Combat/Hero/HeroAanimtion/CombatHeroAnimtion.cs

@@ -19,7 +19,7 @@ namespace GameLogic.Combat.Hero
 
         protected override void ProInit()
         {
-            AnimancerComponent = combatHeroEntity.GameObject.GetComponent<AnimancerComponent>();
+            AnimancerComponent = combatHeroEntity.GameObject.GetComponentInChildren<AnimancerComponent>();
             // AnimancerComponent.gameObject.OnAnimatorMove(OnAnimatorMove);
 
             if (AnimancerComponent != null)

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

@@ -1,3 +1,4 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using GameLogic.Combat.CombatTool;
 using UnityEngine;
 
@@ -12,6 +13,7 @@ namespace GameLogic.Combat.Hero.State
         private float _addTime;
 
         private float _currTime;
+        private TimeLineEventLogicGroupBasic timeLineEventLogicGroup;
 
         public MagicWeaponChuChangState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
@@ -20,6 +22,10 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
+            timeLineEventLogicGroup =
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("jihuo");
+
+
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
             startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 3;
@@ -27,7 +33,7 @@ namespace GameLogic.Combat.Hero.State
 
 
             endPos = startPos + new Vector3(x, y, 0);
-            _addTime = 1.0f / (Vector3.Distance(startPos, endPos) / 10);
+            _addTime = 1.0f / (Vector3.Distance(startPos, endPos) / 3);
             _currTime = 0;
         }
 
@@ -39,8 +45,27 @@ namespace GameLogic.Combat.Hero.State
             myCombatMagicWeaponEntity.combatHeroGameObject.SetPosition(pos);
             if (_currTime >= 1)
             {
-                myCombatMagicWeaponEntity.isCombatState = true;
-                myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                if (timeLineEventLogicGroup != null)
+                {
+                    timeLineEventLogicGroup.CloseLoopFx();
+                }
+                // myCombatMagicWeaponEntity.GameObject.SetActive(true);
+                timeLineEventLogicGroup =
+                    combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("show");
+                if (timeLineEventLogicGroup != null)
+                {
+                    timeLineEventLogicGroup.TimeLineUpdateEnd = delegate()
+                    {
+                        timeLineEventLogicGroup.CloseLoopFx();
+                        myCombatMagicWeaponEntity.isCombatState = true;
+                        myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                    };
+                }
+                else
+                {
+                    myCombatMagicWeaponEntity.isCombatState = true;
+                    myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                }
             }
         }
 

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

@@ -1,3 +1,4 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
@@ -24,6 +25,8 @@ namespace GameLogic.Combat.Hero
 
         protected override void ProEnter()
         {
+            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("run");
             _awaitTime = 1.0f;
         }
 
@@ -32,22 +35,28 @@ namespace GameLogic.Combat.Hero
         {
             if (myCombatMagicWeaponEntity.MagicWeaponCollisionId >= 0)
             {
-                myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.move);
+                MagicWeaponCollisionInfo nMagicWeaponCollisionInfo =
+                    CombatController.currActiveCombat.MagicWeaponCombatSence.FindMagicWeaponCollisionInfo(
+                        myCombatMagicWeaponEntity.MagicWeaponCollisionId);
+                if (!nMagicWeaponCollisionInfo.a.isCombatState || !nMagicWeaponCollisionInfo.b.isCombatState)
+                {
+                    Quaternion newQuaternion = Quaternion.identity;
+
+                    myCombatMagicWeaponEntity.GameObject.transform.rotation = Quaternion.RotateTowards(
+                        myCombatMagicWeaponEntity.GameObject.transform.rotation,
+                        newQuaternion, 5);
+                }
+                else
+                {
+                    myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.move);
+                }
+
                 return;
             }
-
-            _awaitTime -= t;
-            if (_awaitTime <= 0)
+            else
             {
                 myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.att);
-                return;
             }
-
-            Quaternion newQuaternion = Quaternion.LookRotation(Vector3.up);
-
-            myCombatMagicWeaponEntity.GameObject.transform.rotation = Quaternion.RotateTowards(
-                myCombatMagicWeaponEntity.GameObject.transform.rotation,
-                newQuaternion, 5);
         }
 
         protected override void ProExit()

Assets/Scripts/GameLogic/Paritcle/GameTimeLineParticleFactory.cs

@@ -101,6 +101,7 @@ public class GameTimeLineParticleFactory : ITimeLineParticleFactory
         ILifetCycleHitPoint fxTarget, Vector3 startPos, SpecialDotInfo targetSpecialDotInfo,
         Action<IGObjectPoolInterface> callBack)
     {
+        
         Clock clock = CreateParticle(timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.fxName, startPos,
             fxTarget,
             false, targetSpecialDotInfo, delegate(ParticleSystemPool combatParticleSystemPool)

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineEventParticleLogicBasic.cs

@@ -18,12 +18,15 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         // private Timer timer;
 
         private BetterList<Clock> loadTask = new BetterList<Clock>();
+
         // private BetterList<string> long = new BetterList<Clock>();
         public BetterList<ParticleSystemPool> loopFx = new BetterList<ParticleSystemPool>();
         public BetterList<ParticleSystemPool> _allLoadFx = new BetterList<ParticleSystemPool>();
+        public BetterList<ILifetCycleHitPoint> _loopTarget = new BetterList<ILifetCycleHitPoint>();
         private CombatTimer _combatTimer;
 
         private int _loadCount;
+
         public TimeLinePlayFxSerializtion timeLinePlayFxSerializtion
         {
             get { return mTimeLineAssetSerialization as TimeLinePlayFxSerializtion; }
@@ -34,6 +37,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         {
             loopFx.Clear();
             _allLoadFx.Clear();
+            _loopTarget.Clear();
             loadTask.Clear();
             CombatTimerManager.Instance.RemoveTimer(_combatTimer);
             _combatTimer = null;
@@ -89,9 +93,14 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
             ParticleSystemPool[] pool = loopFx.ToArray();
             for (int i = 0; i < pool.Length; i++)
             {
+                for (int j = 0; j < _loopTarget.Count; j++)
+                {
+                    _loopTarget[j].RemoveLoopFx(pool[i]);
+                }
                 GObjectPool.Instance.Recycle(pool[i]);
+                
             }
-
+            _loopTarget.Clear();
             loopFx.Clear();
         }
 
@@ -105,9 +114,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
             ParticleSystemPool[] pool = _allLoadFx.ToArray();
             for (int i = 0; i < pool.Length; i++)
             {
+               
                 GObjectPool.Instance.Recycle(pool[i]);
             }
-
+         
             _allLoadFx.Clear();
         }
 
@@ -130,6 +140,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
             CloseAllFx();
             loopFx.Clear();
             _allLoadFx.Clear();
+            _loopTarget.Clear();
         }
 
 
@@ -214,6 +225,20 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                     startPos = new Vector3(startPos.x, (float)0.7f);
                 }
 
+                if (timeLinePlayFxSerializtion.isLoop&&timeLinePlayFxSerializtion.loopAlone)
+                {
+                    if (fxTarget != null)
+                    {
+                        bool isFix = fxTarget.IsLoopFx(timeLinePlayFxSerializtion.fxName);
+                        if (isFix)
+                        {
+                            index++;
+                            ExecuteFxTarget(combatTarget, index);
+                            return;
+                        }
+                    }
+                }
+
                 LoadFx(lifeCycle, fxTarget, startPos, targetSpecialDotInfo);
             }
 
@@ -236,6 +261,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         {
             loopFx.Remove(particleSystemPool);
             _allLoadFx.Remove(particleSystemPool);
+            for (int i = 0; i < _loopTarget.Count; i++)
+            {
+                _loopTarget[i].RemoveLoopFx(particleSystemPool);
+            }
         }
 
         protected void LoadFx(ILifetCycleHitPoint effectTarget, ILifetCycleHitPoint fxTarget, Vector3 startPos,
@@ -246,7 +275,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
             if (iTimeLineParticleFactory != null)
             {
                 _loadCount++;
-                Clock   clock = iTimeLineParticleFactory.CreateParticle(this, effectTarget, fxTarget, startPos,
+                Clock clock = iTimeLineParticleFactory.CreateParticle(this, effectTarget, fxTarget, startPos,
                     targetSpecialDotInfo,
                     delegate(IGObjectPoolInterface systemPool)
                     {
@@ -259,11 +288,17 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                                 GObjectPool.Instance.Recycle(pool);
                                 return;
                             }
-
+                            pool.fxName= timeLinePlayFxSerializtion.fxName;
                             pool.OnEndFx = ParticleSystemPoolEndFx;
                             if (timeLinePlayFxSerializtion.isLoop)
                             {
                                 loopFx.Add(pool);
+                                if (fxTarget != null)
+                                {
+                                    _loopTarget.Add(fxTarget);
+                                    fxTarget.AddLoopFx(pool);
+                                }
+                              
                             }
 
                             _allLoadFx.Add(pool);

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ILifetCycleHitPoint.cs

@@ -1,4 +1,5 @@
 
+using Fort23.UTool;
 using UnityEngine;
 
 namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
@@ -13,5 +14,8 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
         Vector3 Position { get; }
         T This<T>();
         SpecialDotInfo GetSpecialDotInfo(string specialDotName);
+        void AddLoopFx(ParticleSystemPool particleSystemPool);
+        bool IsLoopFx(string fxName);
+        void RemoveLoopFx(ParticleSystemPool particleSystemPool);
     }
 }