修改bug

Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: tiankonglevelbattle02
   assetBundleVariant: 

Assets/Art/UIAssets/bg/bg_lh_wanxi.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_lh_wanxi
   assetBundleVariant: 

Assets/Art/VFX/Epic Toon FX/Textures/glow1.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: glow1_t28
+  assetBundleName: glow1_t27
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: 0.46320006
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

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

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.005366751
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Tex/Noise/Noise363.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise363_t21
+  assetBundleName: noise363_t20
   assetBundleVariant: 

Assets/Art/VFX/Textures/Dots/fx_glow_fangshe.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_glow_fangshe_t14
+  assetBundleName: fx_glow_fangshe_t13
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/VertMask_13.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: vertmask_13_t19
+  assetBundleName: vertmask_13_t32
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask05.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask05_t13
+  assetBundleName: mask05_t15
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask_shu.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask_shu_t15
+  assetBundleName: mask_shu_t14
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask_u.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask_u_t30
+  assetBundleName: mask_u_t29
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise94.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise94_t32
+  assetBundleName: noise94_t31
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/NoiseCell01_inverted.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noisecell01_inverted_t23
+  assetBundleName: noisecell01_inverted_t22
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/tumo1.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: tumo1_t31
+  assetBundleName: tumo1_t30
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/wb_wenli6.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: wb_wenli6_t22
+  assetBundleName: wb_wenli6_t21
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/wl_shu1.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: wl_shu1_t24
+  assetBundleName: wl_shu1_t23
   assetBundleVariant: 

Assets/Art/VFX/Textures/Sheet/xl_xiaoshandian.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: xl_xiaoshandian_t29
+  assetBundleName: xl_xiaoshandian_t28
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/Trail13_al.png.meta

@@ -227,5 +227,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: trail13_al_t25
+  assetBundleName: trail13_al_t24
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/fx_Trail22_al.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_trail22_al_t26
+  assetBundleName: fx_trail22_al_t25
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/trail_smoke2.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: trail_smoke2_t27
+  assetBundleName: trail_smoke2_t26
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_hen_wl3.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_hen_wl3_t20
+  assetBundleName: fx_hen_wl3_t19
   assetBundleVariant: 

Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab.meta

@@ -3,5 +3,5 @@ guid: BilMvSKvUnwNOXa5pJer2i9eLGAC6jRM038Ebe4ewDkBkLujGb02Vxn5IK8k
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: divinesencehuoquwidget
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobreakthroughsuccesspanel
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobreakthroughsuccesspanelopen
   assetBundleVariant: 

Assets/Res/UI/UIanima/UIanimaKzOpen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: uianimakzopen
   assetBundleVariant: 

Assets/Res/UI/UIanima/UIanimaScale1.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: uianimascale1
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1237,7 +1237,96 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!213 &1418327755
+--- !u!1 &1831378551
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1831378552}
+  - component: {fileID: 1831378554}
+  - component: {fileID: 1831378553}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1831378552
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1831378551}
+  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: 123020045}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1831378553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1831378551}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 2080538702}
+  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
+  _icon_name: dec_jianbian_tiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6f525d051e27c33e0699a302ce6a4b3d
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!222 &1831378554
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1831378551}
+  m_CullTransparentMesh: 1
+--- !u!213 &2080538702
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1452,95 +1541,6 @@ Sprite:
     - {x: 0.575, y: 0.16499999}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!1 &1831378551
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1831378552}
-  - component: {fileID: 1831378554}
-  - component: {fileID: 1831378553}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1831378552
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1831378551}
-  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: 123020045}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1831378553
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1831378551}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 1418327755}
-  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
-  _icon_name: dec_jianbian_tiao
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 6f525d051e27c33e0699a302ce6a4b3d
-  imageH: 100
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!222 &1831378554
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1831378551}
-  m_CullTransparentMesh: 1
 --- !u!114 &4237119297094294473
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -14,6 +14,8 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
     {
         private AudioSourcePool audioSourcePool;
 
+        private bool _Finish;
+
         protected override void ProSetCombatInfo()
         {
         }
@@ -21,7 +23,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         protected override async void ProEnter()
         {
 #if !COMBAT_SERVER
-
+            _Finish = false;
             TimeLineAudioSeralization timeLineAudioSeralization =
                 mTimeLineAssetSerialization as TimeLineAudioSeralization;
             if (!string.IsNullOrEmpty(timeLineAudioSeralization.audioName))
@@ -42,6 +44,12 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                     {
                         audioSourcePool.TimeLineAudioEventLogic = this;
                     }
+
+                    if (_Finish && audioSourcePool != null)
+                    {
+                        audioSourcePool.Finish();
+                        this.audioSourcePool = null;
+                    }
                 }
             }
 #endif
@@ -72,6 +80,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 this.audioSourcePool.Finish();
             }
 
+            _Finish = true;
             audioSourcePool = null;
         }
 
@@ -82,6 +91,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 this.audioSourcePool.Finish();
             }
 
+            _Finish = true;
             audioSourcePool = null;
         }
 
@@ -92,6 +102,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 this.audioSourcePool.Finish();
             }
 
+            _Finish = true;
             audioSourcePool = null;
         }
     }

Assets/StreamingAssets/Dll/DllMD5.txt

@@ -1 +1 @@
-{"fileInfo":[{"fileName":"Assembly-CSharp.dll.bytes","md5":"7b7b6343301d40fe25f3043cfb339400","size":163328},{"fileName":"Fort23.Core.dll.bytes","md5":"14117e2592ea782b6f00985a44c3eab9","size":379392},{"fileName":"Fort23.GameData.dll.bytes","md5":"66a2681b05176860a4a045883dbb4cec","size":45056},{"fileName":"Fort23.GameLogic.dll.bytes","md5":"aca561c217569994502508289c56b87c","size":330240},{"fileName":"Fort23.Mono.dll.bytes","md5":"f8eb780c85cbae2c3e3a69ea4db58b67","size":922624},{"fileName":"GameTimeLine.dll.bytes","md5":"76e9f9a384f3b24118ff154fc917d9f5","size":52224},{"fileName":"mscorlib.dll.bytes","md5":"9515ad7f53bd8dd5846ee76817b34054","size":2668544},{"fileName":"NetCoreBasic.dll.bytes","md5":"510da4f4ef70ba018d49685158eb4b1c","size":10752},{"fileName":"Protocol.dll.bytes","md5":"ba94799fcb1a3542fe1c52204a9c9b62","size":15360},{"fileName":"System.Core.dll.bytes","md5":"11ada542f3966c6d5dd5b42021137d1f","size":449536},{"fileName":"System.dll.bytes","md5":"b2b3d4e7bbd8f4a28cd5c3e783835d5d","size":899584},{"fileName":"ThirdParty.dll.bytes","md5":"68a609e080e77e5125f4d9f32bfa3be5","size":281600},{"fileName":"Unity.Timeline.dll.bytes","md5":"90da2499f74467c0879feea95656d0ab","size":126976},{"fileName":"UnityEngine.AndroidJNIModule.dll.bytes","md5":"9c0b016ab66f3ae1f0dc2d25fb7db470","size":78848},{"fileName":"UnityEngine.CoreModule.dll.bytes","md5":"165505d96b9f6e5df0b181888f8fc9c3","size":985600}]}
+{"fileInfo":[{"fileName":"Assembly-CSharp.dll.bytes","md5":"77c00b63a080880f4c87872e0b50472f","size":163328},{"fileName":"Fort23.Core.dll.bytes","md5":"14117e2592ea782b6f00985a44c3eab9","size":379392},{"fileName":"Fort23.GameData.dll.bytes","md5":"66a2681b05176860a4a045883dbb4cec","size":45056},{"fileName":"Fort23.GameLogic.dll.bytes","md5":"8ded8ed98d4fc452b9556a4af41099d9","size":330240},{"fileName":"Fort23.Mono.dll.bytes","md5":"0bffd5d98d6d132ba3ba39cae033e72d","size":922624},{"fileName":"GameTimeLine.dll.bytes","md5":"5d8fba394019188d3593b525d865cf51","size":52736},{"fileName":"mscorlib.dll.bytes","md5":"9515ad7f53bd8dd5846ee76817b34054","size":2668544},{"fileName":"NetCoreBasic.dll.bytes","md5":"510da4f4ef70ba018d49685158eb4b1c","size":10752},{"fileName":"Protocol.dll.bytes","md5":"ba94799fcb1a3542fe1c52204a9c9b62","size":15360},{"fileName":"System.Core.dll.bytes","md5":"11ada542f3966c6d5dd5b42021137d1f","size":449536},{"fileName":"System.dll.bytes","md5":"b2b3d4e7bbd8f4a28cd5c3e783835d5d","size":899584},{"fileName":"ThirdParty.dll.bytes","md5":"68a609e080e77e5125f4d9f32bfa3be5","size":281600},{"fileName":"Unity.Timeline.dll.bytes","md5":"90da2499f74467c0879feea95656d0ab","size":126976},{"fileName":"UnityEngine.AndroidJNIModule.dll.bytes","md5":"9c0b016ab66f3ae1f0dc2d25fb7db470","size":78848},{"fileName":"UnityEngine.CoreModule.dll.bytes","md5":"165505d96b9f6e5df0b181888f8fc9c3","size":985600}]}

Assets/StreamingAssets/assetMD5.txt

@@ -1 +1 @@
-638977950189740177
+638978564742007607