Merge branch 'tr/bugfix-qa' into cn/develop

熊润斐
2 parents c6c2b828 427520d2
Showing 7 changed files with 38 additions and 14 deletions Show diff stats
src/GlobalVar.lua
src/adv/Adv.lua
src/csvdata
src/models/Activity.lua
src/models/Diner.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
@@ -155,6 +155,23 @@ TimeReset = {
 	DrawType3 = 19, -- 魔法 抽卡加成
 }
  
+-- TimeReset 索引数组
+TimeResetArray = {
+	"CrossDay",  --通用跨天
+	"CrossWeek",  --通用跨周
+	"DinerRank",  -- 餐厅排行榜
+	"PvpRank",  -- pvp排行榜
+	"PvpHight",  --高级竞技场
+	"PvpCross",  -- 跨服竞技场
+	"PvpShop", -- 竞技场商城
+	"DailyBattle2", -- 特殊-每日副本（贴纸）
+	"DailyBattle1", -- 特殊-每日副本（装备）
+	"DailyBattle3", -- 特殊-每日副本（时钟箱）
+	"DrawType1", -- 变异 抽卡加成
+	"DrawType2", -- 通常 抽卡加成
+	"DrawType3", -- 魔法 抽卡加成
+}
+
 GuideStep = {
 	AdvGuide = 41,
 	AdvRelay = 42,
@@ -327,6 +344,7 @@ MailId = {
 	CBBackAward = 243,
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
+	MyCardBuy = 300,
 }
  
 TriggerEventType = {
@@ -1587,7 +1587,7 @@ local function doChooseEffect(self, effectStr, room, block, tag, chooseData)
 			for _, v in ipairs(diceCsv) do
 				local status, okCount = checkChooseCondFunc(self, v.cond, room, block, tag .. " dice", chooseData)
 				pool[#pool + 1] = v.weight + okCount * v.weightUp
-				sum = sum + pool[#pool + 1]
+				sum = sum + pool[#pool]
 				if sum >= weight and not needEffect then
 					-- 达成效果
 					needEffect = v.effect
@@ -1613,7 +1613,8 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 	if not chooseData or not chooseData["button".. choose .."cond"] then return end
  	if not checkChooseCondFunc(self, chooseData["button".. choose .."cond"], room, block, tag, chooseData) then return end
 	local clearBlock = chooseData.keep ~= 1
-	clearBlock = clearBlock and doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	local clearBlock_ = doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	clearBlock = clearBlock and clearBlock_
 	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
 	return true, clearBlock
 end
-Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
+Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
@@ -717,8 +717,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify, actId)
-		self:recycleActItem(actId)
 	end
+	self:recycleActItem(actId)
 	if Activity.schema["act".. actType] then
 		if not Activity.schema["act" .. actType][3] then 
 			self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
@@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 		if not isCrossDay then
 			activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
 		end
+		local taskStatus = self.owner:getProperty("dTask")
+		activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
 	end,
 	["crossDay"] = function(self, actType, notify, actId)
 		local actCfg = csvdb["activity_ctrlCsv"][actId]
@@ -201,7 +201,7 @@ function Diner:calSellReward(sell, delta, dishData)
 			upValue[ItemId.Gold] = (upValue[ItemId.Gold] or 0) + buildData.gold_up
 		end
 		if buildData.item_up > 0 then
-			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.gold_up
+			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.item_up 
 		end
 		if buildData and buildData.famous_up > 0 then
 			upValue[-1] = (upValue[-1] or 0) + buildData.famous_up
@@ -1698,7 +1698,7 @@ function RolePlugin.bind(Role)
 		for k , v in pairs(csvdb["shop_rechargeCsv"]) do
 			if not v[pidField] then return "no product" end
 			if v[pidField] == params.product_id then
-				if v.twd ~= tonumber(params.money) then
+				if v.twd * 100 ~= tonumber(params.money) then
 					return "error money"
 				end
 				-- 发现需要的id
@@ -1823,7 +1823,7 @@ function RolePlugin.bind(Role)
 	-- 充值 --
 	--[[
 	request.order = data.out_trade_no
-	request.amount = data.money / 100
+	request.amount = data.money
 	request.game_money = data.game_money
 	request.product_id = data.product_id
 	request.pay_time = data.pay_time
@@ -1845,7 +1845,7 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if (params.is_mycard and rechargeData.twd ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb ~= tonumber(params.amount)) then
+		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then
 			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
@@ -1861,8 +1861,7 @@ function RolePlugin.bind(Role)
  
 		if not status then
 			if params.extension_info == "mycard_web" then
-				-- todo 发邮件
-				skynet.error("mycard_web " .. params.order)
+				self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
 			end
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 				result = "success", reward = reward}))
@@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify)
 	local resetMode = {}
  
 	local response = {}
-	for funcName, resetId in pairs(TimeReset) do
-		if needResetId[resetId] and ResetFunc[funcName] then
-			ResetFunc[funcName](self, notify, response, now)
-			resetMode[funcName] = true
+	for idx = 1, #TimeResetArray do
+		local funcName = TimeResetArray[idx]
+		local resetId = TimeReset[funcName]
+		if resetId then
+			if needResetId[resetId] and ResetFunc[funcName] then
+				ResetFunc[funcName](self, notify, response, now)
+				resetMode[funcName] = true
+			end
 		end
 	end