vfx

Assets/Art/HeroTimeLine/gf_1101_timeline.playable

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}

Assets/Art/HeroTimeLine/gf_1103_timeline.playable

@@ -67,6 +67,56 @@ MonoBehaviour:
   m_bufferingTime: 0.1
   m_ClipProperties:
     volume: 1
+--- !u!114 &-5406381933419348702
+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)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: cde8ef9eff6d13c43b448e03eb2a97aa
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 1745893356863579098, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 518
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
+  targetType: 2
+  LocationType: 0
+  targetSpecialDotName: zdpos1
+  randomGroup: 0
+  isUseRandom: 1
+  xoff:
+    x: -1
+    y: 1
+  yoff:
+    x: -1
+    y: 1
+  zoff:
+    x: -1
+    y: 1
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 1
+  CustomTargetPosIndex: 0
+  intervalTime: 0
+  isRoat: 1
+  roatIndex: 1
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -397,6 +447,98 @@ MonoBehaviour:
     m_DisplayName: fx_gf_1103
   m_Markers:
     m_Objects: []
+--- !u!114 &518460045151216255
+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: 8849378030042438386}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.9
+    m_ClipIn: 0
+    m_Asset: {fileID: -5406381933419348702}
+    m_Duration: 0.9999999999999999
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 518460045151216255}
+    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_gf_1103
+  m_Markers:
+    m_Objects: []
 --- !u!114 &4367341024689227931
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -706,6 +848,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 455171082174220382}
+  - {fileID: 518460045151216255}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/HeroTimeLine/gf_1104_timeline.playable

@@ -569,11 +569,11 @@ MonoBehaviour:
   randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: 1
-    y: -1
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0.5
-    y: -0.5
+    x: 1.5
+    y: -1.5
   zoff:
     x: 0.5
     y: -0.5

Assets/Art/HeroTimeLine/gf_1105_timeline.playable

@@ -331,11 +331,11 @@ MonoBehaviour:
   randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: 0.5
-    y: -0.5
+    x: 2
+    y: -2
   yoff:
-    x: 0.5
-    y: -0.5
+    x: 2
+    y: -2
   zoff:
     x: 0.5
     y: -0.5

Assets/Art/HeroTimeLine/gf_1401_timeline.playable

@@ -127,8 +127,8 @@ MonoBehaviour:
     x: 2
     y: -2
   zoff:
-    x: 2
-    y: -2
+    x: 1
+    y: -1
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0

Assets/Art/HeroTimeLine/gf_1404_timeline.playable

@@ -43,30 +43,6 @@ MonoBehaviour:
   m_bufferingTime: 0.1
   m_ClipProperties:
     volume: 1
---- !u!114 &-4686349789103776704
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
 --- !u!114 &-894447145330074657
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -351,18 +327,18 @@ MonoBehaviour:
   postPlayback: 2
   targetType: 2
   LocationType: 5
-  targetSpecialDotName: zdpos9
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 2
+    y: -2
   yoff:
-    x: 0
-    y: 0
+    x: 2
+    y: -2
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -398,7 +374,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: 3915563653016217991}
     m_Duration: 1
@@ -468,6 +444,30 @@ MonoBehaviour:
     m_DisplayName: fx_gf_huoqiu
   m_Markers:
     m_Objects: []
+--- !u!114 &5592955626332253043
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -504,8 +504,8 @@ MonoBehaviour:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 1
+    m_Asset: {fileID: 5592955626332253043}
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0
@@ -569,7 +569,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack1
+    m_DisplayName: attack5
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0

Assets/Art/HeroTimeLine/gf_1405_timeline.playable

@@ -21,7 +21,6 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 3594752970235424551}
-  - {fileID: -2068023610703727644}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -50,18 +49,18 @@ MonoBehaviour:
   postPlayback: 2
   targetType: 2
   LocationType: 0
-  targetSpecialDotName: zdpos9
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 2
+    y: -2
   yoff:
-    x: 0
-    y: 0
+    x: 2
+    y: -2
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -101,53 +100,6 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
---- !u!114 &-4686349789103776704
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
---- !u!114 &-2068023610703727644
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (1)
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -9105792293939945729}
-  m_Children: []
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
 --- !u!114 &-894447145330074657
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -285,7 +237,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.3999999999999999
+    m_Start: 0.8
     m_ClipIn: 0
     m_Asset: {fileID: -6653698561631234366}
     m_Duration: 1
@@ -377,7 +329,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0
+    m_Start: 0.7
     m_ClipIn: 0
     m_Asset: {fileID: 5671738132080268482}
     m_Duration: 0.5170975056689342
@@ -451,6 +403,30 @@ MonoBehaviour:
     volume: 1
     stereoPan: 0
     spatialBlend: 0
+--- !u!114 &5195115712222497112
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &5671738132080268482
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -504,8 +480,8 @@ MonoBehaviour:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -4686349789103776704}
-    m_Duration: 0.9333333333333333
+    m_Asset: {fileID: 5195115712222497112}
+    m_Duration: 1.4333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8106544261917024806}
     m_EaseInDuration: 0
@@ -569,7 +545,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack1
+    m_DisplayName: attack5
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0

Assets/Art/VFX/FXAnimation/fx_gf_1401.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1107 &-5793810993970449246
+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: -1299211546103535844}
+    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: -1299211546103535844}
+--- !u!1102 &-1299211546103535844
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: gf1401
+  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: 7400000, guid: cf567b5208bd6b046856b58488ad7928, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_gf_1401
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -5793810993970449246}
+    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/VFX/FXAnimation/fx_gf_1401.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CitK5nz+BS0FE4z8QySNMhKzr7bVIhdlqVPnqdCQYtRJ6p9ysQHQ9ZTgC79R
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/FXAnimation/gf1401.anim

@@ -30,7 +30,7 @@ AnimationClip:
         outWeight: {x: 0.25641033, y: 0.21367529, z: 0.26068383}
       - serializedVersion: 3
         time: 0.26666668
-        value: {x: 0.6, y: 0.6, z: 0.6}
+        value: {x: 1, y: 1, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -96,7 +96,7 @@ AnimationClip:
         outWeight: 0.25641033
       - serializedVersion: 3
         time: 0.26666668
-        value: 0.6
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -126,7 +126,7 @@ AnimationClip:
         outWeight: 0.21367529
       - serializedVersion: 3
         time: 0.26666668
-        value: 0.6
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -156,7 +156,7 @@ AnimationClip:
         outWeight: 0.26068383
       - serializedVersion: 3
         time: 0.26666668
-        value: 0.6
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136

Assets/Art/VFX/FXPrefabs/fx_gf1103_sf.prefab

@@ -9749,7 +9749,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf1402_sf.prefab

@@ -5363,7 +5363,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -21507,7 +21507,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -26431,7 +26431,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -26787,7 +26787,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9011773141688868156}
   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.998, y: -1.7600002, z: -1.186}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -26800,7 +26800,7 @@ Transform:
   - {fileID: 82775228328243839}
   - {fileID: 84016886842218629}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &1652765760019451631
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -31693,6 +31693,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_1402_longfollow_sf1
       objectReference: {fileID: 0}
+    - target: {fileID: 8887316114121747212, guid: 4e055e01f1158924488f07ab18f4a051, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8928299623852339663, guid: 4e055e01f1158924488f07ab18f4a051, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Art/VFX/FXPrefabs/fx_gf1402_sf2.prefab

@@ -24595,14 +24595,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7282454173369998372}
   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.998, y: -1.7600002, z: -1.186}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1743891796295150579}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &6499443057475725528
 ParticleSystem:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf1403_sf.prefab

@@ -24428,7 +24428,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29320,7 +29320,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf1403_shou.prefab

@@ -4980,7 +4980,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1902332234314221939}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.045314528, z: -0, w: 0.9989728}
+  m_LocalRotation: {x: 0, y: -0.045310687, z: 0, w: 0.99897295}
   m_LocalPosition: {x: -0.92, y: -2.58, z: -1.28}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -9971,7 +9971,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14926,7 +14926,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24787,7 +24787,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf1403_zdsf.prefab

@@ -19571,7 +19571,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24476,7 +24476,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24543,7 +24543,7 @@ Transform:
   m_Children:
   - {fileID: 3667049180783683172}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &6844377127527115764
 ParticleSystem:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -9760,7 +9760,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14798,7 +14798,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.3
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -24554,7 +24554,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1101_1.prefab

@@ -4859,7 +4859,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14780,7 +14780,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.3
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -19750,7 +19750,9 @@ MonoBehaviour:
   delayTime: 0.3
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1101_hit
+  startAudioName: 
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -29463,7 +29465,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1102.prefab

@@ -14594,7 +14594,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19486,7 +19486,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29250,7 +29250,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29360,7 +29360,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:

Assets/Art/VFX/FXPrefabs/fx_gf_1102_hit.prefab

@@ -19662,7 +19662,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 3
       scalar: 1.2
-      minScalar: 0.3
+      minScalar: 0.5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -19714,8 +19714,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 15
-      minScalar: 50
+      scalar: 20
+      minScalar: 40
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -19832,8 +19832,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 1
-      minScalar: 0.5
+      scalar: 0.69
+      minScalar: 0.4
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -20156,7 +20156,7 @@ ParticleSystem:
     gravityModifier:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0
+      scalar: 0.4
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -20296,7 +20296,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 1.5
+      value: 0.1
       mode: 0
       spread: 0
       speed:
@@ -20591,8 +20591,8 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 1
-          inSlope: -2
-          outSlope: -2
+          inSlope: 0
+          outSlope: 0
           tangentMode: 0
           weightedMode: 0
           inWeight: 0
@@ -22242,7 +22242,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.3
+    dampen: 0.14
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -24420,7 +24420,7 @@ ParticleSystemRenderer:
   m_MaxParticleSize: 5
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
-  m_LengthScale: 3
+  m_LengthScale: -2
   m_SortingFudge: 0
   m_NormalDirection: 1
   m_ShadowBias: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1102_sf.prefab

@@ -9751,7 +9751,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -10072,7 +10072,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3
+      scalar: 4
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -14703,7 +14703,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3251434223480712966}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.92, y: -1.39, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -14715,7 +14715,7 @@ Transform:
   - {fileID: 2293085557209646313}
   - {fileID: 6877544305961811936}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &6350475867426430394
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -24384,7 +24384,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24641,7 +24641,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 0.14779866, b: 0.31108844, a: 1}
-      maxColor: {r: 0.28975734, g: 0.5520993, b: 0.99999994, a: 1}
+      maxColor: {r: 0.14965278, g: 0.4033099, b: 0.8349055, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -24705,8 +24705,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 1
-      minScalar: 0.5
+      scalar: 0.8
+      minScalar: 0.4
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -25169,7 +25169,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.6
+      value: 0.1
       mode: 0
       spread: 0
       speed:
@@ -25398,7 +25398,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 10
+        scalar: 20
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -27115,7 +27115,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.3
+    dampen: 0.25
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -29293,7 +29293,7 @@ ParticleSystemRenderer:
   m_MaxParticleSize: 5
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
-  m_LengthScale: 1
+  m_LengthScale: -1
   m_SortingFudge: 0
   m_NormalDirection: 1
   m_ShadowBias: 0
@@ -34211,7 +34211,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f8f7cb9c88d2f84479e12dd24897ec5e, type: 2}
+  - {fileID: 2100000, guid: 76fa66a35c5403740b8d16b2eee4ac4d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -34231,7 +34231,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1103.prefab

@@ -135,7 +135,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -14954,7 +14954,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29804,6 +29804,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_gf1103_sf
       objectReference: {fileID: 0}
+    - target: {fileID: 1745893356863579098, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4918118553868030214, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
       propertyPath: InitialModule.startLifetime.scalar
       value: 0.5

Assets/Art/VFX/FXPrefabs/fx_gf_1104.prefab

@@ -4933,7 +4933,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
+  delayTime: 0.1
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1104_hit
   startAudioName: 1104_fashe.wav
@@ -4946,10 +4946,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 20
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -9857,7 +9857,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14749,7 +14749,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14859,7 +14859,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -19781,7 +19781,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1104_hit.prefab

@@ -24637,7 +24637,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.3
+      scalar: 0.2
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -29538,7 +29538,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.4
+      scalar: 0.3
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Assets/Art/VFX/FXPrefabs/fx_gf_1401 sf.prefab

@@ -19553,7 +19553,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -34240,7 +34240,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1401 sf2.prefab

@@ -9778,7 +9778,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1401.prefab

@@ -9808,6 +9808,7 @@ GameObject:
   - component: {fileID: 7832511937306769198}
   - component: {fileID: 6745773445181073610}
   - component: {fileID: -8053844893239359929}
+  - component: {fileID: 4862198090941360258}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1401
@@ -14789,6 +14790,27 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   delayTime: 0.5
+--- !u!95 &4862198090941360258
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2604790741987567871}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 5aecfcffa79d08745a89f4fbd40516ba, type: 2}
+  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 &2633591797791139349
 GameObject:
   m_ObjectHideFlags: 0
@@ -49703,7 +49725,7 @@ ParticleSystem:
         m_RotationOrder: 4
     randomizeRotationDirection: 0
     gravitySource: 0
-    maxNumParticles: 30
+    maxNumParticles: 10
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
     rotation3D: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1402.prefab

@@ -1195,6 +1195,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5308593044411586627}
     m_Modifications:
+    - target: {fileID: 2237349490485496367, guid: 5782a00a30dab3e4795e4227a3ee4a93, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5136135388986181276, guid: 5782a00a30dab3e4795e4227a3ee4a93, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5209703636402898491, guid: 5782a00a30dab3e4795e4227a3ee4a93, type: 3}
       propertyPath: m_Name
       value: fx_1402_follow
@@ -1239,6 +1247,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6642026914323958944, guid: 5782a00a30dab3e4795e4227a3ee4a93, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Art/VFX/FXPrefabs/fx_gf_1402_hit.prefab

@@ -4859,7 +4859,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -5180,7 +5180,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 7
+      scalar: 9
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -9963,8 +9963,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 5
-      minScalar: 30
+      scalar: 20
+      minScalar: 40
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -19884,7 +19884,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 3
       scalar: 0.5
-      minScalar: 1
+      minScalar: 1.5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -19936,8 +19936,8 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 1.5
-      minScalar: 0.6
+      scalar: 2.5
+      minScalar: 1.5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -20576,7 +20576,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 20
+        scalar: 10
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -30089,7 +30089,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.54
+      value: 1
       mode: 0
       spread: 0
       speed:
@@ -34517,7 +34517,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 1.5
+      scalar: 2
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -34981,7 +34981,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.5
+      value: 1
       mode: 0
       spread: 0
       speed:

Assets/Art/VFX/FXPrefabs/fx_gf_1403.prefab

@@ -5056,7 +5056,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -14928,7 +14928,7 @@ Transform:
   - {fileID: 5382949609387829888}
   - {fileID: 1785702283476609746}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &158121833507739391
 ParticleSystem:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1403_hit.prefab

@@ -14720,7 +14720,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -34325,7 +34325,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_huodao.prefab

@@ -4933,8 +4933,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.5
-  multipleTargetDelayTime: 0.2
+  delayTime: 0.2
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_huoqiu_hit
   startAudioName: 1401_feixing.wav
   hitAudioName: 1401_hit.wav
@@ -4946,10 +4946,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 17
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 1
@@ -5215,7 +5215,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 1, b: 1, a: 1}
+      maxColor: {r: 0.9528301, g: 0.58126736, b: 0.3640529, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14760,7 +14760,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19661,7 +19661,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29445,7 +29445,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29555,7 +29555,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:

Assets/Art/VFX/FXPrefabs/fx_gf_huoqiu.prefab

@@ -77,7 +77,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.4
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -5008,7 +5008,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -9842,7 +9842,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14678,7 +14678,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14749,7 +14749,7 @@ Transform:
   - {fileID: 6813174458369187728}
   - {fileID: 4164522838524659830}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &7934156890405659566
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -19584,8 +19584,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
-  multipleTargetDelayTime: 0
+  delayTime: 0.2
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_huoqiu_hit
   startAudioName: 1401_feixing.wav
   hitAudioName: 1401_hit.wav
@@ -19597,10 +19597,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 20
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 0
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0

Assets/Art/VFX/FXPrefabs/fx_gf_huoqiu_hit.prefab

@@ -4922,7 +4922,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 2
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14742,7 +14742,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14802,7 +14802,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3251400174747355607}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.47, y: -1.38, z: 6.3}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -29433,7 +29433,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -34325,7 +34325,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_jinzhen.prefab

@@ -14727,8 +14727,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
-  multipleTargetDelayTime: 0
+  delayTime: 0.1
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_jinzhen_hit
   startAudioName: 
   hitAudioName: feijian_hit.wav
@@ -14740,10 +14740,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 20
+  speed: 22
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 0
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.22346562
+    - _Alpha: 0.23441064
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.18422043
+    - _MainTexOffsetU: 0.17151666
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Art/VFX/Materials/fx_sm_rao_1102 1.mat

@@ -0,0 +1,114 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_sm_rao_1102 1
+  m_Shader: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 0f7f86e5620e97f4caac712a0eb0f4aa, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 2800000, guid: 39d09d16ddfb4c34181dd4ecc70d2531, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Noise94:
+        m_Texture: {fileID: 2800000, guid: bfcfae059f1e1884f97acc795fe3af1b, type: 3}
+        m_Scale: {x: 0.63, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _RJraodong:
+        m_Texture: {fileID: 2800000, guid: 8dd972cbb6cdc024a9da718d46ea3dfc, type: 3}
+        m_Scale: {x: 0.66, y: 0.67}
+        m_Offset: {x: 0, y: 0}
+    - _Rj2Tex:
+        m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TextureGao:
+        m_Texture: {fileID: 2800000, guid: be2dad9cf95ef434aada790911eaf0ff, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _rj2:
+        m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaCutoff: 0.5
+    - _AlphaQD: 1
+    - _CTime: 1
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _Diss_value: 0
+    - _Float0: 0.6
+    - _Float2: 0.684
+    - _Float3: 0.323
+    - _Float4: 0
+    - _Float7: 0.21
+    - _Float8: 0.118
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RJ1soft: 0.161
+    - _RJ2soft: 0.261
+    - _RJraodongqd: 0.47
+    - _RJraodongsd: 0.1
+    - _ReceiveShadows: 1
+    - _Soft_value: 0.46
+    - _Turb_Value: 0
+    - _ca: 1
+    - _light: 1
+    - _soft: 0
+    m_Colors:
+    - _Color0: {r: 0.2051282, g: 0.923077, b: 1, a: 1}
+    - _ColorGG: {r: 1, g: 1, b: 1, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Main_Color: {r: 8, g: 8, b: 8, a: 1}
+    - _Main_UV: {r: 1, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/VFX/Materials/fx_sm_rao_1102 1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CHxJ5CyrAniwfpaLhmgwGg3c1AbzV0f+euQlKVFTkZOL0FbUkmnLYSN6Pfwj
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/1104_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0.2333333,\"endTime\":1.09898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1104\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":true,\"xoff\":{\"x\":1,\"y\":-1},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0.2333333,\"endTime\":1.09898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1104\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":true,\"xoff\":{\"x\":1.5,\"y\":-1.5},\"yoff\":{\"x\":1.5,\"y\":-1.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1105_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0.2833333,\"endTime\":1.14898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":true,\"xoff\":{\"x\":0.5,\"y\":-0.5},\"yoff\":{\"x\":0.5,\"y\":-0.5},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"wannengshifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0.2833333,\"endTime\":1.14898,\"continuedTime\":0.8656462,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1404_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1404_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"1401_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":2.155692,\"continuedTime\":2.155692,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1404_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"1401_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":2.155692,\"continuedTime\":2.155692,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1405_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"feijian_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.5170975,\"continuedTime\":0.5170975,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":false,\"xoff\":{\"x\":0,\"y\":0},\"yoff\":{\"x\":0,\"y\":0},\"zoff\":{\"x\":0,\"y\":0},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineAudioSeralization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack5\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.433333,\"continuedTime\":1.433333,\"targetEntityType\":0,\"totalTime\":0}","{\"audioName\":\"feijian_shifa.wav\",\"isLoop\":false,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0.7,\"endTime\":1.217098,\"continuedTime\":0.5170975,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isUseRandom\":true,\"xoff\":{\"x\":2,\"y\":-2},\"yoff\":{\"x\":2,\"y\":-2},\"zoff\":{\"x\":0.5,\"y\":-0.5},\"randomGroup\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.8,\"endTime\":1.8,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/UI/CombatHPPanel.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6002087470784681157
 RectTransform:
   m_ObjectHideFlags: 0
@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -7, y: -249}
-  m_SizeDelta: {x: 40, y: 36}
+  m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8666807443430326933
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.62264144, b: 0.62264144, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -76,7 +76,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_xiajiang
+  _icon_name: dec_zhandou_biaoji
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -84,7 +84,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

UserSettings/Layouts/default-2022.dwlt

@@ -14,15 +14,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 1254.0001
-    y: 532.00006
-    width: 825.0001
-    height: 448.50006
+    x: 1056.5001
+    y: 855.5001
+    width: 940.0001
+    height: 438.00006
   m_ShowMode: 0
-  m_Title: "\u52A8\u753B"
+  m_Title: "\u65F6\u95F4\u8F74"
   m_RootView: {fileID: 4}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_Maximized: 0
 --- !u!114 &2
 MonoBehaviour:
@@ -58,17 +58,17 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: AnimationWindow
+  m_Name: TimelineWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 825.0001
-    height: 448.50006
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
+    width: 940.0001
+    height: 438.00006
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -92,12 +92,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 825.0001
-    height: 448.50006
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
+    width: 940.0001
+    height: 438.00006
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   vertical: 0
-  controlID: 20967
+  controlID: 17517
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -116,8 +116,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 650.50006
-    height: 962.00006
+    width: 446.50003
+    height: 962.0001
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 22}
@@ -140,9 +140,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 467.00003
+    x: 490.50003
     y: 0
-    width: 369.50003
+    width: 453.5001
     height: 570.00006
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -171,12 +171,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
+    width: 1920.0002
+    height: 962.0001
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 41
+  controlID: 74
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -193,12 +193,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1487.0001
+    x: 1390.5001
     y: 0
-    width: 433
-    height: 962.00006
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 529.5001
+    height: 962.0001
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -221,8 +221,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 570.00006
-    width: 836.50006
-    height: 392
+    width: 944.0001
+    height: 392.00006
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 18}
@@ -251,8 +251,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    width: 1920.0002
+    height: 1012.0001
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -276,7 +276,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 1920.0002
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -297,8 +297,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 992.0001
+    width: 1920.0002
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -319,14 +319,14 @@ MonoBehaviour:
   - {fileID: 9}
   m_Position:
     serializedVersion: 2
-    x: 650.50006
+    x: 446.50003
     y: 0
-    width: 836.50006
-    height: 962.00006
+    width: 944.0001
+    height: 962.0001
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 42
+  controlID: 75
   draggingID: 0
 --- !u!114 &14
 MonoBehaviour:
@@ -347,12 +347,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 836.50006
+    width: 944.0001
     height: 570.00006
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 43
+  controlID: 76
   draggingID: 0
 --- !u!114 &15
 MonoBehaviour:
@@ -371,10 +371,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 467.00003
+    width: 490.50003
     height: 570.00006
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -390,21 +390,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u52A8\u753B"
-    m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u65F6\u95F4\u8F74"
+    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1254.0001
-    y: 532.00006
-    width: 825.0001
-    height: 427.50006
+    x: 1056.5001
+    y: 855.5001
+    width: 940.0001
+    height: 417.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -415,9 +415,15 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
   m_LockTracker:
     m_IsLocked: 0
-  m_LastSelectedObjectID: -34932
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
 --- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -438,9 +444,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 517.50006
+    x: 575.00006
     y: 62.000008
-    width: 540.00006
+    width: 373.50003
     height: 549.00006
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -456,6 +462,8 @@ MonoBehaviour:
     m_KeySerializationHelper:
     - {fileID: -3829393274189455781, guid: 0f5c8044713b5404abc730ac0269d05e, type: 2}
     - {fileID: -2130215466496471781, guid: e5dd2a5a55a7a474eab10862c9c3c640, type: 2}
+    - {fileID: -5793810993970449246, guid: 5aecfcffa79d08745a89f4fbd40516ba, type: 2}
+    - {fileID: -1070583301890442465, guid: b92b7e1b221b05f45b7cb944586d7c0e, type: 2}
     m_ValueSerializationHelper:
     - e00: 1
       e01: 0
@@ -489,10 +497,42 @@ MonoBehaviour:
       e31: 0
       e32: 0
       e33: 1
+    - e00: 0.7225
+      e01: 0
+      e02: 0
+      e03: -132.95
+      e10: 0
+      e11: 0.7225
+      e12: 0
+      e13: 122.63128
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 0.14473686
+      e01: 0
+      e02: 0
+      e03: 7.7631607
+      e10: 0
+      e11: 0.14473686
+      e12: 0
+      e13: 242.6974
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
   m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: e5dd2a5a55a7a474eab10862c9c3c640, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: b92b7e1b221b05f45b7cb944586d7c0e, type: 2}
   m_BreadCrumbs:
-  - m_Target: {fileID: -2130215466496471781, guid: e5dd2a5a55a7a474eab10862c9c3c640, type: 2}
+  - m_Target: {fileID: -1070583301890442465, guid: b92b7e1b221b05f45b7cb944586d7c0e, type: 2}
     m_ScrollPosition: {x: 0, y: 0}
   stateMachineGraph: {fileID: 0}
   stateMachineGraphGUI: {fileID: 0}
@@ -525,10 +565,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 650.50006
+    x: 446.50006
     y: 632.00006
-    width: 834.50006
-    height: 371
+    width: 942.0001
+    height: 371.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -540,7 +580,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: CombatHPPanel
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -550,24 +590,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Art/ArtHero
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: CombatHPPanel
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\XY002\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 62cf0000
-    m_LastClickedID: 53090
-    m_ExpandedIDs: 0000000062cf000064cf000066cf000068cf00006acf00006ccf00006ecf000070cf000072cf000074cf000076cf000078cf00007acf00007ccf00007ecf000080cf000082cf000084cf000086cf000088cf00008acf00008ccf00008ecf000090cf000092cf000094cf000096cf000098cf00009acf00009ccf00009ecf0000a0cf0000a2cf0000a4cf0000a6cf0000a8cf0000aacf0000accf0000aecf0000b0cf0000b2cf000000ca9a3b
+    scrollPos: {x: 0, y: 54.52995}
+    m_SelectedIDs: 7ece0000
+    m_LastClickedID: 52862
+    m_ExpandedIDs: 0000000034ce000036ce000038ce00003ace00003cce00003ece000040ce000042ce000044ce000046ce000048ce00004ace00004cce00004ece000050ce000052ce000054ce000056ce000058ce00005ace00005cce00005ece000060ce000062ce000064ce000066ce000068ce00006ace00006cce00006ece000070ce000072ce000074ce000076ce000078ce00007ace00007cce00007ece000080ce000082ce000084ce00009ccf000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -595,7 +635,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000062cf000064cf000066cf000068cf00006acf00006ccf00006ecf000070cf000072cf000074cf000076cf000078cf00007acf00007ccf00007ecf000080cf000082cf000084cf000086cf000088cf00008acf00008ccf00008ecf000090cf000092cf000094cf000096cf000098cf00009acf00009ccf00009ecf0000a0cf0000a2cf0000a4cf0000a6cf0000a8cf0000aacf0000accf0000aecf0000b0cf0000b2cf0000
+    m_ExpandedIDs: 0000000034ce000036ce000038ce00003ace00003cce00003ece000040ce000042ce000044ce000046ce000048ce00004ace00004cce00004ece000050ce000052ce000054ce000056ce000058ce00005ace00005cce00005ece000060ce000062ce000064ce000066ce000068ce00006ace00006cce00006ece000070ce000072ce000074ce000076ce000078ce00007ace00007cce00007ece000080ce000082ce000084ce0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -622,8 +662,8 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c6230000
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: c62300005cd4000058d4000052d40000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -650,7 +690,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 207
+  m_DirectoriesAreaWidth: 201.5
 --- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -671,10 +711,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1487.0001
+    x: 1390.5001
     y: 62.000008
-    width: 432
-    height: 941.00006
+    width: 528.5001
+    height: 941.0001
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -718,9 +758,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1117.5001
+    x: 937.0001
     y: 62.000008
-    width: 367.50003
+    width: 451.5001
     height: 549.00006
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -737,21 +777,21 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 6a42ffff6e42ffff7c42ffffdc6effff4a77ffff6477ffff7e77ffff8c77ffffeeadffff7efaffff4ec80000e8c80000fac800005cc90000a6c90000bac90000e4c90000
+      m_ExpandedIDs: 44d7f1ff82f6f1ffe4f6f1ffbcf7f1fffccef2ff02cff2ff52d0f2ff5cd0f2ffc6a2f3ff8e60f4ff429af6ffc810f7ffd610f7ff5481f7ffe681f7ff20bff7ff62c1f7ff08c3f7ff7ec8f7ff022bf8ff122bf8ff7a2bf8ff282ef8ff902ef8ff9a2ef8ffe46bf8ff0a6df8ff946ef8ffba82f8ffdecdf8ff1848f9ff1e48f9ffaa68fafff644fbff9a48fbffb6f2fbff5c03fcff962cfcffaa2dfcffb82dfcfff42dfcff0c4dfcff144dfcffb254fcff5a0cfdff4ec7feff68c7feffdac7feff5ef3ffff62f3ffff70f3ffff7efaffff4ec800007ec800000c410200d0640200ae700200e0f30200a4fd0200beff0200b20703008aa605003aad0500c4b30500dabb0500
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: HeroHpWidget
+        m_OriginalName: HeroHpWidget
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -919628
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 6}
       m_SearchString: 
@@ -781,9 +821,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 650.50006
+    x: 446.50006
     y: 62.000008
-    width: 465.00003
+    width: 488.50003
     height: 549.00006
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1015,16 +1055,16 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
+    - dockPosition: 0
+      containerId: Floating
+      floating: 1
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: -275.5, y: -201.50003}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 3
       id: Scene View/Particles
-      index: 8
+      index: 0
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1089,7 +1129,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Path
-      index: 9
+      index: 8
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1102,7 +1142,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: APV Overlay
-      index: 10
+      index: 9
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1115,7 +1155,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Hot Reload
-      index: 11
+      index: 10
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1128,7 +1168,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/TrailRenderer
-      index: 12
+      index: 11
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1141,24 +1181,24 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: UnityEditor.SceneViewCameraOverlay
-      index: 13
+      index: 12
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
-  m_Gizmos: 1
+  m_Gizmos: 0
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.020333547, y: 0.18823302, z: -0.00000008435591}
+    m_Target: {x: 0.71564925, y: 1.6154096, z: 26.099548}
     speed: 2
-    m_Value: {x: -0.020333547, y: 0.18823302, z: -0.00000008435591}
+    m_Value: {x: 0.71564925, y: 1.6154096, z: 26.099548}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1194,27 +1234,27 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
-    m_ShowGrid: 1
+    m_ShowGrid: 0
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.20508973, y: -0.0038182843, z: 0.00080122496, w: -0.97872704}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.20509142, y: -0.0038183157, z: 0.00080123154, w: -0.9787351}
   m_Size:
-    m_Target: 4.1679106
+    m_Target: 0.3467055
     speed: 2
-    m_Value: 4.1679106
+    m_Value: 0.3467055
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1230,7 +1270,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.057121668, y: -0.07346341, z: 0.0042160177, w: -0.9956435}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -1259,8 +1299,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 62.000008
-    width: 649.50006
-    height: 941.00006
+    width: 445.50003
+    height: 941.0001
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1277,7 +1317,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
+  m_TargetSize: {x: 1500, y: 3248}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -1286,16 +1326,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375.00003
+    m_HBaseRangeMax: 375.00003
+    m_VBaseRangeMin: -812.0001
+    m_VBaseRangeMax: 812.0001
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -1313,23 +1353,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 649.50006
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 324.75003, y: 460.00003}
+      width: 445.50003
+      height: 920.0001
+    m_Scale: {x: 0.56650245, y: 0.56650245}
+    m_Translation: {x: 222.75002, y: 460.00006}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -324.75003
-      y: -460.00003
-      width: 649.50006
-      height: 920.00006
+      x: -393.2022
+      y: -812.0001
+      width: 786.4044
+      height: 1624.0002
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1299, y: 1882}
+  m_defaultScale: 0.56650245
+  m_LastWindowPixelSize: {x: 891, y: 1882.0001}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1355,10 +1395,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2249
-    y: 726.5
-    width: 920
-    height: 250
+    x: 575.00006
+    y: 632.00006
+    width: 813.50006
+    height: 371.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0