gitxsm 2 週間 前
コミット
44aa4beb9c

+ 1 - 1
script/module/absAct/Proto.lua

@@ -1355,7 +1355,7 @@ CG_CYCLHEROSENDGIFT_QUERY = {
 }
 
 GC_CYCLHEROSENDGIFT_QUERY = {
-    {"gridList",                 30,      GIFT_INFO},
+    {"gridList",                 40,      GIFT_INFO},
 }
 
 -- 领奖

+ 3 - 1
script/module/combat/CombatObj.lua

@@ -76,6 +76,7 @@ function initAfterStart()
 		obj.extraCombatRecord = nil --战斗中额外统计的数据
 		obj.delayAddBuffer = nil
 		obj.normalTarget = nil
+		obj.miehunBanReviveUntilRound = nil
 	end
 	
 	for pos = 1,CombatDefine.COMBAT_HELP_ALL_CNT do
@@ -153,7 +154,8 @@ function init(obj)
     obj.sex 			= nil
 	obj.normalTarget 	= nil
     obj.notSkillBaoJi	= nil
-    obj.notBaoJi        = nil	
+    obj.notBaoJi        = nil
+	obj.miehunBanReviveUntilRound = nil
 	for k in pairs(obj.buffer) do
 		obj.buffer[k] = nil
 	end

+ 2 - 1
script/module/topup/BuyLogic.lua

@@ -232,7 +232,8 @@ function fontBuyItem(human, net, buyID)
 		net.voucher = conf.Voucher
 		-- net.productId = conf.productid
 		net.productId = getRealProductId(human, buyID, region)
-		net.disableVoucher = conf.disableVoucher or 1
+		-- net.disableVoucher = conf.disableVoucher or 1
+		net.disableVoucher = isExcludedAccRechargeId(buyID) and 1 or 0
 		if conf.module and conf.module ~= "" then
 			local tModule = load("return require(\"" .. conf.module .. "\")")()
 			if tModule and tModule.GetRemainNum then

+ 1 - 1
script/module/voucher/VoucherSpecialOffer.lua

@@ -87,7 +87,7 @@ function onCharge(human, buyId, buyNum)
 
     local giftCfg = getCfg(buyId)
     if not giftCfg then
-        return Broadcast.sendErr(human, Lang.COMMON_COMFIG_ERROR)
+        return
     end
 
     buyNum = buyNum or 1