Browse Source

修改bug

DESKTOP-FB72PO8\Administrator 9 giờ trước cách đây
mục cha
commit
15a56c77f3

+ 6 - 1
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3301.cs

@@ -40,8 +40,13 @@ namespace GameLogic.Combat.Skill.MagicSkill
         private void Finish()
         {
             CombatHeroEntity combatHeroEntity = target;
+            if (combatHeroEntity == null)
+            {
+                return;
+            }
+
             ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
-            if (lifetCycleHitPoint == null)
+            if (lifetCycleHitPoint == null||combatHeroEntity.heroMagicWeaponControl==null||CombatMagicWeaponEntity.RootMagicWeaponControl==null)
             {
                 return;
             }

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9013.cs

@@ -129,6 +129,8 @@ namespace GameLogic.Combat.Skill
                     for (int i = 0; i < allFxAi.Count; i++)
                     {
                         SkillFeaturesData mySkillFeaturesData = GetSkillFeaturesData();
+                        if(mySkillFeaturesData==null)
+                            continue;
                         FxParabolaBulletLogic fxParabolaBulletLogic = allFxAi[i] as FxParabolaBulletLogic;
                         fxParabolaBulletLogic.PengZhuang(mySkillFeaturesData, CombatHeroEntity);
                     }

+ 5 - 0
Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -175,6 +175,11 @@ namespace GameLogic.Combat.Skill
 
         public SkillFeaturesData GetSkillFeaturesData()
         {
+            if (SkillFeaturesData == null || CombatHeroEntity.CurrCombatHeroInfo == null)
+            {
+                return null;
+            }
+
             SkillFeaturesData skillFeaturesData = SkillFeaturesData.CapyFeaturesData();
 
             long v = (long)(skillFeaturesData.hp * CombatHeroEntity.CurrCombatHeroInfo.GetWuXingShuXing(wuXingType));

+ 6 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -141,6 +141,12 @@ namespace Common.Combat.FxAILogic
                     triggerData);
                 SkillBasic skillBasic = trigger as SkillBasic;
                 SkillFeaturesData = skillBasic.GetSkillFeaturesData();
+                if (SkillFeaturesData == null)
+                {
+                    Dispose();
+                    return;
+                }
+
                 SkillFeaturesData.FxAILogicBasic = this;
             }
 

+ 7 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -244,6 +244,13 @@ namespace Common.Combat.FxAILogic
 
         public void PengZhuang(SkillFeaturesData targetSkillFeaturesData, CombatHeroEntity targetCombatHeroEntity)
         {
+            if (targetSkillFeaturesData == null)
+            {
+                PlayPengZhuangHit();
+                Dispose();
+                return;
+            }
+
             CombatCalculateTool.Instance.GongFaPengZhuang(SkillFeaturesData, targetSkillFeaturesData, CombatHeroEntity,
                 targetCombatHeroEntity);
             if (SkillFeaturesData.hp <= 0)

+ 0 - 7
Assets/StreamingAssets/assetBundle.zip.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: