zhanwencai 1 vuosi sitten
vanhempi
sitoutus
f62b390d08
2 muutettua tiedostoa jossa 21 lisäystä ja 4 poistoa
  1. 2 3
      script/module/drawCard/DrawCardLogic.lua
  2. 19 1
      script/module/hero/HeroDefine.lua

+ 2 - 3
script/module/drawCard/DrawCardLogic.lua

@@ -322,9 +322,8 @@ end
 -- 获取剩余广告观看次数
 function getResetAdCnt(human)
     local adRewardCnt = human.db.adRewardCnt or 0
-
-    if adRewardCnt == 4 then 
-        human.db.adRewardCnt = 0 
+    if human.db.adRewardCnt > 3 then 
+        human.db.adRewardCnt = 0
     end
     return math.max(AD_RESET_FREECNT - adRewardCnt, 0)
 end

+ 19 - 1
script/module/hero/HeroDefine.lua

@@ -156,12 +156,30 @@ function getRandHeroByWeightLv(weightLv)
 end
 
 function getRandHeroByGradeAndCamp(grade, camp)
+    local heroId = nil
     if GRADEHEROS[camp] then
         if GRADEHEROS[camp][grade] then
             local gradeIndex = math.random(1, #GRADEHEROS[camp][grade])
-            return GRADEHEROS[camp][grade][gradeIndex]
+            heroId =  GRADEHEROS[camp][grade][gradeIndex]
         end
     end
+
+    if heroId ~= nil then
+        return heroId
+    end
+
+    local isHasHeroList = {}
+    for k, v in pairs(GRADEHEROS) do
+        local isHasHero = GRADEHEROS[k][grade]
+        if isHasHero then
+            isHasHeroList[#isHasHeroList + 1] = k
+        end
+    end
+
+    local r = math.random(1,#isHasHeroList)
+    local newCamp = isHasHeroList[r]
+    local gradeIndex = math.random(1, #GRADEHEROS[newCamp][grade])
+    return GRADEHEROS[newCamp][grade][gradeIndex]
 end
 
 function getRandHeroByWeightLvAndCamp(weightLv, camp)