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

* tr/bugfix-qa: 获得所有SSR 且满级满觉醒同时获得全部满级金色铭文满精进充值mycard 拾荒bug pvp 匹配和失败扣减积分无论什么方式翻开中继层格子都给奖励跨天礼包重置月重置跨月拾荒失败也记录积分编队世界聊天等级15判断活动卡池结束回馈次数通关邮件折算碎片功能注释第一次通关拾荒章节推送限时礼包，活动卡池结束回馈次数通关邮件折算碎片 # Conflicts: # src/adv/Adv.lua

Merge branch 'tr/bugfix-qa' into tr/develop
* tr/bugfix-qa: 获得所有SSR 且满级满觉醒同时获得全部满级金色铭文满精进充值mycard 拾荒bug pvp 匹配和失败扣减积分无论什么方式翻开中继层格子都给奖励跨天礼包重置月重置跨月拾荒失败也记录积分编队世界聊天等级15判断活动卡池结束回馈次数通关邮件折算碎片功能注释第一次通关拾荒章节推送限时礼包，活动卡池结束回馈次数通关邮件折算碎片 # Conflicts: # src/adv/Adv.lua
zhouhaihai
2 parents b23cd820 7cd7fd53
Showing 11 changed files with 138 additions and 49 deletions Show diff stats
src/GlobalVar.lua
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/models/Activity.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
src/models/RoleTask.lua
src/models/RoleTimeReset.lua
src/utils/CommonFunc.lua
@@ -142,7 +142,6 @@ ItemId = {
 TimeReset = {
 	CrossDay = 1,  --通用跨天
 	CrossWeek = 2,  --通用跨周
-	CrossMonth = 1, --通用跨月  索引使用跨天，在回调方法中判断是否跨越 跨月的前置条件是跨天
 	DinerRank = 1,  -- 餐厅排行榜
 	PvpRank = 2,  -- pvp排行榜
 	PvpHight = 11,  --高级竞技场
@@ -326,6 +325,7 @@ MailId = {
 	PayBackAward = 242,
 	CBBackAward = 243,
 	CBBackAward2 = 244,
+	ActivityPoolRet = 280,
 }
 TriggerEventType = {
@@ -247,6 +247,7 @@ table.insert(helpDes, {&quot;获得所有零件&quot;, &quot;get&quot;, &quot;RUNE&quot;})
 table.insert(helpDes, {"获得所有碎片", "get", "FRAG"})
 table.insert(helpDes, {"获得所有食物", "get", "FOOD"})
 table.insert(helpDes, {"获得所有角色", "get", "HERO"})
+table.insert(helpDes, {"获得满级满觉醒角色,满级满精进铭文", "get", "MAXHERO"})
 function _M.get(role, pms)
 	if pms.pm1 == "ALL" then
 		local reward = {}
@@ -263,7 +264,7 @@ function _M.get(role, pms)
 			end
 		end
 	elseif pms.pm1 == "RUNE" then
-		for itemId = 2000 , 3000 do
+		for itemId = 10000 , 20000 do
 			if csvdb["itemCsv"][itemId] then
 				role:award({[itemId] = 1}, {log = {desc = "gm"}})
 			end
@@ -286,6 +287,36 @@ function _M.get(role, pms)
 				role:award({[itemId] = 1}, {log = {desc = "gm"}})
 			end
 		end
+	elseif pms.pm1 == "MAXHERO" then
+		-- 给英雄
+		for itemId = 400 , 700 do
+			if csvdb["itemCsv"][itemId] then
+				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+			end
+		end
+		-- 升满级
+		for _, hero in ipairs(role.heros) do
+			hero:updateProperty({field = "level", value = 140})
+			hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]})
+		end
+
+		-- 添加铭文
+		for itemId = 10000 , 20000 do
+			if csvdb["itemCsv"][itemId] then
+				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+			end
+		end
+		for _, rune in ipairs(role.runeBag) do
+			local typ = rune:getProperty("type")
+			local id = rune:getProperty("id")
+
+			local runeSet = csvdb["runeCsv"][typ]
+			if not runeSet then break end
+			local runeData = runeSet[id]
+			if not runeData then break end
+
+			rune:updateProperty({field = "level",value = runeData.lvLimit})
+		end
 	else
 		local itemId = tonum(pms.pm1)
 		if not csvdb["itemCsv"][itemId] then
@@ -561,6 +592,12 @@ function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
+-- 获取订单号
+function _M.getPurchaseOrder(role, params)
+	return role:getPurchaseOrderByPlatform(params) or ""
+end
+
+
 function _M.cz(role, pms)
 	local id = tonum(pms.pm1)
 	local csvData = csvdb["shop_rechargeCsv"][id]
@@ -157,6 +157,7 @@ function _M.loginRpc( agent, data )
 	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
 	role:changeStructVersion() -- 数据结构 版本更新
+	role:getAdvData(true) -- 清掉不合格的数据
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
 	-- 跨天登陆事件
@@ -1052,6 +1053,10 @@ function _M.chatRpc(agent, data)
 				result = 1
 				return
 			end
+			if role:getProperty("level") < (globalCsv.chat_level or 15) then
+				result = 3
+				return
+			end
 			role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0}  --第一次开始说话时间  从第一次说话次数  能说话的时间
@@ -20,8 +20,6 @@ function Adv:ctor(owner)
 	self.advTask = self.owner:getProperty("advTask")
 	self.advMTask = self.owner:getProperty("advMTask")
 	self.advTaskChange = false -- 任务改变才更新
-
-	self:initByInfo(self.owner:getProperty("advInfo"))
 end
 function Adv:mylog(contents)
@@ -36,7 +34,8 @@ function Adv:mylog(contents)
 end
 --初始化adv 信息
-function Adv:initByInfo(advInfo)
+function Adv:initByInfo()
+	local advInfo = self.owner:getProperty("advInfo")
 	if not next(advInfo) then return end --还没有 开始新地图
 	self.chapterId = advInfo.chapterId
@@ -407,10 +406,9 @@ function Adv:isRunning()
 	return false
 end
--- 强制结束
-function Adv:forceOver(notNotify)
-	if self:isRunning() then
-		
+-- 强制结束  逻辑和adv内部无关
+function Adv:forceOver(notNotify, force)
+	if self:isRunning() or force then
 		local advTeam = self.owner:getProperty("advTeam")
 		advTeam.player = nil
@@ -895,25 +893,27 @@ function Adv:over(success, rewardRatio, overType)
 		if not self:isEndless() and self.level >= chapterData.limitlevel then
 			self.owner:checkTaskEnter("AdvAllPass", {id = self.chapterId})
 		end
+	end
-		local roleId = self.owner:getProperty("id")
-		local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
-		if score > oldMaxScore and not self.actid then
-			local team = self.owner:getProperty("advTeam")
-			local curInfo = {
-				name = self.owner:getProperty("name"),
-				headId = self.owner:getProperty("headId"),
-				lv = self.owner:getProperty("level"),
-				batteV = self.owner:getTeamBattleValue(team.heros),
-				chapter = self.chapterId,
-				format = self.owner:getTeamHerosInfo(team).heros,
-			}
-			redisproxy:pipelining(function (red)
-				red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
-				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
-			end)
-		end
+
+	local roleId = self.owner:getProperty("id")
+	local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
+	if score > oldMaxScore and not self.actid then
+		local team = self.owner:getProperty("advTeam")
+		local curInfo = {
+			name = self.owner:getProperty("name"),
+			headId = self.owner:getProperty("headId"),
+			lv = self.owner:getProperty("level"),
+			batteV = self.owner:getTeamBattleValue(team.heros),
+			chapter = self.chapterId,
+			format = self.owner:getTeamHerosInfo(team).heros,
+		}
+		redisproxy:pipelining(function (red)
+			red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
+			red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
+		end)
 	end
+	
 	-- 通关的时候要把引导步骤设定到成就引导
 	if not self.owner:checkOverGuide(57) then
 		self.owner:saveGuide(57,1,true)
@@ -1224,6 +1224,11 @@ local function clickOut(self, room, block, params, isExit)
 			else
 				if self.level > (advPass[self.chapterId] or 0) then
 					self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}})
+
+				if (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
+					self.owner:checkTaskEnter("AdvPassFirst", {id = self.chapterId})
+				end
+
 				end
 			end
@@ -1821,9 +1826,6 @@ function Adv:clickBlock(roomId, blockId, params)
 	if not block.isOpen then
 		if self.isRelay or checkAroundBlocks() then --开放
 			self:getCurMap():openBlock(roomId, blockId, true, true)
-			if self.isRelay and self:getCurMap():isAllOpen() then  -- 发放翻开的奖励
-				self:passAdvRelay()
-			end
 			status = true
 		end
 	else
@@ -272,6 +272,10 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
+		
+		if self.adv.isRelay and self:isAllOpen() then  -- 发放翻开的奖励
+			self.adv:passAdvRelay()
+		end
 	end
 	return status
 end
@@ -622,6 +622,12 @@ activityFunc[Activity.ActivityType.ActHeroPool] = {
 		local actData = self:getActData(actType)
 		local cfg = csvdb["activity_ctrlCsv"][actId]
 		if not cfg then return end
+		-- 保底次数转换成万能碎片
+		--local count = math.ceil(((actData[cfg.condition] or 0) / 100) * 60)
+		--if count > 0 then
+		--	local gift = {[723] = count}
+		--	self.owner:sendMail(MailId.ActivityPoolRet, nil, gift, {})
+		--end
 		actData[cfg.condition] = nil
 		self:updateActData(actType, actData, not notify)
 	end,
@@ -841,9 +841,16 @@ function RolePlugin.bind(Role)
 		return runeSet
 	end
-	function Role:getAdvData()
+	function Role:getAdvData(notNotify)
 		if not self.advData then
 			self.advData = require("adv.Adv").new(self)
+			local status, err = pcall(function()
+				self.advData:initByInfo()
+			end)
+			if not status then
+				self.advData:forceOver(notNotify, true)
+				skynet.error("getAdvData error adv initByInfo " .. err)
+			end
 		end
 		return self.advData
 	end
@@ -1670,8 +1677,34 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "redp", value = redp})
 	end
+	-- 网页支付获取订单号
+	function Role:getPurchaseOrderByPlatform(params)
+		local checkPlatform = {
+			["mycard"] = "mycard_product_id",
+		}
+		local pidField = checkPlatform[params.payMode or ""]
+		if not pidField or not params.product_id or params.product_id == "" then
+			return "no product"
+		end
+
+		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.rmb ~= params.money then
+					return "error money"
+				end
+				-- 发现需要的id
+				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId)
+				if partnerOrderId == "" then
+					return "no product"
+				end
+				return json.encode({order = partnerOrderId})
+			end
+		end
+	end
+
 	-- 获取充值订单号
-	function Role:getPurchaseOrder(rechargeId)
+	function Role:getPurchaseOrder(rechargeId, transactionId)
 		local roleId = self:getProperty("id")
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if not rechargeData then
@@ -1708,6 +1741,7 @@ function RolePlugin.bind(Role)
 			order = partnerOrderId, 
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
+			transactionId = transactionId,
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -1786,6 +1820,7 @@ function RolePlugin.bind(Role)
 	request.product_id = data.product_id
 	request.pay_time = data.pay_time
 	request.transactionId = data.order_no
+	request.extension_info = data.extension_info
 	]]
 	function Role:handlePurchase(params)
 		local roleId = self:getProperty("id")
@@ -1816,6 +1851,10 @@ function RolePlugin.bind(Role)
 		})
 		if not status then
+			if params.extension_info == "mycard_web" then
+				-- todo 发邮件
+				skynet.error("mycard_web " .. params.order)
+			end
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 				result = "success", reward = reward}))
 		end
@@ -9,7 +9,7 @@ local PVP_RANK_TIME_SORT_PRECISION = 360 -- 时间精度 每6分钟忽略差异
 local PVP_RANK_BASE_SCORE = globalCsv.pvp_base_score -- 初始积分
 -- 匹配规则改为以排名来匹配
-local PVP_GET_ROBOT_SCORE = 2400 -- 2400分以下低档位匹配机器人
+local PVP_GET_ROBOT_SCORE = 1300 -- 1300分以下低档位匹配机器人
 local PRE_RANGE_COUNT = 20 -- 每个档位人数
 local NEED_MATCH = 3 --匹配到多少人
@@ -73,7 +73,7 @@ function Role:changePvpScoreCommon(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((myScore - matchScore) / 400)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((matchScore - myScore) / 400)))
 			myScore = myScore - scoreChange
@@ -139,7 +139,7 @@ function Role:changePvpScoreHigh(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((myScore - matchScore) / 1000)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((matchScore - myScore) / 1000)))
 			myScore = myScore - scoreChange
@@ -530,7 +530,7 @@ function Role:changeCrossServerPvpSelfInfo(cType)
 			return 
 		end
 		change.battleV = self:getProperty("pvpTBVH")
-		change.heros = self:getProperty("pvpTSH")
+		change.team = self:getProperty("pvpTSH")
 		change.battleInfo = self:getProperty("pvpTBH")
 	end
@@ -53,6 +53,7 @@ local TaskType = {
 	AdvMineLayer = 414,			-- 宝藏洞激活
 	AdvKillBoss	= 415,			-- 拾荒击杀boss
 	AdvHangHeroCnt	= 416,		-- 拾荒人数
+	AdvPassFirst = 417,			-- 冒险首次通关			- id
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -249,7 +250,7 @@ local StoreListener = {
 		[TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}},
 		[TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}},
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
-		[TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}},
+		[TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}},
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 	}
 }
@@ -886,4 +887,4 @@ function RoleTask.bind(Role)
 end
-return RoleTask
 \ No newline at end of file
+return RoleTask
@@ -23,6 +23,11 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	end
 	self:setProperty("advMine", advMine)
+	local ltime = self:getProperty("ltime")
+	if isCrossMonth(ltime, now) then
+		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id 
+	end
+
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 	self:log("onLogin")
@@ -43,13 +48,6 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
 end
-ResetFunc["CrossMonth"] = function(self, notify, response)
-	local ltime = self:getProperty("ltime")
-	if isCrossMonth(ltime, skynet.timex()) then
-		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id
-	end
-end
-
 ResetFunc["DinerRank"] = function(self, notify, response)
 	self.dinerData:rankResetData(notify)
@@ -89,13 +87,10 @@ function Role:updateTimeReset(now, notify)
 			ResetFunc[funcName](self, notify, response, now)
 			resetMode[funcName] = true
 		end
-		if needResetId[resetId] then
-			-- 充值商城购买记录
-			self.storeData:resetStoreReored(resetId)
-		end
 	end
 	for resetId, round in pairs(needResetId) do
+		self.storeData:resetStoreReored(resetId)
 		timeReset[resetId] = round
 	end
 	self:setProperties({timeReset = timeReset, ltime = now})
@@ -100,7 +100,7 @@ end
 -- 判断是不是同一个月
 function isCrossMonth(target, now)
 	now = now or skynet.timex()
-	local tarTm = os.date("*t", target)
+	local tarTm = os.date("*t", target - RESET_TIME * 3600)
 	local nowTm = os.date("*t", now - RESET_TIME * 3600)
 	if tarTm.year == nowTm.year and tarTm.month == nowTm.month then
 		return false