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

熊润斐
2 parents c60a8b9b 664e0e07
Showing 19 changed files with 334 additions and 51 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/actions/TowerAction.lua
src/csvdata
src/models/Activity.lua
src/models/Diner.lua
src/models/Role.lua
src/models/RoleBattle.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/RoleTimeReset.lua
@@ -372,7 +372,20 @@ DrawCardType = {
 TeamSystemType = {
 	Hang = 1,
 	BonusBattle = 2,
-	Tower = 3,
 	Dinner = 4,
 	FriendBattle = 5,
-}
 \ No newline at end of file
+}
+
+-- 某个功能对其他系统功能的加成类型
+SystemBnousType = {
+	TowerBuff = 1, 		-- 电波塔内战斗开始时获得buff
+	CrusadeTask = 2, 	-- 讨伐电台任务加速
+	DinerGet = 3, 		-- 食材供应商获取速度
+	DinerLimit = 4, 	-- 食材供应商上限
+	DinerSell = 5, 		-- 料理贩卖速度
+	DinerPrice = 6, 	-- 齿轮价格
+	Adv = 7, 			-- 代理拾荒获得额外道具
+	HangTime = 8, 		-- 挂机时间上限
+	PvpTicket = 9, 		-- 每周额外获得竞技场门票数量
+	SweepReward = 10, 	-- 奖励关卡每次扫荡额外获得道具
+}
@@ -145,6 +145,7 @@ actionCodes = {
 	Tower_rankRpc = 353,
 	Tower_bugCountRpc = 354,
 	Tower_rankInfoRpc = 355,
+	Tower_activeTowerBonusRpc = 356,
  
 	Car_makePotionRpc = 400,
 	Car_equipUpRpc = 401,
@@ -26,6 +26,15 @@ RANK_TYPE = {
 RANK_TOWER 	= "rank:tower"
 RANK_TOWER_INFO = "rank:tower:info"
  
+RANK_TOWER1 	= "rank:tower1"
+RANK_TOWER1_INFO = "rank:tower1:info"
+
+RANK_TOWER2 	= "rank:tower2"
+RANK_TOWER2_INFO = "rank:tower2:info"
+
+RANK_TOWER3 	= "rank:tower3"
+RANK_TOWER3_INFO = "rank:tower3:info"
+
 -- adv
 RANK_ADV 	= {"rank:adv1", "rank:adv2"}
 RANK_ADV_INFO = "rank:adv:info"
@@ -276,7 +276,9 @@ function _M.startHangRpc(agent, data)
 	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
 		return 2
 	end
-	adv_idle_time = adv_idle_time * 60
+	local timeAdd = role:getBnousHangTime()
+	adv_idle_time = adv_idle_time * 60 + timeAdd
+
  
 	local advHang = role:getProperty("advHang")
 	if advHang[chapterId] then return 3 end --正在挂机
@@ -416,7 +418,8 @@ function _M.endHangRpc(agent, data)
 	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
 		return 2
 	end
-	adv_idle_time = adv_idle_time * 60
+	local timeAdd = role:getBnousHangTime()
+	adv_idle_time = adv_idle_time * 60 + timeAdd
  
 	local reward, isFull, change, heroFaithMap
 	local heroCnt = 0
@@ -463,6 +466,15 @@ function _M.endHangRpc(agent, data)
 		for itemId, count in pairs(idleReward) do
 			idleReward[itemId] = count * adv_idle_reward_coef
 		end
+
+		local bnousReward = role:getBnousAdv()
+		for time, set in pairs(bnousReward) do
+			local delta = math.floor(adv_idle_time / time)
+			for key, value in pairs(set) do
+				idleReward[key] = (idleReward[key] or 0) + value * delta
+			end
+		end
+
 		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	else
 		if cancel then
@@ -75,7 +75,8 @@ function _M.addSellRpc( agent, data )
 	sells[slot].count = count
 	sells[slot].time = skynet.timex() - calSell.deltaTime
  
-	local needTime = sells[slot].count * dishData.sell_time + sells[slot].time - skynet.timex()
+	local timeSub = role:getBnousDiner(3,dishData.sell_time)
+	local needTime = sells[slot].count * (dishData.sell_time + timeSub) + sells[slot].time - skynet.timex()
 	role:pushMsg({type = "food", slot = slot, time = needTime})
  
 	-- 检查解锁的顾客
@@ -742,11 +743,15 @@ function _M.getGreenhouseRpc( agent, data )
 	local now = skynet.timex()
 	local gfood = role.dinerData:getProperty("gfood")
 	if not next(gfood) then return end
+
+	local timeAdd = role:getBnousDiner(2,globalCsv.diner_get_food_time_max)
+
 	for k , v in pairs(gfood) do
 		local itemId = v.id
 		local st = v.st
 		local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
-		local endTime = st + globalCsv.diner_get_food_time_max
+		speed = speed + role:getBnousDiner(1,speed)
+		local endTime = st + globalCsv.diner_get_food_time_max + timeAdd
 		local endTime2 = math.min(now, endTime)
 		reward[itemId] = math.floor((endTime2 - st) / speed)
 		if endTime2 == endTime then
@@ -483,13 +483,25 @@ function _M.advit(role, pms)
 end
  
  
-table.insert(helpDes, {"爬塔到指定层", "tower", "层数"})
+table.insert(helpDes, {"爬塔到指定层", "tower", "塔id", "层数"})
 function _M.tower(role, pms)
-	local level = tonum(pms.pm1, 1)
+	local tType = tonum(pms.pm1, 1)
+	local level = tonum(pms.pm2, 1)
+	local layer = (tType - 1) * 10000 + level
 	if not csvdb["tower_battleCsv"][level] then return  "不存在" end
-	role:updateProperty({field = "towerInfo", value = {c = globalCsv.tower_count_limit, l = level}})
-
-	role:mylog("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
+	local values = role:getProperty("towerInfo")
+	if tType == 1 then
+		values.l = layer
+	elseif tType == 2 then
+		values.l1 = layer
+	elseif tType == 3 then
+		values.l2 = layer
+	elseif tType == 4 then
+		values.l3 = layer
+	end
+	role:updateProperty({field = "towerInfo", value = values})
+
+	role:mylog("gm_action", {desc = "tower", int1 = tType, int2 = layer, key1 = pms.sender})
  
 	return "成功"
 end
@@ -326,6 +326,7 @@ function _M.roleFormatRpc(agent , data)
 	local index = msg.index	-- 阵容索引
 	local title = msg.title -- 阵容名称
 	local tactics = msg.tactics	-- 战术
+	local tower = msg.tower
 	local team = {}
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
@@ -361,7 +362,11 @@ function _M.roleFormatRpc(agent , data)
 		team.tactics = msg.tactics
 	end
  
-	role:setTeamFormat(index, team)
+	if tower then
+		role:setTowerTeamFormat(index, team)
+	else
+		role:setTeamFormat(index, team)
+	end
  
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
@@ -508,7 +513,7 @@ function _M.buyBonusCountRpc(agent, data)
 	return true
 end
  
-local function bonusWinReward(role, bonusData, rewardType, count)
+local function bonusWinReward(role, bonusData, rewardType, count, sweep)
 	count = count or 1
  
 	local reward, change = {}
@@ -548,6 +553,13 @@ local function bonusWinReward(role, bonusData, rewardType, count)
 		end
 	end
  
+	if sweep then
+		local bnousReward = role:getBnousSweep()
+		for key, value in pairs(bnousReward) do
+			reward[key] = (reward[key] or 0) + value * count
+		end
+	end
+
 	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = bonusData.id}})
 	role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count})
 	return reward, change
@@ -589,7 +601,7 @@ function _M.startBonusBattleRpc(agent, data)
 			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
 			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
-		local reward, change = bonusWinReward(role, bonusData, 3, count)
+		local reward, change = bonusWinReward(role, bonusData, 3, count, true)
 		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
  
 		role:checkTaskEnter("BonusQuick", {count = count})
@@ -95,8 +95,9 @@ function _M.startQuestRpc(agent, data)
         return 5
     end
     -- start quest, set finish time
+    local timeSub = role:getBnousCrusade(config.time)
     local taskData = {}
-    taskData["time"] = skynet.timex() + config.time
+    taskData["time"] = skynet.timex() + config.time + timeSub
     taskData["heros"] = heros
     radioTask[id] = taskData
     role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
@@ -745,6 +745,7 @@ function _M.openSpeedUpBoxRpc(agent, data)
 			for k , v in pairs(gfood) do
 				local itemId = v.id
 				local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
+				speed = speed + role:getBnousDiner(1,speed)
 				reward[itemId] = (reward[itemId] or 0) + math.floor((time / speed) * count)
 			end
 		else
@@ -23,14 +23,32 @@ function _M.startBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
-	
-	if not role:isFuncUnlock(FuncUnlock.Tower) then return end
+	local towerType = math.floor(id / 10000)
+
+	if not id or towerType < 0 or towerType > 3 then return 0 end
+	if not role:isFuncUnlock(FuncUnlock.Tower) then return 1 end
  
 	local towerInfo = role:getProperty("towerInfo")
  
-	if towerInfo.l ~= id then return end  -- 层数不对
+	if towerType == 0 and (towerInfo.l or 1) ~= id then return 2 end  -- 层数不对
+	if towerType == 1 and ((towerInfo.l1 or 10001) ~= id or (towerInfo.l or 1) <= globalCsv.tower_open[towerType]) then return 2 end  -- 层数不对
+	if towerType == 2 and ((towerInfo.l2 or 20001) ~= id or (towerInfo.l or 1) <= globalCsv.tower_open[towerType]) then return 2 end  -- 层数不对
+	if towerType == 3 and ((towerInfo.l3 or 30001) ~= id or (towerInfo.l or 1) <= globalCsv.tower_open[towerType]) then return 2 end  -- 层数不对
+
+	if not csvdb["tower_battleCsv"][id] then return 4 end
+
+	local teams = role:getTowerTeamFormat(towerType + 1)
+	if not next(teams) then return 5 end
+
+	if towerType ~= 0 then
+		for _, heroId in pairs(teams.heros) do
+			local hero = role.heros[heroId]
+			if not hero then return 6 end
+			local unit = csvdb["unitCsv"][hero:getProperty("type")]
+			if unit.camp ~= towerType then return 7 end
+		end
+	end
  
-	if not csvdb["tower_battleCsv"][id] then return end
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
 	--if curCount < 1 then return end -- 没有次数返回
  
@@ -57,18 +75,24 @@ function _M.endBattleRpc(agent, data)
 	local key = msg.key
 	local passTime = msg.passTime
  
+	local curTower = csvdb["tower_battleCsv"][id] 
+	if not curTower then return 2 end
+
 	local towerInfo = role:getProperty("towerInfo")
-	if towerInfo.l ~= id or not towerInfo.k or towerInfo.k ~= key then 
+	local towerType = math.floor(id / 10000)
+	local towerLevel = {[0] = (towerInfo.l or 1), [1] = (towerInfo.l1 or 10001), [2] = (towerInfo.l2 or 20001), [3] = (towerInfo.l3 or 30001)}
+	local curLevel = towerLevel[towerType]
+
+	if curLevel ~= id or not towerInfo.k or towerInfo.k ~= key then 
 		SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
 	end
-	local curTower = csvdb["tower_battleCsv"][id] 
-	if not curTower then return 2 end
  
 	-- 防作弊
 	if not role:checkBattleCheat("tower", {
 		isWin = msg.starNum and msg.starNum > 0,
-		info = msg.info
+		info = msg.info,
+		tower = towerType + 1
 	}) then
 		SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
@@ -81,11 +105,21 @@ function _M.endBattleRpc(agent, data)
 	if msg.starNum and msg.starNum > 0 then --win
 		curCount = math.min(curCount + 1, globalCsv.tower_count_limit) -- 返还次数
 		--排行榜
-		role:setTowerRank(towerInfo.l)
+		role:setTowerRank(curLevel % 10000, towerType + 1)
  
-		towerInfo.l = towerInfo.l + 1
+		curLevel = curLevel + 1
 		reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
-		role:checkTaskEnter("TowerPass", {level = towerInfo.l - 1})
+		role:checkTaskEnter("TowerPass", {count = 1, type = towerType + 1})
+	end
+
+	if towerType == 0 then
+		towerInfo.l = curLevel
+	elseif towerType == 1 then
+		towerInfo.l1 = curLevel
+	elseif towerType == 2 then
+		towerInfo.l2 = curLevel
+	elseif towerType == 3 then
+		towerInfo.l3 = curLevel
 	end
  
 	towerInfo.c = curCount
@@ -93,8 +127,9 @@ function _M.endBattleRpc(agent, data)
 	towerInfo.k = nil
 	role:updateProperty({field = "towerInfo", value = towerInfo})
  
-
-	local rank = redisproxy:ZREVRANK(RANK_TOWER, role:getProperty("id"))
+	local RankTower = {[0] = RANK_TOWER,[1] = RANK_TOWER1,[2] = RANK_TOWER2,[3] = RANK_TOWER3}
+	local rankName = RankTower[towerType]
+	local rank = redisproxy:ZREVRANK(rankName, role:getProperty("id"))
 	if not rank then
 		rank = -1
 	else
@@ -106,6 +141,7 @@ function _M.endBattleRpc(agent, data)
 		info = msg.info,
 		reward = reward,
 		rank = rank,
+		tower = towerType + 1
 	})
 	role:mylog("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
  
@@ -143,7 +179,9 @@ end
  
 function _M.rankRpc(agent , data)
 	local role = agent.role
-	SendPacket(actionCodes.Tower_rankRpc, MsgPack.pack(role:getTowerRank()))
+	local msg = MsgPack.unpack(data)
+	local towerType = msg.tower or 1
+	SendPacket(actionCodes.Tower_rankRpc, MsgPack.pack(role:getTowerRank(towerType)))
 	return true
 end
  
@@ -151,7 +189,43 @@ function _M.rankInfoRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local roleId = msg.roleId
-	SendPacket(actionCodes.Tower_rankInfoRpc, MsgPack.pack({format = role:getTowerRankOneInfo(roleId)}))
+	local towerType = msg.tower or 1
+	SendPacket(actionCodes.Tower_rankInfoRpc, MsgPack.pack({format = role:getTowerRankOneInfo(roleId, towerType)}))
+	return true
+end
+
+function _M.activeTowerBonusRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local tType = msg.tower
+	local id = msg.id
+
+	local bnousCsv = csvdb["tower_battle_additionCsv"]
+
+	if not tType or not id or not bnousCsv[tType] then return 0 end
+	local bnousData = bnousCsv[tType][id]
+	if not bnousData then return 1 end
+
+	local towerInfo = role:getProperty("towerInfo")
+	local towerBnous = role:getProperty("towerBnous")
+
+	if towerBnous[tType] and towerBnous[tType][id] then return 2 end
+	local towerLevel = {[1] = (towerInfo.l or 1), [2] = (towerInfo.l1 or 10001), [3] = (towerInfo.l2 or 20001), [4] = (towerInfo.l3 or 30001)}
+	local curLevel = towerLevel[tType]
+	
+	if tType ~= 1 then
+		if curLevel <= globalCsv.tower_open[tType - 1] then return 4 end
+	end
+
+	if (curLevel % 10000) <= bnousData.floor then return 3 end
+
+	if not towerBnous[tType] then
+		towerBnous[tType] = {}
+	end
+	towerBnous[tType][id] = 1
+	role:updateProperty({field = "towerBnous", value = towerBnous})
+	role:getTowerBnousActive(true)
+	SendPacket(actionCodes.Tower_activeTowerBonusRpc, '')
 	return true
 end
  
-Subproject commit f70c635c2f99d9800b629e41e13aa5115d5f69cd
+Subproject commit 686b192263f5cc221e472e1b9a41d059d581da2d
@@ -489,7 +489,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
  
 		local towerInfo = role:getProperty("towerInfo")
-		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		role:checkTaskEnter("TowerPass", {count = towerInfo.l, type = 1})
 		--"PvpWin"
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
@@ -557,7 +557,7 @@ activityFunc[Activity.ActivityType.BattleCommandTask] = {
 		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
  
 		local towerInfo = role:getProperty("towerInfo")
-		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		role:checkTaskEnter("TowerPass", {count = towerInfo.l, type = 1})
 		--"PvpWin"
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
@@ -193,6 +193,10 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite)
 	local addReward = {}
 	for key, value in pairs(dishData.item_normal:toNumMap()) do
 		addReward[key] = (addReward[key] or 0) + value * delta
+		if key == ItemId.Gold then
+			local goldPriceAdd = self.owner:getBnousDiner(4,value)
+			addReward[key] = addReward[key] + goldPriceAdd * delta
+		end
 	end
  
 	popular = dishData.famous_normal * delta
@@ -250,7 +254,7 @@ function Diner:updateSell(slot, calOnly)
 	local deltaTime = 0
 	local deltaCount = 0
 	local timePass = skynet.timex() - sell.time
-	local sellTime = dishData.sell_time
+	local sellTime = dishData.sell_time + self.owner:getBnousDiner(3, dishData.sell_time)
  
 	deltaCount = math.floor(timePass / sellTime)
 	if deltaCount < sell.count then
@@ -289,7 +293,7 @@ function Diner:expediteSell(slot)
 	local dishData = csvdb["diner_dishCsv"][sell.dish][sell.level]
 	local expediteCount = 0
 	local expediteTime = globalCsv.diner_sell_expediteTime
-	local sellTime = dishData.sell_time
+	local sellTime = dishData.sell_time + self.owner:getBnousDiner(3,dishData.sell_time)
 	expediteCount = math.floor(expediteTime / sellTime)
 	expediteCount = math.min(expediteCount, sell.count)
 	local lastCount = sell.count - expediteCount
@@ -115,6 +115,7 @@ Role.schema = {
 	hangTeams			= {"table", {}},	-- pve自选编队
 	teamIndex			= {"table", {}},	-- 各个系统使用的编队索引 type->index 见TeamSystemType
 	advTeams			= {"table", {}},	-- 拾荒自选编队
+	towerTeams 			= {"table", {}}, 	-- 四个电波塔的队伍
  
 	bonusStar			= {"table", {}}, 	-- 奖励关卡 通关星星  {[id] = 1}  三个二进制位 表示三个星 从低到高  (1 << 0) (1 << 1) (1 << 2)  满星 (1 << 3) - 1
  
@@ -146,7 +147,8 @@ Role.schema = {
  
 	boxL				= {"table", {}}, -- boxList  正开启的箱子  -- {[1] = {id = 1010, gem = 101, time = 1313}}
  
-	towerInfo			= {"table", {c = globalCsv.tower_count_limit, l = 1}}, -- 当天爬塔消耗的次数  -- {t = time, c = count, l = layer, k = battleKey}
+	towerInfo			= {"table", {c = globalCsv.tower_count_limit, l = 1, l1 = 10001, l2 = 20001, l3 = 30001}}, -- 当天爬塔消耗的次数  -- {t = time, c = count, l = layer, k = battleKey}
+	towerBnous			= {"table", {}}, -- 电波塔加成 {[1] = {[1] = 1, [2] = 1}, [2] = {}, [3] = {}, [4] = {}}
  
 	spTask				= {"table", {}}, -- 特殊任务  -- {id = status}
  
@@ -368,6 +370,7 @@ function Role:data()
 		hangTeams = self:getProperty("hangTeams"),
 		teamIndex = self:getProperty("teamIndex"),
 		advTeams = self:getProperty("advTeams"),
+		towerTeams = self:getProperty("towerTeams"),
  
 		bonusStar = self:getProperty("bonusStar"),
  
@@ -385,6 +388,7 @@ function Role:data()
 		equips = self:getProperty("equips"),
 		boxL = self:getProperty("boxL"),
 		towerInfo = self:getProperty("towerInfo"),
+		towerBnous = self:getProperty("towerBnous"),
 		spTask = self:getProperty("spTask"),
 		dTask = self:getProperty("dTask"),
 		wTask = self:getProperty("wTask"),
@@ -104,7 +104,7 @@ function Role:checkBattleCheat(battleType, params)
 		-- enemyServer = packBattleEnemyCommon(carbonData)
 	end
 	cheat["tower"] = function()
-		local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.Tower))
+		local team = self:getTeamBattleInfo(self:getTowerTeamFormat(params.tower))
 		for slot, hero in pairs(team.heros) do
 			local temp = {}
 			for arr, _ in pairs(checkCheatAttrs) do
@@ -198,7 +198,7 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		tower = function()
-			local towerF = self:getTeamFormatByType(TeamSystemType.Tower)
+			local towerF = self:getTowerTeamFormat(params.tower)
 			for slot, hero in pairs(self:getTeamHerosInfo(towerF).heros) do
 				selflist[slot] = hero.type
 			end
@@ -57,6 +57,7 @@ local ItemReason = {
 	actBuyBpLevel = 141, -- 购买活动战令等级
 	newSign = 142,-- 新的活动签到
 	advLevelStage = 143, -- 拾荒活动阶段奖励
+	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -309,7 +309,6 @@ function RolePlugin.bind(Role)
 	end
  
 	function Role:addPotion(params)
-		dump(params)
 		local pId = globalCsv.adv_item_potion[params.id]
 		local potionBag = self:getProperty("potionBag")
 		local origin = potionBag[pId] or 0
@@ -1276,11 +1275,21 @@ function RolePlugin.bind(Role)
 	end
  
 	local StdTowerRankTime = toUnixtime("2019010100")
-	function Role:setTowerRank(level)
+	local TowerRankInfo = {
+		[1] = {rank = RANK_TOWER, rankInfo = RANK_TOWER_INFO},
+		[2] = {rank = RANK_TOWER1, rankInfo = RANK_TOWER1_INFO},
+		[3] = {rank = RANK_TOWER2, rankInfo = RANK_TOWER2_INFO},
+		[4] = {rank = RANK_TOWER3, rankInfo = RANK_TOWER3_INFO},
+	}
+	function Role:setTowerRank(level,tType)
+		tType = tType or 1
 		local now = skynet.timex()
 		local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
 		local ct = 10000 - ct  -- 越早的排名越靠前
-		local towerTeam = self:getTeamFormatByType(TeamSystemType.Tower)
+
+		
+		local info = TowerRankInfo[tType]
+		local towerTeam = self:getTowerTeamFormat(tostring(tType))
 		local battleV = self:getTeamBattleValue(towerTeam.heros)
 		local score = (level * 10000 + ct) * 10000000 + battleV
  
@@ -1294,21 +1303,23 @@ function RolePlugin.bind(Role)
 		}
 		local roleId = self:getProperty("id")
 		redisproxy:pipelining(function (red)
-			red:zadd(RANK_TOWER, score, roleId)	--更新分数
-			red:hset(RANK_TOWER_INFO, roleId,  MsgPack.pack(curInfo))
+			red:zadd(info.rank, score, roleId)	--更新分数
+			red:hset(info.rankInfo, roleId,  MsgPack.pack(curInfo))
 		end)
 	end
  
-	function Role:getTowerRank()
+	function Role:getTowerRank(tType)
+		tType = tType or 1
+		local info = TowerRankInfo[tType]
 		local list = {}
-		local ids = redisproxy:zrevrange(RANK_TOWER, 0 , 99)
+		local ids = redisproxy:zrevrange(Info.rank, 0 , 99)
 		local redret = {}
 		if ids and next(ids) then
 			redret = redisproxy:pipelining(function (red)
 				for i = 1, #ids do
 					local roleId = ids[i]
 					table.insert(list, {roleId = tonumber(roleId)})
-					red:hget(RANK_TOWER_INFO, roleId)
+					red:hget(Info.rankInfo, roleId)
 				end
 			end)
 		end
@@ -1317,7 +1328,7 @@ function RolePlugin.bind(Role)
 			player.format = nil
 			list[i].player = player
 		end
-		local rank = redisproxy:ZREVRANK(RANK_TOWER, self:getProperty("id"))
+		local rank = redisproxy:ZREVRANK(Info.rank, self:getProperty("id"))
 		if not rank then
 			rank = -1
 		else
@@ -1326,8 +1337,10 @@ function RolePlugin.bind(Role)
 		return {list = list, rank = rank}
 	end
  
-	function Role:getTowerRankOneInfo(roleId)
-		local data = redisproxy:hget(RANK_TOWER_INFO, roleId)
+	function Role:getTowerRankOneInfo(roleId,tType)
+		tType = tType or 1
+		local info = TowerRankInfo[tType]
+		local data = redisproxy:hget(info.rankInfo, roleId)
 		if data then
 			local player = MsgPack.unpack(data)
 			return player.format
@@ -1547,6 +1560,19 @@ function RolePlugin.bind(Role)
 		})
 	end
  
+	-- 设置电波塔阵容
+	function Role:getTowerTeamFormat(teamIdx)
+		local teams = self:getProperty("towerTeams") or {}
+		local team = teams[tostring(teamIdx)] or {}
+		return team
+	end
+
+	function Role:setTowerTeamFormat(teamIdx, team)
+		local teams = self:getProperty("towerTeams") or {}
+		teams[tostring(teamIdx)] = team
+		self:updateProperty({field = "towerTeams", value = teams, notNotify = false})
+	end
+
 	-- update
 	function Role:onRecoverTimer(now)
 		self:updateTimeReset(now, true)
@@ -2152,6 +2178,108 @@ function RolePlugin.bind(Role)
 		return hero:getProperty("faith")
 	end
  
+	function Role:getTowerBnousActive(update)
+		if not update and self.towerBnousActive then
+			return self.towerBnousActive
+		end
+		local towerInfo = self:getProperty("towerInfo")
+		local towerLevel = {towerInfo.l or 1, towerInfo.l1 or 10001, towerInfo.l2 or 20001, towerInfo.l3 or 30001}
+		local towerBnous = self:getProperty("towerBnous")
+		local bnousCsv = csvdb["tower_battle_additionCsv"]
+		self.towerBnousActive = {}
+
+		for towerIdx, Set in pairs(towerBnous) do
+			for id, _ in pairs(Set) do
+				local data = bnousCsv[towerIdx][id]
+				local effects = data.effect:toTableArraySec()
+				for _, effect in pairs(effects) do
+					local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
+					if not self.towerBnousActive[pm1] then
+						self.towerBnousActive[pm1] = {}
+					end
+					if pm1 == SystemBnousType.TowerBuff then
+						if not self.towerBnousActive[pm1][pm2] then
+							self.towerBnousActive[pm1][pm2] = {}
+						end
+						table.insert(self.towerBnousActive[pm1][pm2],pm3)
+					elseif pm1 == SystemBnousType.Adv then
+						if not self.towerBnousActive[pm1][pm4] then
+							self.towerBnousActive[pm1][pm4] = {}
+						end
+						self.towerBnousActive[pm1][pm4][pm2] = (self.towerBnousActive[pm1][pm4][pm2] or 0) + pm3
+					elseif pm1 == SystemBnousType.HangTime then
+						if type(self.towerBnousActive[pm1]) == "table" then
+							self.towerBnousActive[pm1] = 0
+						end
+						self.towerBnousActive[pm1] = self.towerBnousActive[pm1] + pm2
+					else
+						self.towerBnousActive[pm1][pm2] = (self.towerBnousActive[pm1][pm2] or 0) + pm3
+					end
+				end
+			end
+		end
+
+		return self.towerBnousActive
+	end
+
+	function Role:getDeltaValue(result, value)
+		if not result then return 0 end
+		local delta = 0
+		if result[1] and value then
+			delta = math.floor(value * result[1] / 100)
+		end
+		if result[0] then
+			delta = delta + result[0]
+		end
+		return delta
+	end
+
+	function Role:getBnousBattleBuff()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.TowerBuff]
+	end
+
+	function Role:getBnousCrusade(value)
+		local towerBnous = self:getTowerBnousActive()
+		return self:getDeltaValue(towerBnous[SystemBnousType.CrusadeTask], value)
+	end
+
+	function Role:getBnousDiner(type, value)
+		local towerBnous = self:getTowerBnousActive()
+		type = type or 1
+		local result
+		if type == 1 then
+			result = towerBnous[SystemBnousType.DinerGet]
+		elseif type == 2 then
+			result = towerBnous[SystemBnousType.DinerLimit]
+		elseif type == 3 then
+			result = towerBnous[SystemBnousType.DinerSell]
+		elseif type == 4 then
+			result = towerBnous[SystemBnousType.DinerPrice]
+		end
+		return self:getDeltaValue(result, value)
+	end
+
+	function Role:getBnousAdv()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.Adv] or {}
+	end
+
+	function Role:getBnousHangTime()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.HangTime] or 0
+	end
+
+	function Role:getBnousPvpTicket()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.PvpTicket] or {}
+	end
+
+	function Role:getBnousSweep()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.SweepReward] or {}
+	end
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -191,7 +191,7 @@ local AchievListener = {
 		[TaskType.OverOderTask] = {{14}},
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
-		[TaskType.TowerPass] = {{17, f("level")}},
+		[TaskType.TowerPass] = {{17, f("count"), f("type")}},
 		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
@@ -249,6 +249,7 @@ local ActivityListener = {
 		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
 		[TaskType.AdvMineKill] = {{Activity.ActivityType.Crisis, 1}},
 		[TaskType.AdvMineLayer] = {{Activity.ActivityType.Crisis, 2}},
+		[TaskType.AdvCostPower] = {{Activity.ActivityType.Crisis, 3, f("count")}},
 		[TaskType.DailyTask] = {{Activity.ActivityType.CommonSignIn, f("pre"), f("cur")}},
 		[TaskType.AddItem] = {{Activity.ActivityType.BattleCommand, f("id"), f("count")}},
 	}
@@ -492,7 +493,6 @@ function RoleTask.bind(Role)
 			[6] = true,
 			[7] = true,
 			[16] = true,
-			[17] = true,
 			[19] = true,
 			[22] = true,
 			[23] = true,
@@ -48,6 +48,12 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
  
 	self.activity:refreshWeekData(notify)
+
+	-- 跨周送一些道具
+	local BnousReward = self:getBnousPvpTicket()
+	if next(BnousReward) then
+		local reward, change = self:award(BnousReward, {log = {desc = "towerBnous"}})
+	end
 end