修改bug

Assets/Art/ArtHero/GuaiwuBoss01.prefab

@@ -5053,7 +5053,7 @@ MonoBehaviour:
           parameterValue: 0
           animationClip: {fileID: 0}
         nbrOfInBetweenSamples: 0
-      loop: 1
+      loop: 0
       additionalAnimatorParameterValues: []
       additionalAnimatorStatesPerLayer: []
     - animationID: RightSlashAttack
@@ -5070,7 +5070,7 @@ MonoBehaviour:
           parameterValue: 0
           animationClip: {fileID: 0}
         nbrOfInBetweenSamples: 0
-      loop: 1
+      loop: 0
       additionalAnimatorParameterValues: []
       additionalAnimatorStatesPerLayer: []
     - animationID: ProjectileAttackLow
@@ -5087,7 +5087,7 @@ MonoBehaviour:
           parameterValue: 0
           animationClip: {fileID: 0}
         nbrOfInBetweenSamples: 0
-      loop: 1
+      loop: 0
       additionalAnimatorParameterValues: []
       additionalAnimatorStatesPerLayer: []
     - animationID: BreathAttackLeftRight
@@ -5104,7 +5104,7 @@ MonoBehaviour:
           parameterValue: 0
           animationClip: {fileID: 0}
         nbrOfInBetweenSamples: 0
-      loop: 1
+      loop: 0
       additionalAnimatorParameterValues: []
       additionalAnimatorStatesPerLayer: []
     - animationID: BreathAttackRightLeft
@@ -5121,7 +5121,7 @@ MonoBehaviour:
           parameterValue: 0
           animationClip: {fileID: 0}
         nbrOfInBetweenSamples: 0
-      loop: 1
+      loop: 0
       additionalAnimatorParameterValues: []
       additionalAnimatorStatesPerLayer: []
     - animationID: Die
@@ -5138,7 +5138,7 @@ MonoBehaviour:
           parameterValue: 0
           animationClip: {fileID: 0}
         nbrOfInBetweenSamples: 0
-      loop: 1
+      loop: 0
       additionalAnimatorParameterValues: []
       additionalAnimatorStatesPerLayer: []
     generateAnimationIdsEnum: 0

Assets/Art/BakedAssets/BakedAssets_GuaiwuBoss01/GuaiwuBoss01_GpuEcsAnimator.prefab

@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 4353531691696624458}
-  - component: {fileID: 4638891517464389757}
+  - component: {fileID: 6533397390865841345}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: GuaiwuBoss01_GpuEcsAnimator
@@ -31,10 +31,10 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7346863972033256280}
+  - {fileID: 1223863895336242384}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4638891517464389757
+--- !u!114 &6533397390865841345
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -73,7 +73,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: LeftSlashAttack
     stateName: Left Slash Attack
   - startFrameIndex: 103
@@ -82,7 +82,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: RightSlashAttack
     stateName: Right Slash Attack
   - startFrameIndex: 129
@@ -91,7 +91,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: ProjectileAttackLow
     stateName: Projectile Attack Low
   - startFrameIndex: 155
@@ -100,7 +100,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: BreathAttackLeftRight
     stateName: Breath Attack Left Right
   - startFrameIndex: 196
@@ -109,7 +109,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: BreathAttackRightLeft
     stateName: Breath Attack Right Left
   - startFrameIndex: 237
@@ -118,7 +118,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: Die
     stateName: Die
   animationEventOccurences: []
@@ -127,40 +127,7 @@ MonoBehaviour:
   anchorNames:
   - dotpoint
   - zdpos2
---- !u!1 &7065709198803905576
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7346863972033256280}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snake Naga
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7346863972033256280
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7065709198803905576}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.40405536, y: 0.010914803, z: -0.54596424}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6419166577296869148}
-  m_Father: {fileID: 4353531691696624458}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7187466659572050283
+--- !u!1 &3954395558014986300
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -168,10 +135,10 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6419166577296869148}
-  - component: {fileID: 8279147996528165946}
-  - component: {fileID: 2106275759508481528}
-  - component: {fileID: 1563032495255704669}
+  - component: {fileID: 8655005084058359131}
+  - component: {fileID: 4359879949310014546}
+  - component: {fileID: 5147711991037937712}
+  - component: {fileID: 26640802140183510}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Snake Naga
@@ -180,36 +147,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6419166577296869148
+--- !u!4 &8655005084058359131
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7187466659572050283}
+  m_GameObject: {fileID: 3954395558014986300}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: -0.00015357562, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7346863972033256280}
+  m_Father: {fileID: 1223863895336242384}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8279147996528165946
+--- !u!33 &4359879949310014546
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7187466659572050283}
+  m_GameObject: {fileID: 3954395558014986300}
   m_Mesh: {fileID: 4300000, guid: 7ee7f77baa1fc0e4b980ee6b861a4077, type: 2}
---- !u!23 &2106275759508481528
+--- !u!23 &5147711991037937712
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7187466659572050283}
+  m_GameObject: {fileID: 3954395558014986300}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -247,17 +214,50 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &1563032495255704669
+--- !u!114 &26640802140183510
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7187466659572050283}
+  m_GameObject: {fileID: 3954395558014986300}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b927b9dfd6f248378c3364a809fda80f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  animator: {fileID: 4638891517464389757}
+  animator: {fileID: 6533397390865841345}
   transformUsageFlags: 1
+--- !u!1 &7000071077351510215
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1223863895336242384}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Snake Naga
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1223863895336242384
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7000071077351510215}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.40405536, y: 0.010914803, z: -0.54596424}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8655005084058359131}
+  m_Father: {fileID: 4353531691696624458}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Art/BakedAssets/BakedAssets_GuaiwuBoss01/GuaiwuBoss01_Material_Snake Naga.mat

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-5975355468214915733
+--- !u!114 &-3283516620980936642
 MonoBehaviour:
   m_ObjectHideFlags: 11
   m_CorrespondingSourceObject: {fileID: 0}
@@ -25,9 +25,7 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _EMISSION
-  - _SPECULARHIGHLIGHTS_OFF
+  m_InvalidKeywords: []
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -138,14 +136,14 @@ Material:
     - _UVSec: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
-    - _edgeStrength: 0
-    - _injuriedStrength: 0
+    - _edgeStrength: 3
+    - _injuriedStrength: 0.41
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-    - _edgeColor: {r: 0, g: 0, b: 0, a: 0}
+    - _edgeColor: {r: 0.9811321, g: 0.032395888, b: 0.032395888, a: 1}
     - _injuriedColor: {r: 1, g: 1, b: 1, a: 0}
     - _mainColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []

Assets/Art/GuaiWuTimeline/Guaiwu02.playable

@@ -1,5 +1,17 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8603352765439732610
+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
+  m_EditorClassIdentifier: 
 --- !u!114 &-7714127702713516786
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -603,6 +615,99 @@ MonoBehaviour:
   m_bufferingTime: 0.1
   m_ClipProperties:
     volume: 1
+--- !u!114 &-1443813668959023068
+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: 2189606003729695754}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -8603352765439732610}
+    m_Duration: 0.1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1443813668959023068}
+    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
 --- !u!114 &-1029228239878170610
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -988,6 +1093,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -5571945317527968947}
+  - {fileID: -1443813668959023068}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/GuaiWuTimeline/Guaiwu03.playable

@@ -17,6 +17,99 @@ MonoBehaviour:
   m_bufferingTime: 0.1
   m_ClipProperties:
     volume: 1
+--- !u!114 &-7878127855122915940
+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: 2189606003729695754}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -1872665026819449655}
+    m_Duration: 0.016666666666666666
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7878127855122915940}
+    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
 --- !u!114 &-7412339263469120537
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -415,6 +508,18 @@ 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 &-1872665026819449655
+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
+  m_EditorClassIdentifier: 
 --- !u!114 &-680215167242429519
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -787,6 +892,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -5571945317527968947}
+  - {fileID: -7878127855122915940}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/GuaiWuTimeline/Guaiwu04.playable

@@ -463,6 +463,99 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &-1934174118359928239
+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: 2189606003729695754}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 2509687602275249565}
+    m_Duration: 0.016666666666666666
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1934174118359928239}
+    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
 --- !u!114 &-680215167242429519
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -883,6 +976,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -5571945317527968947}
+  - {fileID: -1934174118359928239}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -923,6 +1017,18 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &2509687602275249565
+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
+  m_EditorClassIdentifier: 
 --- !u!114 &3504051212001476799
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/GuaiWuTimeline/Guaiwu05.playable

@@ -1,5 +1,17 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-7749031079425033878
+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
+  m_EditorClassIdentifier: 
 --- !u!114 &-7113829743119953370
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -602,6 +614,99 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-194505017244379854
+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: 2189606003729695754}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7749031079425033878}
+    m_Duration: 0.6666666666666666
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -194505017244379854}
+    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
 --- !u!114 &-32898915636964553
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -913,6 +1018,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: -3540524135443727527}
   - {fileID: -4739308972273994709}
+  - {fileID: -194505017244379854}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/VFX/FXPrefabs/fx_down_zb_blue.prefab

@@ -14384,7 +14384,7 @@ Transform:
   m_GameObject: {fileID: 4165456796047406144}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.79, y: 0, z: 1.7099998}
+  m_LocalPosition: {x: -3.78, y: 0, z: 1.09}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Bundles/BuildConfig.prefab

@@ -156,4 +156,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: -675982352
+    gameObject: {fileID: 102900000, guid: f19c5f5d29b5b6044a79f69207440215, type: 3}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Assets/Res/CombatHero/GuaiwuBoss01_gpu.prefab

@@ -444,7 +444,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: LeftSlashAttack
     stateName: Left Slash Attack
   - startFrameIndex: 103
@@ -453,7 +453,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: RightSlashAttack
     stateName: Right Slash Attack
   - startFrameIndex: 129
@@ -462,7 +462,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: ProjectileAttackLow
     stateName: Projectile Attack Low
   - startFrameIndex: 155
@@ -471,7 +471,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: BreathAttackLeftRight
     stateName: Breath Attack Left Right
   - startFrameIndex: 196
@@ -480,7 +480,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: BreathAttackRightLeft
     stateName: Breath Attack Right Left
   - startFrameIndex: 237
@@ -489,7 +489,7 @@ MonoBehaviour:
     blendTimeCorrection: 1
     startEventOccurenceId: 0
     nbrOfEventOccurenceIds: 0
-    loop: 1
+    loop: 0
     animationID: Die
     stateName: Die
   animationEventOccurences: []

Assets/Res/UI/MainUIPanel.prefab

@@ -978,7 +978,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6989071283435105637}
-  - {fileID: 3198768876211917037}
   - {fileID: 3582209448685582547}
   m_Father: {fileID: 3456306615374035144}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1142,7 +1141,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7295285484143575252}
-  - {fileID: 7634802830320513684}
   - {fileID: 148135373626990328}
   m_Father: {fileID: 3456306615374035144}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1189,128 +1187,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &1321234189803521686
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3198768876211917037}
-  - component: {fileID: 7240718038984817438}
-  - component: {fileID: 460347684267260766}
-  - component: {fileID: 2594139805755148541}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &3198768876211917037
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321234189803521686}
-  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: 5273251793026074665}
-  m_Father: {fileID: 1722181438945693490}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 63.7, y: -0.7}
-  m_SizeDelta: {x: 44, y: 46}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7240718038984817438
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321234189803521686}
-  m_CullTransparentMesh: 1
---- !u!114 &460347684267260766
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321234189803521686}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 16129dca57af842019e4005a4b102930, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &2594139805755148541
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321234189803521686}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 460347684267260766}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &1548508561169705658
 GameObject:
   m_ObjectHideFlags: 0
@@ -1872,128 +1748,6 @@ RectTransform:
   m_AnchoredPosition: {x: 8.320007, y: 0}
   m_SizeDelta: {x: 616.65, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &2764896937034663281
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7990399087824597152}
-  - component: {fileID: 8859892021805303096}
-  - component: {fileID: 6222117145527679496}
-  - component: {fileID: 4424413810182357626}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &7990399087824597152
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2764896937034663281}
-  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: 2007221140761286317}
-  m_Father: {fileID: 6372682890431576924}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.8, y: 0}
-  m_SizeDelta: {x: 44, y: 46}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8859892021805303096
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2764896937034663281}
-  m_CullTransparentMesh: 1
---- !u!114 &6222117145527679496
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2764896937034663281}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77db17572c3694c38812470f80f4009b, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &4424413810182357626
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2764896937034663281}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 6222117145527679496}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &2784682568499014237
 GameObject:
   m_ObjectHideFlags: 0
@@ -2215,82 +1969,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3075984929810736027
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2007221140761286317}
-  - component: {fileID: 188856148128171609}
-  - component: {fileID: 5002248601952712423}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Add
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2007221140761286317
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075984929810736027}
-  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: 7990399087824597152}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 25, y: 26}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &188856148128171609
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075984929810736027}
-  m_CullTransparentMesh: 1
---- !u!114 &5002248601952712423
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075984929810736027}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a707b1e1252f042c58519d2882ee2651, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3138052073950948479
 GameObject:
   m_ObjectHideFlags: 0
@@ -2367,82 +2045,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3358665039323650056
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5273251793026074665}
-  - component: {fileID: 6040250584740752653}
-  - component: {fileID: 4760386669463142815}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Add
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5273251793026074665
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3358665039323650056}
-  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: 3198768876211917037}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 25, y: 26}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6040250584740752653
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3358665039323650056}
-  m_CullTransparentMesh: 1
---- !u!114 &4760386669463142815
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3358665039323650056}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ceb74eb7e05304fea85ed30d56e78b43, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3433613182256208288
 GameObject:
   m_ObjectHideFlags: 0
@@ -4061,82 +3663,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &5037402978013854080
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8834563671748182822}
-  - component: {fileID: 2228025688953711979}
-  - component: {fileID: 1428883931380469042}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Add
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8834563671748182822
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5037402978013854080}
-  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: 7634802830320513684}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 25, y: 26}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2228025688953711979
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5037402978013854080}
-  m_CullTransparentMesh: 1
---- !u!114 &1428883931380469042
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5037402978013854080}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 02dc52ac5e8b84189b58ae5a14baa3b5, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5151063916398883569
 GameObject:
   m_ObjectHideFlags: 0
@@ -4993,7 +4519,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5433286787357854352}
-  - {fileID: 7990399087824597152}
   - {fileID: 9197816965968549393}
   m_Father: {fileID: 3456306615374035144}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5495,7 +5020,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 3544557126014929307}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -5743,128 +5268,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &8752261343087659044
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7634802830320513684}
-  - component: {fileID: 7845611291584749302}
-  - component: {fileID: 3146221552832969254}
-  - component: {fileID: 6692972386198226920}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &7634802830320513684
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8752261343087659044}
-  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: 8834563671748182822}
-  m_Father: {fileID: 3215950451646426847}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0.000061035156, y: 0.00008928776}
-  m_SizeDelta: {x: 44, y: 46}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7845611291584749302
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8752261343087659044}
-  m_CullTransparentMesh: 1
---- !u!114 &3146221552832969254
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8752261343087659044}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e451938e636764f5884b742b961d9ba8, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &6692972386198226920
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8752261343087659044}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 3146221552832969254}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &8900888698835669532
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: equipmenticon
   assetBundleVariant: 

Assets/Res/UIAtlas/MoBan.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: moban
   assetBundleVariant: 

Assets/Res/UIAtlas/all.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: all
   assetBundleVariant: 

Assets/Res/UIAtlas/bb.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: bb
   assetBundleVariant: 

Assets/Res/UIAtlas/beibaoqietu.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: beibaoqietu
   assetBundleVariant: 

Assets/Res/UIAtlas/beijing.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: beijing
   assetBundleVariant: 

Assets/Res/UIAtlas/heroIcon.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: heroicon
   assetBundleVariant: 

Assets/Res/UIAtlas/itemIcon.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: itemicon
   assetBundleVariant: 

Assets/Res/UIAtlas/skillIcon.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: skillicon
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -156,7 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
-  LoadType: 0
+  LoadType: 2
   h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
 --- !u!4 &123020045
 Transform:
@@ -1081,63 +1081,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1001 &1518262157
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.58
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.80000013
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7891069443401101934, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_Name
-      value: fx_down_zb_gz_orange
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 27d45464b3f545543997798ea966175a, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -1145,4 +1088,3 @@ SceneRoots:
   - {fileID: 376281607}
   - {fileID: 235899921}
   - {fileID: 123020045}
-  - {fileID: 1518262157}

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

@@ -37,6 +37,8 @@ namespace Fort23.UTool
         private LoopDelayHide _loopDelayHide;
         protected HideShowEndFx _hideShowEndFx;
 
+        private TrailRenderer[] _trailRenderers;
+        protected bool isInit;
         public ParticleSystem[] Particles
         {
             get
@@ -113,6 +115,19 @@ namespace Fort23.UTool
                     return;
                 }
 
+                if (_trailRenderers == null)
+                {
+                    _trailRenderers= gameObject.GetComponentsInChildren<TrailRenderer>(false);
+                }
+
+                if (_trailRenderers != null)
+                {
+                    for (int i = 0; i < _trailRenderers.Length; i++)
+                    {
+                        _trailRenderers[i].Clear();
+                    }
+                }
+
                 if (Particles != null)
                 {
                     for (int i = 0; i < Particles.Length; i++)

Assets/Scripts/Core/UI/UTool/MyImage.cs

@@ -4,6 +4,9 @@ using System.Collections.Generic;
 using System.Text;
 using Fort23.Mono;
 using Fort23.UTool;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Serialization;
 using UnityEngine.U2D;
@@ -15,7 +18,8 @@ namespace UnityEngine.UI
     /// Image is a textured element in the UI hierarchy.
     /// </summary>
     [RequireComponent(typeof(CanvasRenderer))]
-    [AddComponentMenu("UI/MyImage", 11)]
+    [AddComponentMenu("GameObject/UI/MyImage", 12)]
+    
     /// <summary>
     ///   Displays a Sprite inside the UI System.
     /// </summary>
@@ -30,7 +34,24 @@ namespace UnityEngine.UI
                 ReashUI();
             }
         }
+#if UNITY_EDITOR
+        
+
+        [MenuItem("GameObject/UI/图集UI", false, 1)]
+        static public void AddImage(MenuCommand menuCommand)
+        {
+            GameObject parent = menuCommand.context as GameObject;
+            if (parent == null)
+            {
+                return;
+            }
 
+            GameObject go = new GameObject("myImage");
+            go.AddComponent<MyImage>();
+            go.transform.SetParent(parent.transform);
+            Selection.activeGameObject = go;
+        }
+#endif
         // private Sprite _packSprite;
         //
         // public Sprite GetPackSprite

Assets/Scripts/GameUI/Combat/CombatEquipFallManager.cs

@@ -154,6 +154,19 @@ namespace GameLogic.CombatScenesTool
 
                     Vector3 endPos = startPos + new Vector3(x, 0, z);
                     parabolaPath.SetPos(startPos, endPos);
+                    pool.own.transform.position = startPos;
+                    if (pool == null)
+                    {
+                        TrailRenderer[]  _trailRenderers= pool.own.transform.GetComponentsInChildren<TrailRenderer>(false);
+                        if (_trailRenderers != null)
+                        {
+                            for (int j = 0; j < _trailRenderers.Length; j++)
+                            {
+                                _trailRenderers[i].Clear();
+                            }
+                        }
+                    }
+
                     // equipFallObject.Parabola3DPath = parabolaPath;
                     equipFallObject.Init(pool, parabolaPath);
                     allEquipFall.Add(equipFallObject);

Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CC8c5CqsVS03ALzssB3XM+bRNe3xhNOboNpShKBz8EKBfei2XBZd/YY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXgY4X7+VCiR/9TATXwm3yYw7C8vCubCVxrl7HLwXG62wUinWqxu09w=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg2_07f82c2f7c07c897fbd58c8840b001a2.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BykZ4XmsBykTeD7DbuVSFPIV2XDCI/5XUsMhRk8Iy4/qkknjuMGslDM=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS8YvH6tUXLiLjLTY71OuRo5Mg3CvmegUgk3cU1kB+4VhV7/xdTf/bU=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg3_4487cf8758e755d68d5274b37bc10e6b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DXwXtXipAHi1Lc7KcXLWiJGCeKSKKOFw2n6DaP0NSRFu2GjhOBvLxpo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Dn9NsnisAH61+ROS24gLMSykk9AjYJstcxuzus1WMxszngTvynWTbtU=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DntK4SivUHvmRHUHxlqfxohNA+7LboHZa0HurBONlBne1VNGvgqBBew=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CChN5imtUHow3TmTouXlbbviY9I3BgnDHq9daTLMaHIcBPR6FndAY44=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D3gcsn+oVintbc+NfvVM8MfAd9ptnDIbflI1zMG246+rf71zxGvaaHI=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/403_banyuan_glow_bf249f8ecebd11c4c5fe3c0e32429f2b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXsdsi+sBi7d6LiTILfnuOKgrU02DG6O556RwgN6ZqCVXToFLOFT78c=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/603_ice_zd_07d0aa580b428603944eac977be7c95a.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WylNsi6oWnuu8bAOirPsaHq7lo68s9ClY4ceFDXM5LMtk633jLbVi7s=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CXoXtir8VCrMJLjtQ5BNlhsBUpNKfGjk+TFFBYh4peF0O+q683OB4JI=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: C3IdvCOtWnuhlUMbBTzc6ThUnkDzNRJMa7S5fN3r9wSlZh7/UQbRB/E=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_68f58129b762863d089286affa93e5f1.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B3MXtyz4Uyh2sCwNqCFsHKE9IsdZi/K0033MsMCz0i6DRKsTn1+C0ng=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hong_9bd2e12516a7abea25edf98ed69ac0c6.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DCgX4yOqUn1jVqCnGfKDKTENLWW2ujG0BU22sgM8g/kAq1s8sO029/I=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hong_b1b3c41a17e72889a2bf8dc0a3e7c239.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CCsf4Hv+By+g+0F1uUHVghEB2WfP3XlW3W5f2fBf1HyCqu5WkhNbLJQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/albedo_t1_c22888ebdb1be817e4f98b01f4ef2678.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XSwWvXivBX0AIXx4ct9UeDpapyzB57A0t7VPcWu4ag7CvMs47WhQ46U=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/albedo_t1_f704f945b6b3826db33d9bc1ae0215eb.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: B3MW43+rUnqfgDNx3v0mAdFrCRookp8DpxW9ChEaWQbhyv82syKwg+E=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/all_5876ebc735d0cfd52d89cff34120a9b5.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DygZsCz+U379AZ68ib5cDrW8nkq8btQhbKyccgbHQoOxghAJbyjyyLY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/alpha_bd3_76b4f1db80a60d825c30103739ee7a36.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WigY4Xn5VH/18e2LhXr9iBaH4cwXhXlrxbKTOs87CfC3nl4xUDvWQpY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnIb5nmrW32tXVMje1iP4bOtPZqO6gn2Ha+GJD82jG8scNGATceZcLc=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/ancient_pillar_01_3b543ee24b9f717bea2694940a1b449e.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Bn0etnmqVSlweKjAUxYKQZKrM3wWlWbDSosk5wcIV124YUVXCKf0tqg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXwYtSyvVHP9NP01fNUO4hxS3EkIQ4MUjaV4qIOrTbDp2V6pN0ed/Ls=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CigW5iP+V3yXQSNRWw1RUh4RDoDOtX+ARVoQtkrkjNOVbB4kIn7B8Fo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_01_f1aaf2556958b772c69faa01de204dba.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Bn8ZsS//US1DsEQRfsiZ3WHwqbCVeeUQUe58QhkIgrKKgHdWib7QyLw=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXge5n75UipX0b9khLlY4LmynnSGwRF/ULaWm95h6ALb6RygH7JAGSk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_02_da88788ca1e5bab790bab1a6b5cb360f.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WX4csy/7Wi8Z6BLMUMSR7AsJE7YP/LatEulaMKiG/UF56Ckx3W1zYhA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_debris_01_2cada77b5ae5a45acd37ac48306e3180.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wigb43mrWngLd8PoRIJ6C3iZj2AsulTWdPpgtuy1Hrdp/QwRJgBIGFU=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_debris_01_d3dc7c4fdd170f727e29e65e33f801fc.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHwZ4Cn4UXlBgV244+4s11NR/K9e0NHFxqwEXNqzH8HlkcHnNLZpqcE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_debris_02_5c65b12a0d3a26d531d42e398d657fb0.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XntM53n4Vi3GbOfjPWahxjctFzRBnd2E6itFWxc0mOKbb2bExTWrmfk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_debris_02_759b00549c247fcca3b5f7dfb128b884.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CX8W5ij8AC68DGD9dd5dhzFOn9LM+A7PmgoowACnLVnPdww69RZj9zk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/baodian03_7898626b84694abbb9173fd98be92120.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XnhKt375BnICcSVWP2NrVbtDOcujSR2v2dI4K9lyhNMvFC2Wy4JInt0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/baodian03_e39e426a6d652463e471fe0a6eb8cbe1.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CXobsX+lB3OGpVxELSGPTaTYldHRPt9ctNTOReU+/xUlHZtOM7qnrJg=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/battleground_01_20992dffea8152d33839688818d49c29.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wi4ZsX77Uy9P6opHe1XA7fSC90qlaJ8luj8sd4ol0qT2iW5g0xDt+nQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/battleground_01_a3c788713c01a212a121b659be484d45.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B38XvHv5Bn0Ru7g3mJPcqFd3cgtg0yD0RFs0KHyaselaWtsylnbZ478=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/bb_5274f7025376fdea6ed2e3cbbb761a62.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHJJ5iqqBirR99IdKTF/croFnN5lcxArNPx7IjNAy81xnvUkZLtQb30=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/beibaoqietu_f2b68a211b1eb41b928107700071ff5a.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DykatS/+USkVOjbZ1HVwNtBHMEboNTw2kZXB5bqeusR+8zv5WLSPtGU=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: