瀏覽代碼

修改bug

DESKTOP-FB72PO8\Administrator 5 月之前
父節點
當前提交
9825109725
共有 100 個文件被更改,包括 230 次插入35 次删除
  1. 1 1
      Assets/Art/VFX/FXPrefabs/fx_guaiwu03_die.prefab.meta
  2. 1 1
      Assets/Art/VFX/FXPrefabs/fx_guaiwu04_die.prefab.meta
  3. 1 1
      Assets/Art/VFX/FXPrefabs/fx_guaiwu05_die.prefab.meta
  4. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gw05_zd.prefab.meta
  5. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gw05_zd_hit.prefab.meta
  6. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw03.prefab.meta
  7. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw04.prefab.meta
  8. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw05.prefab.meta
  9. 1 1
      Assets/Res/CombatHero/Guaiwu03_gpu.prefab.meta
  10. 1 1
      Assets/Res/CombatHero/Guaiwu04_gpu.prefab.meta
  11. 1 1
      Assets/Res/CombatHero/Guaiwu05_gpu.prefab.meta
  12. 1 1
      Assets/Res/TimeLineAssets/Guaiwu03_TD.txt.meta
  13. 1 1
      Assets/Res/TimeLineAssets/Guaiwu04_TD.txt.meta
  14. 1 1
      Assets/Res/TimeLineAssets/Guaiwu05_TD.txt.meta
  15. 1 1
      Assets/Res/UI/HeroUpTxtEft.prefab.meta
  16. 5 1
      Assets/Scripts/Core/UI/UTool/ParticleEffectForUGUI/Scripts/UIParticle.cs
  17. 15 3
      Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroAttState.cs
  18. 3 3
      Assets/Scripts/GameLogic/Combat/Skill/S30001.cs
  19. 13 12
      Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs
  20. 11 1
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogicGroupBasic.cs
  21. 0 0
      Assets/StreamingAssets/Bundle/MD5.txt
  22. 二進制
      Assets/StreamingAssets/Bundle/UnityBundle
  23. 0 0
      Assets/StreamingAssets/Bundle/assetConfig.txt
  24. 二進制
      Assets/StreamingAssets/Bundle/chapter01_1_68f1c0a86a452b6a6b97d7fbb76ac995
  25. 二進制
      Assets/StreamingAssets/Bundle/chapter01_1e8a8e3d3b060abc426611ddbc3b448b
  26. 7 0
      Assets/StreamingAssets/Bundle/chapter01_1e8a8e3d3b060abc426611ddbc3b448b.meta
  27. 二進制
      Assets/StreamingAssets/Bundle/chapter02_5cbb5209ba4f94f8ce8497219acd229e
  28. 7 0
      Assets/StreamingAssets/Bundle/chapter02_5cbb5209ba4f94f8ce8497219acd229e.meta
  29. 二進制
      Assets/StreamingAssets/Bundle/circle_ab_e9a18059b2a2c0216b14a7ef8a453f2b
  30. 二進制
      Assets/StreamingAssets/Bundle/cloud_2x2_soft_ab_e1799448ed818164b0ba54c3f1c4e8d4
  31. 二進制
      Assets/StreamingAssets/Bundle/combathppanel_7a00de300456c179184ac1f68fccc225
  32. 7 0
      Assets/StreamingAssets/Bundle/combathppanel_7a00de300456c179184ac1f68fccc225.meta
  33. 二進制
      Assets/StreamingAssets/Bundle/combatroot_1e0aa2f6e94bcb2b0a9c939b1e3f77ec
  34. 7 0
      Assets/StreamingAssets/Bundle/combatroot_1e0aa2f6e94bcb2b0a9c939b1e3f77ec.meta
  35. 二進制
      Assets/StreamingAssets/Bundle/combinefontmat_9418c57363fa67377dece9fa401af8f7
  36. 二進制
      Assets/StreamingAssets/Bundle/defaultpbr_dbc74b2ff1b5d876f1f45f76412e315c
  37. 7 0
      Assets/StreamingAssets/Bundle/defaultpbr_dbc74b2ff1b5d876f1f45f76412e315c.meta
  38. 二進制
      Assets/StreamingAssets/Bundle/dropconfig_86f3c0289d7d78db44c80425f795bec3
  39. 7 0
      Assets/StreamingAssets/Bundle/dropconfig_86f3c0289d7d78db44c80425f795bec3.meta
  40. 二進制
      Assets/StreamingAssets/Bundle/dropgroupconfig_ad1df89094c87de25e1828eb27576a3d
  41. 7 0
      Assets/StreamingAssets/Bundle/dropgroupconfig_ad1df89094c87de25e1828eb27576a3d.meta
  42. 二進制
      Assets/StreamingAssets/Bundle/fb010shader_322f3a802f144a3fcdf7707e32a59384
  43. 7 0
      Assets/StreamingAssets/Bundle/fb010shader_322f3a802f144a3fcdf7707e32a59384.meta
  44. 二進制
      Assets/StreamingAssets/Bundle/fx_204_sk1_sf_729a98f64b079e29fb65732c54f3d910
  45. 二進制
      Assets/StreamingAssets/Bundle/fx_403_banyuan_glow_53afcfe71d9c66359660f734cd78da5c
  46. 二進制
      Assets/StreamingAssets/Bundle/fx_603_sk3_hit_e9d8bb08df19b8bece29bcf012969d2c
  47. 7 0
      Assets/StreamingAssets/Bundle/fx_603_sk3_hit_e9d8bb08df19b8bece29bcf012969d2c.meta
  48. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_blue_7001a883d7c6c517f82b8d59706c00be
  49. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_gold_e85c815c4260822c90543f09a5ebae79
  50. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_green_b38ec09a1d8d35d3c788cb67c5b9d3a8
  51. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_gz_blue_effe6b314867abaa8037856ac15d4a9b
  52. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_gz_gold_ed5c9f6f0b3099bb0f3f757258a89240
  53. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_gz_green_7d41bc33d081d8b5b29a54c5df221382
  54. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_gz_orange_55862734c5af73c4a1c46e0572f39d57
  55. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_gz_purple_e17150bcfa7ee94ca61016e11d075f01
  56. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_orange_6865369e9696de55f9af3a4660a70ad3
  57. 二進制
      Assets/StreamingAssets/Bundle/fx_down_zb_purple_f052af6e66fd5a56d341df4b832b478b
  58. 二進制
      Assets/StreamingAssets/Bundle/fx_fireball_ad_eb9d70e93bbc0e2db13ce388067327bf
  59. 二進制
      Assets/StreamingAssets/Bundle/fx_glow1_a7526e7fbe19a877b150e5bbcb05f790
  60. 二進制
      Assets/StreamingAssets/Bundle/fx_glow1_al_1f7942630fa860c6814fcd09f2cdb305
  61. 二進制
      Assets/StreamingAssets/Bundle/fx_glow2_0e3093d4f2b8c418e6b7e178b3e88c87
  62. 二進制
      Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_9719fd44569ef9a74ee29d2574a5e75b
  63. 7 0
      Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_9719fd44569ef9a74ee29d2574a5e75b.meta
  64. 二進制
      Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_hit_16abb26b380c424e2394fbcafb6f6a26
  65. 7 0
      Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_hit_16abb26b380c424e2394fbcafb6f6a26.meta
  66. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu01_at_hit_e5a70fe169d978d33c0f4c20a70ed3d2
  67. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu01_die_09ad21f942c22e817910272f3db0786a
  68. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu01_sk_hit_4b87da5e5405a21d9786fb591e3693e1
  69. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu01_suikuai_b7bf28d923afb55835805cdb03ca66a4
  70. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu02_die_62e19bf36fbcd3d9e3dc1ff4fa5b1db3
  71. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwu02_die_62e19bf36fbcd3d9e3dc1ff4fa5b1db3.meta
  72. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu03_die_babf2013c25fb5c7e640441b777caada
  73. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwu03_die_babf2013c25fb5c7e640441b777caada.meta
  74. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu04_die_211e00a977dcb8127fe7ac68e38ca8ae
  75. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwu04_die_211e00a977dcb8127fe7ac68e38ca8ae.meta
  76. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwu05_die_fe673787457e28a49f07d5ba763e142d
  77. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwu05_die_fe673787457e28a49f07d5ba763e142d.meta
  78. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss01_at_sf1_546ae1637efb84398154f15ef35a69d1
  79. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss01_at_sf2_be3fd8954840a1a3a943fc8f2d72a88b
  80. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss01_die_fc40a235ca4578e521bffcf2a5467c81
  81. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwuboss01_die_fc40a235ca4578e521bffcf2a5467c81.meta
  82. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss01_sk2_880164ed3a5d38e459d37869b16131df
  83. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_at_hit_96b8af92c7e09b3f3077166dba08064b
  84. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_at_hit_96b8af92c7e09b3f3077166dba08064b.meta
  85. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_die_13db4d890ec0e1551376b6e216b8662a
  86. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_die_13db4d890ec0e1551376b6e216b8662a.meta
  87. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk1_sf1_73ce1360e9c2b1e7a0daa6f9160b59dd
  88. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk1_sf2_6975a68663e83c0a98f2b8f6146d1390
  89. 二進制
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk3_fe8c3b01496620913f54be9fafa1c863
  90. 7 0
      Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk3_fe8c3b01496620913f54be9fafa1c863.meta
  91. 二進制
      Assets/StreamingAssets/Bundle/fx_gw05_zd_058be79c7db1545cf2b740ed96c69182
  92. 7 0
      Assets/StreamingAssets/Bundle/fx_gw05_zd_058be79c7db1545cf2b740ed96c69182.meta
  93. 二進制
      Assets/StreamingAssets/Bundle/fx_gw05_zd_hit_466c9f49ff7f7138e9d8c049678d36fa
  94. 7 0
      Assets/StreamingAssets/Bundle/fx_gw05_zd_hit_466c9f49ff7f7138e9d8c049678d36fa.meta
  95. 二進制
      Assets/StreamingAssets/Bundle/fx_gw_chuxian_dust_a109e2beb91f4499b2a314aec6e1bf54
  96. 7 0
      Assets/StreamingAssets/Bundle/fx_gw_chuxian_dust_a109e2beb91f4499b2a314aec6e1bf54.meta
  97. 二進制
      Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_011533297416e96d8eba49e2368ba71d
  98. 7 0
      Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_011533297416e96d8eba49e2368ba71d.meta
  99. 二進制
      Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_gw03_ab5aec101735a3fa1ecae4e264777277
  100. 7 0
      Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_gw03_ab5aec101735a3fa1ecae4e264777277.meta

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_guaiwu03_die.prefab.meta

@@ -3,5 +3,5 @@ guid: DykXvHn7VS+siaH6UnnhrB5EbhlFccKPicV8CDZTbF+INsOLahbVydY=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwu03_die
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_guaiwu04_die.prefab.meta

@@ -3,5 +3,5 @@ guid: CHwZtCz5AX58QqSEAKIz+93ynw/Stms0n6NFXW9WRVt0tRape8ZV7b8=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwu04_die
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_guaiwu05_die.prefab.meta

@@ -3,5 +3,5 @@ guid: WihOtCKqVC49sjblrfDSJch3QIDg14PlVef7+PmW0X/Hws8kxUPwoFE=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwu05_die
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_gw05_zd.prefab.meta

@@ -3,5 +3,5 @@ guid: BitLtS/8ACkMJpsRCXH2mqrWSn7wiIIft9XbiJzbgunsuEIba3yxjZI=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw05_zd
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_gw05_zd_hit.prefab.meta

@@ -3,5 +3,5 @@ guid: Dikdsn/5AX+KMo+g4fNMj/Lh+EC10D+962htW5e9H8n4SfE16yTzHgA=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw05_zd_hit
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw03.prefab.meta

@@ -3,5 +3,5 @@ guid: DHgavCr/Wn4nZaKGD+5ThiohDj0HKJ41EOXReYO4XPipkA1OPURdUWM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw03
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw04.prefab.meta

@@ -3,5 +3,5 @@ guid: Wy8e4SKlBXrPThb3YfQWf/xEsN15/cISW3yfVMkN+qCaEyG5Jrr7DZc=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw04
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw05.prefab.meta

@@ -3,5 +3,5 @@ guid: WX0X5yypUS/EVqa4i6/xYOeSYgTIE40Pd2F6MMkxJ45H1Q+oiZQMlnU=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw05
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Guaiwu03_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: DS5M53v+Bi3VC008VjFFlAeKhQudRJkFZ47Nbyhoc7LFjfMIxBW7oaw=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu03_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Guaiwu04_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: DCwevC2lAig07LwgHMKW5snDY+osbkPR2OsDTy+r0LeHA/AOZ6W2Xhg=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu04_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Guaiwu05_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: DH4dti/8Wnr0VtvKxtBb1WBmJ73xzcUu4ThlVkKMv3NvVDGOPkaaji4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu05_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/TimeLineAssets/Guaiwu03_TD.txt.meta

@@ -3,5 +3,5 @@ guid: D3hOvCP/Vy87FtreXjlRIUcg+fhM4pyYqA1IDMOwbYZWXre/dUAu3ts=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu03_td
   assetBundleVariant: 

+ 1 - 1
Assets/Res/TimeLineAssets/Guaiwu04_TD.txt.meta

@@ -3,5 +3,5 @@ guid: B3IatHv+VnlUTgqjhCEtKRMc+ygY2bZsV3KC8hx/4aI0r9eUtJ50Pag=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu04_td
   assetBundleVariant: 

+ 1 - 1
Assets/Res/TimeLineAssets/Guaiwu05_TD.txt.meta

@@ -3,5 +3,5 @@ guid: BnxO4yqlVHMi4xWqAow3ErqoHBwB1XbNUdXeY5fAeY0TrcvFCDlPioc=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu05_td
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/HeroUpTxtEft.prefab.meta

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

+ 5 - 1
Assets/Scripts/Core/UI/UTool/ParticleEffectForUGUI/Scripts/UIParticle.cs

@@ -328,7 +328,11 @@ namespace Coffee.UIExtensions
         {
             if (0 < m_StencilValue)
             {
-                baseMaterial = StencilMaterial.Add(baseMaterial, (1 << m_StencilValue) - 1, StencilOp.Keep, CompareFunction.Equal, ColorWriteMask.All, (1 << m_StencilValue) - 1, 0);
+                if (baseMaterial.HasProperty("_Stencil"))
+                {
+                    baseMaterial = StencilMaterial.Add(baseMaterial, (1 << m_StencilValue) - 1, StencilOp.Keep, CompareFunction.Equal, ColorWriteMask.All, (1 << m_StencilValue) - 1, 0);
+                }
+                
                 _maskMaterials.Add(baseMaterial);
             }
 

+ 15 - 3
Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroAttState.cs

@@ -1,3 +1,4 @@
+using Fort23.UTool;
 using GameLogic.Combat.Skill;
 
 namespace GameLogic.Combat.Hero.State
@@ -9,22 +10,32 @@ namespace GameLogic.Combat.Hero.State
         public CombatHeroAttState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
+
         public override bool IsUpdateLockTarget()
         {
             return false;
         }
+
         protected override void ProEnter()
         {
             skillBasic = combatHeroEntity.CombatHeroSkillControl.CanReleaseSkill();
             if (skillBasic == null)
             {
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
                 return;
             }
 
-            skillBasic.SetSkillFinishCallBack(delegate
+            skillBasic.SetSkillFinishCallBack(delegate(SkillBasic sb)
             {
-                skillBasic = null;
-                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                if (sb == skillBasic)
+                {
+                    skillBasic = null;
+                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                }
+                else
+                {
+                    LogTool.Log("其他技能结束");
+                }
             });
             combatHeroEntity.CombatHeroSkillControl.RemoveCommandSkill(skillBasic);
             combatHeroEntity.CombatHeroSkillControl.UseSkill(skillBasic);
@@ -37,6 +48,7 @@ namespace GameLogic.Combat.Hero.State
                 skillBasic.BreakSkill();
             }
 
+          
             combatHeroEntity.CombatHeroSkillControl.currUseSkill = null;
             skillBasic = null;
         }

+ 3 - 3
Assets/Scripts/GameLogic/Combat/Skill/S30001.cs

@@ -58,10 +58,10 @@ namespace GameLogic.Combat.Skill
 
         protected void Finish()
         {
-            currMyLoopGroupBasic?.BreakTimeLine();
+            currMyLoopGroupBasic?.BreakTimeLine(CombatHeroEntity);
             if (loopGroupBasic != null)
             {
-                loopGroupBasic.BreakTimeLine();
+                loopGroupBasic.BreakTimeLine(CombatHeroEntity);
             }
 
             loopGroupBasic = null;
@@ -100,7 +100,7 @@ namespace GameLogic.Combat.Skill
                     _harm);
                 if (loopGroupBasic != null)
                 {
-                    loopGroupBasic.BreakTimeLine();
+                    loopGroupBasic.BreakTimeLine(CombatHeroEntity);
                 }
 
                 // for (int i = 0; i < _currTrigger.Count; i++)

+ 13 - 12
Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -78,7 +78,7 @@ namespace GameLogic.Combat.Skill
         /// </summary>
         public string ActiveTimeLineGroupName;
 
-        private System.Action finishCallBack;
+        private System.Action<SkillBasic> finishCallBack;
 
         /// <summary>
         /// 完成时 是否是要完成的timeGroupName
@@ -245,7 +245,7 @@ namespace GameLogic.Combat.Skill
         }
 
 
-        public void SetSkillFinishCallBack(System.Action finishCallBack)
+        public void SetSkillFinishCallBack(System.Action<SkillBasic> finishCallBack)
         {
             this.finishCallBack = finishCallBack;
         }
@@ -405,8 +405,15 @@ namespace GameLogic.Combat.Skill
             // });
             for (int i = 0; i < currUseAllTimeLineLogic.Count; i++)
             {
-                currUseAllTimeLineLogic[i].BreakTimeLine();
-                _combatHeroEntity.combatHeroTimeLineControl.RemoveEventLogicGroup(currUseAllTimeLineLogic[i]);
+                if (currUseAllTimeLineLogic[i] != null && currUseAllTimeLineLogic[i].CastEntity != CombatHeroEntity)
+                {
+                    LogTool.Log("对象以移交");
+                }
+                else
+                {
+                    currUseAllTimeLineLogic[i].BreakTimeLine(CombatHeroEntity);
+                    _combatHeroEntity.combatHeroTimeLineControl.RemoveEventLogicGroup(currUseAllTimeLineLogic[i]);
+                }
             }
 
             currUseAllTimeLineLogic.Clear();
@@ -444,15 +451,9 @@ namespace GameLogic.Combat.Skill
             }
 
             isUse = false;
-            // CombatEventManager.Instance.Dispatch(CombatEventType.SkillFinish, new HeroUseSkillEventData()
-            // {
-            //     CombatHeroEntity = CombatHeroEntity,
-            //     SkillBasic = this
-            // });
+            finishCallBack?.Invoke(this);
             ProSkillPlayFinish();
-            finishCallBack?.Invoke();
             finishCallBack = null;
-
             _isEarlyWarning = false;
             _earlyWarningFristHero = null;
             if (_earlyWarningFx != null)
@@ -472,7 +473,7 @@ namespace GameLogic.Combat.Skill
         public void TimeLineTrigger(string groupName, ILifetCycleHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
         {
-            if (targetEntity == null|| _isDis)
+            if (targetEntity == null || _isDis)
             {
                 return;
             }

+ 11 - 1
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogicGroupBasic.cs

@@ -51,6 +51,10 @@ namespace CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic
         public string groupName;
         protected ITimeLineTriggerEntity targetEntity;
 
+        public ILifeCycle CastEntity
+        {
+            get { return castEntity; }
+        }
         protected ILifeCycle castEntity;
 
         /// <summary>
@@ -255,8 +259,14 @@ namespace CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic
         /// <summary>
         /// 打断TimeLine
         /// </summary>
-        public void BreakTimeLine()
+        public void BreakTimeLine(ILifeCycle castEntity)
         {
+            if (castEntity != CastEntity)
+            {
+                LogTool.Log("打断TimeLine的施放者与当前施放者不一致");
+                return;
+            }
+
             updateEnd = true;
             if (timeLineLogic != null)
             {

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/Bundle/MD5.txt


二進制
Assets/StreamingAssets/Bundle/UnityBundle


File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/Bundle/assetConfig.txt


二進制
Assets/StreamingAssets/Bundle/chapter01_1_68f1c0a86a452b6a6b97d7fbb76ac995


二進制
Assets/StreamingAssets/Bundle/chapter01_1e8a8e3d3b060abc426611ddbc3b448b


+ 7 - 0
Assets/StreamingAssets/Bundle/chapter01_1e8a8e3d3b060abc426611ddbc3b448b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W3JKsSirAHOfXWBFn8DAgqvAAtdasEAh+pI/8muO9BreBvAzIRzeC58=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/chapter02_5cbb5209ba4f94f8ce8497219acd229e


+ 7 - 0
Assets/StreamingAssets/Bundle/chapter02_5cbb5209ba4f94f8ce8497219acd229e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXwdsS2rAX31Tc8Uisljk1ioxA/kawrE6vJ5o+X+MZ+hHXVjHiQfqEU=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/circle_ab_e9a18059b2a2c0216b14a7ef8a453f2b


二進制
Assets/StreamingAssets/Bundle/cloud_2x2_soft_ab_e1799448ed818164b0ba54c3f1c4e8d4


二進制
Assets/StreamingAssets/Bundle/combathppanel_7a00de300456c179184ac1f68fccc225


+ 7 - 0
Assets/StreamingAssets/Bundle/combathppanel_7a00de300456c179184ac1f68fccc225.meta

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

二進制
Assets/StreamingAssets/Bundle/combatroot_1e0aa2f6e94bcb2b0a9c939b1e3f77ec


+ 7 - 0
Assets/StreamingAssets/Bundle/combatroot_1e0aa2f6e94bcb2b0a9c939b1e3f77ec.meta

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

二進制
Assets/StreamingAssets/Bundle/combinefontmat_9418c57363fa67377dece9fa401af8f7


二進制
Assets/StreamingAssets/Bundle/defaultpbr_dbc74b2ff1b5d876f1f45f76412e315c


+ 7 - 0
Assets/StreamingAssets/Bundle/defaultpbr_dbc74b2ff1b5d876f1f45f76412e315c.meta

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

二進制
Assets/StreamingAssets/Bundle/dropconfig_86f3c0289d7d78db44c80425f795bec3


+ 7 - 0
Assets/StreamingAssets/Bundle/dropconfig_86f3c0289d7d78db44c80425f795bec3.meta

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

二進制
Assets/StreamingAssets/Bundle/dropgroupconfig_ad1df89094c87de25e1828eb27576a3d


+ 7 - 0
Assets/StreamingAssets/Bundle/dropgroupconfig_ad1df89094c87de25e1828eb27576a3d.meta

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

二進制
Assets/StreamingAssets/Bundle/fb010shader_322f3a802f144a3fcdf7707e32a59384


+ 7 - 0
Assets/StreamingAssets/Bundle/fb010shader_322f3a802f144a3fcdf7707e32a59384.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_204_sk1_sf_729a98f64b079e29fb65732c54f3d910


二進制
Assets/StreamingAssets/Bundle/fx_403_banyuan_glow_53afcfe71d9c66359660f734cd78da5c


二進制
Assets/StreamingAssets/Bundle/fx_603_sk3_hit_e9d8bb08df19b8bece29bcf012969d2c


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_603_sk3_hit_e9d8bb08df19b8bece29bcf012969d2c.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_down_zb_blue_7001a883d7c6c517f82b8d59706c00be


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_gold_e85c815c4260822c90543f09a5ebae79


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_green_b38ec09a1d8d35d3c788cb67c5b9d3a8


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_gz_blue_effe6b314867abaa8037856ac15d4a9b


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_gz_gold_ed5c9f6f0b3099bb0f3f757258a89240


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_gz_green_7d41bc33d081d8b5b29a54c5df221382


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_gz_orange_55862734c5af73c4a1c46e0572f39d57


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_gz_purple_e17150bcfa7ee94ca61016e11d075f01


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_orange_6865369e9696de55f9af3a4660a70ad3


二進制
Assets/StreamingAssets/Bundle/fx_down_zb_purple_f052af6e66fd5a56d341df4b832b478b


二進制
Assets/StreamingAssets/Bundle/fx_fireball_ad_eb9d70e93bbc0e2db13ce388067327bf


二進制
Assets/StreamingAssets/Bundle/fx_glow1_a7526e7fbe19a877b150e5bbcb05f790


二進制
Assets/StreamingAssets/Bundle/fx_glow1_al_1f7942630fa860c6814fcd09f2cdb305


二進制
Assets/StreamingAssets/Bundle/fx_glow2_0e3093d4f2b8c418e6b7e178b3e88c87


二進制
Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_9719fd44569ef9a74ee29d2574a5e75b


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_9719fd44569ef9a74ee29d2574a5e75b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Ci8e5H+vBnPt6mWw84SWFN+5KKtkI8MS4/JuvesRZFnioxHJ6frqW+8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_hit_16abb26b380c424e2394fbcafb6f6a26


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gongjian_sk_zd_hit_16abb26b380c424e2394fbcafb6f6a26.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_guaiwu01_at_hit_e5a70fe169d978d33c0f4c20a70ed3d2


二進制
Assets/StreamingAssets/Bundle/fx_guaiwu01_die_09ad21f942c22e817910272f3db0786a


二進制
Assets/StreamingAssets/Bundle/fx_guaiwu01_sk_hit_4b87da5e5405a21d9786fb591e3693e1


二進制
Assets/StreamingAssets/Bundle/fx_guaiwu01_suikuai_b7bf28d923afb55835805cdb03ca66a4


二進制
Assets/StreamingAssets/Bundle/fx_guaiwu02_die_62e19bf36fbcd3d9e3dc1ff4fa5b1db3


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwu02_die_62e19bf36fbcd3d9e3dc1ff4fa5b1db3.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_guaiwu03_die_babf2013c25fb5c7e640441b777caada


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwu03_die_babf2013c25fb5c7e640441b777caada.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_guaiwu04_die_211e00a977dcb8127fe7ac68e38ca8ae


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwu04_die_211e00a977dcb8127fe7ac68e38ca8ae.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_guaiwu05_die_fe673787457e28a49f07d5ba763e142d


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwu05_die_fe673787457e28a49f07d5ba763e142d.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss01_at_sf1_546ae1637efb84398154f15ef35a69d1


二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss01_at_sf2_be3fd8954840a1a3a943fc8f2d72a88b


二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss01_die_fc40a235ca4578e521bffcf2a5467c81


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwuboss01_die_fc40a235ca4578e521bffcf2a5467c81.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHxNt3+sU3hD++m/3sL2IZydj8M610OYsgeHE+CTXH+MHje3MAmw2U0=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss01_sk2_880164ed3a5d38e459d37869b16131df


二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_at_hit_96b8af92c7e09b3f3077166dba08064b


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_at_hit_96b8af92c7e09b3f3077166dba08064b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHgf43uvASot8WCKb9QzSj/53PGPLz+NboyddHd7A3F4hlyGAoHSm8s=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_die_13db4d890ec0e1551376b6e216b8662a


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_die_13db4d890ec0e1551376b6e216b8662a.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Bn4f4Hv4U3g4b57mhRsY+B/zdWC8NFUUswaHOz+7KsLI4tLnYuznoDY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk1_sf1_73ce1360e9c2b1e7a0daa6f9160b59dd


二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk1_sf2_6975a68663e83c0a98f2b8f6146d1390


二進制
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk3_fe8c3b01496620913f54be9fafa1c863


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_guaiwuboss02_sk3_fe8c3b01496620913f54be9fafa1c863.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WX8asCyvAC62H+CXDey3/qh9fAJBDeUbTpUH4FsBuMW107+rp+XMBcA=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_gw05_zd_058be79c7db1545cf2b740ed96c69182


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gw05_zd_058be79c7db1545cf2b740ed96c69182.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_gw05_zd_hit_466c9f49ff7f7138e9d8c049678d36fa


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gw05_zd_hit_466c9f49ff7f7138e9d8c049678d36fa.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnkdvCP4AHhCSUrBSHkvzWXykAuUhGop9Vn6TCTLR/aFauKqj/3nRw4=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_gw_chuxian_dust_a109e2beb91f4499b2a314aec6e1bf54


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gw_chuxian_dust_a109e2beb91f4499b2a314aec6e1bf54.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnIYvXirVSpW+9jW/YvWgy/KpuegRRnBLVCaPlXzgqAEwXC6rwwJ5Vk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_011533297416e96d8eba49e2368ba71d


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_011533297416e96d8eba49e2368ba71d.meta

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

二進制
Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_gw03_ab5aec101735a3fa1ecae4e264777277


+ 7 - 0
Assets/StreamingAssets/Bundle/fx_gw_chuxian_smoke_gw03_ab5aec101735a3fa1ecae4e264777277.meta

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

Some files were not shown because too many files changed in this diff