merge code

测试
2 parents 7d662b85 f7f26c15
Showing 13 changed files with 273 additions and 120 deletions Show diff stats
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/PvpAction.lua
src/actions/RoleAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvPlayer.lua
src/models/Role.lua
src/models/RoleBattle.lua
src/models/RolePlugin.lua
@@ -419,7 +419,6 @@ end
 table.insert(helpDes, {"挂机清除"	, "idlec"})
 function _M.idlec(role, pms)
-	role:updateProperty({field = "hangTeam", value = {}})
 	role:updateProperty({field = "hangInfo", value = {}})
 	role:updateProperty({field = "hangBag", value = {}})
 	role:mylog("gm_action", {desc = "idlec", key1 = pms.sender})
@@ -347,7 +347,9 @@ function _M.roleFormatRpc(agent , data)
 	team.leader = msg.leader
 	team.supports = supports
 	team.title = title
-	team.tactics = tactics
+	if msg.tactics and globalCsv.tactics_skill_passive_cell[msg.tactics] then
+		team.tactics = msg.tactics
+	end
 	role:setTeamFormat(index, team)
@@ -461,36 +463,6 @@ function _M.quickRpc(agent , data)
 	return true
 end
-function _M.bonusFormatRpc(agent , data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-	local bTeam = role:getProperty("bTeam")
-	for slot, heroId in pairs(msg.heros) do
-		if not role.heros[heroId] then
-			return
-		end
-	end
-	local supports = {}
-	for slot, support in pairs(msg.supports) do
-		if slot ~= 1 and slot ~= 2 then return end
-		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
-		if level <= 0 then return end
-		supports[slot] = support
-	end
-	if not checkLeader(msg.heros, msg.leader) then return end
-	
-	table.clear(bTeam)
-	bTeam.heros = {}
-	for slot, heroId in pairs(msg.heros) do
-		bTeam.heros[slot] = heroId
-	end
-	bTeam.leader = msg.leader
-	bTeam.supports = supports
-
-	role:updateProperty({field = "bTeam", value = bTeam}) 
-	SendPacket(actionCodes.Hang_bonusFormatRpc, '')
-	return true
-end
 function _M.buyBonusCountRpc(agent, data)
 	local role = agent.role
@@ -713,4 +685,4 @@ function _M.selectTeamRpc(agent, data)
 	return true
 end
-return _M
 \ No newline at end of file
+return _M
@@ -50,6 +50,9 @@ function _M.formatCommonRpc(agent , data)
 	end
 	pvpTC.leader = msg.leader
 	pvpTC.supports = supports
+	if msg.tactics and globalCsv.tactics_skill_passive_cell[msg.tactics] then
+		pvpTC.tactics = msg.tactics
+	end
 	role:savePvpCTeam(pvpTC)
 	SendPacket(actionCodes.Pvp_formatCommonRpc, '')
@@ -92,6 +95,9 @@ function _M.formatHighRpc(agent , data)
 		curTeam.heros = team.heros
 		curTeam.leader = team.leader
 		curTeam.supports = supports
+		if team.tactics and globalCsv.tactics_skill_passive_cell[team.tactics] then
+			curTeam.tactics = team.tactics
+		end
 		table.insert(pvpTH, curTeam)
 	end
@@ -462,6 +468,10 @@ function _M.startBattleHRpc(agent, data)
 		curTeam.heros = team.heros
 		curTeam.leader = team.leader
 		curTeam.supports = supports
+		if team.tactics and globalCsv.tactics_skill_passive_cell[team.tactics] then
+			curTeam.tactics = team.tactics
+		end
+
 		table.insert(pvpTH, curTeam)
 	end
@@ -291,7 +291,7 @@ function _M.loginRpc( agent, data )
 	-- 玩家登陆做的一些操作
-	role:saveHangTeam()
+	role:updateHangTeamInfo()
 	role:savePvpCTeam()
 	role:savePvpHTeam()
@@ -8,36 +8,6 @@ local MsgPack = MsgPack
 local _M = {}
-function _M.roleFormatRpc(agent , data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-	local towerTeam = role:getProperty("towerF")
-	for slot, heroId in pairs(msg.heros) do
-		if not role.heros[heroId] then
-			return
-		end
-	end
-	local supports = {}
-	for slot, support in pairs(msg.supports) do
-		if slot ~= 1 and slot ~= 2 then return end
-		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
-		if level <= 0 then return end
-		supports[slot] = support
-	end
-	table.clear(towerTeam)
-	towerTeam.heros = {}
-	for slot, heroId in pairs(msg.heros) do
-		towerTeam.heros[slot] = heroId
-	end
-	towerTeam.leader = msg.leader
-	towerTeam.supports = supports
-
-
-	role:updateProperty({field = "towerF", value = towerTeam}) 
-	SendPacket(actionCodes.Tower_roleFormatRpc, '')
-	return true
-end
-
 local function getUpdateTime(lastCount, lastTime)
 	local nextCount, nextTime = lastCount, skynet.timex()
@@ -102,6 +102,9 @@ function Adv:initByChapter(params)
 	self.cacheUnlock = self.cacheUnlock or {}
 	self.shopStatus = self.shopStatus or {}
 	self.support = self.support or {}
+	if self.battle then
+		self.battle:overBattle()
+	end
 	self.battle = nil  -- 清掉 老的 battle
 	self.logid = self.owner:getActionUcode()
@@ -211,7 +214,7 @@ function Adv:saveDB(notNotify)
 		advInfo.logid = self.logid
 		advInfo.maps = {}
-		self.battle:saveDB()
+		self.battle:saveDB(advInfo)
 		for id , map in ipairs(self.maps) do
 			advInfo.maps[id] = map:getDB()
@@ -468,6 +471,11 @@ function Adv:initBattle(notDb)
 	if notDb and self.level ~= 1 then
 		self.battle.player:attrChangeCondBuffCheck(1)
 	end
+
+	-- 初始化
+	if notDb then
+		self.battle:newBattle()
+	end
 end
 function Adv:triggerPassive(condType, params)
@@ -1029,7 +1037,7 @@ function Adv:useItem(itemId, count, target)
 	if itemData["function"] == 0 or itemData["function"] == 2 then count = 1 end
 	if itemId == 5020 then
-		role:finishGuide(53)
+		self.owner:finishGuide(53)
 	end
 	self:checkAchievement(self.AchievType.UseItem, count, itemId)
@@ -1084,7 +1092,9 @@ local function clickOut(self, room, block, params, isExit)
 		end
 		if #self.mapStack > 1 then -- 处于夹层中
+			local oldMapIdx = self:getCurMapIdx()
 			table.remove(self.mapStack) --退出夹层
+			self.battle:iLayerChange(oldMapIdx)
 			self:backLayer(-1)
 		else --处于底层
@@ -1119,7 +1129,6 @@ local function clickOut(self, room, block, params, isExit)
 				end
 				local isHaveRelay = self:isHaveRelay(self.level)
-				self.owner:getProperty("advTeam").player = self.battle.player:getDB()  -- 临时缓存住 battle 的player
 				if isHaveRelay and not self.isRelay then 
 					self:initByChapter({
 						chapterId = self.chapterId, 
@@ -1562,6 +1571,7 @@ local function clickClick(self, room, block, params)
 end
 local function clickLayer(self, room, block, params)
+	local oldMapIdx = self:getCurMapIdx()
 	if block.event.mapIdx then
 		table.insert(self.mapStack, block.event.mapIdx) --进入夹层
 	else
@@ -1577,6 +1587,7 @@ local function clickLayer(self, room, block, params)
 		self.maps[mapIdx]:initBattleAfter()
 		self:checkAchievement(Adv.AchievType.EnterILayer, 1, mapId)
 	end
+	self.battle:iLayerChange(oldMapIdx)
 	self:backLayer(1)
 	return true
 end
@@ -2101,21 +2112,11 @@ function Adv:scoreChange(scoreType, score)
 end
 function Adv:getScore()
-	self.score[AdvScoreType.Level] = math.floor(self.score[AdvScoreType.Level] or 0)
-	self.score[AdvScoreType.Task] = math.floor(self.score[AdvScoreType.Task] or 0)
-	self.score[AdvScoreType.Kill] = math.floor(self.score[AdvScoreType.Kill] or 0)
-	self.score[AdvScoreType.KillBoss] = math.floor(self.score[AdvScoreType.KillBoss] or 0)
-	self.score[AdvScoreType.ItemBack] = math.floor(self.score[AdvScoreType.ItemBack] or 0)
-	self.score[AdvScoreType.Event] = math.floor(self.score[AdvScoreType.Event] or 0)
-	self.score[AdvScoreType.Story] = math.floor(self.score[AdvScoreType.Story] or 0)
-
-	return self.score[AdvScoreType.Level] 
-		+ self.score[AdvScoreType.Task]
-		+ self.score[AdvScoreType.Kill] 
-		+ self.score[AdvScoreType.KillBoss] 
-		+ self.score[AdvScoreType.ItemBack] 
-		+ self.score[AdvScoreType.Event]
-		+ self.score[AdvScoreType.Story]
+	local allScore = 0
+	for _, score in pairs(self.score) do
+		allScore = allScore + math.floor(score)
+	end
+	return allScore
 end
 function Adv:popBackEvents()
@@ -8,6 +8,7 @@ function Battle:ctor(adv)
 	self.isNewPlayer = false
 	self.enemys = {} --怪
 	self.builds = {} -- 建筑
+	self.auras = {} -- 光环
 	self.cachePassiveEvent = {}
 	self:initPlayer()
 	self:initEnemys()
@@ -198,8 +199,10 @@ function Battle:addEnemy(room, block, mapIdx, init)
 			end
 			for _, buff in ipairs(buffs) do
-				enemy:addBuff(buff)
+				player:addBuff(buff)
 			end
+			-- 新生成的怪 加上 已有的光环buff
+			player:checkAuraBuff(self:checkDiffAuraBuff({}, self:getAurasByMap()))
 		end
 	end
 	return player
@@ -347,6 +350,8 @@ function Battle:afterRound()
 	self.player:triggerPassive(Passive.AFTER_ROUND)
+	self:checkAura()
+
 	if self.player.isDead then
 		self.adv:over(false, nil, -2)
 	end
@@ -435,8 +440,116 @@ function Battle:initMapEffect(ilayer)
 end
+-- 夹层 进入退出 接口 清理玩家身上的老光环 添加新的光环
+function Battle:iLayerChange(oldMapIdx)
+	local auras = self:getActiveAuras()
+	local playerBuffs = self:checkDiffAuraBuff(self:getAurasByMap(oldMapIdx), auras)
+	local enemyBuffs = self:checkDiffAuraBuff(self:getAurasByMap(), auras)
+	self.player:checkAuraBuff(playerBuffs)
+	for _, enemy in pairs(self.player:getTeam(2)) do
+		enemy:checkAuraBuff(enemyBuffs)
+	end
+	self:setMapAuras(auras)
+end
+
+-- 新的 关卡 关闭旧的战斗模块 清理 玩家身上的光环效果
+function Battle:overBattle()
+	local buffs = self:checkDiffAuraBuff(self:getAurasByMap(), {})
+	self.player:checkAuraBuff(buffs)
+	self.adv.owner:getProperty("advTeam").player = self.player:getDB()  -- 临时缓存住 battle 的player
+end
+
+-- 初始化 新的 关卡
+function Battle:newBattle()
+	local auras = self:getActiveAuras()
+	local buffs = self:checkDiffAuraBuff({}, auras)
+	self:setMapAuras(auras)
+end
+
+-- 过了回合 检查光环
+function Battle:checkAura()
+	local auras = self:getActiveAuras()
+	local buffs = self:checkDiffAuraBuff(self:getAurasByMap(), auras)
+	self.player:checkAuraBuff(buffs)
+	for _, enemy in pairs(self.player:getTeam(2)) do
+		enemy:checkAuraBuff(buffs)
+	end
+	self:setMapAuras(auras)
+end
+
+-- 查找差异buff
+function Battle:checkDiffAuraBuff(oldAuras, newAuras)
+	local auras = {}
+	for aurasId , count in pairs(oldAuras) do
+		auras[aurasId] = -count
+	end
+	for aurasId , count in pairs(newAuras) do
+		auras[aurasId] = (auras[aurasId] or 0) + count
+	end
+
+	local buffs = {}
+	for aurasId , count in pairs(auras) do
+		local auraData = csvdb["adv_map_haloCsv"][aurasId]
+		if auraData then
+			for _, effect in ipairs(auraData.effect:toTableArray(true)) do
+				temp = buffs
+				for i = 1, #effect do
+					temp[effect[i]] = temp[effect[i]] or {}
+					temp = temp[effect[i]]
+				end
+				temp.count = (temp.count or 0) + count
+				if newAuras[aurasId] then
+					-- 加上 未消失标记
+					temp.exist = true
+				end
+			end
+		end
+	end
+	return buffs
+end
+
+-- 获取所有生效的 光环
+function Battle:getActiveAuras()
+	local auras = {}
+	for _, one in pairs(self.player:getAuras()) do
+		auras[one] = (auras[one] or 0) + 1
+	end
+	for _, enemy in pairs(self.player:getTeam(2)) do
+		for _, one in pairs(enemy:getAuras()) do
+			auras[one] = (auras[one] or 0) + 1
+		end
+	end
+	for _, build in pairs(self:getBuilds()) do
+		for _, one in pairs(build:getAuras()) do
+			auras[one] = (auras[one] or 0) + 1
+		end
+	end
+	return auras
+end
+
+function Battle:setMapAuras(auras)
+	 self.auras[self.adv:getCurMapIdx()] = auras
+end
+
+function Battle:getAurasByMap(mapIdx)
+	mapIdx = mapIdx or self.adv:getCurMapIdx()
+	local auras = self.auras[mapIdx] or {}
+	return auras
+end
+
+function Battle:getBuilds()
+	local team = {}
+	for _, build in pairs(self.builds[self.adv:getCurMapIdx()]) do
+		if not build.isDead and not build.lock then -- 已经翻开的
+			table.insert(team, build)
+		end
+	end
+	return team
+end
+
+
 --写入数据
-function Battle:saveDB()
+function Battle:saveDB(advInfo)
 	for idx, mapEnemys in pairs(self.enemys) do
 		for _, enemy in ipairs(mapEnemys) do
 			local block = self.adv:getBlock(enemy.roomId, enemy.blockId, idx)
@@ -453,6 +566,7 @@ function Battle:saveDB()
 			end
 		end
 	end
+	advInfo.auras = self.auras
 end
 return Battle
 \ No newline at end of file
@@ -70,7 +70,7 @@ function Block:updateEvent(event, isInit)
 				em[oldet] =1 
 			end
 			if newet then
-				em[oldet] =1 
+				em[newet] =1 
 			end
 			local player = self.room.map.adv.battle.player
@@ -460,7 +460,18 @@ function Buff:initNew(release, data)
 	end
 end
-function Buff:createAfter()
+function Buff:createAfter(layer)
+	layer = layer or 1
+	local otype, maxLayer = self:getOverlay()
+	if otype then
+		self.layer = layer
+		if maxLayer ~= 0 then
+			self.layer = math.min(maxLayer, self.layer)
+		end
+	else
+		self.layer = 1
+	end
+	
 	if self._init then
 		self:_init()
 	end
@@ -647,12 +658,13 @@ function Buff:getOverlay()
 end
 -- 叠加
-function Buff:overlay(releaser, data)
+function Buff:overlay(releaser, data, layer)
 	local otype, maxLayer = self:getOverlay()
 	if self.isDel or not otype then  -- 新获得的 (不可叠加相当于新获得的)
-		self.isDel = false
 		self:endBuff()
+		self.isDel = false
 		self:initNew(releaser, data)
+		self:createAfter(layer)
 	else
 		-- 重置回合 次数
 		self.roundSpace = 0
@@ -665,7 +677,7 @@ function Buff:overlay(releaser, data)
 		self.release = releaser or self.release
 		-- 叠加层数
-		self.layer = self.layer + 1
+		self.layer = self.layer + layer
 		if maxLayer ~= 0 then
 			self.layer = math.min(maxLayer, self.layer)
 		end
@@ -676,14 +688,32 @@ function Buff:overlay(releaser, data)
 end
 -- 扣减层数
-function Buff:uncover()
-	if self.layer <= 1 then
+function Buff:uncover(layer, isAura)
+	layer = layer or 1
+	local oldLayer = self.layer
+
+	self.layer = self.layer - layer
+
+	if self.layer <= 0 then
 		self.isDel = true
 	end
-	self.layer = self.layer - 1
-	if self._uncover then
-		self:_uncover()
+	if isAura then
+		if layer == -1 then
+			self.layer = 0
+			self.isDel = true
+		else
+			self.layer = math.max(1, self.layer)
+			self.isDel = false
+		end
+	end
+
+	if self.isDel then return end
+
+	if oldLayer ~= self.layer then
+		if self._uncover then
+			self:_uncover()
+		end
 	end
 end
@@ -143,7 +143,8 @@ function BaseObject:getDisablePassiveCount()
 	return count
 end
-function BaseObject:addBuff(buffId, releaser)
+function BaseObject:addBuff(buffId, releaser, layer)
+	layer = layer or 1
 	local buffData = csvdb["adv_map_buffCsv"][buffId]
 	if not buffData then return end
 	for _, buff in ipairs(self.buffs) do
@@ -157,7 +158,7 @@ function BaseObject:addBuff(buffId, releaser)
 	local oldBuff = self:getBuffById(buffId)
 	if oldBuff then
 		if not oldBuff:checkKeep() then return end
-		oldBuff:overlay(releaser, {}) -- 叠加
+		oldBuff:overlay(releaser, {}, layer) -- 叠加
 	else
 		-- 不能保持的buff 也加不上去
 		if not Buff.checkKeep({
@@ -167,7 +168,7 @@ function BaseObject:addBuff(buffId, releaser)
 		}) then return end
 		local buff = Buff.create(self, releaser, {id = buffId})
 		table.insert(self.buffs, buff)
-		buff:createAfter()
+		buff:createAfter(layer)
 	end
 	self:triggerPassive(Passive.GET_BUFF, {trigger = releaser, buffId = buffId})
 	self:triggerPassive(Passive.PLAYER_BUFF_CLASSIFY, {trigger = releaser, classify = buffData.classify})
@@ -224,6 +225,30 @@ end
 function BaseObject:reSetSpMax()
 end
+function BaseObject:checkAuraBuff(buffs)
+end
+
+function BaseObject:getAuras()
+	local auras = {}
+	if self:is("Enemy") then
+		local halo = csvdb["event_monsterCsv"][self.monsterId].halo
+		if halo then
+			for _, one in ipairs(halo:toArray(true, "=")) do
+				table.insert(auras, one)
+			end
+		end
+	elseif self:is("Build") then
+		local halo = csvdb["event_buildingCsv"][self.id].halo
+		if halo then
+			for _, one in ipairs(halo:toArray(true, "=")) do
+				table.insert(auras, one)
+			end
+		end
+	end 
+
+	return auras
+end
+
 -- 通用的buff 效果汇总  -- 0 固定 1百分比  两种分类
 function BaseObject:getCommonBuffEffect(bType, otherCond)
@@ -625,6 +650,33 @@ function Enemy:getClassify()
 	return csvdb["event_monsterCsv"][self.monsterId].classify
 end
+-- 0=所有  1=怪物  2=玩家
+function Enemy:checkAuraBuff(buffs)
+	local needBuffs = {}
+
+	for buffId, info in pairs(buffs[0] or {}) do
+		needBuffs[buffId] = needBuffs[buffId] or {}
+		needBuffs[buffId].count = (needBuffs[buffId].count or 0) + info.count
+		needBuffs[buffId].exist = info.exist
+	end
+
+	for buffId, info in pairs(buffs[1] or {}) do
+		needBuffs[buffId] = needBuffs[buffId] or {}
+		needBuffs[buffId].count = (needBuffs[buffId].count or 0) + info.count
+		needBuffs[buffId].exist = info.exist
+	end
+
+	for buffId, info in pairs(needBuffs) do
+		if info.count < 0 then
+			local buff = self:getBuffById(buffId)
+			if buff then
+				buff:uncover(info.exist and -info.count or -1, true)
+			end
+		elseif count > 0 then
+			self:addBuff(buffId, nil, info.count)
+		end
+	end
+end
 function Enemy:kill()
 	self:hurt(self.hp, self.battle.player, {hurtType = 5})
@@ -775,6 +827,33 @@ function Player:addBuff(buffId, releaser)
 	end
 	return status
 end
+-- 0=所有  1=怪物  2=玩家
+function Player:checkAuraBuff(buffs)
+	local needBuffs = {}
+
+	for buffId, info in pairs(buffs[0] or {}) do
+		needBuffs[buffId] = needBuffs[buffId] or {}
+		needBuffs[buffId].count = (needBuffs[buffId].count or 0) + info.count
+		needBuffs[buffId].exist = info.exist
+	end
+
+	for buffId, info in pairs(buffs[2] or {}) do
+		needBuffs[buffId] = needBuffs[buffId] or {}
+		needBuffs[buffId].count = (needBuffs[buffId].count or 0) + info.count
+		needBuffs[buffId].exist = info.exist
+	end
+
+	for buffId, info in pairs(needBuffs) do
+		if info.count < 0 then
+			local buff = self:getBuffById(buffId)
+			if buff then
+				buff:uncover(info.exist and -info.count or -1, true)
+			end
+		elseif info.count  > 0 then
+			self:addBuff(buffId, nil, info.count)
+		end
+	end
+end
 function Player:isPlayer()
 	return true
@@ -103,7 +103,6 @@ Role.schema = {
 	--挂机相关
 	hangPass 			= {"table", {}}, -- 挂机通过的最大关卡
 	hangGift			= {"table", {}}, -- 挂机奖励 {id = 1}
-	hangTeam 			= {"table", {}}, -- 挂机队伍
 	hangTS				= {"table", {}}, -- 挂机队伍他人可读的队伍信息
 	hangTB 				= {"table", {}}, -- 挂机队伍他人可用的战斗信息mao
 	hangTBV				= {"number", 0}, -- 挂机队伍他人可用的战斗力
@@ -111,7 +110,6 @@ Role.schema = {
 	hangInfo			= {"table", {}},  -- 当前挂机信息
 	hangBag				= {"table", {}},	-- 背包
 	hangBagLimit 		= {"number", globalCsv.idle_field_origin}, --背包上限
-	bTeam				= {"table", {}}, -- 奖励副本队伍
 	hangTeams			= {"table", {}},	-- pve自选编队
 	teamIndex			= {"table", {}},	-- 各个系统使用的编队索引 type->index 见TeamSystemType
 	advTeams			= {"table", {}},	-- 拾荒自选编队
@@ -145,7 +143,6 @@ 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}
-	towerF				= {"table", {}}, -- 爬塔阵容 
 	spTask				= {"table", {}}, -- 特殊任务  -- {id = status}
@@ -357,11 +354,9 @@ function Role:data()
 		hangPass = self:getProperty("hangPass"),
 		hangGift = self:getProperty("hangGift"),
-		hangTeam = self:getProperty("hangTeam"),
 		hangInfo = self:getProperty("hangInfo"),
 		hangBag = self:getProperty("hangBag"),
 		hangBagLimit = self:getProperty("hangBagLimit"),
-		bTeam = self:getProperty("bTeam"),
 		hangTeams = self:getProperty("hangTeams"),
 		teamIndex = self:getProperty("teamIndex"),
 		advTeams = self:getProperty("advTeams"),
@@ -380,7 +375,6 @@ function Role:data()
 		equips = self:getProperty("equips"),
 		boxL = self:getProperty("boxL"),
 		towerInfo = self:getProperty("towerInfo"),
-		towerF = self:getProperty("towerF"),
 		spTask = self:getProperty("spTask"),
 		dTask = self:getProperty("dTask"),
 		wTask = self:getProperty("wTask"),
@@ -57,7 +57,6 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		tower = function()
-			--local towerF = self:getProperty("towerF")
 			local towerF = self:getTeamFormatByType(TeamSystemType.Tower)
 			for slot, hero in pairs(self:getTeamHerosInfo(towerF.heros)) do
 				selflist[slot] = hero.type
@@ -73,7 +72,6 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		bonus = function()
-			--local bTeam = self:getProperty("bTeam")
 			local bTeam = self:getTeamFormatByType(TeamSystemType.BonusBattle)
 			for slot, hero in pairs(self:getTeamHerosInfo(bTeam.heros)) do
 				selflist[slot] = hero.type
@@ -1135,7 +1135,6 @@ function RolePlugin.bind(Role)
 		local now = skynet.timex()
 		local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
 		local ct = 10000 - ct  -- 越早的排名越靠前
-		--local towerTeam = self:getProperty("towerF")
 		local towerTeam = self:getTeamFormatByType(TeamSystemType.Tower)
 		local battleV = self:getTeamBattleValue(towerTeam.heros)
 		local score = (level * 10000 + ct) * 10000000 + battleV
@@ -1289,6 +1288,7 @@ function RolePlugin.bind(Role)
 		for slot, id in pairs(team.supports or {}) do
 			teamInfo.supports[slot] = {id, self.dinerData:getProperty("dishTree"):getv(id, 0)}
 		end
+		teamInfo.tactics = globalCsv.tactics_skill_passive_cell[team.tactics] and team.tactics or nil
 		return teamInfo
 	end
@@ -1315,20 +1315,6 @@ function RolePlugin.bind(Role)
 		return self:getRealBattleValue(heros)
 	end
-	-- 不传参数 只修改保存的阵容信息
-	function Role:saveHangTeam(team)	
-		if not team then
-			team = self:getProperty("hangTeam")
-		else
-			self:updateProperty({field = "hangTeam", value = team})
-		end
-		self:setProperties({
-			hangTS = self:getTeamHerosInfo(team.heros),
-			hangTB = self:getTeamBattleInfo(team),
-			hangTBV = self:getTeamBattleValue(team.heros),
-		})
-	end
-
 	function Role:updateHangTeamInfo()
 		local team = self:getTeamFormatByType(TeamSystemType.Hang)
 		if not team then return end