Merge branch 'tr/bugfix' into tr/publish/preview

熊润斐
2 parents 3ffe6116 607b1031
Showing 9 changed files with 22 additions and 5 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/csvdata
src/models/Activity.lua
src/models/RoleBattle.lua
src/models/RolePvp.lua
src/models/RoleTask.lua
@@ -325,6 +325,7 @@ MailId = {
 	PayBackAward = 242,
 	CBBackAward = 243,
 	CBBackAward2 = 244,
+	ActivityPoolRet = 280,
 }
 TriggerEventType = {
@@ -587,7 +587,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
@@ -1013,6 +1013,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}  --第一次开始说话时间  从第一次说话次数  能说话的时间
@@ -1120,6 +1120,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
-Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
+Subproject commit 76b7ed2b1684a9741a5c531e616acc31c8b5aa9d
@@ -529,6 +529,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,
@@ -150,7 +150,7 @@ function Role:checkBattleCheat(battleType, params)
 		-- 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
@@ -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
@@ -50,6 +50,7 @@ local TaskType = {
 	AdvHang	= 412,				-- 代理拾荒次数
 	AdvMineKill = 413,			-- 宝藏怪击杀
 	AdvMineLayer = 414,			-- 宝藏洞激活
+	AdvPassFirst = 415,			-- 冒险首次通关			- id
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -240,7 +241,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")}},
 	}
 }