SCFC 1 год назад
Родитель
Сommit
ee7f98bb95
2 измененных файлов с 44 добавлено и 40 удалено
  1. 4 0
      script/module/battle/BattleLogic.lua
  2. 40 40
      script/module/drawCard/RecommendLineup.lua

+ 4 - 0
script/module/battle/BattleLogic.lua

@@ -2529,6 +2529,10 @@ function onFightEnd(human, result, fightTypeID, param1, combatInfo)
     if not nextBattleConfig then
         showNext = 0
     end
+    
+    if battleID == 3 then
+        showNext = 0
+    end
 
     RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_1105)
 

+ 40 - 40
script/module/drawCard/RecommendLineup.lua

@@ -125,47 +125,47 @@ end
 
 
 function RecommendLineup_UpDate(human)
-    local combatHero,helpList = CombatPosLogic.getCombatHeros(human, CombatDefine.COMBAT_TYPE1)
-    if not combatHero then
-        return
-    end
-
-    local nNewPower = CombatPosLogic.getCombatHeroZDL(human, CombatDefine.COMBAT_TYPE1, true)
-
-    local nIndex = RecommendLineup_GetIndex(nNewPower)
-    if -1 >= nIndex then
-        return
-    end
-
-    local tHeroData = {
-        nPower = nNewPower,
-        data = {},
-    }
-
-    local nLen = 1
-    for _, v in pairs(combatHero) do
-        local heroGrid = HeroLogic.getHeroGridByUuid(human, v)
-        if heroGrid then
-              tHeroData.data[nLen] = {
-                general = {},
-                gemData = {},
-            }
-            HeroGrid.makeHeroSimple(tHeroData.data[nLen], heroGrid, heroGrid.bagIndex, human)
-            nLen = nLen + 1
-        end
-    end
+    -- local combatHero,helpList = CombatPosLogic.getCombatHeros(human, CombatDefine.COMBAT_TYPE1)
+    -- if not combatHero then
+    --     return
+    -- end
+
+    -- local nNewPower = CombatPosLogic.getCombatHeroZDL(human, CombatDefine.COMBAT_TYPE1, true)
+
+    -- local nIndex = RecommendLineup_GetIndex(nNewPower)
+    -- if -1 >= nIndex then
+    --     return
+    -- end
+
+    -- local tHeroData = {
+    --     nPower = nNewPower,
+    --     data = {},
+    -- }
+
+    -- local nLen = 1
+    -- for _, v in pairs(combatHero) do
+    --     local heroGrid = HeroLogic.getHeroGridByUuid(human, v)
+    --     if heroGrid then
+    --           tHeroData.data[nLen] = {
+    --             general = {},
+    --             gemData = {},
+    --         }
+    --         HeroGrid.makeHeroSimple(tHeroData.data[nLen], heroGrid, heroGrid.bagIndex, human)
+    --         nLen = nLen + 1
+    --     end
+    -- end
     
-    for _,v in pairs(helpList) do
-        local heroGrid = HeroLogic.getHeroGridByUuid(human, v)
-        if heroGrid then
-            tHeroData.data[nLen] = {
-                general = {},
-                gemData = {},
-            }
-            HeroGrid.makeHeroSimple(tHeroData.data[nLen], heroGrid, heroGrid.bagIndex, human)
-            nLen = nLen + 1
-        end
-    end
+    -- for _,v in pairs(helpList) do
+    --     local heroGrid = HeroLogic.getHeroGridByUuid(human, v)
+    --     if heroGrid then
+    --         tHeroData.data[nLen] = {
+    --             general = {},
+    --             gemData = {},
+    --         }
+    --         HeroGrid.makeHeroSimple(tHeroData.data[nLen], heroGrid, heroGrid.bagIndex, human)
+    --         nLen = nLen + 1
+    --     end
+    -- end
 
     -- RecommendLineup_UpDateData(human, nIndex, tHeroData)
 end