修改bug

Assets/Art/VFX/FXPrefabs/fx_guaiwu02_die.prefab.meta

@@ -3,5 +3,5 @@ guid: DH5N5HipWn7wwE0GoGRsk5vKTF1CocaSHfYArgtBuC7IzdRMnzIRDgY=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwu02_die
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke.prefab.meta

@@ -3,5 +3,5 @@ guid: Di4fsy+sVigvTvkUDRvXvIInd2pPZeX7buiJKFo4UckFsZ58pnVB4fM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw2.prefab.meta

@@ -3,5 +3,5 @@ guid: Bn0etiqoVC4XS4aowM1GevuwLysUWAXC2CS49jqQDsZNvdzFq7OyC6g=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw2
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_gw_chuxian_dust.mat.meta

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

Assets/Resources/PerformanceTestRunSettings.json

@@ -1 +0,0 @@
-{"MeasurementCount":-1}

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:

Assets/Scripts/Core/Pool/CObject/CObject.cs

@@ -18,6 +18,11 @@ namespace Fort23.Core
         {
         }
 
+        public virtual async CTask AwaitTask()
+        {
+            
+        }
+
         public abstract void ActiveObj();
 
         /// <summary>

Assets/Scripts/Core/Pool/CObject/CObjectPool.cs

@@ -14,13 +14,20 @@ namespace Fort23.Core
             this.TypeName = typeName;
         }
 
-        public void Enqueue(CObject entity)
+        public async void Enqueue(CObject entity)
         {
+            if (entity == null)
+            {
+                return;
+            }
+
+            await entity.AwaitTask();
             if (!entity.isActive)
             {
                 return;
             }
 
+
             entity.isActive = false;
             this._queue.Enqueue(entity);
             entity.DormancyObj();

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

@@ -340,6 +340,12 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
         _isDis = false;
     }
 
+    public override async CTask AwaitTask()
+    {
+        Dispose();
+        await TimerComponent.Instance.WaitAsync(10000);
+    }
+
     public override void DormancyObj()
     {
         Dispose();

Assets/Resources/PerformanceTestRunInfo.json.meta → Assets/StreamingAssets/Bundle/albedo_t1_c38e459a9673a6e3ab381a7c11ae8f5c.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: W3NO4yKvVXmI7LvZevbqu9Tl56WppXDEFf80J7jvsiLjuGO4QvloKfs=
-TextScriptImporter:
+guid: Dn1Jsi6uASmAG5eff2er4e10hiWalyTxHzIqU4pGYTxSo+2vR5cS+zg=
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Resources/PerformanceTestRunSettings.json.meta → Assets/StreamingAssets/Bundle/bg_icon_heianqianghualight2__b15606fc5cadf925a20dcaf3d9077643.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: BywXsCOtBXxf4lS0nWDWuM6AaqOQNGKsWizNVzunNAUc6bui1v2tTFI=
-TextScriptImporter:
+guid: DnkftXupWn0ivxwaH4KFh/pmUZHkmU2NK+G/fAjqFSszuwINssk03OY=
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/StreamingAssets/Bundle/chapter01_171e7fa4f734f6c776653362184dea75.meta

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

Assets/StreamingAssets/Bundle/chapter01_1_691ba002f96cc113d293ffde6923902f.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnpK4H+vBSid/OAxpWfdNeByu9Z3TtWAui8HFXNw9it/4RD5x4LmZEw=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/chapter01_673b6fb40595a6c484b593dcf26f5aa5.meta

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

Assets/StreamingAssets/Bundle/chapter02_831c8284b8c043da3344572a77ec6e82.meta

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

Assets/StreamingAssets/Bundle/circle_ab_0dba39348e4751cd9f07c0af5713cc9a.meta

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

Assets/StreamingAssets/Bundle/circle_ab_27ad5172bd2f99a11ae0b61ddebfc53d.meta

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

Assets/StreamingAssets/Bundle/cloud_2x2_soft_ab_7917fea59e8e0d554986983186c832ee.meta

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

Assets/StreamingAssets/Bundle/cloud_2x2_soft_t4_bd9d40a8f1beea67a31a04a1b5a3dd5e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnIbsi//VS6BBly6rKV9dDH+PjY1WKIm3ColMr6sE32tqRYZWmSv/kk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/combathppanel_944fec919043d03f9b23542afa97974f.meta

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

Assets/StreamingAssets/Bundle/combatroot_6ea6b02b7feaa37039711b23a6bf21a9.meta

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

Assets/StreamingAssets/Bundle/combatroot_a66623171aa0cb93c50d569e0ba7738f.meta

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

Assets/StreamingAssets/Bundle/combatshowtextpanel_9fd8ce26d8d049623461c5e74eff141c.meta

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

Assets/StreamingAssets/Bundle/defaultpbr_f726774e09fd6dd6ebdb82f65d9c2edb.meta

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

Assets/StreamingAssets/Bundle/dropconfig_4aa4f8e0796a8a60f50a99ae2007c354.meta

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

Assets/StreamingAssets/Bundle/dropgroupconfig_8767395ea6dc2c48b78da2cde7013a26.meta

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

Assets/StreamingAssets/Bundle/fb010shader_07efe292898527aba4add2ccb8d6d66f.meta

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

Assets/StreamingAssets/Bundle/fb010shader_854441b5fc6af8e37ec493734850abc5.meta

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

Assets/StreamingAssets/Bundle/forest_ruins_5dc8ae8c29debbaf845ca0061422826d.meta

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

Assets/StreamingAssets/Bundle/forest_ruins_a686a27fb2df3dcdd364c6963d7d8c02.meta

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

Assets/StreamingAssets/Bundle/fx_603_sk3_hit_2d9467d04d2c55098b40950772706688.meta

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

Assets/StreamingAssets/Bundle/fx_glow1_74f39de2081bf72f94e5e07d3b85e405.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3sYtHypUXnzwr6ye/b0gwIa/i+Wbt9kMf4MfuarApncN6O7sHWXMTc=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_glow1_al_aebe0a68d181f4744295262ca6143ec9.meta

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

Assets/StreamingAssets/Bundle/fx_glow2_529c3eda8a91202e3104e25b9e5cd357.meta

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

Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_9d09e8d1fe85669e22fa4a329e66fbd7.meta

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

Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_hit_0c59217005db6fc416832fbb7325e7fc.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwu01_at_hit_17fb984142890bcb68792699c00957d7.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DnJMsy+rVy1ExrdUPDLdjOfuQaM38+UZalC+YEoEeb89DIBVTKviSaU=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_guaiwu01_die_428688d4cc4214478f15a21b2abca57e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXkdt3z+AX/a+vqv8JRqIRdACxbDfh7U9fozaXtY+ntPO1w2dIBqBpY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_guaiwu01_die_6864e8b642ae0cc39e137f8ec54c646a.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D39NtCj/V3/nX9F3I4uLHA64+ifzONqKe4SnXPFjce1IQJimP7FNmV0=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_guaiwu01_sk_hit_4321dadee2d3b1e753fff7fcfeee38b2.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwu01_suikuai_ab42371595609da839c7cd9f94568d5a.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwu02_die_7c7a185688dc3540422fddcf58f5870b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BylLtSL7USiMN9+/ebPDiPx27pjtKFfUPczMOo2LEWO3ocpN/4z+ehE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_guaiwuboss01_at_sf1_4c76696d10258c4f2fa7731de09eb4b6.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwuboss01_at_sf2_bf23aa35f6ebf27d9f0f4131a748f0c7.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwuboss01_die_ae76b9dbde7647bd33abf8d1217a97fc.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwuboss01_sk2_e5e0db4b05879fb273dd669f3e85eeb3.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnhNsnyuWy+RcNFPDrSO/tM1UEMtr2JZM8VP71ai+s7TjNzzpABpaEk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_guaiwuboss02_at_hit_b9389c31f5bb604703235ea4d3446d96.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnsZtHiqASqAv1QDFvE8TkjU/oyrIxBdl3G/45kTeWDRAnmf0EPqgoQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_guaiwuboss02_die_3e0b1a4827b5e270524d84d932d59f2c.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk1_sf1_394ab5399468f6b39f24f7d81d3932dd.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk1_sf2_e0cceddf46ccade3a7070d83b2c02c31.meta

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

Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk3_c81a63b40f4a73248a3869230f655e4d.meta

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

Assets/StreamingAssets/Bundle/fx_gw_chuxian_dust_f6544b371a5ab995133c757fff903a5c.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Bn0b4y3+VC6dr3wJ4LbDX6HK1LU/4csy+FrFoqmdB5XPAzpog8+XArI=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: