DESKTOP-FB72PO8\Administrator 2 日 前
コミット
8458714903

+ 64 - 0
Assets/Res/Config/BuffConfig.json

@@ -223,6 +223,70 @@
       "isTeam": 0,
       "abyssBuffType": 0,
       "scriptsName": "b_1007"
+    },
+    {
+      "ID": 10081,
+      "nameTest": "封禁",
+      "decTest": "法宝封禁不能充能,不能使用",
+      "Rare": null,
+      "opposite": 1,
+      "icon": "icon_buff1",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1008,
+      "overlayCount": 1,
+      "effectValue": [
+        0.0
+      ],
+      "graduallyDecrease": 20,
+      "Power": 0,
+      "timeType": 1,
+      "effectIndex": [
+        0
+      ],
+      "buffTime": 9.0,
+      "buffType": 2,
+      "attentionType": 0,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsStopSmallSkill": 0,
+      "IsHideIcon": 0,
+      "EnableType": 0,
+      "isTeam": 0,
+      "abyssBuffType": 0,
+      "scriptsName": "b_1008"
+    },
+    {
+      "ID": 10091,
+      "nameTest": "五行混乱",
+      "decTest": "敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算",
+      "Rare": null,
+      "opposite": 1,
+      "icon": "icon_buff1",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1009,
+      "overlayCount": 1,
+      "effectValue": [
+        0.0
+      ],
+      "graduallyDecrease": 20,
+      "Power": 0,
+      "timeType": 1,
+      "effectIndex": [
+        0
+      ],
+      "buffTime": 9.0,
+      "buffType": 2,
+      "attentionType": 0,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsStopSmallSkill": 0,
+      "IsHideIcon": 0,
+      "EnableType": 0,
+      "isTeam": 0,
+      "abyssBuffType": 0,
+      "scriptsName": "b_1009"
     }
   ]
 }

+ 7 - 0
Assets/Res/Config/GroupConfig.json

@@ -20,6 +20,13 @@
       "GroupMonster": [
         9103
       ]
+    },
+    {
+      "ID": 100004,
+      "GroupMonsterLevel": -1,
+      "GroupMonster": [
+        9201
+      ]
     }
   ]
 }

+ 10 - 0
Assets/Res/Config/LevelbattleConfig.json

@@ -29,6 +29,16 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 100004,
+      "Group": [
+        100004
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

+ 1 - 1
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -54,7 +54,7 @@ namespace GameLogic.Combat
 
         public async CTask LoadLevelBattleCombat(int levelBattleId, System.Action<bool> caombatFinish)
         {
-        
+            levelBattleId = 100004;
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;
             if (levelBattleCombatType != null)
             {

+ 5 - 0
Assets/Scripts/GameUI/UI/CombatPanel/BossHpWidget.cs

@@ -93,6 +93,11 @@ namespace Fort23.Mono
                     for (int i = 0; i < combatHeroSkillControl.SkillTurntable.allSkillSlots.Count; i++)
                     {
                         SkillSlots skillSlots = combatHeroSkillControl.SkillTurntable.allSkillSlots[i];
+                        if (skillSlots.SkillBasic != null && skillSlots.SkillBasic.SelfSkillConfig.SkillType != 1)
+                        {
+                            continue;
+                        }
+
                         float angle = skillSlots.GetFinishAngle();
                         if (angle <= minA && !showSkillSlots.Contains(skillSlots))
                         {

BIN
Excel2Json/Excel/Buff.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx