烟花邮件，金币经验加成

script/module/bag/BagLogic.lua

@@ -326,6 +326,7 @@ function sendItemGetList1(human, list, logStr)
 		end
 		local itemID = list[i][1]
 		local itemCnt = list[i][2]
+		itemCnt=calculateBonusItemCount(human,itemID,itemCnt)
         if not ItemDefine.isEquip(itemID) then
         	cnt = cnt + 1
 			--Grid.makeItem(msgRet.list[cnt], itemID, itemCnt)
@@ -351,7 +352,7 @@ function sendItemGetList2(human, list, logStr)
 		if cnt >= #msgRet.list then
 			break
 		end
-
+		itemCnt=calculateBonusItemCount(human,itemID,itemCnt)
         if not ItemDefine.isEquip(itemID) then
 			cnt = cnt + 1
 			--Grid.makeItem(msgRet.list[cnt], itemID, itemCnt)

script/module/topup/TopupLogic.lua

@@ -25,8 +25,8 @@ TOPUP_LIBAO_ID1 = 1   --盲盒礼包
 TOPUP_LIBAO_ID2 = 2   --铂金周卡
 TOPUP_LIBAO_ID3 = 3   --365王卡
 local MAX_FIREWORKS_DURATION = 43200
-local YanhuaEmail = 7012
-local ItemId=1022
+local YANHUA_EMAIL = 7012 --烟花邮箱
+local ITEMID=1022  --烟花道具ID
 --封装直购基本信息
 local function wrapTopupItem(net, config, human)
 	net.id = config.id	
@@ -77,14 +77,13 @@ function sendFireworksMail(human, price)
 	if 0 >= nFireWorksCount then
 		return
 	end
-	local mailCfg = MailExcel.mail[YanhuaEmail]
+	local mailCfg = MailExcel.mail[YANHUA_EMAIL]
 	local title = mailCfg.title
 	local content = mailCfg.content
 	local senderName = mailCfg.senderName
     local items = {
-        {ItemId,nFireWorksCount}  -- 1022是烟花的道具ID
+        {ITEMID,nFireWorksCount}  -- 1022是烟花的道具ID
     }
-
     -- 调用邮件管理器发送邮件
     MailManager.add(MailManager.SYSTEM, human.db._id, title, content, items, senderName)
 end
@@ -99,7 +98,7 @@ end
 --给客户端下发结束时间//定义的协议时间 //当客户端有点击请求的时候
 function DurationofBonus(human)
 	local tMsgData = Msg.gc.GC_FIREWORKS_QUERY
-	local nowBufferDuration=CommonDB.getFireWorksBonusTime()-os.time()
+	local nowBufferDuration = CommonDB.getFireWorksBonusTime()-os.time()
 	tMsgData.buffDuration = math.max(0,nowBufferDuration)
 	Msg.send(tMsgData, human.fd)
 end
@@ -125,11 +124,11 @@ function Addtime(human, fireworksCount)
 	end
     CommonDB.setFireWorkBonusTime(newEndTime)
 	local tMsgData = Msg.gc.GC_FIREWORKS_SHOW
-	local nowBuffDuration=CommonDB.getFireWorksBonusTime()-os.time()
+	local nowBuffDuration = CommonDB.getFireWorksBonusTime()-os.time()
 	tMsgData.buffDuration = math.max(0,nowBuffDuration)
 	tMsgData.playerName = human.db.name
 
-    -- 下发时间给客户端时间和玩家名称
+    -- 下发时间和玩家名称
 	for _, human in pairs(ObjHuman.onlineUuid) do
 		if human and human.fd then
 		    Msg.send(tMsgData, human.fd)

script/module/voucher/VoucherShopLogic.lua

@@ -366,9 +366,10 @@ function VoucherShop_BuyItem(human, nBuyID)
         price = tTrueBuyConfig.CN
     }
     BuyLogic.buy(human, tBuyInfo)
-    if nDelVoucherNum >= 100 then
-        TopupLogic.sendFireworksMail(human, nDelVoucherNum)
-    end
+    -- local voucherDenomination = tTrueBuyConfig.CN
+    -- if voucherDenomination >= 100 then
+    --     TopupLogic.sendFireworksMail(human, nDelVoucherNum)
+    -- end
     YunYingLogic.sendIconUpdate(VOUCHERSHOP_ACTID, human)
     
     -- 写日志