Merge branch 'develop' into tr/publish

# Conflicts: # config/nodenames.lua

Merge branch 'develop' into tr/publish
# Conflicts: # config/nodenames.lua
熊润斐
2 parents daaf02b6 eb87ab7d
Showing 33 changed files with 2067 additions and 624 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
@@ -126,6 +126,7 @@ ItemId = {
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
 	BoxKey = 60, -- 拆解工具
+	AdvPower = 4701, -- 拾荒体力
 }
  
 TimeReset = {
@@ -303,6 +304,7 @@ MailId = {
 	ActDrawCardReward = 222,
 	ActAdvDrawReward = 223,
 	ActOpenBoxReward = 224,
+	ActItemRecycle = 225,
  
 	PaySignAward = 241,
 	PayBackAward = 242,
@@ -322,4 +324,13 @@ DrawCardType = {
 	SpecifyDraw = 1,
 	NormalDraw = 2,
 	FriendDraw = 3
+}
+
+-- 阵容系统类型
+TeamSystemType = {
+	Hang = 1,
+	BonusBattle = 2,
+	Tower = 3,
+	Dinner = 4,
+	FriendBattle = 5,
 }
 \ No newline at end of file
@@ -49,6 +49,8 @@ actionCodes = {
 	Role_updateFeedbackInfoRpc = 133,
 	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
 	Role_broadGetSSR = 135,		-- 全服广播 获得ssr英雄
+	Role_renameTeamRpc = 136,	-- 编队改名
+	Role_accuseRpc = 137,		-- 举报
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -71,6 +73,8 @@ actionCodes = {
 	Adv_rankRpc = 169,
 	Adv_quickHangRpc = 170,
 	Adv_refreshSupportRpc = 171,
+	Adv_selectTeamRpc = 172,
+	Adv_roleFormatRpc = 173,
  
 	Hero_loadInfos = 201,
 	Hero_updateProperty = 202,
@@ -96,6 +100,8 @@ actionCodes = {
 	Hero_unlockPoolRpc = 222,
 	Hero_changeCrown = 223,
 	Hero_drawHeroExtraRewardNtf = 224,
+	Hero_itemComposeRpc = 225,
+	Hero_setWishPoolRpc = 226,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -111,6 +117,7 @@ actionCodes = {
 	Hang_hangGiftRpc = 262,
 	Hang_bagFieldRpc = 263,
 	Hang_chatLineRpc = 264,
+	Hang_selectTeamRpc = 265,
  
 	Diner_updateProperty = 300,
 	Diner_addSellRpc = 301,
@@ -197,6 +204,7 @@ actionCodes = {
 	Store_getGrowFundRewardRpc = 561,	--成长助力奖励
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Store_getExploreCommandRewardRpc = 563, --探索指令
+	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
  
  
 	Email_listRpc = 600,
@@ -212,6 +220,11 @@ actionCodes = {
 	Activity_actPaySignRewardNtf = 654,
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
+	Activity_exchangeRpc = 657,
+
+	Radio_startQuestRpc = 700,
+	Radio_finishQuestRpc = 701,
+	Radio_cancelQuestRpc = 702,
 }
  
 rpcResponseBegin = 10000
@@ -12,6 +12,8 @@ R_RUNE = &quot;role:%d:rune:%d&quot;       -- 符文详细信息
 R_EMAIL = "role:%d:emailIds" --邮件列表
 R_EMAIL_ITEM = "email:%d:%d" --邮件
 R_STORE = "role:%d:store"   -- 商店
+R_ORDERS = "role:%d:orders" -- 订单
+R_ORDER = "order:%d:%d"
  
  
 -- rank
@@ -263,4 +263,36 @@ function _M.actCalendaTaskRpc(agent, data)
 	return true
 end
  
+function _M.exchangeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	if not role.activity:isOpen("Exchange") then return 1 end
+
+	local exchangeCfg = csvdb["activity_exchangeCsv"][actid]
+	if not exchangeCfg then return 2 end
+	if not exchangeCfg[id] then return 3 end
+	local curData = role.activity:getActData("Exchange") or {}
+	local exchangeData = curData[actid] or {}
+	local curCount = exchangeData[id] or 0
+	local actCfg = exchangeCfg[id]
+	if curCount >= actCfg then return 4 end
+
+	local costs = actCfg.goods:toNumMap()
+	if not role:checkItemEnough(costs) then return 5 end
+	role:costItems(costs, {log = {desc = "actExchange", int1 = actid, int2 = id}})
+
+	curCount = curCount + 1
+	exchangeData[id] = curCount
+	curData[actid] = exchangeData
+	role.activity:updateActData("Exchange", curData)
+
+	local reward, change = role:award(actCfg.award, {log = {desc = "actExchange", int1 = actid, int2 = id}})
+
+
+	SendPacket(actionCodes.Activity_exchangeRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -47,6 +47,10 @@ local function checkFormat(role, format, checkAdvTeam)
 		end
 	end
  
+	if not format then
+		format = role:getProperty("advTeam")
+	end
+
 	if checkAdvTeam then
 		for _, heroId in pairs(role:getProperty("advTeam").heros or {}) do
 			hadHero[heroId] = true
@@ -83,7 +87,7 @@ function _M.startAdvRpc( agent, data )
 	local msg = MsgPack.unpack(data)
 	local chapterId = msg.chapterId --关卡id
 	local layer = msg.layer or 1	--选择层数
-	local format = msg.format 		--编队
+	--local format = msg.format 		--编队
 	local supportIdx = msg.supportIdx --选择的支援效果
 	if not role:isFuncUnlock(FuncUnlock.Adv) then return end
  
@@ -127,18 +131,18 @@ function _M.startAdvRpc( agent, data )
 		end
 	end
  
-	if not checkFormat(role, format) then return 7 end
-
-	local advTeam = role:getProperty("advTeam")
-	table.clear(advTeam)
-
-	advTeam.heros = {}
-	for slot, heroId in pairs(format.heros) do
-		advTeam.heros[slot] = heroId
-	end
-	advTeam.leader = format.leader
-	advTeam.leader2 = format.leader2
-	role:updateProperty({field = "advTeam", value = advTeam})
+	if not checkFormat(role) then return 7 end
+
+	--local advTeam = role:getProperty("advTeam")
+	--table.clear(advTeam)
+
+	--advTeam.heros = {}
+	--for slot, heroId in pairs(format.heros) do
+	--	advTeam.heros[slot] = heroId
+	--end
+	--advTeam.leader = format.leader
+	--advTeam.leader2 = format.leader2
+	--role:updateProperty({field = "advTeam", value = advTeam})
 	if AdvCommon.isEndless(chapterId) then
 		role.dailyData:updateProperty({field = "advElC", delta = 1})
 	else
@@ -243,13 +247,14 @@ function _M.startHangRpc(agent, data)
 		info.format.heros[slot] = heroId
 	end
 	info.time = skynet.timex() + adv_idle_time --挂机时间
+	info.duration = adv_idle_time
 	info.campId = campId
 	info.index = index
  
 	-- 没有在战斗  用team来挂机了  把team清掉
-	if not role:getAdvData():isRunning() then
-		role:updateProperty({field = "advTeam", value = {}})
-	end
+	--if not role:getAdvData():isRunning() then
+	--	role:updateProperty({field = "advTeam", value = {}})
+	--end
 	role:pushMsg({type = "adv", slot = chapterId, time = adv_idle_time})
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
@@ -261,6 +266,16 @@ function _M.startHangRpc(agent, data)
 	return true
 end
  
+local function addHeroFaith(role, heroId, exp)
+	local hero = role.heros[heroId]
+	if not hero then
+		return
+	end
+
+	hero:addHeroFaith(exp)
+	return hero:getProperty("faith")
+end
+
 function _M.quickHangRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -328,7 +343,7 @@ function _M.endHangRpc(agent, data)
 	end
 	adv_idle_time = adv_idle_time * 60
  
-	local reward, isFull, change
+	local reward, isFull, change, heroFaithMap
 	if skynet.timex() >= info.time then
 		-- 最新需求加成取消
 		--[[
@@ -357,6 +372,14 @@ function _M.endHangRpc(agent, data)
  
 		if not maxCampsite then return end
 		]]
+		-- 增加英雄信赖
+		local exp = info.duration / 60
+		heroFaithMap = {}
+		for _, heroId in pairs(info.format.heros) do
+			local curFaith = addHeroFaith(role, heroId, exp)
+			heroFaithMap[heroId] = curFaith
+		end
+
 		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
  
 		local idleReward = totalReward:toNumMap()
@@ -384,7 +407,7 @@ function _M.endHangRpc(agent, data)
  
 	role:checkTaskEnter("AdvHang", {})
  
-	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
+	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
 	return true
 end
  
@@ -504,25 +527,8 @@ function _M.useItemRpc(agent, data)
 		adv:cost({[itemId] = count}, {log = {desc = "useItem", int1 = itemId, int2 = count}})
 		adv:backUse({[itemId] = count})
 	end
-
-	if itemId == 5020 then
-		role:finishGuide(53)
-	end
-	adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
-	adv:mylog({desc = "useItem", int1 = itemId, int2 = count})
-
-	role:log("mission_pick_use", {
-		mission_threadid = adv.chapterId, -- 大地图ID
-		mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
-		mission_id = adv.level, -- 关卡ID
-		item_id = itemId, -- 道具ID
-		mission_pick_use_num = count, -- 道具使用量
-		mission_sequenceid = adv.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
-	})
-
-	for i = 1, count do
-		adv:doActive(itemData.effect, target) -- target
-	end
+	
+	adv:useItem(itemId, count, target)
  
 	adv:afterRound()
 	adv:saveDB()
@@ -740,7 +746,7 @@ function _M.endBattleRpc(agent, data)
 		end
 	end
 	adv:mylog({desc = "endBattle"})
-	local status = adv:clickBlock(roomId, blockId, {player = player, bySkill = bySkill})
+	local status = adv:clickBlock(roomId, blockId, {player = player, enemy = msg.enemy, bySkill = bySkill})
  
 	if not status then return end
 	SendPacket(actionCodes.Adv_endBattleRpc, MsgPack.pack({events = adv:popBackEvents()}))
@@ -950,4 +956,61 @@ function _M.refreshSupportRpc(agent, data)
 	return true
 end
  
+function _M.roleFormatRpc(agent , data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local index = msg.index	-- 阵容索引
+	local title = msg.title -- 阵容名称
+	local team = {}
+	for slot, heroId in pairs(msg.heros) do
+		if not role.heros[heroId] then
+			return 1
+		end
+	end
+
+	if index > 10 then
+		return 2
+	end
+
+	team.heros = {}
+	for slot, heroId in pairs(msg.heros) do
+		team.heros[slot] = heroId
+	end
+	team.leader = msg.leader
+	team.leader2 = msg.leader2
+	team.title = title
+	role:setAdvTeamFormat(index, team)
+
+	local advTeam = role:getProperty("advTeam")
+	local curIndex = advTeam.index
+	if curIndex == index then
+		table.clear(advTeam)
+
+		advTeam.heros = {}
+		for slot, heroId in pairs(msg.heros) do
+			advTeam.heros[slot] = heroId
+		end
+		advTeam.leader = msg.leader
+		advTeam.leader2 = msg.leader2
+		advTeam.index = index
+		role:updateProperty({field = "advTeam", value = advTeam})
+	end
+
+	SendPacket(actionCodes.Adv_roleFormatRpc, '')
+	return true
+end
+
+function _M.selectTeamRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local index = msg.index	-- 阵容索引
+	local team = role:getAdvTeamFormat(index)
+	if not next(team) then return end
+	team["index"] = index
+	role:updateProperty({field = "advTeam", value = team})
+
+	SendPacket(actionCodes.Adv_selectTeamRpc, '')
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -609,10 +609,10 @@ function _M.refreshTaskRpc( agent, data )
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
  
-	local cost = {[ItemId.Diamond] = 40}
-	if not role:checkItemEnough(cost) then
-		return 1
-	end
+	--local cost = {[ItemId.Diamond] = 40}
+	--if not role:checkItemEnough(cost) then
+	--	return 1
+	--end
  
 	local orders = json.decode(role.dinerData:getProperty("order"))
  
@@ -402,24 +402,23 @@ function _M.advl(role, pms)
 	return "成功"
 end
  
-table.insert(helpDes, {"冒险内等级增加", "advcl", "经验值"})
-function _M.advcl(role, pms)
-	local exp = tonum(pms.pm1)
-	local advData = role:getAdvData()
+-- table.insert(helpDes, {"冒险内等级增加", "advcl", "经验值"})
+-- function _M.advcl(role, pms)
+-- 	local exp = tonum(pms.pm1)
+-- 	local advData = role:getAdvData()
  
-	if not advData.chapterId then
-		return "先随便开启一关"
-	end
-	advData.battle.player:addExp(exp)
-	advData:saveDB()
-	role:mylog("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
+-- 	if not advData.chapterId then
+-- 		return "先随便开启一关"
+-- 	end
+-- 	advData.battle.player:addExp(exp)
+-- 	advData:saveDB()
+-- 	role:mylog("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
  
-	return "成功"
-end
+-- 	return "成功"
+-- 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})
@@ -534,7 +533,8 @@ function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
 	--local hero = require ("actions.HeroAction")
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
-	print(role:getPaybackReward(0, 10000))
+
+	role:sendMail(13, nil, "1=2", {111})
 	return "成功"
 end
  
@@ -269,7 +269,15 @@ function _M.endBattleRpc(agent, data)
 	local nextCarbonId = role:getNextCarbonId(carbonId)
 	-- 设置挂机关卡
 	if isWin then --and (hangInfo.carbonId or 0) < nextCarbonId then
-		hangInfo.expCarbonId = carbonId
+		if not hangInfo.expCarbonId then
+			hangInfo.expCarbonId = carbonId
+		else
+			local oldCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+			local newCarbonData = csvdb["idle_battleCsv"][carbonId]
+			if oldCarbonData.money < newCarbonData.money then
+				hangInfo.expCarbonId = carbonId
+			end
+		end
 		--local cfg = csvdb["idle_battleCsv"][nextCarbonId]
 		--if cfg then
 		--	hangInfo.bossTime = skynet.timex() + cfg.idle_time
@@ -305,7 +313,10 @@ end
 function _M.roleFormatRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-	local hangTeam = role:getProperty("hangTeam")
+	local index = msg.index	-- 阵容索引
+	local title = msg.title -- 阵容名称
+	local tactics = msg.tactics	-- 战术
+	local team = {}
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
 			return 1
@@ -321,15 +332,27 @@ function _M.roleFormatRpc(agent , data)
 	end
 	if not checkLeader(msg.heros, msg.leader) then return 4 end
  
-	table.clear(hangTeam)
-	hangTeam.heros = {}
+	if index > 10 then
+		return 5
+	end
+
+	if #title > 100 then
+		return 6
+	end
+
+	team.heros = {}
 	for slot, heroId in pairs(msg.heros) do
-		hangTeam.heros[slot] = heroId
+		team.heros[slot] = heroId
 	end
-	hangTeam.leader = msg.leader
-	hangTeam.supports = supports
-	role:saveHangTeam(hangTeam)
-	role:finishGuide(5)
+	team.leader = msg.leader
+	team.supports = supports
+	team.title = title
+	if msg.tactics and globalCsv.tactics_skill_passive_cell[msg.tactics] then
+		team.tactics = msg.tactics
+	end
+
+	role:setTeamFormat(index, team)
+
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
 end
@@ -440,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
@@ -505,10 +498,53 @@ function _M.buyBonusCountRpc(agent, data)
 	return true
 end
  
+local function bonusWinReward(role, bonusData, bwin, count)
+	count = count or 1
+	local open, actId = role.activity:isOpen("BonusDouble")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	local extraCnt = role.storeData:getBonusExtraFightCount()
+
+	local coef = 1
+	if open and actData then
+		coef = tonumber(actData.condition2)
+	end
+	local bonusC = role.dailyData:getProperty("bonusC")
+	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] < count then return false, 1 end
+	bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
+	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
+
+	local reward, change
+	reward = bonusData.reward:toNumMap()
+	for itemId, c in pairs(reward) do
+		reward[itemId] = c * count
+	end
+	for i = 1, count do
+		local chance = bonusData.chance:randWeight(true)
+		if chance[1] ~= 0 then
+			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+		end
+	end
+
+	for k, v  in pairs(reward) do
+		reward[k] = v * (coef > 1 and actData.condition or 1)
+	end
+	
+	if bwin then -- 满星 额外奖励
+		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
+			reward[k] = (reward[k] or 0) + v
+		end
+	end
+	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
+	role:checkTaskEnter("BonusPass", {id = id, count = count})
+	return true, reward, change
+end
+
 function _M.startBonusBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
+	local count = msg.count or 1
  
 	local open, actId = role.activity:isOpen("BonusDouble")
  
@@ -523,8 +559,6 @@ function _M.startBonusBattleRpc(agent, data)
 	if not bonusData then return 3 end
 	if not role:checkHangPass(bonusData.unlock) then return 4 end
  
-	if not next(role:getProperty("bTeam")) then return 5 end
-
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
  
@@ -535,15 +569,24 @@ function _M.startBonusBattleRpc(agent, data)
 	if open and actData then
 		coef = tonumber(actData.condition2)
 	end
+	
+	if math.illegalNum(count, 1, globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
  
-	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 7 end
-
+	local bonusStar = role:getProperty("bonusStar")
+	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
+		local status, reward, change = bonusWinReward(role, bonusData, nil, count)
+		if not status then return 10 * (reward or 0) end
+		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
+	else
+		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
+		if not next(bTeam) then return 5 end
+		role.__bonusBattleCache = {
+			key = tostring(math.random()),
+			id = id,
+		}
+		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
+	end
  
-	role.__bonusBattleCache = {
-		key = tostring(math.random()),
-		id = id,
-	}
-	SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
 	return true
 end
  
@@ -554,14 +597,7 @@ function _M.endBonusBattleRpc(agent, data)
 	local key = msg.key
 	local starNum = msg.starNum
 	if not role.__bonusBattleCache then return 1 end
-	local open, actId = role.activity:isOpen("BonusDouble")
-	local actData = csvdb["activity_ctrlCsv"][actId]
-	local extraCnt = role.storeData:getBonusExtraFightCount()
-
-	local coef = 1
-	if open and actData then
-		coef = tonumber(actData.condition2)
-	end
+	
  
 	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
 		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
@@ -570,24 +606,79 @@ function _M.endBonusBattleRpc(agent, data)
 	local bonusData = csvdb["bonus_battleCsv"][id]
  
 	local reward, change
+
+	local bonusStar = role:getProperty("bonusStar")
+	local curStar = 0
  	if starNum and starNum > 0 then
  		-- 胜利扣除次数
- 		local bonusC = role.dailyData:getProperty("bonusC")
-		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-		if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 3 end
-		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
-		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
-
-		reward = bonusData.reward:toNumMap()
-		local chance = bonusData.chance:randWeight(true)
-		if chance[1] ~= 0 then
-			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+ 		
+ 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
+ 		local herosInfo = role:getTeamHerosInfo(bTeam.heros)
+
+ 		local check = {}
+ 		-- 1 通关
+		check[1] = function(_)
+			return true
 		end
-		for k, v  in pairs(reward) do
-			reward[k] = v * (coef > 1 and actData.condition or 1)
+		-- 2 阵亡人数 <= N
+		check[2] = function(_, cond)
+			return msg.info.dead and msg.info.dead <= cond
 		end
- 		reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
- 		role:checkTaskEnter("BonusPass", {id = id})
+		-- 3 全员存活
+		check[3] = function(_)
+			return msg.info.dead and msg.info.dead == 0
+		end
+		-- 4 指定种族 >= N
+		check[4] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csv["unitCsv"][one.type]
+				if heroData.camp == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
+		end
+		-- 5 指定职业 >= N
+		check[5] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csv["unitCsv"][one.type]
+				if heroData.job == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
+		end
+		-- 6 含有指定角色 
+		check[6] = function(_, cond)
+			for _, one in pairs(herosInfo) do
+				if one.type == cond then
+					return true
+				end
+			end
+			return false
+		end
+		-- 7 通关耗时 <= X 秒  msg.info.atime
+		check[7] = function(_, cond)
+			return msg.info.atime and msg.info.atime <= cond
+		end
+		curStar = 0
+		local sweepConds = bonusData.sweep_condition:toTableArray(true)
+ 		for i, cond in ipairs(sweepConds) do
+ 			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
+ 				curStar = curStar + (1 << (i - 1))
+ 			end
+ 		end
+ 		local status
+ 		status, reward, change = bonusWinReward(role, bonusData, curStar >= (1 << #sweepConds) - 1)
+ 		if not status then return 10 + (reward or 0) end
+ 	else
+ 		curStar = 0
+ 	end
+ 	if curStar ~= bonusStar[id] then
+ 		bonusStar[id] = curStar
+ 		role:updateProperty({field = "bonusStar", value = bonusStar})
  	end
  
  	role:checkBattle("bonus", {
@@ -666,4 +757,29 @@ function _M.chatLineRpc(agent, data)
 	return true
 end
  
-return _M
 \ No newline at end of file
+function _M.selectTeamRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local index = msg.index	-- 阵容索引
+	local type = msg.type	-- 系统类型
+
+	if index > 10 then
+		return 1
+	end
+	local team = role:getTeamFormat(index)
+	if not next(team) then return 2 end
+
+	local teamIndex = role:getProperty("teamIndex") or {}
+	teamIndex[type] = index
+	role:updateProperty({field = "teamIndex", value = teamIndex})
+
+	if type == TeamSystemType.Hang then
+		role:finishGuide(5)
+		role:updateHangTeamInfo()
+	end
+
+	SendPacket(actionCodes.Hang_selectTeamRpc, '')
+	return true
+end
+
+return _M
@@ -143,74 +143,45 @@ function _M.talentRpc(agent, data)
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
  
-	local index = msg.index -- 第几个天赋
-	local need = {[0] = 1, [1] = 1, [2] = 1, [3] = 1, [4] = 1}
-	if not need[index] then return 2 end
-
 	local talent = hero:getProperty("talent")
+	local heroCfgId = hero:getProperty("type")
 	local curStage = talent:getv(0, 1)
-	local curData = csvdb["unit_talentCsv"][curStage]
-	if not curData then return 4 end
+	local curLevel = talent:getv(1, 1)
+	local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][curStage]
+	if not curData then return 1 end
 	local oldSkillLv = hero:getSkillLevel(1)
  
  
 	local cost = {}
-	if index == 0 then
-		--是否进阶
-		local max = true
-		for i = 1, 4 do
-			if talent:getv(i, 0) < #curData then
-				max = false
-				break
-			end
-		end
-		if max then
-			talent = talent:setv(0, curStage + 1)
-			for i = 1, 4 do
-				talent = talent:setv(i, 0)
-			end
-		else
-			return 12
-		end
+	if curLevel == #curData then
+		talent = talent:setv(0, curStage + 1)
+		talent = talent:setv(1, 1)
 	else
-		
-		local level = talent:getv(index, 0)
-		if level >= #curData then return 5 end
+		if curLevel > #curData then return 2 end
  
-		local talentData = curData[level]
-		if not talentData then return end
+		local talentData = curData[curLevel]
+		if not talentData then return 3 end
  
-		if talentData.lvRequire > hero:getProperty("level") then return 6 end
+		if talentData.lvRequire > hero:getProperty("level") then return 4 end
  
 		cost = talentData.money:toNumMap()
-		local cost2 = talentData.cost:toNumMap()
-		for k,v in pairs(cost2) do
-			cost[globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp][k]] = v
-		end
-		if not role:checkItemEnough(cost) then return 6 end
+		if not role:checkItemEnough(cost) then return 5 end
 		role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})
-		talent = talent:incrv(index, 1)
-
-
-		local aheadLevel = 0
-		for i = 1, talent:getv(0, 1) - 1 do
-			aheadLevel = aheadLevel + #csvdb["unit_talentCsv"][i]
-		end
-		aheadLevel = aheadLevel + talent:getv(index, 0)
-
-		role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = aheadLevel})
+		talent = talent:setv(1, curLevel + 1)
 	end
+	curStage = talent:getv(0, 1)
+	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
  
 	hero:updateProperty({field = "talent", value = talent})
  
 	role:log("hero_talent", {
 		hero_id = hero:getProperty("type"), --英雄ID
-		hero_talent_id = index, --天赋ID
+		hero_talent_id = curStage, --天赋ID
 		hero_talent_cost = cost, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
 		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
 	})
-	hero:mylog({desc = "talent", int1 = index, int2 = talent:getv(index, 0)})
+	hero:mylog({desc = "talent", int1 = talent:getv(0, 1), int2 = talent:getv(1, 1)})
  
 	SendPacket(actionCodes.Hero_talentRpc, '')
 	return true
@@ -640,9 +611,37 @@ function _M.getResetRewardRpc(agent, data)
 	local level = hero:getProperty("level")
 	local breakL = hero:getProperty("breakL")
 	local talent = hero:getProperty("talent")
+	local heroCfgId = hero:getProperty("type")
  
+	local tmpLevel = level
 	if level <= 1 and talent == "" then return end
  
+	local pay = true
+	if level <= 60 then
+		pay = false
+	end
+
+	if pay then
+		local costArr = globalCsv.unit_heroBack_cost:toArray(true, "=")
+		local itemCount = role:getItemCount(costArr[1])
+		local totalCost = {}
+		if itemCount >= costArr[2] then
+			totalCost[costArr[1]] = costArr[2]
+		else
+			local diamond = (costArr[2] - itemCount) * costArr[3]
+			if role:getItemCount(ItemId.Diamond) < diamond then
+				return 1
+			end
+			totalCost[costArr[1]] = itemCount
+			totalCost[ItemId.Diamond] = diamond
+		end
+
+		--if pay and not role:costDiamond({count = globalCsv.unit_heroBack_cost or 200, log = {desc = "resetHero", int1 = msg.id}}) then
+		--	return 1
+		--end
+		role:costItems(totalCost, {log = {desc = "resetHero", int1 = msg.id}})
+	end
+
 	local reward = {}
 	while level > 1 do
 		local curData = csvdb["unit_expCsv"][level - 1]
@@ -659,32 +658,18 @@ function _M.getResetRewardRpc(agent, data)
 	end
  
 	local stage = talent:getv(0, 1)
-	local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
+	local curTalentLvl = talent:getv(1, 1)
+	--local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
  
-	local talentCostIds = globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp]
 	while stage > 0 do
-		local curData = csvdb["unit_talentCsv"][stage]
-		for level = math.max(table.unpack(tlevel)), 1, -1 do
-			local add = 0
-			for i = 1, 4 do
-				if tlevel[i] == level then
-					add = add + 1
-					tlevel[i] = tlevel[i] - 1
-				end
-			end
-			local talentData = curData[level - 1]
+		local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][stage]
+		for lvl = 1, curTalentLvl - 1 do
+			local talentData = curData[lvl]
 			for itemId, count in pairs(talentData.money:toNumMap()) do
-				reward[itemId] = (reward[itemId] or 0) + count * add
-			end
-			for idx , count in pairs(talentData.cost:toNumMap()) do
-				reward[talentCostIds[idx]] = (reward[talentCostIds[idx]] or 0) + count * add
+				reward[itemId] = (reward[itemId] or 0) + count
 			end
 		end
 		stage = stage - 1
-		curData = csvdb["unit_talentCsv"][stage]
-		if curData then
-			tlevel = {#curData, #curData, #curData, #curData}
-		end
 	end
  
 	local equip = hero:getProperty("equip")
@@ -708,9 +693,11 @@ function _M.getResetRewardRpc(agent, data)
 		rune = "",
 	})
 	hero:mylog({desc = "resetHero"})
-
+	
+	--local coef = globalCsv.unit_back_discount
+	--coef = (pay or tmpLevel <= 60) and  1 or coef
 	for itemId, count in pairs(reward) do
-		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
+		reward[itemId] = count
 	end
 	local change
 	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -729,11 +716,14 @@ function _M.drawHeroRpc(agent, data)
 	local msg = MsgPack.unpack(data)
  
 	if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
-	local btype = msg.pool	-- 1 2 3	卡池类型
+	local btype = msg.pool	-- 1 2 3 4 5	卡池类型  4新手卡池 5心愿卡池
 	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
 	local drawType = msg.type -- 1 单抽 2 十连
 	if btype ~= 1 then
 		subType = 1
+		if btype == 4 and role:getProperty("newerDraw") >= 10 then
+			subType = 2
+		end
 	end
  
 	if btype == 1 then
@@ -754,23 +744,32 @@ function _M.drawHeroRpc(agent, data)
  
 	-- 计算抽卡消耗品
 	local cost = {}
-	local lastCount = drawCount[drawType]
-	for _, costType in ipairs({"draw_card", "draw_coin"}) do
+	if buildTypeData["draw_coin_1"] == "" then
+		return 11
+	end
+	local diamondCost = buildTypeData["draw_coin_1"]:toArray(true, "=")
+
+	local isEnough = true
+	for _, costType in ipairs({"draw_card_"}) do
+		costType = costType..drawCount[drawType]
 		if buildTypeData[costType] ~= "" then
 			local curCost = buildTypeData[costType]:toArray(true, "=")
 			local hadCount = role:getItemCount(curCost[1])
-			local curCount = math.floor(hadCount / curCost[2])
-			if curCount >= lastCount then
-				cost[curCost[1]] = curCost[2] * lastCount
-				lastCount = 0
+			if hadCount >= curCost[2] then
+				cost[curCost[1]] = curCost[2]
 				break
-			elseif curCount > 0 then
-				cost[curCost[1]] = curCost[2] * curCount
-				lastCount = lastCount - curCount
+			else
+				cost[curCost[1]] = hadCount
+				diamondCost[2] = (curCost[2] - hadCount) * diamondCost[2]
+				if not role:checkItemEnough({[diamondCost[1]]=diamondCost[2]}) then
+					isEnough = false
+					break
+				end
+				cost[diamondCost[1]] = diamondCost[2]
 			end
 		end
 	end
-	if lastCount > 0 then -- 钱不够
+	if isEnough == false then -- 钱不够
 		return 4
 	end
  
@@ -833,6 +832,9 @@ function _M.drawHeroRpc(agent, data)
 		--print(poolId, rand_v, weight, up_pool, values[1])
 		if rand_v < weight and up_pool then
 			up_pool = up_pool:toArray(true, "=")
+			if btype == 5 then -- 爱心卡池，使用玩家设置的备选池子
+				up_pool = role:getProperty("wishPool")
+			end
 			for k, v in ipairs(up_pool) do
 				resultPool[v] = {1}
 			end
@@ -898,8 +900,14 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
  
-		if itemData.quality >= HeroQuality.SR then
-			floorHeroCount = 0
+		if btype == 4 and role:getProperty("newerDraw") == 0 then		-- 新手卡池
+			if itemData.quality == HeroQuality.SSR then
+				floorHeroCount = 0
+			end
+		else
+			if itemData.quality >= HeroQuality.SR then
+				floorHeroCount = 0
+			end
 		end
  
 		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
@@ -922,6 +930,11 @@ function _M.drawHeroRpc(agent, data)
 		role:setProperty("floorHero", floorHero)
 	end
  
+	if btype == 4 then
+		local newCount = role:getProperty("newerDraw")
+		role:updateProperty({field="newerDraw", value = newCount + drawCount[drawType]})
+	end
+
 	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
@@ -1068,4 +1081,51 @@ function _M.changeCrown(agent, data)
 	return true
 end
  
+function _M.itemComposeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local itemId = msg.id
+	local count = msg.count
+	if not csvdb["itemCsv"][itemId] then return 1 end
+	local config = csvdb["item_processCsv"][itemId]
+	if not config then return 2 end
+
+	local cost = config.cost:toNumMap()
+	if not role:checkItemEnough(cost) then return 2 end
+	role:costItems(cost, {log = {desc = "itemCompose", int1 = itemId, int2 = count}})
+	role:award({[itemId] = count}, {log = {desc = "itemCompose"}})
+
+	SendPacket(actionCodes.Hero_itemComposeRpc, "")
+	return true
+end
+
+function _M.setWishPoolRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local heros = msg.heros
+	if #heros > 3 then return 1 end
+
+	for _, heroId in pairs(heros) do
+		local cfg = csvdb["build_poolCsv"][heroId]
+		if not cfg then return 2 end
+
+		local buildTypeData = csvdb["build_typeCsv"][5]
+		if not buildTypeData then return 3 end
+		local poolMap = buildTypeData["pool"]:toNumMap()
+		local poolId = poolMap[1]
+		if not poolId then return 4 end
+
+		if cfg["pool_"..poolId] == 0 then
+			return 5
+		end
+	end
+
+	role:updateProperty({field="wishPool", value = heros})
+
+	SendPacket(actionCodes.Hero_setWishPoolRpc, "")
+	return true
+end
+
 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
@@ -725,6 +735,7 @@ function _M.endBattleHRpc(agent, data)
 		myRank = myRank,
 		oldMyRank = oldMyRank,
 		video = video,
+		headers = headers,
 		isWin = isWin,
 	}))
 	return true
@@ -0,0 +1,181 @@
+local _M = {}
+
+-- 获取英雄大成功率
+local function getHeroCoef(hero, condition)
+    -- 基础概率
+    local rareMap = {[HeroQuality.N] = 10, [HeroQuality.R] = 10, [HeroQuality.SR] = 15, [HeroQuality.SSR] = 20}
+    local rare = hero:getRare()
+    local result = 0
+    for _, it in ipairs(condition:toTableArray(true)) do
+        local type = it[1]
+        local value = it[2]
+        local add = it[3]
+        if type == 1 then   -- 种族加成
+            if hero:getCamp() == value then
+                result = result + add
+            end
+        elseif type == 2 then   -- 定位加成
+            if hero:getPosition() == value then
+                result = result + add
+            end
+        end
+    end
+
+    return result + (rareMap[rare] or 0)
+end
+
+local function getQuestMax(role)
+    local count = 0
+    for _, carbonId in ipairs(globalCsv.crusade_team_unlock or {}) do
+        if role:checkHangPass(carbonId) then
+            count = count + 1
+        end
+    end
+
+    return count + (globalCsv.cursade_team_count_initial or 0)
+end
+
+function _M.startQuestRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local heros = msg.heros
+    local result = {}
+    local radioTask = role:getProperty("radioTask")
+    if table.numbers(radioTask) >= getQuestMax(role) then
+        return 1
+    end
+    --  check id
+    local config = csvdb["crusadeCsv"][id]
+    if not config then return 2 end
+    if not role:checkHangPass(config.unlock) then return 3 end
+    if radioTask[id] then return 4 end
+    --  check hero
+    --1=指定等级=人数
+    --2=指定稀有度=人数 
+    --3=人数
+    local needHeroCnt = 0
+    local lvlMap = {}
+    local rareMap = {}
+    for _, it in ipairs(config.condition:toTableArray(true)) do
+        local type = it[1]
+        if type == 1 then
+            lvlMap[1] = it[2]
+            lvlMap[2] = it[3]
+        elseif type == 2 then
+            rareMap[1] = it[2]
+            rareMap[2] = it[3]
+        elseif type == 3 then
+            needHeroCnt = it[2]
+        end
+    end
+    for _, heroId in ipairs(heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            needHeroCnt = needHeroCnt - 1
+            if next(lvlMap) then
+                if hero:getProperty("level") >= lvlMap[1] then
+                    lvlMap[2] = lvlMap[2] - 1
+                    if lvlMap[2] <= 0 then
+                        lvlMap = {}
+                    end
+                end
+            end
+            if next(rareMap) then
+                if hero:getRare() >= rareMap[1] then
+                    rareMap[2] = rareMap[2] - 1
+                end
+                    if rareMap[2] <= 0 then
+                        rareMap = {}
+                    end
+            end
+        end
+    end
+    if needHeroCnt > 0 or next(rareMap) or next(lvlMap) then
+        return 5
+    end
+    -- start quest, set finish time
+    local taskData = {}
+    taskData["time"] = skynet.timex() + config.time
+    taskData["heros"] = heros
+    radioTask[id] = taskData
+    role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
+
+	SendPacket(actionCodes.Radio_startQuestRpc, MsgPack.pack({id=id, task=taskData}))
+	return true
+end
+
+function _M.finishQuestRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+    -- check finish time
+    local radioTask = role:getProperty("radioTask")
+    local task = radioTask[id]
+    if not task then return 1 end
+    if skynet.timex() < task.time then return 2 end
+    --  check id
+    local config = csvdb["crusadeCsv"][id]
+    if not config then return 3 end
+    local carbonData = csvdb["idle_battleCsv"][config.unlock]
+    if not carbonData then return 4 end
+    --  get heros
+    local totalCoef = 0
+    local exp = config.time / 60
+    local heroFaithMap = {}
+    for _, heroId in ipairs(task.heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            totalCoef = totalCoef + getHeroCoef(hero, config.success)
+            -- 增加英雄信赖
+            hero:addHeroFaith(exp)
+            heroFaithMap[heroId] = hero:getProperty("faith")
+        end
+    end
+    -- send award
+    local bigSuccess = false
+    local result = math.randomInt(0, 100)
+    if result < totalCoef then
+        bigSuccess = true
+    end
+    local money = math.ceil(carbonData.money / 5) * config.time * config.money_clear
+    local exp = math.ceil(carbonData.exp / 5) * config.time * config.exp_clear
+    local itemReward = config.item_clear_special:toNumMap()
+    itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
+    itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
+    if bigSuccess then
+        for key, value in pairs(itemReward) do
+            itemReward[key] = math.ceil(1.5 * value)
+        end
+    end
+
+    local r, change = role:award(itemReward, {log = {desc = "radioQuest", int1 = id}})
+    
+    radioTask[id] = nil
+    role:updateProperty({field="radioTask", value=radioTask, notNotify = true})
+
+    local msg = role:packReward(r, change)
+    msg["big"] = bigSuccess
+    msg["id"] = id
+    msg["heroFaith"] = heroFaithMap
+	SendPacket(actionCodes.Radio_finishQuestRpc, MsgPack.pack(msg))
+	return true
+end
+
+function _M.cancelQuestRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+    -- check finish time
+    local radioTask = role:getProperty("radioTask")
+    local task = radioTask[id]
+    if not task then return 1 end
+    if skynet.timex() > task.time then return 2 end
+    radioTask[id] = nil
+    role:updateProperty({field="radioTask", value=radioTask, notNotify = true})
+
+    SendPacket(actionCodes.Radio_cancelQuestRpc, MsgPack.pack({id = id}))
+    return true
+end
+
+return _M
 \ No newline at end of file
@@ -291,7 +291,7 @@ function _M.loginRpc( agent, data )
  
  
 	-- 玩家登陆做的一些操作
-	role:saveHangTeam()
+	role:updateHangTeamInfo()
 	role:savePvpCTeam()
 	role:savePvpHTeam()
  
@@ -1255,4 +1255,40 @@ function _M.useSelectItemRpc(agent, data)
 	return true
 end
  
+function _M.renameTeamRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local title = msg.title
+	local index = msg.index
+	local ispve = msg.ispve
+	if ispve then
+		local teams = role:getProperty("hangTeams")
+		local team = role:getTeamFormat(index)
+		team.title = title
+		teams[index] = team
+		role:updateProperty({field = "hangTeams", value = teams, notNotify = false})
+	else
+		local teams = role:getProperty("advTeams")
+		local team = role:getAdvTeamFormat(index)
+		team.title = title
+		teams[index] = team
+		role:updateProperty({field = "advTeams", value = teams, notNotify = false})
+	end
+
+	SendPacket(actionCodes.Role_renameTeamRpc, "")
+	return true
+end
+
+function _M.accuseRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local targetId = msg.targetId
+	local atype = msg.type
+	local note = msg.note
+
+	role:mylog("role_action", {desc = "accuse", int1 = targetId, short1 = atype, text1 = note})
+	SendPacket(actionCodes.Role_accuseRpc, "")
+	return true
+end
+
 return _M
 \ No newline at end of file
 local _M = {}
  
-local serverId = tonumber(skynet.getenv("servId"))
 local md5 = require "md5"
  
-local function makeOrder(roleId, rechargeId)
-	local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
-	local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
-	local orderKey = string.format("order:%d:%d", roleId, orderId)
-	redisproxy:del(orderKey)
-	local order = require("models.Order").new({ 
-		key = orderKey, 
-		order = partnerOrderId, 
-		rechargeId = rechargeId, 
-	})
-	order:create()
-	redisproxy:sadd(string.format("role:%d:orders", roleId), partnerOrderId)
-	return partnerOrderId
-end
-
 -- 入口在正式服关闭  -- mock 充值
 function _M.rechargeRpc(agent , data)
 	if true then return end
@@ -29,7 +13,7 @@ function _M.rechargeRpc(agent , data)
 	local roleId = role:getProperty("id")
  
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
  
  
@@ -78,7 +62,7 @@ function _M.googleRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
 	local need = {
@@ -105,7 +89,7 @@ function _M.myCardRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "48759e07540f46d9af17ec82669b4272"
 	local need = {
@@ -131,7 +115,7 @@ function _M.iosRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
 	local need = {
@@ -155,43 +139,15 @@ function _M.purchaseOrderResult(agent, data)
  
 	role.ignoreHeartbeat = false
  
-	local partnerOrderStr = msg.order
-	local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
-	local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
-	if not orderObject:load() then
-		-- 订单不存在
-		skynet.error("cancelPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
-		return true
-	end
-
-	if msg.status == "success" then
-		orderObject:setProperty("transactionId", msg.platformOrder or "")
-		local rechargeId = orderObject:getProperty("rechargeId")
-		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
-		
-		role:log("setOrder", {
-			order_status = 100, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
-			item_id = rechargeId, -- 道具id
-			item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
-			item_name = dataSet.title, -- 购买的道具名
-			item_number = 1, -- 购买的道具数量
-			item_level = 1, -- 购买的道具等级
-			order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
-			order_type = role:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
-			order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
-		})
-
-		return true
-	end
+	local status = {
+		fail = true,
+		success = true
+	}
  
-	if orderObject:getProperty("finishTime") > 0 then
-		return true
+	local partnerOrderStr = msg.order
+	if partnerOrderStr then
+		role:updatePurchaseOrder(partnerOrderStr, msg.platformOrder, status[msg.status] and msg.status or "unknown")
 	end
-
-	orderObject:setProperty("status", msg.status)
-
-	redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
 	return true
 end
  
@@ -441,4 +397,24 @@ function _M.getExploreCommandRewardRpc(agent, data)
 	return true
 end
  
+-- 累充奖励
+function _M.getTotalRechargeAwardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local index = msg.index		-- 领取的索引id
+	local totalRechargeRecord = role.storeData:getProperty("totalRR")
+	local flag = string.char(string.getbit(totalRechargeRecord, index))
+	if flag == "1" then
+		return 1
+	end
+	totalRechargeRecord = string.setbit(totalRechargeRecord, index)
+	role.storeData:updateProperty({field = "totalRR", value = totalRechargeRecord})
+	local cfg = csvdb["Csv"][index]
+	if not cfg then return 2 end
+
+	local reward, _ = role:award(cfg.reward, {log = {desc = "totalRecharge", int1 = index}})
+	SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -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()
@@ -58,7 +58,7 @@ function Adv:initByInfo(advInfo)
 		self.maps[id] = AdvMap.new(self, id, map)
 	end
  
-	self:initBattle()
+	self:initBattle(advInfo)
 end
 -- 找出level 是否存在中继层
 function Adv:isHaveRelay(level, chapterId)
@@ -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()
  
@@ -146,7 +149,7 @@ function Adv:initByChapter(params)
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
  
-	self:initBattle(true)
+	self:initBattle(nil)
  
 	self:initLayerTask()
  
@@ -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()
@@ -453,7 +456,7 @@ function Adv:clearAdvUnlockCache()
 	self.cacheUnlock = {}
 end
  
-function Adv:initBattle(notDb)
+function Adv:initBattle(info)
 	self.battle = require("adv.AdvBattle").new(self)
 	for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
 		self.battle:triggerPassive(passiveC[1], passiveC[2])
@@ -465,9 +468,16 @@ function Adv:initBattle(notDb)
 		map:initBattleAfter()
 	end
 	--下层
-	if notDb and self.level ~= 1 then
+	if not info and self.level ~= 1 then
 		self.battle.player:attrChangeCondBuffCheck(1)
 	end
+
+	-- 初始化
+	if not info then
+		self.battle:newBattle()
+	else
+		self.battle:loadBattle(info)
+	end
 end
  
 function Adv:triggerPassive(condType, params)
@@ -936,7 +946,7 @@ end
  
 -- log long1 字段被征用！！！
 -- 在冒险中获得的物品都发放在冒险背包内
-function Adv:award(gift, params)
+function Adv:award(gift, params, backRewardParams)
 	params = params or {}
 	local tgift = {}
 	if type(gift) == "string" then
@@ -948,6 +958,8 @@ function Adv:award(gift, params)
 	end
 	local items = self.owner:getProperty("advItems")
 	local oldItems = items
+
+	local autoUse = {}
 	for itemId, count in pairs(tgift) do
 		if count > 0 then
 			local buffAdd = self.battle.player:getRewardChange(itemId)
@@ -956,41 +968,45 @@ function Adv:award(gift, params)
 			self:checkAchievement(Adv.AchievType.GetItem, count, itemId)
 		end
 		tgift[itemId] = count
-		local origin = items:getv(itemId, 0)
-		local nums = origin + count
-
-		if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
-			self:awardArtifact(itemId, params)
-			if not self.owner:checkOverGuide(55) then
-				self.owner:saveGuide(55,1,true)
-			end
+		if globalCsv.adv_auto_useItem[itemId] and count > 0 then
+			autoUse[itemId] = count
 		else
-			if nums <= 0 then
-				items = items:delk(itemId)
-				nums = 0
+			local origin = items:getv(itemId, 0)
+			local nums = origin + count
+
+			if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
+				self:awardArtifact(itemId, params)
+				if not self.owner:checkOverGuide(55) then
+					self.owner:saveGuide(55,1,true)
+				end
 			else
-				items = items:setv(itemId, nums)
-			end
+				if nums <= 0 then
+					items = items:delk(itemId)
+					nums = 0
+				else
+					items = items:setv(itemId, nums)
+				end
  
-			if itemId == 16 and not self.owner:checkOverGuide(51,4) then
-				self.owner:saveGuide(51,4)
-			end
-			if params.log then
-				local log = clone(params.log)
-				if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
-					print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
+				if itemId == 16 and not self.owner:checkOverGuide(51,4) then
+					self.owner:saveGuide(51,4)
 				end
-				log["cint1"] = itemId
-				log["cint2"] = math.abs(count)
-				log["cint3"] = self.chapterId
-				log["long1"] = self.level
-				if count >= 0 then
-					self.owner:mylog("in_adv", log)
+				if params.log then
+					local log = clone(params.log)
+					if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
+						print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
+					end
+					log["cint1"] = itemId
+					log["cint2"] = math.abs(count)
+					log["cint3"] = self.chapterId
+					log["long1"] = self.level
+					if count >= 0 then
+						self.owner:mylog("in_adv", log)
+					else
+						self.owner:mylog("out_adv", log)
+					end
 				else
-					self.owner:mylog("out_adv", log)
+					print("addAdvItem no log ", debug.traceback())
 				end
-			else
-				print("addAdvItem no log ", debug.traceback())
 			end
 		end
 	end
@@ -1001,10 +1017,48 @@ function Adv:award(gift, params)
 	if tgift[ItemId.OldCoin] then
 		self.battle.player:attrChangeCondBuffCheck(0)
 	end
+
+	if backRewardParams then
+		self:backReward(tgift, backRewardParams)
+	end
+
+	if next(autoUse) then
+		for itemId, count in pairs(autoUse) do
+			self:useItem(itemId, count)
+		end
+		self:backUse(autoUse, 1)
+	end
 	return tgift
 end
  
  
+function Adv:useItem(itemId, count, target)
+	local itemData = csvdb["adv_itemCsv"][itemId] 
+	if not itemData then return end
+
+	if itemData["function"] == 0 or itemData["function"] == 2 then count = 1 end
+
+	if itemId == 5020 then
+		self.owner:finishGuide(53)
+	end
+
+	self:checkAchievement(self.AchievType.UseItem, count, itemId)
+	self:mylog({desc = "useItem", int1 = itemId, int2 = count})
+
+	self.owner:log("mission_pick_use", {
+		mission_threadid = self.chapterId, -- 大地图ID
+		mission_threadname = (csvdb["adv_chapterCsv"][self.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+		mission_id = self.level, -- 关卡ID
+		item_id = itemId, -- 道具ID
+		mission_pick_use_num = count, -- 道具使用量
+		mission_sequenceid = self.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	})
+
+	for i = 1, count do
+		self:doActive(itemData.effect, target) -- target
+	end
+end
+
 -- 消耗物品 优先冒险背包  --check 只是检查够不够
 function Adv:cost(item, params, check)
 	local items = self.owner:getProperty("advItems")
@@ -1040,7 +1094,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 --处于底层
  
@@ -1071,11 +1127,10 @@ local function clickOut(self, room, block, params, isExit)
 				self.battle.player:triggerPassive(Passive.DOWN_LAYER)
  
 				if curFloorData then
-					self:backReward(self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}))
+					self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}, {})
 				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, 
@@ -1255,7 +1310,7 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 						skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  effect[2], tag, chooseData.id))
 					end
 				end
-				self:backReward(self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}), {roomId = room.roomId, blockId = block.blockId})
+				self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, {roomId = room.roomId, blockId = block.blockId})
 			end,
 			[2] = function() --获得冒险buff
 				local layer = effect[3] or 1
@@ -1419,14 +1474,12 @@ local function clickDrop(self, room, block, params)
 	if not self.battle or not self.battle.player then return end
 	self.battle.player:triggerPassive(Passive.CLICK_DROP)
  
-	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
-	-- local reward = self:award({[5801] = 1})
-	-- 获取绷带的引导
+	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}}, {roomId = room.roomId, blockId = block.blockId})
+
 	if block.event.item[1] == 5020 and not self.owner:checkOverGuide(53,2) then
 		self.owner:saveGuide(53,2)
 	end
 	block:clear()
-	self:backReward(reward, {roomId = room.roomId, blockId = block.blockId})
 	return true
 end
  
@@ -1447,7 +1500,7 @@ local function clickTrader(self, room, block, params)
 	local costCount = math.ceil(goodsData.price * (block.event.shop[buyId][2] or 100) / 100)
 	if not self:cost({[goodsData.currency] = costCount}, {log = {desc = "clickTrader", int1 = block.event.id}}) then return false, 6 end --不够
 	self:backCost({[goodsData.currency] = costCount})
-	local reward = self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}})
+	self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}}, {})
 	if goodsData.restrict == 1 then
 		self.shopStatus[goodsData.goods] = (self.shopStatus[goodsData.goods] or 0) + 1
 	elseif goodsData.restrict == 2 then
@@ -1459,7 +1512,6 @@ local function clickTrader(self, room, block, params)
 	buyCount = buyCount + 1
 	self:checkTask(Adv.TaskType.Shop, 1, block.event.id)
 	self:checkAchievement(Adv.AchievType.Shop, 1, block.event.id)
-	self:backReward(reward)
  
 	if (traderData.purchasetime ~= 0 and traderData.purchasetime <= buyCount) or #block.event.shop <= buyCount then
 		block:clear()
@@ -1501,7 +1553,7 @@ local function clickClick(self, room, block, params)
 				local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true)
 				reward[item[1]] = (reward[item[1]] or 0) + item[2]
 			end
-			self:backReward(self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}), {roomId = room.roomId, blockId = block.blockId})
+			self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}, {roomId = room.roomId, blockId = block.blockId})
 		end,
 		[3] = function()
 			for _, buffId in ipairs(clickData.effect:toArray(true, "=")) do
@@ -1521,6 +1573,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
@@ -1536,6 +1589,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
@@ -1842,23 +1896,31 @@ end
  
 -- 地图上物品变化
 function Adv:mapItemChange(ctype)
+	local blocks = {}
+	for roomId, room in pairs(self:getCurMap().rooms) do
+		for blockId, block in pairs(room.blocks) do
+			table.insert(blocks, block)
+		end
+	end
+	self:blockDropChange(ctype, blocks)
+end
+
+function Adv:blockDropChange(ctype, blocks)
 	local clist = csvdb["transform_itemCsv"][ctype]
 	if clist then
-		for roomId, room in pairs(self:getCurMap().rooms) do
-			for blockId, block in pairs(room.blocks) do
-				if block:getEventType() == AdvEventType.Drop and block.event.item then
-					local id = block.event.item[1]
-					local count = block.event.item[2]
-					local changeTo = nil
-					if clist[id] then
-						changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
-					elseif clist[-1] then
-						changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
-					end
-					if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
-						block.event.item = changeTo
-						self:backBlockChange(roomId, blockId, ctype)
-					end
+		for _, block in ipairs(blocks) do
+			if block:getEventType() == AdvEventType.Drop and block.event.item then
+				local id = block.event.item[1]
+				local count = block.event.item[2]
+				local changeTo = nil
+				if clist[id] then
+					changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
+				elseif clist[-1] then
+					changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
+				end
+				if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
+					block.event.item = changeTo
+					self:backBlockChange(block.room.roomId, block.blockId, ctype)
 				end
 			end
 		end
@@ -1887,76 +1949,148 @@ function Adv:enemyDead(enemy, escape)
 			else
 				self:scoreChange(AdvScoreType.Kill, monsterData.advScore)
 			end
-			local changeV = self.battle.player:addExp(monsterData.exp)
-			self:backDead(enemyId, changeV)
-
-			local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
-			if toClick then
-				toClick = toClick:effect()
+			-- local changeV = self.battle.player:addExp(monsterData.exp)
+			-- self:backDead(enemyId, changeV)
+			self:backDead(enemyId)
+
+			local isMine = false -- 是不是宝藏怪
+			for _, mid in ipairs(globalCsv.adv_egg_treasureMonster_id) do 
+				if mid == enemyId then
+					isMine = true
+					break
+				end
 			end
+			if isMine then
+				local advMine = self.owner:getProperty("advMine")
+				advMine[1] = advMine[1] or {}
+				advMine[2] = advMine[2] or {}
+				local mineCo = advMine[1].co or {}
+				local mineCo2 = advMine[2].co or {}
+				local mineCh = advMine[2].ch or globalCsv.adv_egg_treasureLayer_showup
+				if monsterData.limit ~= 0 then
+					mineCo[enemyId] = (mineCo[enemyId] or 0) + 1
+				end
  
-			local changItem = enemy:hadBuff(Buff.CHANGE_DROP)
-			if changItem then
-				changItem = table.pack(changItem:effect())
-			end
+				local had = false
+				if math.randomInt(1, 100) <= mineCh then -- 刷出来了
+					local mpool = {}
+					for _, mid in ipairs(globalCsv.adv_egg_treasureLayer_id) do
+						local layer = csvdb["event_buildingCsv"][mid]
+						if (not mineCo2[mid] or layer.limit == 0 or mineCo2[mid] < layer.limit) and layer.showup > 0 then
+							mpool[mid] = {layer.showup}
+						end
+					end
+					if next(mpool) then
+						local cId = math.randWeight(mpool, 1)
+						block:updateEvent({
+							etype = AdvEventType.Build,
+							id = cId
+						})
+						if csvdb["event_buildingCsv"][cId].limit ~= 0 then
+							mineCo2[cId] = (mineCo2[cId] or 0) + 1
+						end
+						had = true
+					end
+				end
+				if had then
+					mineCh = math.min(mineCh + globalCsv.adv_egg_treasureLayer_showup_add, 100)
+				else
+					mineCh = nil
+				end
  
-			local addMult = 0
-			local dropBuff = enemy:hadBuff(Buff.DROP_BUFF_BY_ENEMY)  -- 根据敌人数量变化个数
-			if dropBuff then
-				local team = enemy:getTeam(1, true)
-				addMult = addMult + 0.2 * #team
-			end
+				local drops = {}
+				for _, dropId in ipairs(monsterData.dropid:toArray(true, "=")) do
+					local dropData = csvdb["event_dropCsv"][dropId]
+					if dropData then
+						local cur = dropData["range"]:randWeight(true)
+						if cur and cur[1] ~= 0 then
+							drops[#drops + 1] = cur
+						end
+					end
+				end
+				local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, #drops)
+				for _i, cblock in ipairs(blocks) do
+					cblock:updateEvent({
+						etype = AdvEventType.Drop,
+						item = drops[_i]
+					})
+					if cblock ~= block then
+						self:backBlockChange(cblock.room.roomId, cblock.blockId)
+					end
+				end
+				advMine[1].co = mineCo
+				advMine[2].co = mineCo2
+				advMine[2].ch = mineCh
+				self.owner:setProperty("advMine", advMine)
+			else
+				local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
+				if toClick then
+					toClick = toClick:effect()
+				end
  
-			local dropIds = monsterData.dropid:toArray(true, "=")
-			local drops = {}
-			local cCcount = 0 -- 需要改变为click 的个数
-			for _, dropId in ipairs(dropIds) do
-				local dropData = csvdb["event_dropCsv"][dropId]
-				if dropData then
-					local cur = dropData["range"]:randWeight(true)
-					if cur and cur[1] ~= 0 then
-						if toClick then
-							cCcount = cCcount + 1
-						else
-							local item = changItem and changItem or cur
-							item[2] = math.floor(item[2] * (1 + addMult))
-							drops[#drops + 1] = item
+				local changItem = enemy:hadBuff(Buff.CHANGE_DROP)
+				if changItem then
+					changItem = table.pack(changItem:effect())
+				end
+
+				local addMult = 0
+				local dropBuff = enemy:hadBuff(Buff.DROP_BUFF_BY_ENEMY)  -- 根据敌人数量变化个数
+				if dropBuff then
+					local team = enemy:getTeam(1, true)
+					addMult = addMult + 0.2 * #team
+				end
+
+				local dropIds = monsterData.dropid:toArray(true, "=")
+				local drops = {}
+				local cCcount = 0 -- 需要改变为click 的个数
+				for _, dropId in ipairs(dropIds) do
+					local dropData = csvdb["event_dropCsv"][dropId]
+					if dropData then
+						local cur = dropData["range"]:randWeight(true)
+						if cur and cur[1] ~= 0 then
+							if toClick then
+								cCcount = cCcount + 1
+							else
+								local item = changItem and changItem or cur
+								item[2] = math.floor(item[2] * (1 + addMult))
+								drops[#drops + 1] = item
+							end
 						end
 					end
 				end
-			end
-			-- 这些奖励可能会有被动加成
-			self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops})
+				-- 这些奖励可能会有被动加成
+				self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops})
  
-			-- 自身带的掉落是不会被改变的 也不会被加成
-			if block.event.item and block.event.item[1] ~= 0 then
-				table.insert(drops,  1, block.event.item)
-			end
+				-- 自身带的掉落是不会被改变的 也不会被加成
+				if block.event.item and block.event.item[1] ~= 0 then
+					table.insert(drops,  1, block.event.item)
+				end
  
-			-- 清空当前的格子
-			block:clear()
+				-- 清空当前的格子
+				block:clear()
  
-			-- 掉落走一波
-			local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, #drops)
-			for _i, cblock in ipairs(blocks) do
-				cblock:updateEvent({
-					etype = AdvEventType.Drop,
-					item = drops[_i]
-				})
-				if cblock ~= block then
-					self:backBlockChange(cblock.room.roomId, cblock.blockId)
+				-- 掉落走一波
+				local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, #drops)
+				for _i, cblock in ipairs(blocks) do
+					cblock:updateEvent({
+						etype = AdvEventType.Drop,
+						item = drops[_i]
+					})
+					if cblock ~= block then
+						self:backBlockChange(cblock.room.roomId, cblock.blockId)
+					end
 				end
-			end
  
-			-- 转换的click走一波
-			local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, cCcount)
-			for _i, cblock in ipairs(blocks) do
-				cblock:updateEvent({
-					etype = AdvEventType.Click,
-					id = clickId
-				})
-				if cblock ~= block then
-					self:backBlockChange(cblock.room.roomId, cblock.blockId)
+				-- 转换的click走一波
+				local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, cCcount)
+				for _i, cblock in ipairs(blocks) do
+					cblock:updateEvent({
+						etype = AdvEventType.Click,
+						id = clickId
+					})
+					if cblock ~= block then
+						self:backBlockChange(cblock.room.roomId, cblock.blockId)
+					end
 				end
 			end
  
@@ -1989,10 +2123,13 @@ end
 function Adv:pushBackEvent(btype, params)
 	table.insert(self.backEvents, {btype = btype, params = params})
 end
-
+--[=[
+tag
+1 自动拾取
+--]=] 
 function Adv:backReward(items, params)
 	params = params or {}
-	self:pushBackEvent(AdvBackEventType.Reward, {items = items, roomId = params.roomId, blockId = params.blockId})
+	self:pushBackEvent(AdvBackEventType.Reward, {items = items, roomId = params.roomId, blockId = params.blockId, tag = params.tag})
 end
  
 -- if is player enemyId is nil 
@@ -2009,8 +2146,8 @@ function Adv:backBlockChange(roomId, blockId, itemChangeType)
 	self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId, itemChangeType = itemChangeType})
 end
  
-function Adv:backDead(enemyId, exp)
-	self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId, exp = exp})
+function Adv:backDead(enemyId)
+	self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId})
 end
  
 function Adv:backTrap()
@@ -2033,8 +2170,12 @@ function Adv:backCost(items)
 	self:pushBackEvent(AdvBackEventType.Cost, {items = items})
 end
  
-function Adv:backUse(items)
-	self:pushBackEvent(AdvBackEventType.Use, {items = items})
+--[=[
+tag
+1 自动使用
+--]=] 
+function Adv:backUse(items, tag)
+	self:pushBackEvent(AdvBackEventType.Use, {items = items, tag = tag})
 end
  
  
@@ -2044,21 +2185,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()
@@ -67,17 +68,17 @@ function Battle:initPlayer()
 		local advAddAttrs = self.adv.owner:getAdvLvAddAttrs()
  
 		player = {}
-		player.level = 1
-		if self.adv.level ~= 1 then
-			local relayData = self.adv:isHaveRelay()
-			if relayData then
-				player.level = relayData.level
-			end
-		end
-		player.exp = 0
+		-- player.level = 1
+		-- if self.adv.level ~= 1 then
+		-- 	local relayData = self.adv:isHaveRelay()
+		-- 	if relayData then
+		-- 		player.level = relayData.level
+		-- 	end
+		-- end
+		-- player.exp = 0
 		player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100)
 		player.spMax = player.sp
-		player.growth = {}
+		-- player.growth = {}
 		player.passives = {}
  
 		for slot, heroId in pairs(advTeam.heros) do
@@ -100,8 +101,8 @@ function Battle:initPlayer()
 				player[attrName] = (player[attrName] or 0) + hero[attrName]
 			end
 			player[attrName] = getAdvLvAttrUp(advAddAttrs, attrName, player[attrName]) * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
-			player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
-			player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
+			-- player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
+			-- player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
 		end
  
 		player.hpMax = player.hp or 0
@@ -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
@@ -313,8 +316,19 @@ function Battle:afterRound()
 		build:afterRound("buffAfter")
 	end
  
+	self.player:triggerPassive(Passive.AFTER_ROUND)
+
+	self:checkAura()
  
+	self:clearRound()
+
+	if self.player.isDead then
+		self.adv:over(false, nil, -2)
+	end
+end
  
+function Battle:clearRound()
+	local mapIdx = self.adv:getCurMapIdx()
 	self.player:clearRound()
 	for _, enemy in ipairs(self.enemys[mapIdx]) do
 		enemy:clearRound()
@@ -344,12 +358,6 @@ function Battle:afterRound()
 			build:clear()
 		end
 	end
-
-	self.player:triggerPassive(Passive.AFTER_ROUND)
-
-	if self.player.isDead then
-		self.adv:over(false, nil, -2)
-	end
 end
  
  
@@ -358,18 +366,32 @@ function Battle:battleBegin(roomId, blockId, params)
 	if not enemy then return end
 	local player = params.player
 	if not player then return end
+	local penemy = params.enemy or {hp = 0}
+	if player.hp ~= 0 then
+		if penemy.hp <= 0 then
+			enemy:kill()
+			self.adv.owner:checkTaskEnter("AdvBattleWin", {id = self.adv.chapterId})
+		else
+			-- 处理一下怪物
+			if penemy.hp > enemy.hp then
+				enemy:recover(penemy.hp - enemy.hp)
+			else
+				enemy:hurt(math.max(0, math.ceil(enemy.hp - penemy.hp)), self.player, {hurtType = 5}) --战斗血量只会变少
+			end
+			if penemy.escape and penemy.escape == 0 then
+				enemy.isDead = 1
+			end
+		end
+	end
 	-- 玩家没死就是怪死了
 	if player.hp > 0 then
-		enemy:kill()
 		self.player:effectBattleBuff()
-
-		self.adv.owner:checkTaskEnter("AdvBattleWin", {id = self.adv.chapterId})
 		if params.bySkill then
 			self.player:triggerPassive(Passive.SKILL_KILL)
 		end
 	end
 	if player.hp > self.player.hp then
-		self.player:recover(player.hp - self.player.hp, player)
+		self.player:recover(player.hp - self.player.hp)
 	else
 		self.player:hurt(math.max(0, math.ceil(self.player.hp - player.hp)), enemy, {hurtType = 5}) --战斗血量只会变少
 	end
@@ -424,7 +446,7 @@ function Battle:initMapEffect(ilayer)
 	end
  
 	for _, buff in ipairs(buffs[1] or {}) do
-		self.palyer:addBuff(buff)
+		self.player:addBuff(buff)
 	end
  
 	for _, buff in ipairs(buffs[2] or {}) do
@@ -435,8 +457,126 @@ 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)
+	self:clearRound()
+end
+
+-- 新的 关卡 关闭旧的战斗模块 清理 玩家身上的光环效果
+function Battle:overBattle()
+	local buffs = self:checkDiffAuraBuff(self:getAurasByMap(), {})
+	self.player:checkAuraBuff(buffs)
+	self:clearRound()
+	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.player:checkAuraBuff(buffs)
+	for _, enemy in pairs(self.player:getTeam(2)) do
+		enemy:checkAuraBuff(buffs)
+	end
+	self:setMapAuras(auras)
+end
+
+function Battle:loadBattle(info)
+	self.auras = info.auras or {}
+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 +593,7 @@ function Battle:saveDB()
 			end
 		end
 	end
+	advInfo.auras = self.auras
 end
  
 return Battle
 \ No newline at end of file
@@ -48,6 +48,8 @@ function Block:updateEvent(event, isInit)
 			end
 		end
 	end
+	local oldet = self:getEventType()
+
 	self.event = event
 	if not isInit and self.event then
 		-- 判断下类型是不是错的
@@ -58,18 +60,49 @@ function Block:updateEvent(event, isInit)
 		end
 		self:randomEvent()
 	end
+	self:quickDrop()
+
+	if not isInit and self.isOpen then
+		local newet = self:getEventType()
+		if oldet ~= newet then
+			local em = {}
+			if oldet then
+				em[oldet] =1 
+			end
+			if newet then
+				em[newet] =1 
+			end
+
+			local player = self.room.map.adv.battle.player
+			player:attrChangeCondBuffCheck(4, em)
+			for _, monster in pairs(player:getTeam(2)) do
+				monster:attrChangeCondBuffCheck(4, em)
+			end
+		end
+	end
 end
  
 function Block:clear()
-	if self:getEventType() == AdvEventType.Trap then 
+	local et = self:getEventType()
+	if et == AdvEventType.Trap then 
 		self.trapId = self.event.id
-	elseif self:getEventType() == AdvEventType.Build then
+	elseif et == AdvEventType.Build then
 		local build = self.room.map.adv.battle:getBuild(self.room.roomId, self.blockId, self.room.map.mapIdx)
 		if build then
 			build.isDead = true
 		end
 	end
 	self.event = nil
+
+
+	if et then
+		local em = {[et] = 1}
+		local player = self.room.map.adv.battle.player
+		player:attrChangeCondBuffCheck(4, em)
+		for _, monster in pairs(player:getTeam(2)) do
+			monster:attrChangeCondBuffCheck(4, em)
+		end
+	end
 end
  
  
@@ -90,8 +123,10 @@ function Block:randomEvent()
 		enemy:triggerPassive(Passive.BORN_ONCE)
  
 		adv.battle.player:triggerPassive(Passive.OPEN_MONSTER, {trigger = enemy})
+		adv.battle.player:attrChangeCondBuffCheck(3, enemy:getClassify())
 		for _, monster in pairs(adv.battle.player:getTeam(2)) do
-			adv.battle.player:triggerPassive(Passive.OPEN_MONSTER, {trigger = enemy})
+			monster:triggerPassive(Passive.OPEN_MONSTER, {trigger = enemy})
+			monster:attrChangeCondBuffCheck(3, enemy:getClassify())
 		end
 	end
 	randomFunc[AdvEventType.BOSS] = randomFunc[AdvEventType.Monster]
@@ -208,6 +243,13 @@ function Block:randomEvent()
 					e:addBuff(buffId)
 				end
 			end
+		elseif data.target == 4 then
+			local enemys = self.room.map.adv:getCurMap():openBlocksIsMonsterByRoom(self.room.roomId)
+			for _, e in ipairs(enemys) do
+				for _, buffId in ipairs(buffs) do
+					e:addBuff(buffId)
+				end
+			end
 		end
  
 		if data.specialEff ~= "" then
@@ -263,10 +305,37 @@ function Block:open()
 	local adv = map.adv
 	self.isOpen = true
 	self:randomEvent()
+	self:quickDrop()
+
+	local et = self:getEventType()
+	if et then
+		local em = {[et] = 1}
+		local player = self.room.map.adv.battle.player
+		player:attrChangeCondBuffCheck(4, em)
+		for _, monster in pairs(player:getTeam(2)) do
+			monster:attrChangeCondBuffCheck(4, em)
+		end
+	end
 	return true
 end
  
+function Block:quickDrop()
+	if self:getEventType() == AdvEventType.Drop and self.event.item then
+		local itemId, count = table.unpack(self.event.item)
+		if globalCsv.adv_auto_collect[itemId] then
+			self.room.map.adv:award({[itemId] = count}, {log = {desc = "clickDrop"}}, {roomId = self.room.roomId, blockId = self.blockId, tag = 1})
+			self:clear()
+		end
+	end
+end
+
 function Block:getObstacle()
+	if self:isMonster() then
+		local enemy = self.room.map.adv.battle:getEnemy(self.room.roomId, self.blockId)
+		if enemy then
+			return enemy:getObstacle()	
+		end
+	end
 	local data = self:getEventData()
 	if not data then return 0 end
 	return data.obstacle or 0
@@ -20,7 +20,7 @@ Buff.HP_CHANGE_NOW = 16 -- 生命变化（每回合生效,立刻生效）
 Buff.BATTLE_BUFF = 17 -- 切换为战斗中的buff
 Buff.CHANGE_DROP = 18 -- 转换掉落
 Buff.BATTLE_PASSIVE = 19 -- 切换为战斗中的被动技
-Buff.EXP_ADD = 20 -- 增加exp（每回合）
+-- Buff.EXP_ADD = 20 -- 增加exp（每回合）
 Buff.DONT_DEFEND = 21 -- 不看守地板 -- 怪周围点半可点击
 Buff.SHOW_DANGER = 22 -- 扫雷 展示地上怪物和陷阱数量的标记
 Buff.SHOW_MONSTER_POS = 23 -- 蓝臂章训练场 感知
@@ -34,6 +34,10 @@ Buff.Buff_EFFECT_CHANGE = 30 -- 改变 buff 效果
 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.DISABLE_AURA = 36 -- 禁用光环
+Buff.GET_AURA = 37 -- 获得光环
  
  
 --角色一些属性的变化
@@ -87,13 +91,24 @@ local function commonAttCond(_Buff, attrName)
 			if buff then
 				effectCount = buff.layer
 			end
+		elseif self.buffData.effectValue4 == 3 then
+			local classify = tonumber(self.buffData.effectValue5) -- 怪标签
+			local enemy = self.owner.battle.player:getTeam(2)
+			for _, one in pairs(enemy) do
+				if one.isClassify and one:isClassify(classify) then
+					effectCount = effectCount + 1
+				end
+			end
+		elseif self.buffData.effectValue4 == 4 then
+			local eventType = tonumber(self.buffData.effectValue5) -- event 类型
+			effectCount = #self.owner.battle.adv:getCurMap():getEventTypeAllMap(eventType)
 		end
 		return self.buffData.effectValue2 * effectCount 
 	end
  
 	_Buff.getEffectBy = function(self)
 		local cond = nil
-		if self.buffData.effectValue4 == 2 then
+		if self.buffData.effectValue4 == 2 or self.buffData.effectValue4 == 3 or self.buffData.effectValue4 == 4 then
 			cond = tonumber(self.buffData.effectValue5)
 		end
 		return self.buffData.effectValue4, attrName, cond
@@ -302,18 +317,30 @@ local BuffFactory = {
 		end
 	end,
  
-	[Buff.EXP_ADD] = function(_Buff)
-		_Buff._afterRound = function(self)
-			local value = self:effect()
-			self.owner.battle.player:addExp(value)
+	-- [Buff.EXP_ADD] = function(_Buff)
+	-- 	_Buff._afterRound = function(self)
+	-- 		local value = self:effect()
+	-- 		self.owner.battle.player:addExp(value)
+	-- 	end
+	-- 	_Buff._effectValue = function(self)
+	-- 		-- 经验值
+	-- 		return self.buffData.effectValue1 * self.layer
+	-- 	end
+	-- end,
+
+	[Buff.DISABLE_BUFF] = function(_Buff)
+		_Buff._effectValue = function(self)
+			return self.buffData.effectValue1
 		end
+	end,
+
+	[Buff.DISABLE_AURA] = function(_Buff)
 		_Buff._effectValue = function(self)
-			-- 经验值
-			return self.buffData.effectValue1 * self.layer
+			return self.buffData.effectValue1
 		end
 	end,
  
-	[Buff.DISABLE_BUFF] = function(_Buff)
+	[Buff.GET_AURA] = function(_Buff)
 		_Buff._effectValue = function(self)
 			return self.buffData.effectValue1
 		end
@@ -378,6 +405,14 @@ local BuffFactory = {
 			self.layer = self.buffData.effectValue1
 		end
 	end,
+	[Buff.GET_PASSIVE] = function( _Buff )
+		_Buff._init = function(self)
+			self.owner:addPassive({id = self.buffData.effectValue1})
+		end
+		_Buff._endBuff = function(self)
+			self.owner:delPassiveById(self.buffData.effectValue1)
+		end
+	end
 }
  
 -- 同样的返回  effectValue1, effectValue2 * self.layer 类型的buff
@@ -439,7 +474,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
@@ -626,12 +672,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
@@ -644,7 +691,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
@@ -655,14 +702,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
  
@@ -256,7 +256,7 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
  
 	if status then
 		if isPlayer then
-			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK)
+			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK, {roomId = roomId, blockId = blockId})
 			self.adv.owner:checkTaskEnter("AdvOpenBlock")
  
 			-- 潜行检查
@@ -272,8 +272,8 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
-
 	end
+	return status
 end
  
 function Map:openBlocksBySize(roomId, blockId, size, isPlayer, ignoreBack)
@@ -292,6 +292,41 @@ function Map:openBlocksByRoom(roomId, isPlayer, ignoreBack)
 	end
 end
  
+function Map:openBlocksIsMonsterByRoom(roomId, count, isPlayer, ignoreBack)
+	local room = self.rooms[roomId]
+	if not room then return end 
+
+	local allBlock = {}
+	for blockId, block in pairs(room.blocks) do
+		if block:isMonster() and not block.isOpen then
+			table.insert(allBlock, blockId)
+		end
+	end
+
+	local enemys = {}
+	local openBlock = function(blockId)
+		if self:openBlock(roomId, blockId, isPlayer, ignoreBack) then
+			local e = self.adv.battle:getEnemy(roomId, blockId)
+			if e then
+				table.insert(enemys, e)
+			end
+		end
+	end
+
+	if not count or count == -1 or count >= #allBlock then
+		for _, blockId in ipairs(allBlock)  do
+			openBlock(blockId)
+		end
+	else
+		for i = 1, count do
+			local idx = math.randomInt(1, #allBlock)
+			openBlock(allBlock[idx])
+			table.remove(allBlock, idx)
+		end
+	end
+	return enemys
+end
+
 function Map:openAllBlocks(isPlayer, ignoreBack)
 	for roomId, room in pairs(self.rooms) do
 		self:openBlocksByRoom(room.roomId, isPlayer, ignoreBack)
@@ -309,6 +344,22 @@ function Map:getRBByPos(c, r)
 	end
 end
  
+function Map:getDistance(froomId, fblockId, troomId, tblockId)
+	local distance = -1
+	local room1 = self.rooms[froomId]
+	local room2 = self.rooms[troomId]
+	if room1 and room2 then
+		local block1 = room1[fblockId]
+		local block2 = room2[tblockId]
+		if block1 and block2 then
+			local c1, r1 = room1:tranLtoG(block1.col, block1.row)
+			local c2, r2 = room2:tranLtoG(block2.col, block2.row)
+			distance = math.max(math.abs(c1 - c2), math.abs(r1 - r2))
+		end
+	end
+	return distance
+end
+
 function Map:getAroundBlocks(room, block)
 	local blocks = {}
 	local range = {1, -1}
@@ -412,6 +463,18 @@ function Map:getEnemysBySize(roomId, blockId, size)
 	return enemys
 end
  
+function Map:getEventTypeAllMap(eventType)
+	local blocks = {}
+	if not eventType then return blocks end
+	for roomId, room in pairs(self.rooms) do
+		for blockId, block in pairs(room.blocks) do
+			if block.isOpen and block:getEventType() == eventType then
+				table.insert(blocks, block)
+			end
+		end
+	end
+	return blocks
+end
 -----------------------------随机地图-----------------------------
  
 -- isEnter isNewRelay 区分中继层的类型   --是否是开始进入  是否是第一次进入
@@ -749,6 +812,47 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		end
 	end
  
+	-- 宝藏怪刷新
+	for idx = #(stagePool["global"][AdvCodeRandomStage] or {}), 1, -1 do
+		local c = stagePool["global"][AdvCodeRandomStage][idx] --  {room = roomId, block = blockId}
+		if mapInfo.rooms[c["room"]]["event"][c["block"]] then -- 存在
+			table.remove(stagePool["global"][AdvCodeRandomStage], idx)
+		end
+	end
+	local ln = #(stagePool["global"][AdvCodeRandomStage] or {})
+	local advMine = self.adv.owner:getProperty("advMine")
+	advMine[1] = advMine[1] or {}
+	local mineCh = advMine[1].ch or globalCsv.adv_egg_treasureMonster_showup
+	local mineCo = advMine[1].co or {}
+	local had = false
+	if ln > 0 then
+		if math.randomInt(1, 100) <= mineCh then -- 刷出来了
+			local mpool = {}
+			for _, mid in ipairs(globalCsv.adv_egg_treasureMonster_id) do
+				local monster = csvdb["event_monsterCsv"][mid]
+				if (not mineCo[mid] or monster.limit == 0 or mineCo[mid] < monster.limit) and monster.showup > 0 then
+					mpool[mid] = {monster.showup}
+				end
+			end
+			if next(mpool) then
+				local idx = math.randomInt(1, ln)
+				local cur = stagePool["global"][AdvCodeRandomStage][idx]
+				giveEvent(cur["room"], cur["block"], AdvEventType.Monster, math.randWeight(mpool, 1))
+				table.remove(stagePool["global"][AdvCodeRandomStage], idx)
+				ln = ln - 1
+				had = true
+			end
+		end
+	end
+	if not had then
+		mineCh = math.min(mineCh + globalCsv.adv_egg_treasureMonster_showup_add, 100)
+	else
+		mineCh = nil
+	end
+	advMine[1].ch = mineCh
+	self.adv.owner:setProperty("advMine", advMine)
+
+
 	if mapCsvData.clearType == 1 and not haveBoss then
 		if not next(monsterEvents) then
 			error("这个地图没有钥匙！！！ mapId : " .. mapId)
@@ -7,6 +7,8 @@ Filter.HP_LOW = 4 -- 血量&lt;value%
 Filter.BUFF_BY_TYPE = 5 -- 指定类型buff
 Filter.BUFF_BY_ID = 6 -- 指定id的buff
 Filter.CAMP = 7 -- 玩家是指定阵营
+Filter.RANGE = 8 -- 筛选范围 （触发是地块）
+Filter.CLASSIFY = 9 -- 标签
  
 local FilterFactory = {}
 FilterFactory[Filter.HP_UP_WITH_EQUAL] = function (_Filter)
@@ -46,6 +48,21 @@ FilterFactory[Filter.CAMP] = function (_Filter)
 	end
 end
  
+FilterFactory[Filter.RANGE] = function (_Filter)
+	_Filter._execute = function (self, target, params)
+		if self.owner.blockId and self.owner.roomId  and params.blockId and params.roomId then
+			local distance = self.owner.battle.adv:getCurMap():getDistance(self.owner.roomId, self.owner.blockId, params.roomId, params.blockId)
+			return distance ~= -1 and distance <= self.value
+		end
+		return false
+	end
+end
+
+FilterFactory[Filter.CLASSIFY] = function (_Filter)
+	_Filter._execute = function (self, target)
+		return target.isClassify and target:isClassify(self.value)
+	end
+end
  
 function Filter:ctor(params)
 	self.owner = params.owner
@@ -79,7 +96,7 @@ function Filter:execute(params)
 		return
 	end
 	if self:_execute(target) then
-		return self:_execute(target)
+		return self:_execute(target, params)
 	end
 end
  
@@ -120,6 +137,7 @@ Passive.GET_BUFF = 28 --获得指定buff
 Passive.OPEN_BLOCK = 29 --翻开格子
 Passive.OPEN_MONSTER = 30 --翻开怪物
 Passive.PLAYER_BUFF = 31 --玩家获得buff
+
 Passive.PLAYER_BUFF_CLASSIFY = 35 -- 获得指定标签的buff
  
 -- 不同的开启条件
@@ -442,6 +460,7 @@ end
  
 --3=翻开自己所在格子
 function Passive:effect3(value)
+	if not self.owner.roomId or not self.owner.blockId then return end
 	if value == 0 then
 		self.owner.battle.adv:getCurMap():openBlock(self.owner.roomId, self.owner.blockId)
 	elseif value > 0 then
@@ -494,7 +513,7 @@ function Passive:effect8(dropId)
 		skynet.error(string.format("CSVDATA Error  adv_map_passive %s effect 8 not id %s in event_drop", self.id, dropId))
 	end
 	local item = dropData["range"]:randWeight(true)
-	self.owner.battle.adv:backReward(self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}), {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
  
 end
  
@@ -509,7 +528,7 @@ function Passive:effect9(itemId, triggerPms, ratio, max)
 		return
 	end
 	if not cond then return end
-	self.owner.battle.adv:backReward(self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}), {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
 end
  
 --10=战斗额外掉落次数
@@ -561,5 +580,22 @@ function Passive:effect14(value, triggerPms, enemyId)
 	end
 end
  
+--15=翻开房间内的count 个怪 并且增加一个buff
+function Passive:effect15(count, triggerPms, buffId)
+	local roomId = self.owner.roomId
+	if not roomId then return end
+	local enemys = self.owner.battle.adv:getCurMap():openBlocksIsMonsterByRoom(roomId, count)
+	for _, e in ipairs(enemys) do
+		e:addBuff(buffId)
+	end
+end
+
+--16=转变 value 范围内的掉落物 为 id count
+function Passive:effect16(value, triggerPms, changeType)
+	if not self.owner.roomId or not self.owner.blockId then return end
+	local blocks = self.owner.battle.adv:getCurMap():getBlocksBySize(self.owner.roomId, self.owner.blockId, value)
+	self.owner.battle.adv:blockDropChange(changeType, blocks)
+end
+
  
 return Passive
 \ No newline at end of file
@@ -90,6 +90,12 @@ end
 function BaseObject:clear()
 	self.buffs = {}
 	self.passives = {}
+	if self:is("Enemy") then
+		self.battle.player:attrChangeCondBuffCheck(3, self:getClassify())
+		for _, monster in pairs(self.battle.player:getTeam(2)) do
+			monster:attrChangeCondBuffCheck(3, self:getClassify())
+		end
+	end
 end
  
 function BaseObject:addPassive(params)
@@ -137,7 +143,21 @@ function BaseObject:getDisablePassiveCount()
 	return count
 end
  
-function BaseObject:addBuff(buffId, releaser)
+function BaseObject:getDisableAuraCount()
+	local count = 0
+	for _, buff in ipairs(self.buffs) do
+		if not buff:isHide() and buff:getType() == Buff.DISABLE_AURA then
+			if buff:effect() == 0 then
+				return 0
+			end
+			count = (count or 0) + buff:effect()
+		end
+	end
+	return count
+end
+
+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
@@ -151,7 +171,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({
@@ -161,10 +181,11 @@ 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})
+	self:attrChangeCondBuffCheck(2, buffId)
 	return true
 end
  
@@ -217,6 +238,44 @@ end
 function BaseObject:reSetSpMax()
 end
  
+function BaseObject:checkAuraBuff(buffs)
+end
+
+function BaseObject:getAuras()
+	local disable = self:getDisableAuraCount()
+	local auras = {}
+	local function addAura(one)
+		if disable > 0 then
+			disable = disable - 1
+		else
+			table.insert(auras, one)
+		end
+	end
+	if self:is("Enemy") then
+		local halo = csvdb["event_monsterCsv"][self.monsterId].halo
+		if halo then
+			for _, one in ipairs(halo:toArray(true, "=")) do
+				addAura(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
+				addAura(one)
+			end
+		end
+	end
+
+	for _, buff in ipairs(self.buffs) do
+		if not buff:isHide() and buff:getType() == Buff.GET_AURA then
+			addAura(buff:effect())
+		end
+	end
+
+	return auras
+end
+
  
 -- 通用的buff 效果汇总  -- 0 固定 1百分比  两种分类
 function BaseObject:getCommonBuffEffect(bType, otherCond)
@@ -417,7 +476,7 @@ function BaseObject:hurt(value, releaser, params)
 	if self.hp == 0 then
 		self:triggerPassive(Passive.SELF_DEAD)
 		for _, team in ipairs(self:getTeam(1, true)) do
-			team:triggerPassive(Passive.TEAM_DEAD)
+			team:triggerPassive(Passive.TEAM_DEAD, {trigger = self})
 		end
  
 		if (params.hurtType == 6 or params.hurtType == 2) and self ~= self.battle.player then
@@ -505,6 +564,50 @@ function BaseObject:getTeam(nType, noSelf, mapIdx, includeLock)
 	return team
 end
  
+function BaseObject:attrChangeCondBuffCheck(etype, cond)
+	local effect = {}
+	if etype == 3 then
+		if type(cond) ~= "string" then
+			return
+		end
+		local temp = cond:toArray(true, " ")
+		cond = {}
+		for _, one in pairs(temp) do
+			cond[one] = 1
+		end
+	elseif etype == 4 then
+		if not cond then
+			cond = {}
+		end
+		if type(cond) == "number" then
+			cond = {[cond] = 1}
+		end
+	end
+	for _, buff in ipairs(self.buffs) do
+		if not buff:isHide() and (buff:getType() == Buff.ATTR_CHANGE_COND) then
+			local _et, _attr, _co = buff:getEffectBy()
+			if etype == _et then
+				if etype == 3 or etype == 4 then
+					if cond[_co] then
+						effect[_attr] = 1
+					end
+				else
+					if (not _co or _co == cond) then
+						effect[_attr] = 1
+					end
+				end
+			end
+		end
+	end
+	for attrName, _ in pairs(effect) do
+		if attrName == "hp" then
+			self:reSetHpMax()
+		else
+			self:reSetAttr(attrName)
+		end
+	end
+end
+
 function BaseObject:getDB()
 	local db = {}
 	db.hp = self.hp
@@ -557,6 +660,51 @@ function Enemy:isEnemy()
 	return true
 end
  
+function Enemy:getObstacle()
+	local obstacle = csvdb["event_monsterCsv"][self.monsterId].obstacle
+	if obstacle == 0 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
+		obstacle = 1
+	end
+	return obstacle
+end
+
+function Enemy:isClassify(check)
+	local classify = self:getClassify()
+	return classify and classify:sismember(check, " ")
+end
+
+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 info.count > 0 then
+			self:addBuff(buffId, nil, info.count)
+		end
+	end
+end
+
 function Enemy:kill()
 	self:hurt(self.hp, self.battle.player, {hurtType = 5})
 end
@@ -569,44 +717,44 @@ end
  
 function Player:initData(data)
 	Player.super.initData(self, data)
-	self.level = data.level or 1  --level 每增加1级  属性增长 growth * baseAttr
+	-- self.level = data.level or 1  --level 每增加1级  属性增长 growth * baseAttr
 	self.growth = data.growth
-	self.exp = data.exp or 0
+	-- self.exp = data.exp or 0
 	self.sp = data.sp or 100
 	self.spMax = data.spMax or 100
 	self._spMax = data._spMax or 100
 end
  
-function Player:addExp(value)
-	-- buff 经验加成
-	local up = self:getCommonBuffEffect(Buff.EXP_UP)
-	value = math.ceil((value + up[0]) * (1 + up[1]))
-
-	if value <= 0 then return end
-	local newExp = self.exp + value
-	local level = self.level
-	if level >= #csvdb["adv_levelCsv"] then return end
-	while true do
-		local curData = csvdb["adv_levelCsv"][level]
-		if newExp < curData.exp then break end
-		level = level + 1
-		newExp = newExp - curData.exp
-		if level >= #csvdb["adv_levelCsv"] then break end
-	end
-	local delta = level - self.level
-
-	self.battle.adv:pushBackEvent(AdvBackEventType.Exp, {delta = value})
-
-	if delta > 0 then
-		for attr, _ in pairs(AdvAttsEnum) do
-			self:addBaseAttr(attr, self.growth[attr] * delta, 0, true)
-		end
-		self.battle.adv:pushBackEvent(AdvBackEventType.Level, {level = level, delta = delta})
-	end
-	self.level = level
-	self.exp = newExp
-	return value
-end
+-- function Player:addExp(value)
+-- 	-- buff 经验加成
+-- 	local up = self:getCommonBuffEffect(Buff.EXP_UP)
+-- 	value = math.ceil((value + up[0]) * (1 + up[1]))
+
+-- 	if value <= 0 then return end
+-- 	local newExp = self.exp + value
+-- 	local level = self.level
+-- 	if level >= #csvdb["adv_levelCsv"] then return end
+-- 	while true do
+-- 		local curData = csvdb["adv_levelCsv"][level]
+-- 		if newExp < curData.exp then break end
+-- 		level = level + 1
+-- 		newExp = newExp - curData.exp
+-- 		if level >= #csvdb["adv_levelCsv"] then break end
+-- 	end
+-- 	local delta = level - self.level
+
+-- 	self.battle.adv:pushBackEvent(AdvBackEventType.Exp, {delta = value})
+
+-- 	if delta > 0 then
+-- 		for attr, _ in pairs(AdvAttsEnum) do
+-- 			self:addBaseAttr(attr, self.growth[attr] * delta, 0, true)
+-- 		end
+-- 		self.battle.adv:pushBackEvent(AdvBackEventType.Level, {level = level, delta = delta})
+-- 	end
+-- 	self.level = level
+-- 	self.exp = newExp
+-- 	return value
+-- end
 --vtype 0/1 值/%
 function Player:addBaseAttr(attr, value, vtype, ignoreBack)
 	local attrName = attr
@@ -696,7 +844,6 @@ end
 function Player:addBuff(buffId, releaser)
 	local status = Player.super.addBuff(self, buffId, releaser)
 	if  status then
-		self.battle.player:attrChangeCondBuffCheck(2, buffId)
 		self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId)
 		self.battle.adv:pushBackEvent(AdvBackEventType.Buff, {buffId = buffId})
 		self.battle:triggerPassive(Passive.PLAYER_BUFF, {buffId = buffId})
@@ -707,23 +854,30 @@ function Player:addBuff(buffId, releaser)
 	end
 	return status
 end
+-- 0=所有  1=怪物  2=玩家
+function Player:checkAuraBuff(buffs)
+	local needBuffs = {}
  
-function Player:attrChangeCondBuffCheck(etype, cond)
-	local effect = {}
-	for _, buff in ipairs(self.buffs) do
-		if not buff:isHide() and (buff:getType() == Buff.ATTR_CHANGE_COND) then
-			local _et, _attr, _co = buff:getEffectBy()
-			if etype == _et and (not _co or _co == cond) then
-				effect[_attr] = 1
-			end
-			
-		end
+	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 attrName, _ in pairs(effect) do
-		if attrName == "hp" then
-			self:reSetHpMax()
-		else
-			self:reSetAttr(attrName)
+
+	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
@@ -734,7 +888,8 @@ end
  
 function Player:getDB()
 	local db = Player.super.getDB(self)
-	for _ , field in pairs({"level", "exp", "growth", "sp", "spMax"}) do
+	-- for _ , field in pairs({"level", "exp", "growth", "sp", "spMax"}) do
+	for _ , field in pairs({"level", "growth", "sp", "spMax"}) do
 		db[field] = self[field]
 	end
 	db["_spMax"] = self._spMax
-Subproject commit 02a9bbbb10bb99a91cc5d67f62dc7e5b49d8cb46
+Subproject commit 897a3e0e4afa8217614a9ecf199d54b0ca641bab
@@ -19,6 +19,11 @@ Activity.ActivityType = {
 	AdvDraw = 13,	--拾荒抽周 资助
 	OpenBox = 14,	--拆解周 时钟箱
 	RaceDraw = 16,  -- 定向招募活动
+
+	ChallengeLevel = 17,	-- 挑战关卡活动
+	Exchange = 18,	-- 兑换活动
+	HangDrop = 19,	-- 挂机掉落活动
+	Gachakon = 20,	-- 扭蛋活动
 }
  
  
@@ -48,6 +53,11 @@ Activity.schema = {
 	act12		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
 	act13		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
 	act14		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
+
+	act20		= {"table", {}, true},	  -- {id=兑换数量}
+	act21		= {"table", {}},	  -- {id=抽取的数量}
+	act22		= {"table", {}},	  -- {id=关卡星数, totalDmg=Boss总伤害}
+	act23		= {"table", {}},	  -- {挂机信息}
 }
  
 function Activity:data()
@@ -409,12 +419,34 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 	-- end,
 }
  
+-- 兑换
+activityFunc[Activity.ActivityType.Exchange] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		local role = self.owner
+		local actData = self:getActData(actType) or {}
+		actData[actId] = {}
+		self:updateActData(actType, actData, not notify)
+	end,
+	--["close"] = function(self, actType, notify, actId)
+	--end,
+}
+
+-- 扭蛋机
+activityFunc[Activity.ActivityType.Gachakon] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		self:updateActData(actType, {}, not notify)
+	end,
+	["crossDay"] = function(self, actType, notify)
+		self:updateActData(actType, {}, not notify)
+	end,
+}
+
 function Activity:initActivity(actId, isCrossDay, notify)
 	local actData = csvdb["activity_ctrlCsv"][actId]
 	if not actData then return end
 	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
-		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
+		activityFunc[actType]["init"](self, actType, isCrossDay, notify, actId)
 	end
 end
  
@@ -423,7 +455,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 	if not actData then return end
 	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
-		activityFunc[actType]["close"](self, actType, notify)
+		activityFunc[actType]["close"](self, actType, notify, actId)
+		self:recycleActItem(actId)
 	end
 	if Activity.schema["act".. actType] then
 		self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
@@ -529,5 +562,33 @@ function Activity:getPaySignReward()
 	--SendPacket(actionCodes.Activity_actPaySignRpc, MsgPack.pack(role:packReward(reward, change)))
 end
  
+-- 回收活动道具
+function Activity:recycleActItem(actId)
+	local role = self.owner
+	local actCfg = csvdb["activity_ctrlCsv"][actId]
+	if not actCfg then return end
+	local gift = {}
+	local costs = {}
+	for _, arr in ipairs(role:getItemCount(actCfg.recycle):toTableArray(true)) do
+		local fromId, toId, toNum = arr[1], arr[2], arr[3]
+		local itemCount = role:getItemCount(fromId)
+		if itemCount > 0 then
+			costs[fromId] = (costs[fromId] or 0) + itemCount
+			gift[toId] = toNum * itemCount
+		end
+	end
+	if next(costs) then
+		local itemStr = ""
+		for k, v in pairs(costs) do
+			if itemStr ~= "" then
+				itemStr = itemStr .. " "
+			end
+			itemStr = itemStr .. k .. "=" .. v
+		end
+		role:costItems(costs, {log = {desc = "actRecycle"}})
+		role:sendMail(actCfg.recycle_email, nil, gift, {itemStr})
+	end
+end
+
  
 return Activity
@@ -48,10 +48,10 @@ function Email:data()
  
 	if emailData then
 		-- 如果内容是直接插入到数据库
-		if content == "" and emailData.body ~= "" then
-			content = io.readfile("src/" .. emailData.body) or ""
-			content = content:format(table.unpack(contentPms))
-		end
+		--if content == "" and emailData.body ~= "" then
+		--	content = io.readfile("src/" .. emailData.body) or ""
+		--	content = content:format(table.unpack(contentPms))
+		--end
  
 		if title == "" and emailData.title ~= "" then
 			title = emailData.title
@@ -67,12 +67,14 @@ function Email:data()
 	end
  
 	return {
+		cfgId = emailId,
 		id = self:getProperty("id"),
 		status = self:getProperty("status"),
 		createtime = self:getProperty("createtime"),
 		title = title,
 		stitle = stitle,
 		content = content,
+		contentPms = contentPms,
 		attachments = attachments,
 	}
 end
@@ -15,6 +15,7 @@ Hero.schema = {
 	-- loveL		= {"number", 0},		--好感度等级
 	equip       = {"string",""},        --装备 type=level
 	rune       = {"string",""},        --零件 type=id
+	faith	   = {"number", 0},			-- 信赖
 }
  
 function Hero:ctor( properties )
@@ -102,6 +103,7 @@ function Hero:data()
 		-- loveL = self:getProperty("loveL"),
 		equip = self:getProperty("equip"),
 		rune = self:getProperty("rune"),
+		faith = self:getProperty("faith")
 	}
 end
  
@@ -113,4 +115,8 @@ function Hero:getRare()
     return csvdb["unitCsv"][self:getProperty("type")].rare
 end
  
+function Hero:getPosition()
+    return csvdb["unitCsv"][self:getProperty("type")].position
+end
+
 return Hero
 \ No newline at end of file
@@ -48,30 +48,29 @@ function HeroPlugin.bind(Hero)
 		local breakL = params.breakL or self:getProperty("breakL")
 		local wakeL = params.wakeL or self:getProperty("wakeL")
 		local talent = params.talent or self:getProperty("talent")
-
+		local heroCfgId = self:getProperty("type")
 		--天赋
 		local talentAttrS = {}
  
 		-- 四个基础属性
 		local curData = csvdb["unit_talentCsv"][talent:getv(0, 1)]
+		local curTalentLvl = 0
 		if not curData then -- 已经满阶段了
-			curData = csvdb["unit_talentCsv"][#csvdb["unit_talentCsv"]]
-			local strength = curData[#curData].strength
-			for i = 1, 4 do
-				talentAttrS[TalentAttsEnumEx[i]] = (talentAttrS[TalentAttsEnumEx[i]] or 0) + strength
-			end
+			local cfgName = "unit_talent_"..heroCfgId.."Csv"
+			curData = csvdb[cfgName][#csvdb[cfgName]]
 		else
-			for i = 1, 4 do --4个天赋
-				talentAttrS[TalentAttsEnumEx[i]] = (talentAttrS[TalentAttsEnumEx[i]] or 0) + curData[talent:getv(i, 0)].strength
-			end
+			curTalentLvl = talent:getv(1, 1)
 		end
-		--阶段属性
-		for i = 1, (talent:getv(0, 1) - 1) do
-			local curData = csvdb["unit_talentCsv"][i]
-			local effect = curData[#curData].effect:toArray(true, "=")
-			talentAttrS[AttsEnumEx[effect[1]]] = (talentAttrS[AttsEnumEx[effect[1]]] or 0) + effect[2]
+		for lvl, cfg in pairs(curData) do
+			if lvl < curTalentLvl or curTalentLvl == 0 then
+				if cfg.effect ~= 99 then
+					local curVal = talentAttrS[cfg.effect] or 0
+					if curVal < cfg.strength then
+						talentAttrS[cfg.effect] = cfg.strength
+					end
+				end
+			end
 		end
-
  
 		for _, attrName in pairs(AttsEnumEx) do
 			if talentAttrS[attrName] then
@@ -79,6 +78,22 @@ function HeroPlugin.bind(Hero)
 			end
 		end
  
+		-- 信赖属性
+		local faithAttr = {}
+		local faith = self:getProperty("faith")
+		local faithConfig = csvdb["unit_trustCsv"]
+		for lvl = 1, #faithConfig do
+			if faith >= faithConfig[lvl].exp then
+				local add = faithConfig[lvl]["position_"..unitData.position]:toArray(true, "=")
+				faithAttr[add[1]] = (faithAttr[add[1]] or 0) + add[2]
+			end
+		end
+		for _, attrName in pairs(AttsEnumEx) do
+			if faithAttr[attrName] then
+				faithAttr[attrName] = addAttr(unitData[attrName], faithAttr[attrName], 1, attrName)
+			end
+		end
+
 		local attrs = {}
 		for _, attName in pairs(AttsEnumEx) do
 			attrs[attName] = unitData[attName] or 0
@@ -90,7 +105,7 @@ function HeroPlugin.bind(Hero)
 		for attr, value in pairs(attrs) do
 			attrs[attr] = attrs[attr] + addAttr(attrs[attr], lData[attr .. "Level"], 1, attr)
 			attrs[attr] = attrs[attr] + addAttr(attrs[attr], blData[attr .. "Level"], 1, attr)
-			attrs[attr] = attrs[attr] + addAttr(attrs[attr], wData[attr .. "Level"], 1, attr) + (talentAttrS[attr] or 0)
+			attrs[attr] = attrs[attr] + addAttr(attrs[attr], wData[attr .. "Level"], 1, attr) + (talentAttrS[attr] or 0) + (faithAttr[attr] or 0)
 		end
  
 		return attrs
@@ -237,6 +252,37 @@ function HeroPlugin.bind(Hero)
 		return level
 	end
  
+	-- 天赋获得的技能
+	function Hero:getTalentSkill()
+		local TalentEnum = {
+			[1] = 1,			-- 血量
+			[2] = 2,			-- 攻击
+			[3] = 3,			-- 物理防御
+			[4] = 4,			-- 命中
+			[5] = 5, 			-- 闪避
+		}
+	    local talentCsv = csvdb["unit_talent_" .. self:getProperty("type") .. "Csv"]
+	    local curLv = self:getProperty("talent"):getv(1,1) - 1
+	    local curRan = self:getProperty("talent"):getv(0,1)
+	    local skills = {}
+	    for ran, data in ipairs(talentCsv) do
+	        if ran <= curRan then
+	            for lv, value in ipairs(data) do
+	                if ran < curRan or lv <= curLv then
+	                    if not TalentEnum[value.effect] then
+	                        skills[value.strength] = true
+	                    end
+	                else
+	                    break
+	                end
+	            end
+	        else
+	            break
+	        end
+	    end
+	    return skills
+	end
+
 	function Hero:getSkillData(idx)
 		local unitData = csvdb["unitCsv"][self:getProperty("type")]
 		if idx == 1 then
@@ -296,6 +342,27 @@ function HeroPlugin.bind(Hero)
 	    end
 	    return
 	end
+
+	-- 添加英雄信赖
+	function Hero:addHeroFaith(exp)
+		local faith = self:getProperty("faith")
+		local config = csvdb["unit_trustCsv"]
+		local star = self:getProperty("wakeL")
+		local tmpExp = faith + exp
+		for lvl = 1, #config do
+			if star < config[lvl].star then
+				break
+			end
+			if tmpExp < config[lvl].exp then
+				faith = tmpExp
+				break
+			else
+				faith = config[lvl].exp
+			end
+		end
+		self:setProperty("faith", faith)
+	end
+
 end
  
  
@@ -99,11 +99,11 @@ Role.schema = {
 	advLimit			= {"table", {}}, -- 冒险事件每次的limit
 	advC				= {"number", 0}, -- 冒险次数（消耗体力）
 	advCT 				= {"number", 0}, -- 冒险次数 上次恢复时间
-	
+	advMine				= {"table", {}}, -- -- {1 = {ch = 0, co = {id = count}}, 2 = {ch = 0, co = {id = count}}} 宝藏怪刷出概率 1 宝藏怪 2 宝藏洞  ch 概率 co 不同id 次数记录
+ 	
 	--挂机相关
 	hangPass 			= {"table", {}}, -- 挂机通过的最大关卡
 	hangGift			= {"table", {}}, -- 挂机奖励 {id = 1}
-	hangTeam 			= {"table", {}}, -- 挂机队伍
 	hangTS				= {"table", {}}, -- 挂机队伍他人可读的队伍信息
 	hangTB 				= {"table", {}}, -- 挂机队伍他人可用的战斗信息mao
 	hangTBV				= {"number", 0}, -- 挂机队伍他人可用的战斗力
@@ -111,8 +111,11 @@ Role.schema = {
 	hangInfo			= {"table", {}},  -- 当前挂机信息
 	hangBag				= {"table", {}},	-- 背包
 	hangBagLimit 		= {"number", globalCsv.idle_field_origin}, --背包上限
-	bTeam				= {"table", {}}, -- 奖励副本队伍
-	heroFormate			= {"table", {}},	-- 自选编队	 {adv={}, hang={}}
+	hangTeams			= {"table", {}},	-- pve自选编队
+	teamIndex			= {"table", {}},	-- 各个系统使用的编队索引 type->index 见TeamSystemType
+	advTeams			= {"table", {}},	-- 拾荒自选编队
+
+	bonusStar			= {"table", {}}, 	-- 奖励关卡 通关星星  {[id] = 1}  三个二进制位 表示三个星 从低到高  (1 << 0) (1 << 1) (1 << 2)  满星 (1 << 3) - 1
  
 	--引导相关
 	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
@@ -143,7 +146,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}
  
@@ -166,7 +168,8 @@ Role.schema = {
 	repayMaxC			= {"number", 0}, -- 招募保底英雄领取次数 100一次
 	floorHero			= {"table", {}}, -- 招募保底 -- {[poolId] = count}
 	ssrUp				= {"table", {}}, -- ssr up -- {[poolId] = count}
-	newerDraw			= {"table", {}}, -- 新手池子 {N, 1} 抽了多少次, 是否出了ssr
+	newerDraw			= {"number", 0}, -- 新手池子抽卡次数
+	wishPool			= {"table", {}}, -- 心愿池子
  
 	sudoku				= {"table", {}}, -- 九宫格   {[-1] = 1, task = {[1] = {}, [2] = {}}}} -- [-1] 阶段 如果为 -1 关闭(都做完了), task 当前阶段任务进度， reward  连串奖励领取情况
 	sign 				= {"table", {}}, -- 签到记录 {[1] = 20181029}
@@ -179,6 +182,7 @@ Role.schema = {
 	feedback			= {"table", {}}, -- 反馈相关信息  {flag = false, count = 0} 	flag是否评论过，count 提示次数
  
 	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
+	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
 }
  
  
@@ -354,11 +358,14 @@ 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"),
+		
+		bonusStar = self:getProperty("bonusStar"),
  
 		newerGuide = self:getProperty("newerGuide"),
 		funcGuide = self:getProperty("funcGuide"),
@@ -374,7 +381,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"),
@@ -390,6 +396,7 @@ function Role:data()
 		repayHero = self:getProperty("repayHero"),
 		newerDraw = self:getProperty("newerDraw"),
 		floorHero = self:getProperty("floorHero"),
+		wishPool = self:getProperty("wishPool"),
  
 		sudoku = self:getProperty("sudoku"),
 		sign = self:getProperty("sign"),
@@ -401,6 +408,7 @@ function Role:data()
 		feedback = self:getProperty("feedback"),
 		ctime = self:getProperty("ctime"),
 		calTask = self:getProperty("calTask"),
+		radioTask = self:getProperty("radioTask"),
 	}
 end
  
@@ -57,7 +57,7 @@ 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
 			end
@@ -72,7 +72,7 @@ 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
 			end
@@ -42,6 +42,10 @@ local ItemReason = {
 	freeGift = 127, -- 免费礼包
 	exploreCommand = 128, -- 探索指令
 	drawHeroExtraReward = 129, -- 抽卡阶段奖励
+	actRecycle = 130,	-- 活动道具回收
+	actExchange = 131,	-- 兑换活动
+	actGachakon = 132, 	-- 扭蛋活动
+	totalRecharge = 133, -- 累计充值奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -107,6 +111,8 @@ local ItemReason = {
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
 	downloadCv = 1209, -- 下载 cv包奖励
 	refer = 1210, -- 穿戴
+	itemCompose = 1211, 	-- 天赋道具合成
+	radioQuest = 1212,		-- 电台任务奖励
  
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
  
-
+local serverId = tonumber(skynet.getenv("servId"))
 local RolePlugin = {}
  
 function RolePlugin.bind(Role)
@@ -64,6 +64,9 @@ function RolePlugin.bind(Role)
 			[ItemId.PlayerExp] = function()
 				self:addPlayExp(count, pms)
 			end,
+			[ItemId.AdvPower] = function()
+				self:changeAdvCount(-count)
+			end,
 		}
  
 		local itemTypeAward = {
@@ -1132,7 +1135,7 @@ 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
  
@@ -1279,11 +1282,13 @@ function RolePlugin.bind(Role)
 			info.specialLevel = hero:getSkillLevel(1)
 			info.passiveLevel = hero:getSkillLevel(3)
 			info.runeSkill = hero:getRuneSkill(102)
+			info.talentSkills = hero:getTalentSkill()
 			teamInfo.heros[slot] = info
 		end
 		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
  
@@ -1310,13 +1315,10 @@ 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
+	function Role:updateHangTeamInfo()
+		local team = self:getTeamFormatByType(TeamSystemType.Hang)
+		if not team then return end
+
 		self:setProperties({
 			hangTS = self:getTeamHerosInfo(team.heros),
 			hangTB = self:getTeamBattleInfo(team),
@@ -1324,6 +1326,41 @@ function RolePlugin.bind(Role)
 		})
 	end
  
+	-- 设置pve阵容
+	function Role:getTeamFormat(index)
+		local teams = self:getProperty("hangTeams") or {}
+		local team = teams[index] or {}
+		return team
+	end
+
+	function Role:getTeamFormatByType(type)
+		local teamIndex = self:getProperty("teamIndex") or {}
+		local index = teamIndex[type]
+		if not index then return {} end
+
+		return self:getTeamFormat(index)
+	end
+
+	function Role:setTeamFormat(index, team)
+		local teams = self:getProperty("hangTeams") or {}
+		teams[index] = team
+		self:updateProperty({field = "hangTeams", value = teams, notNotify = false})
+	end
+
+	-- 设置拾荒编队阵容
+	function Role:getAdvTeamFormat(index)
+		local teams = self:getProperty("advTeams") or {}
+		local team = teams[index] or {}
+		return team
+	end
+
+	function Role:setAdvTeamFormat(index, team)
+		local teams = self:getProperty("advTeams") or {}
+		teams[index] = team
+		self:updateProperty({field = "advTeams", value = teams, notNotify = false})
+	end
+
+
 	function Role:savePvpCTeam(team)
 		if not team then
 			team = self:getProperty("pvpTC")
@@ -1497,6 +1534,102 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "redp", value = redp})
 	end
  
+	-- 获取充值订单号
+	function Role:getPurchaseOrder(rechargeId)
+		local roleId = self:getProperty("id")
+		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
+		if not rechargeData then
+			skynet.error("recharge id not exist", rechargeId)
+			return ""
+		end
+		local limit = rechargeData.limit
+	    local rechargeRecord = self:getProperty("payR") or {}
+	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
+	        return ""
+	    end
+
+	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
+	    if orderId then
+	    	local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
+				return string.format("%d_%d_%d", serverId, roleId, orderId)
+			end
+	    end
+
+		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
+		local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
+		local orderKey = string.format(R_ORDER, roleId, orderId)
+		redisproxy:del(orderKey) -- 删掉可能有了
+		local order = require("models.Order").new({ 
+			key = orderKey, 
+			order = partnerOrderId, 
+			rechargeId = rechargeId, 
+		})
+		order:create()
+		-- 正在进行中的订单 缓存
+		redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
+		return partnerOrderId
+	end
+
+	-- 更新订单信息
+	--[[
+
+	status
+
+	success
+	fail
+	finsh
+	unknow
+
+	--]]
+	function Role:updatePurchaseOrder(partnerOrderStr, platformOrder, status)
+		if not partnerOrderStr then return false end
+		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
+
+		local roleId = self:getProperty("id")
+		local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+		if not orderObject:load() then
+			return false
+		end
+
+		local rechargeId = orderObject:getProperty("rechargeId")
+		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
+
+		if orderObject:getProperty("finishTime") > 0 then
+			return false, "finsh"
+		end
+		
+		if platformOrder then
+			orderObject:setProperty("transactionId", platformOrder)
+		end
+		orderObject:setProperty("status", status)
+
+		-- 开始下单
+		if status == "success" then
+		elseif status == "fail" then
+			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+		elseif status == "finsh" then
+			orderObject:setProperty("finishTime", skynet.time())
+			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+		end
+
+		if status ~= "unknow" then
+			self:log("setOrder", {
+				order_status = ({success = 100, finsh = 200, fail = 300})[status] or 1000, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
+				item_id = rechargeId, -- 道具id
+				item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
+				item_name = dataSet.title, -- 购买的道具名
+				item_number = 1, -- 购买的道具数量
+				item_level = 1, -- 购买的道具等级
+				order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
+				order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+				order_type = self:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
+				order_id = platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
+			})
+		end
+
+		return true, rechargeId
+	end
  
 	-- 充值 --
 	--[[
@@ -1511,63 +1644,37 @@ function RolePlugin.bind(Role)
 		local roleId = self:getProperty("id")
 		local partnerOrderStr = params.order
  
-		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
-		local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
-		if not orderObject:load() then
-			-- 订单不存在
-			skynet.error("ayncPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
-			return
-		end
  
-		if orderObject:getProperty("finishTime") > 0 then
-			-- 订单已经处理
-			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
+		local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
+		if not status then
+			if back == "finsh" then
+				-- 订单已经处理
+				SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
+			end
 			return
 		end
-		local rechargeId = orderObject:getProperty("rechargeId")
+		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if rechargeData.rmb ~= tonumber(params.amount) then
-			skynet.error(string.format("fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
+			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
 			return
 		end
  
-		local order_type = self:getProperty("rmbC") > 0 and 0 or 1
 		local status, reward = self:recharge({ 
 			id = rechargeId,
 			transactionId = params.transactionId,
 			pay_time = params.pay_time,
 			order = partnerOrderStr,
 		})
-		orderObject:setProperty("finishTime", skynet.time())
-		orderObject:setProperty("status", "finish")
-
-		redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
  
 		if not status then
-			status = 200
-		else
-			status = 1000 + status
-		end
-		self:log("setOrder", {
-			order_status = status, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
-			item_id = rechargeId, -- 道具id
-			item_type = rechargeData.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
-			item_name = rechargeData.title, -- 购买的道具名
-			item_number = 1, -- 购买的道具数量
-			item_level = 1, -- 购买的道具等级
-			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
-			order_type = order_type, -- 订单类型，首充记录为1，否则为0
-			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
-		})
-		if status ~= 200 then return end
-		
-		SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
-			result = "success", reward = reward}))
+			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
+				result = "success", reward = reward}))
+		end
  
-		return orderObject:getProperty("rechargeId")
+		return rechargeId
 	end
  
  
@@ -1575,7 +1682,7 @@ function RolePlugin.bind(Role)
 		local id = tonumber(params.id)
 		local rechargeData = csvdb["shop_rechargeCsv"][id]
 		if not rechargeData then
-			skynet.error("recharge id not exist", id)
+			skynet.error("[recharge] recharge id not exist", id)
 			return 1
 		end
  
@@ -1600,7 +1707,7 @@ function RolePlugin.bind(Role)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 		else
-			skynet.error("invalid recharge shop type " .. id)
+			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
 		end
  
@@ -33,7 +33,7 @@ local TaskType = {
 	HangQuick = 303, 			-- 快速挂机
 	HangBattle = 304,			-- 挂机战斗			- id
 	HangGetGold = 305,			-- 挂机获得齿轮		- count
-	BonusPass = 306,			-- 奖励副本通关		- id
+	BonusPass = 306,			-- 奖励副本通关		- id count
  
 	-- 冒险相关
 	AdvPass = 401,				-- 冒险通过关			- id 	level 	score
@@ -142,7 +142,7 @@ local CommonListener = {
 		[TaskType.GiveFriendP] = {{20, f("count")}},
 		[TaskType.UnionBoss] = {{21}},
 		[TaskType.GetFriendP] = {{22, f("count")}},
-		[TaskType.BonusPass] = {{23}},
+		[TaskType.BonusPass] = {{23, f("count")}},
 		[TaskType.AdvStartSelf] = {{24}},
 		[TaskType.ShopAll] = {{25, f("count")}},
 		[TaskType.RuneUp] = {{26}},
@@ -244,7 +244,7 @@ local CalendaTaskListener = {
 	func = "checkCalendaTask",
 	listen = {
 		[TaskType.DrawHero] = {{1, 1, f("count")}},
-		[TaskType.BonusPass]= {{2, 1}},
+		[TaskType.BonusPass]= {{2, 1, f("count")}},
 		[TaskType.AdvStart]= {{3, 1}},
 		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
 		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
@@ -17,6 +17,11 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	self:advRandomSupportEffect(not notify)
  
 	self:checkExpireItem(not notify)
+	local advMine = self:getProperty("advMine")
+	if advMine[1] then
+		advMine[1].co = nil
+	end
+	self:setProperty("advMine", advMine)
  
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
@@ -24,10 +29,16 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 end
  
 ResetFunc["CrossWeek"] = function(self, notify, response)
+	local advMine = self:getProperty("advMine")
+	if advMine[2] then
+		advMine[2].co = nil
+	end
 	self:setProperties({
 		wTask =  {}, 
 		dinerS = {},
+		advMine = advMine,
 	})
+
 	response.wTask = {}
 	response.dinerS = {}
 end
@@ -33,6 +33,8 @@ Store.schema = {
     actGoodsFlag = {"table", {}},       -- ActGoodsType  1购买，0未购买
  
     bpInfo = {"table", {}},         -- battle pass 探索指令  1={flag=0 为1表示买了，br=""付费领取记录, fr=""免费领取记录},2,3,4
+    
+    totalRR  = {"string", ""},        -- 累计充值奖励领取记录
 }
  
 function Store:updateProperty(params)
@@ -224,9 +226,9 @@ end
  
 --检测购买是否超过限制数量
 function Store:checkRechargeRecord(limit, id)
-    local rechargeRecord = self:getProperty("payR")
+    local rechargeRecord = self:getProperty("payR") or {}
     if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
-        skynet.error(string.format("recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
+        skynet.error(string.format("[recharge] recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
         return false
     end
     rechargeRecord[id] = (rechargeRecord[id] or 0) + 1
@@ -464,6 +466,7 @@ function Store:data()
         --packTrigger = self:getProperty("packTrigger"),
         actGoodsFlag = self:getProperty("actGoodsFlag"),
         bpInfo = self:getProperty("bpInfo"),
+        totalRR = self:getProperty("totalRR"),
 	}
 end