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

* tr/bugfix-qa: 可能的报错点结算正常删除自动封号输出删掉登入刷新兑换活动商店兑换活动上线检测是否需要刷新修复存在的冒险进不去的玩家兑换商店不刷新bug 新增倍数 bugfix 同单号充值输出 # Conflicts: # src/csvdata

Merge branch 'tr/bugfix-qa' into tr/develop
* tr/bugfix-qa: 可能的报错点结算正常删除自动封号输出删掉登入刷新兑换活动商店兑换活动上线检测是否需要刷新修复存在的冒险进不去的玩家兑换商店不刷新bug 新增倍数 bugfix 同单号充值输出 # Conflicts: # src/csvdata
zhouhaihai
2 parents 20a479b8 5a8b84a1
Showing 11 changed files with 51 additions and 30 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvPassive.lua
src/models/Activity.lua
src/models/Role.lua
src/models/RoleBattle.lua
src/models/RoleChangeStruct.lua
src/models/RolePlugin.lua
@@ -16,6 +16,7 @@ TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date(&quot;!*t&quot;,
 START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
+STRUCT_VERSION = 3 -- 数据结构版本
 MAX_ROLE_NUM = 1000000
 -- 属性枚举
@@ -631,7 +631,7 @@ function _M.endBattleRpc(agent, data)
 		info = msg.info,
 		format = role.__actBattleCache.format
 	}) then
-		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
+		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
 	end
 	role.__actBattleCache = nil
@@ -1030,6 +1030,9 @@ function _M.roleFormatRpc(agent , data)
 	local index = msg.index	-- 阵容索引
 	local title = msg.title -- 阵容名称
 	local team = {}
+
+	if role:getAdvData():isRunning() then return 3 end
+
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
 			return 1
@@ -1072,6 +1075,9 @@ function _M.selectTeamRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local index = msg.index	-- 阵容索引
+
+	if role:getAdvData():isRunning() then return 1 end
+
 	local team = role:getAdvTeamFormat(index)
 	if not next(team) then return end
 	team["index"] = index
@@ -425,7 +425,7 @@ function Adv:forceOver(notNotify)
 				reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
 			end
 		end
-		self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
+		self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}, notNotify = notNotify})
 		self:clear()
 		self.owner:updateProperties({
@@ -1050,7 +1050,7 @@ function Adv:award(gift, params, backRewardParams)
 	local autoUse = {}
 	for itemId, count in pairs(tgift) do
-		if count > 0 then
+		if count > 0 and self.battle.player then
 			local buffAdd = self.battle.player:getRewardChange(itemId)
 			count = math.floor(math.max(0, (count + buffAdd[0]) * (1 + buffAdd[1]))) --附加 buff 的影响
 			self:checkTask(Adv.TaskType.Item, count, itemId)
@@ -60,9 +60,9 @@ function Block:updateEvent(event, isInit)
 		end
 		self:randomEvent()
 	end
-	self:quickDrop()
 	if not isInit and self.isOpen then
+		self:quickDrop()
 		local newet = self:getEventType()
 		if oldet ~= newet then
 			local em = {}
@@ -532,7 +532,7 @@ function Passive:effect8(dropId)
 end
 --9=直接获得item（可在结算触发时使用）
-function Passive:effect9(itemId, triggerPms, ratio, max)
+function Passive:effect9(itemId, triggerPms, ratio, ratio2, max)
 	local cond = nil
 	if self.passiveData.value == 0 then
 		cond = triggerPms.score
@@ -542,7 +542,7 @@ function Passive:effect9(itemId, triggerPms, ratio, max)
 		return
 	end
 	if not cond then return end
-	self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio * ratio2)))}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
 end
 --10=战斗额外掉落次数
@@ -575,6 +575,9 @@ activityFunc[Activity.ActivityType.Exchange] = {
 		actData[actId] = {}
 		self:updateActData(actType, actData, not notify)
 	end,
+	["login"] = function(self, actType, actId)
+		activityFunc[Activity.ActivityType.Exchange]["crossDay"](self, actType, true, actId)
+	end,
 	["crossDay"] = function(self, actType, notify, actId)
 		local actData = self:getActData(actType) or {}
 		local lastTs = actData["ts"] or 0
@@ -583,14 +586,14 @@ activityFunc[Activity.ActivityType.Exchange] = {
 		if not cfg then return end
 		local refreshTimes = cfg.condition2:toArray(false, "=")
 		for i = 1, #refreshTimes do
-			local rt = toUnixtime(refreshTimes[1]..string_format("%02x", RESET_TIME))
+			local rt = toUnixtime(refreshTimes[i]..string_format("%02x", RESET_TIME))
 			if timeNow >= rt and rt > lastTs then
 				lastTs = rt
 				actData = {}
 			end
 		end
-		if next(actData) then
-			actData["ts"] = lastTs
+		if not next(actData) then
+			actData["ts"] = timeNow
 			self:updateActData(actType, actData, not notify)
 		end
 	end,
@@ -57,7 +57,7 @@ Role.schema = {
 	ltime 				= {"number", 0}, -- 最后登录时间
 	ctime 				= {"number", skynet.timex()},  -- 创建时间
 	ignoreMt			= {"number", 0},  -- 忽略维护拦截
-	sversion			= {"number", globalCsv.StructVersion or 0}, -- 重整数据版本
+	sversion			= {"number", STRUCT_VERSION or 0}, -- 重整数据版本
 	timeReset			= {"table", {}}, --重置轮回记录
 	diamond				= {"number", 0},
 	reDiamond			= {"number", 0},
@@ -145,28 +145,28 @@ function Role:checkBattleCheat(battleType, params)
 	local status = checkOneCheat(clientInfo.selfAttr, selfTeamServer, clientInfo.enemyAttr, enemyServer)
 	if not status then
-		local cheatCount = self:getProperty("cheatCount")
-		cheatCount = cheatCount + 1
-		self:setProperty("cheatCount", cheatCount)
+		-- local cheatCount = self:getProperty("cheatCount")
+		-- cheatCount = cheatCount + 1
+		-- self:setProperty("cheatCount", cheatCount)
 		local result = {clientSelf = {}, serverSelf = {}}
-		for k , v in pairs(clientInfo.selfAttr) do
+		for k , v in pairs(clientInfo.selfAttr or {}) do
 			result.clientSelf[tostring(k)] = v
 		end
 		for k , v in pairs(selfTeamServer) do
 			result.serverSelf[tostring(k)] = v
 		end
 		result = json.encode(result)
-		self:mylog("cheat", {desc = battleType, int1 = cheatCount, text1 = result})
+		self:mylog("cheat", {desc = battleType, int1 = 1, text1 = result})
-		for _, v in ipairs(globalCsv.cheat_check) do
-			if cheatCount == v[1] then
-				self:setBan(v[2] / 86400, 5)
-				break
-			end
-		end
+		-- for _, v in ipairs(globalCsv.cheat_check) do
+		-- 	if cheatCount == v[1] then
+		-- 		self:setBan(v[2] / 86400, 5)
+		-- 		break
+		-- 	end
+		-- end
 	end
-	return status
+	return true
 end
 function Role:checkBattle(battleType, params)
@@ -31,6 +31,7 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params)
 	print("awardGift" .. " >>> " .. params)
 end)
+
 local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params)
 	local sudoku = role:getProperty("sudoku")
 	local phase = sudoku[-1] or 1
@@ -65,12 +66,21 @@ local bugFixRune = createVersionFunc(VersionType.DoOnly, function(role, params)
 		-- 补偿
 	end
 end)
+
+-- 清除 player 消失 的冒险
+local bugFixAdvPlayer = createVersionFunc(VersionType.Override, function(role, params)
+	if role:getAdvData():isRunning() and not role:getProperty("advTeam").player then
+		role:getAdvData():forceOver(true)
+	end
+end)
+
 ---------------------版本方法  end   ----------------------
 -- version 罗列start
 local versionList = {} -- version 列表
 versionList[1] = {bugFixSuduku, {}}
 versionList[2] = {bugFixRune, {}}
+versionList[3] = {bugFixAdvPlayer, {}}
 -- versionList[2] = {clearActivity, {5, 7}}
 -- versionList[3] = {changeStructF, "test1"}
 -- versionList[4] = {changeStructF, "test2"}
@@ -87,11 +97,11 @@ function RoleChangeStruct.bind(Role)
 	function Role:changeStructVersion()
 		local curVersion = self:getProperty("sversion")
-		if not globalCsv.StructVersion or curVersion >= globalCsv.StructVersion then return end
+		if not STRUCT_VERSION or curVersion >= STRUCT_VERSION then return end
 		local jumpVersion = {}
 		local versionTemp = {}
-		for version = curVersion + 1, globalCsv.StructVersion do
+		for version = curVersion + 1, STRUCT_VERSION do
 			local versionData = versionList[version]
 			if versionData then
 				if versionData[1].vType == VersionType.DoOnly then
@@ -124,7 +134,7 @@ function RoleChangeStruct.bind(Role)
 			end
 		end
-		for version = curVersion + 1, globalCsv.StructVersion do
+		for version = curVersion + 1, STRUCT_VERSION do
 			if not jumpVersion[version] then
 				local versionData = versionList[version]
 				if versionData[1].vType == VersionType.DoOnly or versionData[1].vType == VersionType.Override then
@@ -134,7 +144,7 @@ function RoleChangeStruct.bind(Role)
 				end
 			end
 		end
-		self:setProperty("sversion", globalCsv.StructVersion)
+		self:setProperty("sversion", STRUCT_VERSION)
 	end
 end
@@ -289,7 +289,7 @@ function RolePlugin.bind(Role)
 			print("addPlayExp no log ", debug.traceback())
 		end
-		self:updateProperties({level = level, exp = newExp})
+		self:updateProperties({level = level, exp = newExp}, params.notNotify)
 		self:changeCrossServerPvpSelfInfo("level")
 	end
@@ -424,7 +424,7 @@ function RolePlugin.bind(Role)
 		end
 		if update then
-			self:updateProperty({field = "boxL", value = boxL})
+			self:updateProperty({field = "boxL", value = boxL, notNotify = pms.notNotify})
 		end
 	end
@@ -886,7 +886,6 @@ function RolePlugin.bind(Role)
 			self:mylog("role_action", {desc = "ban_rm"})
 		else
 			self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
-			print(86400 * time)
 			self:setProperty("banTime", math.ceil(now + 86400 * time))
 			self:setProperty("banType", banType)
 			self:resetRank()
@@ -1741,6 +1740,9 @@ function RolePlugin.bind(Role)
 		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
 		if orderObject:getProperty("finishTime") > 0 then
+			skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
+				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
+			))
 			return false, "finsh"
 		end
@@ -1789,7 +1791,6 @@ function RolePlugin.bind(Role)
 		local roleId = self:getProperty("id")
 		local partnerOrderStr = params.order
-
 		local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
 		if not status then
 			if back == "finsh" then