fix conflict

测试
2 parents 5a8b84a1 0285ef6c
Showing 4 changed files with 15 additions and 2 deletions Show diff stats
src/GlobalVar.lua
src/adv/Adv.lua
src/models/Activity.lua
src/models/RoleTask.lua
@@ -325,6 +325,7 @@ MailId = {
 	PayBackAward = 242,
 	CBBackAward = 243,
 	CBBackAward2 = 244,
+	ActivityPoolRet = 280,
 }
  
 TriggerEventType = {
@@ -1165,6 +1165,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
  
@@ -539,6 +539,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,
@@ -53,6 +53,7 @@ local TaskType = {
 	AdvMineLayer = 414,			-- 宝藏洞激活
 	AdvKillBoss	= 415,			-- 拾荒击杀boss
 	AdvHangHeroCnt	= 416,		-- 拾荒人数
+	AdvPassFirst = 417,			-- 冒险首次通关			- id
  
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -247,7 +248,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")}},
 	}
 }
@@ -736,4 +737,4 @@ function RoleTask.bind(Role)
  
 end
  
-return RoleTask
 \ No newline at end of file
+return RoleTask