修改bug

Assets/Art/ArtHero/Hero04.prefab

@@ -3027,30 +3027,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 659048671226328915}
     m_Modifications:
-    - target: {fileID: 1503328064290495693, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
-      propertyPath: m_Layer
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 2401147413138482245, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
-      propertyPath: m_Layer
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 2437463278763423417, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
-      propertyPath: m_Layer
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 3885720483754967700, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
-      propertyPath: m_Layer
-      value: 9
-      objectReference: {fileID: 0}
     - target: {fileID: 5909360642068039313, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
       propertyPath: m_Name
       value: fx_gongjian_sk_zd
       objectReference: {fileID: 0}
-    - target: {fileID: 5909360642068039313, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
-      propertyPath: m_Layer
-      value: 9
-      objectReference: {fileID: 0}
     - target: {fileID: 6528322062404683719, guid: afb7368ddcb0a1d4faecaff3236a0a86, type: 3}
       propertyPath: m_LocalPosition.x
       value: -1.55

Assets/Art/GuaiWuTimeline/Guaiwu01.playable

@@ -231,6 +231,7 @@ MonoBehaviour:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
   - {fileID: 2069995017928919523}
+  - {fileID: -3984868104051355284}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -250,6 +251,102 @@ MonoBehaviour:
   m_Retroactive: 0
   m_EmitOnce: 0
   m_Asset: {fileID: 0}
+--- !u!114 &-3984868104051355284
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 966918083168716970}
+    m_Duration: 0.5475736961451246
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -3984868104051355284}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: die1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-3798375387370889261
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -656,6 +753,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset
   m_EditorClassIdentifier: 
+--- !u!114 &966918083168716970
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: dfba76e7fa18b8148a4a03c9a599903c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &1130384948799537865
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/GuaiWuTimeline/Guaiwu02.playable

@@ -244,6 +244,7 @@ MonoBehaviour:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
   - {fileID: 2069995017928919523}
+  - {fileID: -2931465401696578439}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -379,6 +380,102 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &-2931465401696578439
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -2018407037902507362}
+    m_Duration: 0.6475736961451247
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -2931465401696578439}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: die1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-2699148646001001778
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -489,6 +586,23 @@ 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 &-2018407037902507362
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: dfba76e7fa18b8148a4a03c9a599903c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-1029228239878170610
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/GuaiWuTimeline/Guaiwu03.playable

@@ -1,5 +1,22 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8921410164446947234
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: dfba76e7fa18b8148a4a03c9a599903c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-7412339263469120537
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -139,6 +156,7 @@ MonoBehaviour:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
   - {fileID: 2069995017928919523}
+  - {fileID: 5900133370067354962}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1121,6 +1139,102 @@ 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 &5900133370067354962
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -8921410164446947234}
+    m_Duration: 0.6475736961451247
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5900133370067354962}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: die1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &6093655842795777454
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/GuaiWuTimeline/Guaiwu04.playable

@@ -139,6 +139,7 @@ MonoBehaviour:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
   - {fileID: 2069995017928919523}
+  - {fileID: -618735068991075060}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -287,6 +288,23 @@ MonoBehaviour:
     m_DisplayName: fx_gw_chuxian_smoke_gw04
   m_Markers:
     m_Objects: []
+--- !u!114 &-3957479412254766541
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: dfba76e7fa18b8148a4a03c9a599903c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-2699148646001001778
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -484,6 +502,102 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-618735068991075060
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -3957479412254766541}
+    m_Duration: 0.6475736961451247
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -618735068991075060}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: die1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &-32898915636964553
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/GuaiWuTimeline/Guaiwu05.playable

@@ -133,9 +133,27 @@ MonoBehaviour:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
   - {fileID: 2069995017928919523}
+  - {fileID: 3244330348256019829}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-6090995364908641070
+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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
+  m_Name: AudioPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 8300000, guid: dfba76e7fa18b8148a4a03c9a599903c, type: 3}
+  m_Loop: 0
+  m_bufferingTime: 0.1
+  m_ClipProperties:
+    volume: 1
 --- !u!114 &-5798624984763836640
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -959,6 +977,102 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &3244330348256019829
+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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
+  m_Name: Audio 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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -6090995364908641070}
+    m_Duration: 0.6475736961451247
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 3244330348256019829}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: die1
+  m_Markers:
+    m_Objects: []
+  m_TrackProperties:
+    volume: 1
+    stereoPan: 0
+    spatialBlend: 0
 --- !u!114 &3504051212001476799
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/VFX/HeroFXprefab/fx_gongjian_sk_zd.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 4444747567585271036}
   - component: {fileID: 8771819064896566904}
   - component: {fileID: 3395244089516292577}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: smoke02
   m_TagString: Untagged
@@ -4902,7 +4902,7 @@ GameObject:
   - component: {fileID: 1482675910623683269}
   - component: {fileID: 3211430997267355425}
   - component: {fileID: 3240545330964509535}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: Particletw
   m_TagString: Untagged
@@ -9793,7 +9793,7 @@ GameObject:
   - component: {fileID: 7608041513340765355}
   - component: {fileID: 4803964917495893809}
   - component: {fileID: 1447531778650065678}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: lz
   m_TagString: Untagged
@@ -14693,7 +14693,7 @@ GameObject:
   - component: {fileID: 9172511347028148179}
   - component: {fileID: 735295700155420795}
   - component: {fileID: 89898379384189258}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: 603_ice_zd
   m_TagString: Untagged
@@ -19589,7 +19589,7 @@ GameObject:
   - component: {fileID: 7668476979556581787}
   - component: {fileID: 929334952724321305}
   - component: {fileID: 2551275485491574577}
-  m_Layer: 0
+  m_Layer: 9
   m_HasEditorInfo: 1
   m_Name: fx_gongjian_sk_zd
   m_TagString: Untagged
@@ -24446,7 +24446,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   hitFxName: fx_gongjian_sk_zd_hit
-  hitAudioName: 
+  hitAudioName: bing_hit.wav
   isPenetrate: 1
   isUseCustomTargetEndPos: 1
   customTargetEndPosIndex: 0

Assets/Bundles/BuildConfig.prefab

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

Assets/Res/Aduio/Lang.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XHgY53/+An9vzgzsbWsijtadUfHRFrmw8Dd3pCrBIR/uS4Cq7txw2rA=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/MainAudio.asset

@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b099297e0f149559e4f5adf700639ce, type: 3}
+  m_Name: MainAudio
+  m_EditorClassIdentifier: 
+  useCount: 1
+  configs:
+  - describe: "\u6253boss\u7684\u65F6\u5019\u7528\u7684"
+    audionClipName: bossBattle.wav
+    volume: 0.7
+  - describe: "\u9ED8\u8BA4\u6218\u6597\u4F7F\u7528\u7684"
+    audionClipName: combatBattle.wav
+    volume: 0.4
+  - describe: "\u51B0\u7684\u5907\u673A"
+    audionClipName: bing_hit.wav
+    volume: 0.4
+  - describe: "\u6B7B\u4EA1\u7684\u9ED8\u8BA4\u97F3\u6548"
+    audionClipName: die1.wav
+    volume: 0.4

Assets/Res/Aduio/MainAudio.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Cisc4yj4WnlVB2zdfoB1LU8voQR6j4P1LbcCnVnicX+Fm9G8b6sZRyI=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Skill.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CitMsiOrV32zXp37OnzrbFcCEyP2a8qlnNBbNbb31QOJiy53HZmQ65w=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/a-little-taller-117254.mp3.meta → Assets/Res/Aduio/Skill/bing_hit.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XC5JvC2sVy6sy4esCg4wYIdfpul/daG6ZKrdKlYyI5hGqukamRCfM04=
+guid: C3xOsSz4VXs2kcd8ydyb4rHcLniMMqI7AyOXcJsPQx6V+xu15xepd6A=
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7

Assets/Res/Aduio/bird-sound-249237.mp3.meta → Assets/Res/Aduio/bossBattle.wav.meta

@@ -1,28 +1,28 @@
 fileFormatVersion: 2
-guid: CHoZt3irBX4P+VBh5iznalt/e9Ls1FEX2gXtUpnJ1gsxPjrFfJqi/kU=
+guid: DX9OsCytWnryFvNZCpF51OPJu7S1sMYHdzF5yYTCLPrYR7lOnd+bFpg=
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 1
     quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides:
     36:
       serializedVersion: 2
-      loadType: 2
+      loadType: 0
       sampleRateSetting: 2
       sampleRateOverride: 44100
       compressionFormat: 7
-      quality: 1
+      quality: 0.5
       conversionMode: 0
       preloadAudioData: 0
-  forceToMono: 0
+  forceToMono: 1
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

Assets/Res/Aduio/combatBattle.wav.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: DSgevHyvU367kol7AgTdvaK8/DEJ448GSQG+JGxFXA3pe1mw4m1gKX8=
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides:
+    36:
+      serializedVersion: 2
+      loadType: 0
+      sampleRateSetting: 2
+      sampleRateOverride: 44100
+      compressionFormat: 7
+      quality: 0.5
+      conversionMode: 0
+      preloadAudioData: 0
+  forceToMono: 1
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/die1.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WyxN5C2rBnw907ZX7Ph0J8ZyMlEWdphlymfbWbl6TXQpBiiiN5dBm5Y=
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -222,10 +222,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 753442136}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &164319094
 MonoBehaviour:
@@ -276,6 +276,7 @@ GameObject:
   - component: {fileID: 168908852}
   - component: {fileID: 168908851}
   - component: {fileID: 168908850}
+  - component: {fileID: 168908853}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: EventSystem
@@ -334,6 +335,102 @@ Transform:
   m_Children: []
   m_Father: {fileID: 123020045}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &168908853
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168908849}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &235899919
 GameObject:
   m_ObjectHideFlags: 0
@@ -904,7 +1001,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1324294697}
   - component: {fileID: 1324294698}
-  - component: {fileID: 1324294699}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: LoadSlider
@@ -929,10 +1025,10 @@ RectTransform:
   - {fileID: 1080868192}
   m_Father: {fileID: 753442136}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -685}
-  m_SizeDelta: {x: 660.2, y: 122.3}
+  m_SizeDelta: {x: -89.79999, y: -1501.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1324294698
 MonoBehaviour:
@@ -985,25 +1081,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!320 &1324294699
-PlayableDirector:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1324294696}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-  m_InitialState: 1
-  m_WrapMode: 2
-  m_DirectorUpdateMode: 1
-  m_InitialTime: 0
-  m_SceneBindings:
-  - key: {fileID: -4398279264670304355, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 1324294697}
-  m_ExposedReferences:
-    m_References: []
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Assets/Scripts/Core/Audio/AudioBundleInfo.cs

@@ -8,10 +8,12 @@ namespace Core.Audio
     {
 
         private string _audioClipName;
+        public float _volume;
 
         public AudioBundleInfo(string audioClipName, float volume)
         {
             _audioClipName = audioClipName;
+            _volume=volume;
         }
 
         public async CTask<AssetHandle> GetAudioClip()

Assets/Scripts/Core/Audio/AudioManager.cs

@@ -14,7 +14,7 @@ namespace Core.Audio
         private Map<string, AudioBundleInfo> _allAduionBundleInfos = new Map<string, AudioBundleInfo>();
 
         private Queue<AudioSourcePool> _audioSourcePools = new Queue<AudioSourcePool>();
-        private List<AudioSourcePool> _currPlayAudio = new List<AudioSourcePool>();
+        private Map<string, AudioSourcePool> _currPlayAudio = new Map<string, AudioSourcePool>();
 
         private List<string> _bgmQueue = new List<string>();
         private AudioSourcePool _currBgm;
@@ -49,6 +49,13 @@ namespace Core.Audio
         {
         }
 
+        public async CTask InitMainAudio()
+        {
+            string config = "MainAudio.asset";
+            AssetHandle assetHandle =
+                await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<AudionSettingConfig>(config);
+            await LoadAudio(assetHandle.AssetObject<AudionSettingConfig>());
+        }
 
         public async CTask LoadAudio(AudionSettingConfig audionSettingConfig)
         {
@@ -69,6 +76,11 @@ namespace Core.Audio
 
         public async CTask<AudioBundleInfo> GetAduionBundleInfo(string audionName, float volume = 1)
         {
+            // if (audionName.Contains('.'))
+            // {
+            //     audionName = audionName.Split('.')[0];
+            // }
+
             if (_allAduionBundleInfos.TryGetValue(audionName, out AudioBundleInfo abi))
             {
                 return abi;
@@ -86,7 +98,7 @@ namespace Core.Audio
                 _audioSourcePools.Enqueue(audioSourcePool);
             }
 
-            _currPlayAudio.Remove(audioSourcePool);
+            _currPlayAudio.Remove(audioSourcePool.CurrPlayName);
         }
 
         private AudioSourcePool GetAudioSourcePool()
@@ -104,14 +116,14 @@ namespace Core.Audio
 
         public void Stop(string audionName)
         {
-            for (int i = 0; i < _currPlayAudio.Count; i++)
-            {
-                if (_currPlayAudio[i].CurrPlayName.Equals(audionName))
-                {
-                    _currPlayAudio[i].Finish();
-                    i--;
-                }
-            }
+            // for (int i = 0; i < _currPlayAudio.Count; i++)
+            // {
+            //     if (_currPlayAudio[i].CurrPlayName.Equals(audionName))
+            //     {
+            //         _currPlayAudio[i].Finish();
+            //         i--;
+            //     }
+            // }
         }
 
         public async void PlayBGM(string bgmName)
@@ -134,7 +146,7 @@ namespace Core.Audio
                 _currBgm = GetAudioSourcePool();
             }
 
-            _currBgm.Play(bgmName, audioClip, true);
+            _currBgm.Play(bgmName, audioClip, true, audioBundleInfo._volume);
         }
 
         public void PauseBGM()
@@ -192,17 +204,28 @@ namespace Core.Audio
                 return null;
             }
 
-            AudioBundleInfo audioBundleInfo = await GetAduionBundleInfo(audionName);
-
-            AssetHandle audioClip = await audioBundleInfo.GetAudioClip();
-            if (audioClip == null)
+            using (await CoroutineLockComponent.Instance.Wait(audionName))
             {
-                return null;
+                if (_currPlayAudio.TryGetValue(audionName, out AudioSourcePool asp))
+                {
+                    asp.Finish();
+                }
+
+                AudioBundleInfo audioBundleInfo = await GetAduionBundleInfo(audionName);
+
+                AssetHandle audioClip = await audioBundleInfo.GetAudioClip();
+                if (audioClip == null)
+                {
+                    return null;
+                }
+
+                AudioSourcePool audioSourcePool = GetAudioSourcePool();
+                audioSourcePool.Play(audionName, audioClip, isLoop, speed);
+                _currPlayAudio[audionName] = audioSourcePool;
+                return audioSourcePool;
             }
 
-            AudioSourcePool audioSourcePool = GetAudioSourcePool();
-            audioSourcePool.Play(audionName, audioClip, isLoop, speed);
-            return audioSourcePool;
+           
         }
 
         public void Play(string audionName, bool isLoop)

Assets/Scripts/Core/Audio/AudioSourcePool.cs

@@ -29,7 +29,7 @@ namespace Core.Audio
             gameObject.transform.SetParent(root);
         }
 
-        public void Play(string audioName, AssetHandle audioClip, bool isLoop, float speed = 1)
+        public void Play(string audioName, AssetHandle audioClip, bool isLoop,float volume, float speed = 1)
         {
             if (audioClip == null)
             {
@@ -47,6 +47,7 @@ namespace Core.Audio
             _audioSource.clip = _assetHandle.AssetObject<AudioClip>();
             _audioSource.loop = isLoop;
             _audioSource.pitch = speed;
+            _audioSource.volume = volume;
             if (speed > 1)
             {
                 _audioSource.outputAudioMixerGroup = AudioManager.Instance.AudioMixerGroup;

Assets/Scripts/Core/Audio/AudionSettingConfig.cs

@@ -4,14 +4,16 @@ using UnityEngine;
 namespace Core.Audio
 {
     [CreateAssetMenu(menuName = "Asset/AudionSettingConfig", fileName = "AudionSettingConfig")]
-    public class AudionSettingConfig: ScriptableObject
+    public class AudionSettingConfig : ScriptableObject
     {
         public int useCount;
 
         [System.Serializable]
         public class AudionConfig
         {
+#if UNITY_EDITOR
             public string describe = "描述这个音效作用";
+#endif
             public string audionClipName;
             [Range(0, 1)] public float volume = 1;
         }
@@ -26,7 +28,7 @@ namespace Core.Audio
                 return null;
             for (int i = 0; i < configs.Count; i++)
             {
-                if (configs[i].audionClipName==null)
+                if (configs[i].audionClipName == null)
                     continue;
                 if (configs[i].audionClipName.Equals(clipName))
                     return configs[i];

Assets/Scripts/Core/Utility/BetterList.cs

@@ -197,6 +197,7 @@ public class BetterList<T> : IDisposable
     public BetterList(int size)
     {
         buffSize = size;
+        buffer = new T[size];
     }
 
     public BetterList(List<T> allVe)
@@ -427,9 +428,14 @@ public class BetterList<T> : IDisposable
     /// <summary>
     /// Mimic List's ToArray() functionality, except that in this case the list is resized to match the current size.
     /// </summary>
-    public T[] ToArray()
+    public T[] ToArray(bool isNoTrim=false)
     {
-        Trim();
+        if (!isNoTrim)
+        {
+            Trim();
+        }
+
+      
         return buffer;
     }
 

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using Common.Utility.CombatEvent;
 using Common.Utility.CombatTimer;
+using Core.Audio;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
@@ -82,6 +83,7 @@ namespace GameLogic.Combat.CombatType
             _currLevelBattleNodeIndex = 0;
             exp = 0;
             _simulatedExp = 0;
+            PlayBgm();
         }
 
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
@@ -124,6 +126,10 @@ namespace GameLogic.Combat.CombatType
             }
         }
 
+        private void PlayBgm()
+        {
+            AudioManager.Instance.PlayBGM("combatBattle.wav");
+        }
 
         private void ResurrectionFinish()
         {
@@ -269,6 +275,7 @@ namespace GameLogic.Combat.CombatType
             CombatController.currActiveCombat.isStopAi = true;
             TimerComponent.Instance.AddTimer(2000, delegate
             {
+               PlayBgm();
                 CombatController.currActiveCombat.isStopAi = false;
                 Time.timeScale = 1f;
                 // CombatController.currActiveCombat.speed = 1;
@@ -279,7 +286,7 @@ namespace GameLogic.Combat.CombatType
         {
             isBossCombat = true;
             CombatController.currActiveCombat.isStopAi = true;
-
+            AudioManager.Instance.PlayBGM("bossBattle.wav");
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
             if (allHero != null)
             {

Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/GPURender.cs

@@ -14,17 +14,18 @@ namespace GameLogic.Combat.Hero.HeroGPU
         public Material Material;
         public Mesh Mesh;
         public MaterialPropertyBlock _materialPropertyBlock;
-        BetterList<Matrix4x4> instData = new BetterList<Matrix4x4>();
-        BetterList<Matrix4x4> animtionStata = new BetterList<Matrix4x4>();
-        BetterList<float> enableAnimations = new BetterList<float>();
-        BetterList<Vector4> edgeColor = new BetterList<Vector4>();
-        BetterList<float> edgeStrength = new BetterList<float>();
-        BetterList<float> injuriedStrength = new BetterList<float>();
+        BetterList<Matrix4x4> instData = new BetterList<Matrix4x4>(100);
+        BetterList<Matrix4x4> animtionStata = new BetterList<Matrix4x4>(100);
+        BetterList<float> enableAnimations = new BetterList<float>(100);
+        BetterList<Vector4> edgeColor = new BetterList<Vector4>(100);
+        BetterList<float> edgeStrength = new BetterList<float>(100);
+        BetterList<float> injuriedStrength = new BetterList<float>(100);
 
         private RenderParams rp;
 
         public void Init(Material Material, Mesh Mesh)
         {
+            
             this.Material = Material;
             this.Mesh = Mesh;
             _materialPropertyBlock = new MaterialPropertyBlock();
@@ -56,6 +57,7 @@ namespace GameLogic.Combat.Hero.HeroGPU
             edgeColor.Clear();
             edgeStrength.Clear();
             injuriedStrength.Clear();
+            int rendCombat = 0;
             for (int i = 0; i < count; i++)
             {
                 HeroGPUMono heroGPUMono = gpuMonoList[i];
@@ -64,6 +66,7 @@ namespace GameLogic.Combat.Hero.HeroGPU
                     continue;
                 }
 
+                rendCombat++;
                 instData.Add(heroGPUMono.rootTrans.localToWorldMatrix);
                 animtionStata.Add(heroGPUMono.animtionState);
                 edgeColor.Add(heroGPUMono.edgecolor);
@@ -72,12 +75,12 @@ namespace GameLogic.Combat.Hero.HeroGPU
                 enableAnimations.Add(1);
             }
 
-            _materialPropertyBlock.SetFloatArray(shader_enableShaderId, enableAnimations.ToArray());
-            _materialPropertyBlock.SetMatrixArray(shader_animtionStateId, animtionStata.ToArray());
-            _materialPropertyBlock.SetVectorArray(shader_edgeColor, edgeColor.ToArray());
-            _materialPropertyBlock.SetFloatArray(shader_edgeStrength, edgeStrength.ToArray());
-            _materialPropertyBlock.SetFloatArray(shader_injuriedStrength, injuriedStrength.ToArray());
-            Graphics.RenderMeshInstanced(rp, Mesh, 0, instData.ToArray(), instData.Count, 0);
+            _materialPropertyBlock.SetFloatArray(shader_enableShaderId, enableAnimations.ToArray(true));
+            _materialPropertyBlock.SetMatrixArray(shader_animtionStateId, animtionStata.ToArray(true));
+            _materialPropertyBlock.SetVectorArray(shader_edgeColor, edgeColor.ToArray(true));
+            _materialPropertyBlock.SetFloatArray(shader_edgeStrength, edgeStrength.ToArray(true));
+            _materialPropertyBlock.SetFloatArray(shader_injuriedStrength, injuriedStrength.ToArray(true));
+            Graphics.RenderMeshInstanced(rp, Mesh, 0, instData.ToArray(true), rendCombat, 0);
         }
     }
 }

Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLineSerialization/TimeLineAudioSeralization.cs

@@ -26,6 +26,11 @@ public class TimeLineAudioSeralization : TimeLineAssetSerialization
         if (audioPlayableAsset.clip != null)
         {
             audioName = audioPlayableAsset.clip.name;
+            if (!audioName.Contains('.'))
+            {
+                audioName += ".wav";
+            }
+
             isLoop = audioPlayableAsset.loop;
             // volume = 1;
         }

Assets/Scripts/GameUI/GameApplction.cs

@@ -1,4 +1,5 @@
 using Core.AssetLoadTool.Asset;
+using Core.Audio;
 using Core.Language;
 using Fort23.Core;
 using Fort23.Mono;
@@ -77,6 +78,9 @@ public class GameApplction : IGameStart
         _root.AddComponent<UIManager, Transform>(null);
         gameStartUIPanel.ShowMassge("loadUI");
         gameStartUIPanel.SetSlider(0.55f);
+
+        await AudioManager.Instance.InitMainAudio();
+
         await UIManager.Instance.InitUI();
         CustomTweenManager.Init();
 

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -57,6 +57,12 @@ namespace Fort23.Mono
                 Vector3 pos = mainUIPanel.expPoint.position;
                 target = transform.worldToLocalMatrix * pos;
             }
+            else
+            {
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                Vector3 pos = mainUIPanel.Icon_Coin.position;
+                target = transform.worldToLocalMatrix * pos;
+            }
 
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(
                 combatItemShowEventData.startPos_WorldPos);