fix conflict

测试
2 parents 6857a37f e8719dc4
Showing 10 changed files with 112 additions and 22 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/adv/Adv.lua
src/adv/AdvBuff.lua
src/adv/AdvPlayer.lua
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RoleTask.lua
@@ -136,6 +136,7 @@ ItemId = {
 	AdvKey = 80, -- 冒险钥匙
 	BoxKey = 60, -- 拆解工具
 	AdvPower = 4701, -- 拾荒体力
+	CrisisScore = 8010, -- 积分
 }
 TimeReset = {
@@ -228,6 +228,7 @@ actionCodes = {
 	Activity_battleRankRpc = 662,
 	Activity_battleMilestoneRpc = 663,
 	Activity_bossRewardRpc = 664,
+	Activity_crisisMilestoneRpc = 665,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -19,6 +19,7 @@ R_ORDER = &quot;order:%d:%d&quot;
 RANK_COMMON 	= "rank:common:"
 RANK_TYPE = {
     ActBattleBoss = "act_battle_boss",
+    ActCrisis = "crisis",
 }
 -- rank
@@ -721,10 +721,15 @@ function _M.battleRankRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
-	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
-
-	local rankInfo = role:getRankInfoCommon(RANK_TYPE.ActBattleBoss)
-
+	local cfg = csvdb["activity_ctrlCsv"][actid]
+	if not cfg then return 1 end
+	if not role.activity:isOpen(cfg.showType) then return 2 end
+	local actTypeToRank = {
+		[role.activity.ActivityType.ChallengeLevel] = RANK_TYPE.ActBattleBoss,
+		[role.activity.ActivityType.Crisis] = RANK_TYPE.ActCrisis,
+	}
+	if not actTypeToRank[cfg.showType] then return end
+	local rankInfo = role:getRankInfoCommon(actTypeToRank[cfg.showType])
 	SendPacket(actionCodes.Activity_battleRankRpc, MsgPack.pack(rankInfo))
 	return true
 end
@@ -769,6 +774,36 @@ function _M.battleMilestoneRpc(agent, data)
 	return true
 end
+function _M.crisisMilestoneRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	if not role.activity:isOpenById(actid, "Crisis") then return 1 end
+	local actCfg = csvdb["activity_mileageCsv"][actid]
+	if not actCfg then return 3 end
+
+	local curCsv = actCfg[id]
+	if not curCsv then return 4 end
+
+	if role:getItemCount(ItemId.CrisisScore) < curCsv.condition then
+		return 5
+	end
+
+	local actData = role.activity:getActData("Crisis") or {}
+	actData.score = actData.score or {}
+	if actData.score[id] then
+		return 6
+	end
+	actData.score[id] = -1
+	role.activity:updateActData("Crisis", actData)
+
+	local reward, change = role:award(curCsv.reward, {log = {desc = "actMilecrisis", int1 = actid}})
+	SendPacket(actionCodes.Activity_crisisMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+
 function _M.bossRewardRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -149,25 +149,15 @@ function Adv:initByChapter(params)
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
-	self:initBattle(nil)
+	self:initBattle(nil, isToNext)
 	self:initLayerTask()
-	-- 支援效果生效一些
-	self:activeSomeSupport()
+
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
-	if isToNext then
-		self.battle.player:afterLayer() -- 玩家的buff 清理一下
-	end
-
-	-- 不是中继层  加上 层 和 地图的buff和被动
-	if not self.isRelay then
-		self.battle:initMapEffect()
-	end
-
 	-- 中继进入奖励
 	if relayData and isEnter then
 		self:awardRelay(relayData, notNotify)
@@ -456,8 +446,20 @@ function Adv:clearAdvUnlockCache()
 	self.cacheUnlock = {}
 end
-function Adv:initBattle(info)
+function Adv:initBattle(info, isToNext)
 	self.battle = require("adv.AdvBattle").new(self)
+	-- 支援效果生效一些
+	self:activeSomeSupport()
+	
+	-- 不是中继层  加上 层 和 地图的buff和被动
+	if not self.isRelay then
+		self.battle:initMapEffect()
+	end
+
+	if isToNext then
+		self.battle.player:afterLayer() -- 玩家的buff 清理一下
+	end
+
 	for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
 		self.battle:triggerPassive(passiveC[1], passiveC[2])
 	end
@@ -468,7 +470,7 @@ function Adv:initBattle(info)
 		map:initBattleAfter()
 	end
 	--下层
-	if not info and self.level ~= 1 then
+	if not info and isToNext then
 		self.battle.player:attrChangeCondBuffCheck(1)
 	end
@@ -1553,6 +1555,7 @@ local function clickBuild(self, room, block, params)
 		end
 		advMine[2].co = mineCo2
 		self.owner:setProperty("advMine", advMine)
+		self.owner:checkTaskEnter("AdvMineLayer")
 	end
 	self:checkTask(Adv.TaskType.Build, 1, oldId)
@@ -2050,6 +2053,7 @@ function Adv:enemyDead(enemy, escape)
 				advMine[2].co = mineCo2
 				advMine[2].ch = mineCh
 				self.owner:setProperty("advMine", advMine)
+				self.owner:checkTaskEnter("AdvMineKill")
 			else
 				local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
 				if toClick then
@@ -35,7 +35,7 @@ Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物
 Buff.SNEAK = 32 --潜行
 Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成  -- 怪物使用
 Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效
-Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  0 - 1
+Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  2 - 1
 Buff.DISABLE_AURA = 36 -- 禁用光环
 Buff.GET_AURA = 37 -- 获得光环
@@ -662,7 +662,7 @@ end
 function Enemy:getObstacle()
 	local obstacle = csvdb["event_monsterCsv"][self.monsterId].obstacle
-	if obstacle == 0 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
+	if obstacle == 2 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
 		obstacle = 1
 	end
 	return obstacle
@@ -28,8 +28,9 @@ Activity.ActivityType = {
 	WishHeroPool = 23, 	-- 心愿卡池
 	ActHeroPool = 24, -- 活动卡池
 	ActShopGoods = 25, 	-- 活动商品
-}
+	Crisis = 26, -- 宝藏怪活动
+}
 local function checkActivityType(activityType)
 	if type(activityType) == "string" then
@@ -71,6 +72,7 @@ Activity.schema = {
 	act20		= {"table", {}},	  -- {id=扭蛋抽出数量}
 	act24		= {"table", {}, true},	-- 活动卡池 {id=repaynum}
+	act26 		= {"table", {}},	-- {task = {id = count}, socre = {id = status}}
 }
 function Activity:data()
@@ -89,6 +91,7 @@ function Activity:data()
 		act18 = self:getProperty("act18"),
 		act19 = self:getProperty("act19"),
 		act20 = self:getProperty("act20"),
+		act26 = self:getProperty("act26"),
 	}
 end
@@ -737,4 +740,44 @@ activityFunc[Activity.ActivityType.ActShopGoods] = {
 }
+
+activityFunc[Activity.ActivityType.Crisis] = {
+	["check"] = function(self, actType, notify, atype, count) -- 检查
+		count = count or 1
+		local isOpen, actId = self:isOpen(actType)
+		local actData = self:getActData(actType) or {}
+		actData.task = actData.task or {}
+		local change = false
+		local actCsv = csvdb["activity_crisisCsv"][actId]
+		for id, actSet in pairs(actCsv) do
+			if actSet.type == atype then
+				local status = actData.task[id] or 0
+				status = status + count
+				if status >= actSet.condition1 then
+					local reward
+					if actSet.loop == 1 then
+						local rcount = math.floor(status / actSet.condition1)
+						local reward = actSet.reward:toNumMap()
+						for itemId, itemC in pairs(reward) do
+							reward[itemId] = itemC * rcount
+						end
+						status = status % actSet.condition1
+					else
+						reward = actSet.reward
+						status = -1
+					end
+					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+				end
+				actData.task[id] = status
+				change = true
+			end
+		end
+		if change then
+			-- 更新下排行榜
+			self.owner:updateRankCommon(RANK_TYPE.ActCrisis, self.owner:getItemCount(ItemId.CrisisScore))
+			self:updateActData(actType, actData)
+		end
+	end,
+}
+
 return Activity
@@ -91,6 +91,7 @@ local ItemReason = {
 	actSign = 1007, -- 活动签到
 	actPaySign = 1008, -- 活动付费签到
 	calendaTask = 1009,	-- 英雄帖
+	actMilecrisis = 1010, -- 物资危机
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -48,6 +48,8 @@ local TaskType = {
 	AdvScore = 410, 			-- 冒险分数			- score		
 	AdvDraw = 411, 				-- 冒险资助			- count		ptype
 	AdvHang	= 412,				-- 代理拾荒次数
+	AdvMineKill = 413,			-- 宝藏怪击杀
+	AdvMineLayer = 414,			-- 宝藏洞激活
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -218,6 +220,7 @@ local SudokuListener = {
 }
 local Activity = require("models.Activity")
+
 local ActivityListener = {
 	func = "checkActivityTask",
 	listen = {
@@ -226,6 +229,8 @@ local ActivityListener = {
 		[TaskType.AdvDraw] = {{Activity.ActivityType.AdvDraw, f("count")}},
 		[TaskType.OpenBox] = {{Activity.ActivityType.OpenBox, f("count")}},
 		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
+		[TaskType.AdvMineKill] = {{Activity.ActivityType.Crisis, 1}},
+		[TaskType.AdvMineLayer] = {{Activity.ActivityType.Crisis, 2}},
 	}
 }
@@ -266,7 +271,6 @@ local CalendaTaskListener = {
 	}
 }
-
 local TaskListeners = {
 	StoryListener,
 	CommonListener,