1.修改闯关主题 2.修改代金券bug

script/module/battle/BreakThroughTheme.lua

@@ -198,7 +198,11 @@ local function getBreakThroughReward(human)
     BagLogic.addItemList(human, itemList, LOGTYPE)
 
     redDotUpdate(human)
-    entranceCloseCheck(human)
+    if ModuleisOpen(human) then
+        BreakThrough_BreakThroughReward_Query(human)(human)
+    else
+        entranceCloseCheck(human)
+    end
 end
 
 -- 领取所有进阶奖励
@@ -214,7 +218,12 @@ local function getAdvancedReward(human)
     BagLogic.addItemList(human, itemList, LOGTYPE)
 
     redDotUpdate(human)
-    entranceCloseCheck(human)
+
+    if ModuleisOpen(human) then
+        BreakThrough_AdvancedReward_Query(human)
+    else
+        entranceCloseCheck(human)
+    end
 end
 
 -- 通知客户端弹出提示
@@ -254,7 +263,7 @@ function ModuleisOpen(human)
         end
     end
 
-    local advanceRewardGetList = breakThroughData.breakThroughGetList
+    local advanceRewardGetList = breakThroughData.advanceRewardGetList
     for k in ipairs(BreakThroughThemeConfig.advancedReward) do
         if not advanceRewardGetList[k] then
             return true
@@ -318,6 +327,8 @@ function charge(human, nAllPrice, buyID)
 
     -- 红点
     redDotUpdate(human)
+
+    BreakThrough_AdvancedReward_Query(human)
 end
 
 -- 通关新的关卡了
@@ -418,7 +429,7 @@ function BreakThrough_AdvancedReward_Query(human)
     local var = BreakThroughThemeConfig.var[1]
     local advancedRewardCfg = BreakThroughThemeConfig.advancedReward
 
-    local msgRet = Msg.gc.GC_BREATHROUGHTHEME_BREAKTHROUGHREWARD_QUERY
+    local msgRet = Msg.gc.GC_BREATHROUGHTHEME_ADVANCEDREWARD_QUERY
     msgRet.list[0] = 0
     BuyLogic.fontBuyItem(human, msgRet.buyItem, var.buyId)
     msgRet.buyState = 0
@@ -435,7 +446,7 @@ function BreakThrough_AdvancedReward_Query(human)
         msgRet.list[k].condDays = v.condDay
         Grid.makeItem(msgRet.list[k].reward, v.reward[1], v.reward[2])
 
-        if advanceRewardGetList and advanceRewardGetList.getList[k] then
+        if advanceRewardGetList and advanceRewardGetList[k] then
             msgRet.list[k].rewardStage = 2
         else
             if msgRet.buyState == 1 and (breakThroughData and breakThroughData.loginDays or 0) >= v.condDay then

script/module/voucher/VoucherShopLogic.lua

@@ -408,7 +408,7 @@ function VoucherShop_BuyItem(human, nBuyID, nBuyNum)
         return
     end
 
-    if tTrueBuyConfig.module then
+    if tTrueBuyConfig.module and tTrueBuyConfig.module ~= "" then
         local tModule = load("return require(\"" .. tTrueBuyConfig.module .. "\")")()
         if tModule and tModule.GetRemainNum then
             local nTrueNum = tModule.GetRemainNum(human, nBuyID)