Merge branch 'develop' into tr/qa

# Conflicts: # config/nodenames.lua

Merge branch 'develop' into tr/qa
# Conflicts: # config/nodenames.lua
熊润斐
2 parents d34562d5 e6dc06cc
Showing 28 changed files with 1181 additions and 346 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/EmailAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.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
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
+BUG_LOG = false
+
+function buglog(tag, advstr, ...)
+	if BUG_LOG then
+		print(string.format("[%s] %s", tag, string.format(advstr, ...)))
+	end
+end
+
+
 XXTEA_KEY = "699D448D6D24f7F941E9F6E99F823E18"
 RESET_TIME = 4
  
@@ -214,6 +223,7 @@ AdvBackEventType = {
 	Level = 25, -- 升级
 	LinkChooseOver = 26, -- 连锁事件结束
 	BuffEffect = 27, -- buff 效果
+	PassiveEffect = 28, -- 被动 效果
 }
  
 AdvScoreType = {
@@ -304,6 +314,7 @@ MailId = {
 	ActDrawCardReward = 222,
 	ActAdvDrawReward = 223,
 	ActOpenBoxReward = 224,
+	ActItemRecycle = 225,
  
 	PaySignAward = 241,
 	PayBackAward = 242,
@@ -50,6 +50,7 @@ actionCodes = {
 	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
 	Role_broadGetSSR = 135,		-- 全服广播 获得ssr英雄
 	Role_renameTeamRpc = 136,	-- 编队改名
+	Role_accuseRpc = 137,		-- 举报
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -100,6 +101,7 @@ actionCodes = {
 	Hero_changeCrown = 223,
 	Hero_drawHeroExtraRewardNtf = 224,
 	Hero_itemComposeRpc = 225,
+	Hero_setWishPoolRpc = 226,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -202,6 +204,7 @@ actionCodes = {
 	Store_getGrowFundRewardRpc = 561,	--成长助力奖励
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Store_getExploreCommandRewardRpc = 563, --探索指令
+	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
  
  
 	Email_listRpc = 600,
@@ -217,9 +220,13 @@ actionCodes = {
 	Activity_actPaySignRewardNtf = 654,
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
+	Activity_exchangeRpc = 657,
+	Activity_gachakonRpc = 658,
+	Activity_hangDropRpc = 659,
  
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
+	Radio_cancelQuestRpc = 702,
 }
  
 rpcResponseBegin = 10000
@@ -263,4 +263,156 @@ 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:isOpenById(actid) 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]
+	local limitArr = actCfg.limit:toArray(true, "=")
+	if curCount >= limitArr[2] 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
+
+function _M.gachakonRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local count = msg.count
+
+	if count > 10 then return end
+
+	if not role.activity:isOpenById(actid) then return 1 end
+
+	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
+	if not actCtrlData then return 2 end
+	local cost = actCtrlData.condition2:toNumMap()
+
+	local actCfg = csvdb["activity_capsuleToysCsv"][actid]
+	if not actCfg then return 3 end
+
+	local gachakonInfo = role.activity:getActData("Gachakon") or {}
+	local award = {}
+	local remain = 0
+	for i = 1, count do
+		local tmpCfg = clone(actCfg)
+		remain = 0
+		print("-----------------, ", i)
+		for id, cfg in pairs(tmpCfg) do
+			local num = gachakonInfo[id] or 0
+			num = cfg.amount >= num and cfg.amount - num or 0
+			cfg.weight = cfg.weight * num
+			if cfg.weight > 0 then
+				remain = remain + num
+			end
+			print("num ".. num, id, cfg.weight, cfg.amount)
+		end
+		if remain == 0 then
+			break
+		end
+		local id = math.randWeight(tmpCfg, "weight")
+		if not id then return 4 end
+		gachakonInfo[id] = (gachakonInfo[id] or 0) + 1
+		local curAward = tmpCfg[id].award:toNumMap()
+		for k, v in pairs(curAward) do
+			award[k] = (award[k] or 0) + v
+		end
+	end
+
+	for k, v in pairs(cost) do
+		cost[k] = v * count
+	end
+
+	if not role:checkItemEnough(cost) then return 5 end
+
+	role:costItems(cost, {log = {desc = "actGachakon", int1 = actid, int2 = count}})
+
+	local reward, change = role:award(award, {log = {desc = "actGachakon", int1 = actid, int2 = count}})
+	if remain <= count then
+		gachakonInfo = {}
+		print("hahaha")
+	end
+	role.activity:updateActData("Gachakon", gachakonInfo)
+
+	SendPacket(actionCodes.Activity_gachakonRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.hangDropRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	if not role.activity:isOpenById(actid) then return 1 end
+
+	local actCfg = csvdb["activity_putCsv"][actid]
+	if not actCfg then return 2 end
+
+	local award, period = "", 0
+	for i = 1, #actCfg do
+		local cfg = actCfg[i]
+		if not cfg then
+			break
+		end
+		if cfg.condition ~= "" then
+			local arr = cfg.condition:toArray(true, "=")
+			local type = arr[1]
+			if type == 1 then
+				local actId = arr[2]
+				local carbonId = arr[3]
+				if not role.activity:isOpenById(actid) then return 3 end
+				local clInfo = role.activity:getActData("ChallengeLevel") or {}
+				if not clInfo[carbonId] then
+					break
+				end
+			end
+		end
+		award = cfg.reward
+		period = cfg.period * 60
+	end
+	local actData = role.activity:getActData("HangDrop") or 0
+	local timeNow = skynet.timex()
+	if period == 0 or award == "" then
+		return 4
+	end
+	local num = math.floor((timeNow - actData)/ period)
+	num = num > 8 and 8 or num
+	if num == 0 then
+		return 5
+	end
+	local reward, change = {}, nil
+	for id, value in pairs(award:toNumMap()) do
+		reward[id] = value * num
+	end
+
+	reward, change  = role:award(reward, {log = {desc = "actHangDrop", int1 = actid, int2 = num}})
+
+	role.activity:updateActData("HangDrop", timeNow)
+
+	SendPacket(actionCodes.Activity_hangDropRpc, MsgPack.pack(role:packReward(reward, change)))
+
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -746,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()}))
@@ -121,7 +121,7 @@ function _M.drawAttachRpc(agent, data)
 	local attachments = getEmailAttachments(email)
 	if attachments == "" then return end
  
-	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = emailId}})
+	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = id}})
 	email:setProperty("status", 2)
 	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
@@ -533,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
  
@@ -585,16 +585,16 @@ function _M.createHeroRandomRpc(agent, data)
 	local itemData = csvdb["itemCsv"][itemId]
 	if not itemData or itemData.type ~= ItemType.HeroFCommon then return end
 	local cost = globalCsv.unit_fragment_cost[itemData.quality]
-	if not cost or role:getItemCount(itemId) < cost then return end
+	if not cost or role:getItemCount(itemId) < cost then return 1 end
  
 	local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
-	if not randomData then return end
+	if not randomData then return 2 end
  
 	local temp = randomData.gift1:randWeight(true)
-	if not temp or not next(temp) then return end
+	if not temp or not next(temp) then return 3 end
  
 	role:costItems({[itemId] = cost}, {log = {desc = "createHeroRandom"}})
-	local reward, change = role:award({[temp[1] + ItemStartId.Hero] = 1}, {log = {desc = "createHeroRandom"}})
+	local reward, change = role:award({[temp[1]] = 1}, {log = {desc = "createHeroRandom"}})
  
  
 	SendPacket(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -604,7 +604,6 @@ end
 function _M.getResetRewardRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-	local pay = msg.pay
  
 	local hero = role.heros[msg.id]
 	if not hero then return end
@@ -617,12 +616,30 @@ function _M.getResetRewardRpc(agent, data)
 	local tmpLevel = level
 	if level <= 1 and talent == "" then return end
  
+	local pay = true
 	if level <= 60 then
 		pay = false
 	end
  
-	if pay and not role:costDiamond({count = globalCsv.unit_heroBack_cost or 200, log = {desc = "resetHero", int1 = msg.id}}) then
-		return 1
+	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 = {}
@@ -677,10 +694,10 @@ function _M.getResetRewardRpc(agent, data)
 	})
 	hero:mylog({desc = "resetHero"})
  
-	local coef = globalCsv.unit_back_discount
-	coef = (pay or tmpLevel <= 60) and  1 or coef
+	--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 * coef)
+		reward[itemId] = count
 	end
 	local change
 	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -699,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
@@ -724,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
  
@@ -803,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
@@ -868,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
@@ -892,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})
@@ -1057,4 +1100,32 @@ function _M.itemComposeRpc(agent, data)
 	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
@@ -23,6 +23,7 @@ local _revengeRecord = {} -- 复仇对单人1分钟间隔
 local RevengeWaitTime = 60
  
 function _M.formatCommonRpc(agent , data)
+	if true then return end
 	local role = agent.role
 	local roleId = role:getProperty("id")
 	local msg = MsgPack.unpack(data)
@@ -63,7 +64,8 @@ function _M.formatHighRpc(agent , data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
 	local msg = MsgPack.unpack(data)
-
+	
+	if not role:isCrossServerPvpPlayer() then return end
 	local pvpTH = {}
 	local had = {} -- 上阵的角色
 	local supportHad = {}
@@ -169,7 +171,7 @@ function _M.infoRpc(agent, data)
  
 		local pvpMC = role:getProperty("pvpMC")
 		if not next(pvpMC) then --没有分配过对手
-			role:refreshPvpMatchC(score)
+			role:refreshPvpMatchC(score, -1)
 			pvpMC = role:getProperty("pvpMC")
 		end
 		if not next(pvpMC) then return end
@@ -189,7 +191,7 @@ function _M.infoRpc(agent, data)
  
 		local pvpMH = role:getProperty("pvpMH")
 		if not next(pvpMH) then --没有分配过对手
-			role:refreshPvpMatchH(score)
+			role:refreshPvpMatchH(score, -1)
 			pvpMH = role:getProperty("pvpMH")
 		end
 		if not next(pvpMH) then return end
@@ -255,8 +257,38 @@ function _M.startBattleRpc(agent, data)
 	local idx = msg.idx
 	local revenge = msg.revenge
  
-	local pvpTC = role:getProperty("pvpTC")
-	if not pvpTC.heros or not next(pvpTC.heros) then return 1 end
+	-- local pvpTC = role:getProperty("pvpTC")
+	-- if not pvpTC.heros or not next(pvpTC.heros) then return 1 end
+
+	local team = msg.team
+	if not team then return end
+
+	for slot, heroId in pairs(team.heros or {}) do
+		if not role.heros[heroId] then
+			return
+		end
+	end
+	if not team.heros or not next(team.heros) then
+		return
+	end
+	local supports = {}
+	for slot, support in pairs(team.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
+
+	local pvpTC = {}
+	pvpTC.heros = {}
+	for slot, heroId in pairs(team.heros) do
+		pvpTC.heros[slot] = heroId
+	end
+	pvpTC.leader = team.leader
+	pvpTC.supports = supports
+	if team.tactics and globalCsv.tactics_skill_passive_cell[team.tactics] then
+		pvpTC.tactics = team.tactics
+	end
  
 	local matchInfo, result, key, wait
  
@@ -299,7 +331,7 @@ function _M.startBattleRpc(agent, data)
 		end
  
 		key = tostring(math.random())
-		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge}
+		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge, pvpTC = pvpTC}
  
 		role:checkTaskEnter("PvpBattle")
  
@@ -342,7 +374,15 @@ function _M.endBattleRpc(agent, data)
  
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
 	local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
-	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreCommon(match.t == 1 and match.id or -1, isWin)
+	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, -1, -1
+	-- 失败了没再排行榜 不计入
+	if isWin or (not isWin and role:isInPvpRank(RANK_PVP_COMMON)) then
+		myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank= role:changePvpScoreCommon(match.t == 1 and match.id or -1, isWin)
+	end
+	if isWin then
+		-- 记录编队
+		role:savePvpCTeam(_pvpStartBattleCacheC.pvpTC)
+	end
  
 	-- 请求上传录像
 	local params = {
@@ -433,8 +473,8 @@ function _M.startBattleHRpc(agent, data)
 	local revenge = msg.revenge
 	if not role:isTimeResetOpen(TimeReset.PvpHight) then return end
  
-	local pvpTH = role:getProperty("pvpTH")
-	if not next(pvpTH) then return 1 end
+	-- local pvpTH = role:getProperty("pvpTH")
+	-- if not next(pvpTH) then return 1 end
  
 	-- 检查并记录玩家队伍
 	local pvpTH = {}
@@ -472,7 +512,6 @@ function _M.startBattleHRpc(agent, data)
 			curTeam.tactics = team.tactics
 		end
  
-
 		table.insert(pvpTH, curTeam)
 	end
  
@@ -644,9 +683,18 @@ function _M.endBattleHRpc(agent, data)
 	-- 战斗结束了发奖 
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpgroupBonus, true)
 	local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleH"}})
-	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, 0, 0
-	if role:isTimeResetOpen(TimeReset.PvpHight) then 
-		myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreHigh(match.t == 1 and match.id or -1, isWin)
+
+
+	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, -1, -1
+	-- 失败了没再排行榜 不计入
+	if role:isTimeResetOpen(TimeReset.PvpHight) then
+		if isWin or (not isWin and role:isInPvpRank(RANK_PVP_HIGHT)) then
+			myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreHigh(match.t == 1 and match.id or -1, isWin)
+		end
+		-- 记录编队
+		if isWin then
+			role:savePvpHTeam(_pvpStartBattleCacheH.pvpTH)
+		end
 	end
  
 	-- 加入战斗记录
@@ -735,6 +783,7 @@ function _M.endBattleHRpc(agent, data)
 		myRank = myRank,
 		oldMyRank = oldMyRank,
 		video = video,
+		headers = headers,
 		isWin = isWin,
 	}))
 	return true
@@ -122,7 +122,7 @@ function _M.finishQuestRpc(agent, data)
     --  get heros
     local totalCoef = 0
     local exp = config.time / 60
-    heroFaithMap = {}
+    local heroFaithMap = {}
     for _, heroId in ipairs(task.heros) do
         local hero = role.heros[heroId]
         if hero then
@@ -162,4 +162,20 @@ function _M.finishQuestRpc(agent, data)
 	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
@@ -1279,4 +1279,16 @@ function _M.renameTeamRpc(agent, data)
 	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
@@ -396,4 +396,30 @@ 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 totalTwd = role:getProperty("twdC")
+	local totalRechargeRecord = role.storeData:getProperty("totalRR")
+	local flag = string.char(string.getbit(totalRechargeRecord, index))
+	if flag == "1" then return 1 end
+	local cfg = csvdb["activity_payRebateCsv"][index]
+	if not cfg then return 2 end
+	if cfg.twd > totalTwd then return 3 end
+
+	totalRechargeRecord = string.setbit(totalRechargeRecord, index)
+	role.storeData:updateProperty({field = "totalRR", value = totalRechargeRecord})
+	local main = cfg.main_reward:toNumMap()
+	local sub = cfg.sub_reward:toNumMap()
+	for k, v in pairs(sub) do
+		main[k] = (main[k] or 0) + v
+	end
+
+	local reward, change = role:award(main, {log = {desc = "totalRecharge", int1 = index}})
+	SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -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)
@@ -149,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()
  
@@ -456,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])
@@ -468,13 +468,15 @@ 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 notDb then
+	if not info then
 		self.battle:newBattle()
+	else
+		self.battle:loadBattle(info)
 	end
 end
  
@@ -1386,19 +1388,31 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			[14] = function() -- 指定地块召唤 指定类型的id
 				local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5])
 				for _, one in ipairs(change) do
-					self:backBlockChange(one[1].roomId, one[2].blockId)
+					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+						clearBlock = false
+					else
+						self:backBlockChange(one[1].roomId, one[2].blockId)
+					end
 				end
 			end,
 			[15] = function() -- 移除指定事件
 				local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4])
 				for _, one in ipairs(change) do
-					self:backBlockChange(one[1].roomId, one[2].blockId)
+					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+						clearBlock = false
+					else
+						self:backBlockChange(one[1].roomId, one[2].blockId)
+					end
 				end
 			end,
 			[16] = function() -- 指定事件转移
 				local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6])
 				for _, one in ipairs(change) do
-					self:backBlockChange(one[1].roomId, one[2].blockId)
+					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+						clearBlock = false
+					else
+						self:backBlockChange(one[1].roomId, one[2].blockId)
+					end
 				end
 			end,
 		}
@@ -1524,6 +1538,24 @@ local function clickBuild(self, room, block, params)
 	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "build")
 	if not status then return end
  
+	local isMine = false -- 是不是宝藏怪
+	for _, mid in ipairs(globalCsv.adv_egg_treasureLayer_id) do 
+		if mid == oldId then
+			isMine = true
+			break
+		end
+	end
+	if isMine then
+		local advMine = self.owner:getProperty("advMine")
+		advMine[2] = advMine[2] or {}
+		local mineCo2 = advMine[2].co or {}
+		if chooseData.limit ~= 0 then
+			mineCo2[oldId] = (mineCo2[oldId] or 0) + 1
+		end
+		advMine[2].co = mineCo2
+		self.owner:setProperty("advMine", advMine)
+	end
+
 	self:checkTask(Adv.TaskType.Build, 1, oldId)
 	self:checkAchievement(Adv.AchievType.Build, 1, oldId)
 	self:checkAchievement(Adv.AchievType.BuildBySelect, 1, oldId, choose)
@@ -1951,73 +1983,143 @@ function Adv:enemyDead(enemy, escape)
 			-- self:backDead(enemyId, changeV)
 			self:backDead(enemyId)
  
-			local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
-			if toClick then
-				toClick = toClick:effect()
+			local isMine = false -- 是不是宝藏怪
+			for _, mid in ipairs(globalCsv.adv_egg_treasureMonster_id) do 
+				if mid == enemyId then
+					isMine = true
+					break
+				end
 			end
  
-			local changItem = enemy:hadBuff(Buff.CHANGE_DROP)
-			if changItem then
-				changItem = table.pack(changItem:effect())
-			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 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 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
+						})
+						had = true
+					end
+				end
+				if had then
+					mineCh = nil
+				else
+					block:clear()
+					mineCh = math.min(mineCh + globalCsv.adv_egg_treasureLayer_showup_add, 100)
+				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 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
-			end
-			-- 这些奖励可能会有被动加成
-			self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops})
+				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
  
-			-- 自身带的掉落是不会被改变的 也不会被加成
-			if block.event.item and block.event.item[1] ~= 0 then
-				table.insert(drops,  1, block.event.item)
-			end
+				local changItem = enemy:hadBuff(Buff.CHANGE_DROP)
+				if changItem then
+					changItem = table.pack(changItem:effect())
+				end
  
-			-- 清空当前的格子
-			block:clear()
+				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 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 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})
  
-			-- 转换的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)
+				-- 自身带的掉落是不会被改变的 也不会被加成
+				if block.event.item and block.event.item[1] ~= 0 then
+					table.insert(drops,  1, block.event.item)
+				end
+
+				-- 清空当前的格子
+				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)
+					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)
+					end
 				end
 			end
  
@@ -316,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()
@@ -347,14 +358,6 @@ function Battle:afterRound()
 			build:clear()
 		end
 	end
-
-	self.player:triggerPassive(Passive.AFTER_ROUND)
-
-	self:checkAura()
-
-	if self.player.isDead then
-		self.adv:over(false, nil, -2)
-	end
 end
  
  
@@ -363,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
@@ -429,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
@@ -446,16 +463,18 @@ function Battle:iLayerChange(oldMapIdx)
 	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
+	for _, enemy in ipairs(self.enemys[self.adv:getCurMapIdx()]) 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
  
@@ -463,9 +482,17 @@ end
 function Battle:newBattle()
 	local auras = self:getActiveAuras()
 	local buffs = self:checkDiffAuraBuff({}, auras)
+	self.player:checkAuraBuff(buffs)
+	for _, enemy in ipairs(self.enemys[self.adv:getCurMapIdx()]) 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()
@@ -332,7 +332,9 @@ end
 function Block:getObstacle()
 	if self:isMonster() then
 		local enemy = self.room.map.adv.battle:getEnemy(self.room.roomId, self.blockId)
-		return enemy:getObstacle()
+		if enemy then
+			return enemy:getObstacle()	
+		end
 	end
 	local data = self:getEventData()
 	if not data then return 0 end
@@ -489,6 +489,8 @@ function Buff:createAfter(layer)
 	if self._init then
 		self:_init()
 	end
+	self:pushBackEffect(1)
+	buglog("Buff", "who: %s create buffId: %s", self.owner.monsterId, self.id)
 end
  
 function Buff:initByDB(data)
@@ -620,11 +622,20 @@ function Buff:canEffect(...)
 	return self:_canEffect(...)
 end
  
+function Buff:pushBackEffect(etype)
+	local shows = self.buffData.show:toTableArray(true)
+	for _, one in ipairs(shows) do
+		if one[1] == etype then
+			self.owner.battle.adv:pushBackEvent(AdvBackEventType.BuffEffect, {etype = etype, id = self.id, blockId = self.owner.blockId, roomId = self.owner.roomId})
+			break
+		end
+	end
+end
+
 function Buff:effect()
+	buglog("Buff", "who: %s effect buffId: %s", self.owner.monsterId, self.id)
 	self:decCount()
-	if self.buffData.show:sismember(2, " ") then
-		self.owner.battle.adv:pushBackEvent(AdvBackEventType.BuffEffect, {etype = 2})
-	end
+	self:pushBackEffect(2)
 	if self._effectValue then
 		return self:_effectValue()
 	end
@@ -646,6 +657,7 @@ function Buff:endBuff()
 	if self._endBuff then
 		self:_endBuff()
 	end
+	buglog("Buff", "who: %s endBuff buffId: %s", self.owner.monsterId, self.id)
 end
  
 function Buff:getType()
@@ -698,6 +710,9 @@ function Buff:overlay(releaser, data, layer)
 		if self._overlay then
 			self:_overlay()
 		end
+
+		self:pushBackEffect(1)
+		buglog("Buff", "who: %s overlay buffId: %s", self.owner.monsterId, self.id)
 	end
 end
  
@@ -13,12 +13,12 @@ local createMap, getEventLib
 function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 	self.adv = adv
 	local isNew = type(mapInfo) == "number"
+	self.mapIdx = mapIdx
 	if isNew then -- mapInfo 传入 id
 		mapInfo = createMap(self, mapInfo, isEnter, isNewRelay)  -- 生成地图
 	end
 	if not mapInfo then return end
  
-	self.mapIdx = mapIdx
 	self.mapId = mapInfo.mapId
 	self.isShow = mapInfo.isShow  -- 是否全部展示 -- 客户端用
 	self.rooms = {}
@@ -258,7 +258,7 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if isPlayer then
 			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK, {roomId = roomId, blockId = blockId})
 			self.adv.owner:checkTaskEnter("AdvOpenBlock")
-
+			self.adv.battle.player:changeSp(1) -- 翻开格子 sp 加1
 			-- 潜行检查
 		 	local sneakBuff = self.adv.battle.player:hadBuff(Buff.SNEAK)
 		 	if sneakBuff then
@@ -313,13 +313,13 @@ function Map:openBlocksIsMonsterByRoom(roomId, count, isPlayer, ignoreBack)
 		end
 	end
  
-	if not count or count == -1 or count >= len(allBlock) then
+	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, len(allBlock))
+			local idx = math.randomInt(1, #allBlock)
 			openBlock(allBlock[idx])
 			table.remove(allBlock, idx)
 		end
@@ -349,8 +349,8 @@ function Map:getDistance(froomId, fblockId, troomId, tblockId)
 	local room1 = self.rooms[froomId]
 	local room2 = self.rooms[troomId]
 	if room1 and room2 then
-		local block1 = room1[fblockId]
-		local block2 = room2[tblockId]
+		local block1 = room1.blocks[fblockId]
+		local block2 = room2.blocks[tblockId]
 		if block1 and block2 then
 			local c1, r1 = room1:tranLtoG(block1.col, block1.row)
 			local c2, r2 = room2:tranLtoG(block2.col, block2.row)
@@ -811,6 +811,48 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 			end
 		end
 	end
+	-- 宝藏怪刷新
+	if self.mapIdx == 1 and not self.adv.isRelay and self.adv.chapterId ~= 100 then
+		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 had then
+			mineCh = nil
+		else
+			mineCh = math.min(mineCh + globalCsv.adv_egg_treasureMonster_showup_add, 100)
+		end
+		advMine[1].ch = mineCh
+		self.adv.owner:setProperty("advMine", advMine)
+	end
+
  
 	if mapCsvData.clearType == 1 and not haveBoss then
 		if not next(monsterEvents) then
@@ -50,7 +50,7 @@ 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
+		if params and 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
@@ -95,9 +95,8 @@ function Filter:execute(params)
 	if not target then
 		return
 	end
-	if self:_execute(target) then
-		return self:_execute(target, params)
-	end
+
+	return self:_execute(target, params)
 end
  
 -->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -203,7 +202,7 @@ PassiveCondFactory[Passive.PLAYER_BUFF] = PassiveCondFactory[Passive.GET_BUFF]
  
 PassiveCondFactory[Passive.PLAYER_BUFF_CLASSIFY] = function(_Passive)
 	_Passive._trigger = function(self, params)
-		if params.classify:sismember(self.passiveData.value) then
+		if params.classify:sismember(self.passiveData.value, " ") then
 			return true
 		end
 	end
@@ -340,6 +339,7 @@ function Passive:canEffect(effType, effValue)
 end
  
 function Passive:effect(triggerPms)
+	local hadEffect = false
 	for _, effect in ipairs(self.effects) do
 		local effType = effect[1]
 		local effValue = effect[2]
@@ -348,10 +348,14 @@ function Passive:effect(triggerPms)
 			table.insert(otherPms, effect[i])
 		end
 		if self:canEffect(effType, effValue) then
+			hadEffect = true
 			self["effect" .. effType](self, effValue, triggerPms, table.unpack(otherPms))
 		end
 	end
-
+	if hadEffect then
+		self.owner.battle.adv:pushBackEvent(AdvBackEventType.PassiveEffect, {id = self.id, level = self.level, roomId = self.owner.roomId, blockId = self.owner.blockId})
+		buglog("Passive", "who: %s effect id: %s", self.owner.monsterId, self.id)
+	end
 	if self.count > 0 then
 		self.count = self.count < 999 and self.count - 1 or self.count
 		self.round = self.passiveData.round
@@ -401,6 +405,8 @@ function Passive:trigger(condType, params) --触发检查
 	params = params or {}
 	if self.isDel or self.owner.isDead then return end
 	if self:getCondType() ~= condType then return end
+
+	buglog("Passive", "who: %s trigger id: %s", self.owner.monsterId, self.id)
 	if not self:canTrigger() then return end
 	if self._trigger then
 		if not self:_trigger(params) then return end  --检查
@@ -597,5 +603,9 @@ function Passive:effect16(value, triggerPms, changeType)
 	self.owner.battle.adv:blockDropChange(changeType, blocks)
 end
  
+--17=玩家获得buff
+function Passive:effect17(value, triggerPms)
+	self.owner.battle.player:addBuff(value, self.owner)
+end
  
 return Passive
 \ No newline at end of file
@@ -144,7 +144,7 @@ function BaseObject:getDisablePassiveCount()
 end
  
 function BaseObject:getDisableAuraCount()
-	local count
+	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
@@ -699,7 +699,7 @@ function Enemy:checkAuraBuff(buffs)
 			if buff then
 				buff:uncover(info.exist and -info.count or -1, true)
 			end
-		elseif count > 0 then
+		elseif info.count > 0 then
 			self:addBuff(buffId, nil, info.count)
 		end
 	end
@@ -847,10 +847,6 @@ function Player:addBuff(buffId, releaser)
 		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})
-		local buffData = csvdb["adv_map_buffCsv"][buffId]
-		if buffData and buffData.show:sismember(1, " ") then
-			self.battle.adv:pushBackEvent(AdvBackEventType.BuffEffect, {etype = 1})
-		end
 	end
 	return status
 end
-Subproject commit a2598231ccc5e16da1a27f976602871f30fcd035
+Subproject commit 295feade86593a4793972e2cd2d83135d8aee247
@@ -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表示领取过该档位的奖励
+
+	act17		= {"table", {}},	  -- {id=关卡星数, totalDmg=Boss总伤害}
+	act18		= {"table", {}, true},	  -- {id=兑换数量}
+	act19		= {"number", 0},	  -- {挂机信息}
+	act20		= {"table", {}},	  -- {id=扭蛋抽出数量}
 }
  
 function Activity:data()
@@ -61,6 +71,11 @@ function Activity:data()
 		act12 = self:getProperty("act12"),
 		act13 = self:getProperty("act13"),
 		act14 = self:getProperty("act14"),
+
+		act17 = self:getProperty("act17"),
+		act18 = self:getProperty("act18"),
+		act19 = self:getProperty("act19"),
+		act20 = self:getProperty("act20"),
 	}
 end
  
@@ -138,6 +153,10 @@ function Activity:isOpen(activityType)
 	return false
 end
  
+function Activity:isOpenById(id)
+	return self._isOpen[id]
+end
+
 function Activity:getActData(actType)
 	actType = checkActivityType(actType)
 	return self:getProperty("act" .. actType)
@@ -409,12 +428,68 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 	-- end,
 }
  
+-- 兑换
+activityFunc[Activity.ActivityType.Exchange] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		local actData = self:getActData(actType) or {}
+		actData[actId] = {}
+		self:updateActData(actType, actData, not notify)
+	end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType) or {}
+		local lastTs = actData["ts"] or 0
+		local timeNow = skynet.timex()
+		local cfg = csvdb["activity_ctrlCsv"][actId]
+		if not cfg then return end
+		local refreshTimes = cfg.condition2:toArray(false, "=")
+		for i = 1, #refreshTimes do
+			local rt = toUnixtime(refreshTimes[1]..string_format("%02x", RESET_TIME))
+			if timeNow >= rt and rt > lastTs then
+				lastTs = rt
+				actData = {}
+			end
+		end
+		if next(actData) then
+			actData["ts"] = lastTs
+			self:updateActData(actType, actData, not notify)
+		end
+	end,
+	["close"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType) or {}
+		actData[actId] = nil
+		self:updateActData(actType, actData, not notify)
+	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,
+}
+
+-- 挂机掉落
+activityFunc[Activity.ActivityType.HangDrop] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		local actime = self:getProperty("actime")
+		local startTime = actime[actId]
+		local actData = self:getActData(actType) or 0
+		local cfg = csvdb["activity_putCsv"][actId]
+		if not cfg then return end
+		actData = startTime
+		self:updateActData(actType, actData, 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 +498,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)
@@ -436,7 +512,7 @@ function Activity:refreshDailyData(notify)
 		if status and actData then
 			local actType = actData.showType
 			if activityFunc[actType] and activityFunc[actType]['crossDay'] then
-				activityFunc[actType]["crossDay"](self, actType, notify)
+				activityFunc[actType]["crossDay"](self, actType, notify, actId)
 			end
 		end
 	end
@@ -453,8 +529,8 @@ end
 -- 获取此次挂机掉落翻倍时长
 function Activity:getActHangDoubleTime(lastTs, nowTs)
 	local type = "DoubleDrop"
-	local actId = checkActivityType(type)
-	local isOpen = self:isOpen(type)
+	--local actId = checkActivityType(type)
+	local isOpen, actId = self:isOpen(type)
 	local openTs = self:getProperty("actime")[actId] or 0
 	local timeNow = skynet.timex()
 	lastTs =  math.max(lastTs, openTs)
@@ -529,5 +605,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(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
@@ -126,11 +126,11 @@ function HeroPlugin.bind(Hero)
 		end
  
 		-- 羁绊加成
-	    if params.activeRelation then
-	        for k, attName in pairs(AttsEnumEx) do
-				attrs[attName] = attrs[attName] + addAttr(attrs[attName], params.activeRelation[attName], 1, attName)
-	        end
-	    end
+	   --  if params.activeRelation then
+	   --      for k, attName in pairs(AttsEnumEx) do
+				-- attrs[attName] = attrs[attName] + addAttr(attrs[attName], params.activeRelation[attName], 1, attName)
+	   --      end
+	   --  end
 		return attrs
 	end
  
@@ -224,8 +224,10 @@ function HeroPlugin.bind(Hero)
  
  
 	-- 战斗力（当前属性）= POWER[（生命 + 防御 * 7 + 闪避 * 4）*（攻击*4 + 命中 * 2）*（1 + 暴击几率/100 * 暴击伤害/100）* 攻击速度 / 60000 ，0.8 ]
-	function Hero:getBattleValue(activeRelation) -- isReal包括队伍加成
-	    local attrs = self:getTotalAttrs({activeRelation = activeRelation})
+	-- function Hero:getBattleValue(activeRelation) -- isReal包括队伍加成
+	function Hero:getBattleValue() -- isReal包括队伍加成
+	    -- local attrs = self:getTotalAttrs({activeRelation = activeRelation})
+	    local attrs = self:getTotalAttrs()
 	    local battleValue = ((attrs["hp"] + attrs["def"] * 7 + attrs["miss"] * 4) * (attrs["atk"] * 4 + attrs["hit"] * 2) * (1 + attrs["crit"]/100 * attrs["critHurt"]/100) * attrs["atkSpeed"] / 600000) ^ 0.8
 	    return math.floor(battleValue)
 	end
@@ -99,7 +99,8 @@ 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}
@@ -167,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}
@@ -394,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"),
@@ -42,6 +42,11 @@ local ItemReason = {
 	freeGift = 127, -- 免费礼包
 	exploreCommand = 128, -- 探索指令
 	drawHeroExtraReward = 129, -- 抽卡阶段奖励
+	actRecycle = 130,	-- 活动道具回收
+	actExchange = 131,	-- 兑换活动
+	actGachakon = 132, 	-- 扭蛋活动
+	totalRecharge = 133, -- 累计充值奖励
+	actHangDrop = 134, -- 掉落活动奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -102,6 +102,35 @@ function RolePlugin.bind(Role)
 			[ItemType.FuncOpen] = function()
 				self:funcOpen(itemId, count, pms)
 			end,
+			[ItemType.HeroFCommon] = function()
+				if itemData.use_type == 2 then
+					local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
+					for _i = 1, count do
+						for i = 1, 10 do
+							local num = randomData["num" .. i] 
+							local gift = randomData["gift" .. i]
+							if num and gift and num > 0 and gift ~= "" then
+								local pool = {}
+								for _, temp in ipairs(gift:toArray()) do
+									table.insert(pool, temp:toArray(true, "="))
+								end
+								local needCount = math.min(#pool, num)
+								for j = 1, needCount do
+									local idx = math.randWeight(pool, 3)
+									change[pool[idx][1]] = (change[pool[idx][1]] or 0) + pool[idx][2]
+									table.remove(pool, idx)
+								end
+							end
+						end
+					end
+					change[0] = nil
+					count = 0
+				else
+					pms.itemId = itemId
+					pms.count = count
+					self:addItem(pms)
+				end
+			end,
 		}
 		-- 对数量筛查
 		count = checkItemCount(self, itemId, count)
@@ -806,50 +835,50 @@ function RolePlugin.bind(Role)
 		SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
 	end
  
-	function Role:getHeroActiveRelationData(heros)
-		local relations = {} 
-		for _, id in pairs(heros or {}) do
-			local hero = self.heros[id]
-			if hero then
-				local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
-				relations[camp] = (relations[camp] or 0) + 1
-			end
-		end
-		local curData = csvdb["unit_relationCsv"][0]
-		if not next(relations) then return curData end
+	-- function Role:getHeroActiveRelationData(heros)
+	-- 	local relations = {} 
+	-- 	for _, id in pairs(heros or {}) do
+	-- 		local hero = self.heros[id]
+	-- 		if hero then
+	-- 			local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
+	-- 			relations[camp] = (relations[camp] or 0) + 1
+	-- 		end
+	-- 	end
+	-- 	local curData = csvdb["unit_relationCsv"][0]
+	-- 	if not next(relations) then return curData end
  
-		for _, data in ipairs(csvdb["unit_relationCsv"]) do
-			local had = {}
-			local isDone = true
-			for _, count in pairs(data.relation:toArray(true, "=")) do
-				local find = false
-				for camp, _count in pairs(relations) do
-					if count == _count and not had[camp] then
-						had[camp] = true
-						find = true
-						break
-					end
-				end
-				if not find then
-					isDone = false
-					break
-				end
-			end
-			if isDone then
-				curData = data
-			end
-		end
-		return curData
-	end
-
-	function Role:getHeroActiveRelation(heros)
-		local data = self:getHeroActiveRelationData(heros)
-		local result = {}
-		for attr, value in pairs(data.effect:toNumMap()) do
-			result[AttsEnumEx[attr]] = (result[AttsEnumEx[attr]] or 0) + value
-		end
-		return result
-	end
+	-- 	for _, data in ipairs(csvdb["unit_relationCsv"]) do
+	-- 		local had = {}
+	-- 		local isDone = true
+	-- 		for _, count in pairs(data.relation:toArray(true, "=")) do
+	-- 			local find = false
+	-- 			for camp, _count in pairs(relations) do
+	-- 				if count == _count and not had[camp] then
+	-- 					had[camp] = true
+	-- 					find = true
+	-- 					break
+	-- 				end
+	-- 			end
+	-- 			if not find then
+	-- 				isDone = false
+	-- 				break
+	-- 			end
+	-- 		end
+	-- 		if isDone then
+	-- 			curData = data
+	-- 		end
+	-- 	end
+	-- 	return curData
+	-- end
+
+	-- function Role:getHeroActiveRelation(heros)
+	-- 	local data = self:getHeroActiveRelationData(heros)
+	-- 	local result = {}
+	-- 	for attr, value in pairs(data.effect:toNumMap()) do
+	-- 		result[AttsEnumEx[attr]] = (result[AttsEnumEx[attr]] or 0) + value
+	-- 	end
+	-- 	return result
+	-- end
  
 	function Role:getHerosCamp(heros)
 		local had = {}
@@ -870,14 +899,16 @@ function RolePlugin.bind(Role)
 		return curCamp
 	end
  
-	function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
+	-- function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
+	function Role:getRealBattleValue(heros) -- 获取队伍战斗力  羁绊加成
 		heros = heros or {}
-		local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
+		-- local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
 		local battleValue = 0
 		for _, id in pairs(heros) do
 			local hero = self.heros[id]
 			if hero then
-				battleValue = battleValue + hero:getBattleValue(activeRelation)
+				-- battleValue = battleValue + hero:getBattleValue(activeRelation)
+				battleValue = battleValue + hero:getBattleValue()
 			end
 		end
 		return battleValue
@@ -1263,7 +1294,7 @@ function RolePlugin.bind(Role)
  
 	function Role:getTeamBattleInfo(team)
 		local teamInfo = {heros = {}, supports = {}}
-		local activeRelation = self:getHeroActiveRelation(team.heros)
+		-- local activeRelation = self:getHeroActiveRelation(team.heros)
  
 		for slot, id in pairs(team.heros or {}) do
 			local info = {}
@@ -1271,7 +1302,8 @@ function RolePlugin.bind(Role)
 			if not hero then
 				print("error heroid " .. id)
 			end
-			local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
+			-- local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
+			local attrs = hero:getTotalAttrs()
 			for k, v in pairs(AttsEnumEx) do
 				info[v] = (attrs[v] or 0)
 			end
@@ -6,7 +6,12 @@ RolePvp.bind = function (Role)
 local PVP_RANK_TIME_SORT_STD = 1924876800 -- 2030-12-31 00:00:00
 local PVP_RANK_TIME_SORT_PLACE = 1000000 -- 时间戳占据 6位数
 local PVP_RANK_TIME_SORT_PRECISION = 360 -- 时间精度 每6分钟忽略差异
-local PVP_RANK_ROBOT_SCORE = globalCsv.pvp_base_score -- 机器人积分
+local PVP_RANK_BASE_SCORE = globalCsv.pvp_base_score -- 初始积分
+
+-- 匹配规则改为以排名来匹配
+local PVP_GET_ROBOT_SCORE = 2400 -- 2400分以下低档位匹配机器人
+local PRE_RANGE_COUNT = 20 -- 每个档位人数
+local NEED_MATCH = 3 --匹配到多少人
  
  
 function Role:unpackPvpScore(score)
@@ -34,7 +39,7 @@ function Role:changePvpScore(rankKey, changeScoreCallback, matchId)
 	end)
 	local myScore = self:unpackPvpScore(redret[1])
 	local oldMyRank = tonumber(redret[2] or -2) + 1
-	local matchScore = PVP_RANK_ROBOT_SCORE
+	local matchScore = PVP_RANK_BASE_SCORE
 	if isPlayer then
 		matchScore = self:unpackPvpScore(redret[3])
 	end
@@ -68,7 +73,7 @@ function Role:changePvpScoreCommon(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((myScore - matchScore) / 400)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - scoreChange
+			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
 		else
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((matchScore - myScore) / 400)))
 			myScore = myScore - scoreChange
@@ -78,7 +83,7 @@ function Role:changePvpScoreCommon(matchId, isWin)
 	end
  
 	local result = self:changePvpScore(RANK_PVP_COMMON, changeScoreCallback, matchId)
-	self:refreshPvpMatchC(result[1])
+	self:refreshPvpMatchC(result[1], result[5])
 	return table.unpack(result)
 end
  
@@ -134,7 +139,7 @@ function Role:changePvpScoreHigh(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((myScore - matchScore) / 1000)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - scoreChange
+			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
 		else
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((matchScore - myScore) / 1000)))
 			myScore = myScore - scoreChange
@@ -162,85 +167,50 @@ function Role:changePvpScoreHigh(matchId, isWin)
 		})
 	end
  
-	self:refreshPvpMatchH(result[1])
+	self:refreshPvpMatchH(result[1], result[5])
 	return table.unpack(result)
 end
  
-function Role:refreshPvpMatch(score, rankKey)
+function Role:isInPvpRank(rankKey)
+	local Fields = {
+		[RANK_PVP_COMMON] = "pvpMC",
+		[RANK_PVP_HIGHT] = "pvpMH",
+	}
+	local dbKey = self:getPvpDBKey(rankKey)
+	local roleId = self:getProperty("id")
+	if redisproxy:zscore(dbKey, roleId) then
+		return true
+	end
+	return false
+end
  
+-- 新的匹配规则
+function Role:refreshPvpMatch(score, rank, rankKey)
 	local Fields = {
 		[RANK_PVP_COMMON] = "pvpMC",
 		[RANK_PVP_HIGHT] = "pvpMH",
 	}
 	local RobotCsvs = {
 		[RANK_PVP_COMMON] = "pvp_robotCsv",
-		[RANK_PVP_HIGHT] = "pvp_robotCsv",
+		[RANK_PVP_HIGHT] = "pvp_robot_groupCsv",
 	}
+
 	local mField = Fields[rankKey]
 	local robotCsv = RobotCsvs[rankKey]
-	local dbKey = self:getPvpDBKey(rankKey)
  
+	local dbKey = self:getPvpDBKey(rankKey)
 	local roleId = self:getProperty("id")
-	score =  score or self:unpackPvpScore(redisproxy:zscore(dbKey, roleId))
-
-	local function getPlayers(levels)
+	if not score and not rank then
 		local redret = redisproxy:pipelining(function(red)
-			for _, level in ipairs(levels) do
-				local low, high = table.unpack(level)
-				red:zadd(dbKey, low * PVP_RANK_TIME_SORT_PLACE, "std_temp1")
-				red:zadd(dbKey, high * PVP_RANK_TIME_SORT_PLACE + PVP_RANK_TIME_SORT_PLACE - 1, "std_temp2")
-				red:ZREVRANK(dbKey, "std_temp1")
-				red:ZREVRANK(dbKey, "std_temp2")
-			end
-			red:zrem(dbKey, "std_temp1", "std_temp2")
+			red:zscore(dbKey, roleId)
+			red:zrevrank(dbKey, roleId)
 		end)
-
-		local PreGetCount = 7 
-		local redret = redisproxy:pipelining(function(red)
-			for idx, level in ipairs(levels) do
-				local rank1 = tonumber(redret[(idx - 1) * 4 + 3])
-				local rank2 = tonumber(redret[(idx - 1) * 4 + 4])
-				if rank1 - rank2 > PreGetCount then
-					rank2 = math.randomInt(rank2, rank1 - PreGetCount + 1)
-					rank1 = rank2 + PreGetCount - 1
-				end
-				red:ZREVRANGE(dbKey, rank2, rank1)
-			end
-		end)
-		return redret
-	end
-
-	local findIdx = #globalCsv.pvp_division
-	for idx, limit in ipairs(globalCsv.pvp_division) do
-		if score < limit then
-			findIdx = idx - 1
-			break
-		end
+		score = self:unpackPvpScore(redret[1])
+		rank = tonumber(redret[2] or -2) + 1
 	end
-	local levels = {
-		{}, {}, {}
-	}
-	if globalCsv.pvp_division[findIdx + 1] then
-		levels[1] = {globalCsv.pvp_division[findIdx + 1], (globalCsv.pvp_division[findIdx + 2] or 100000000) - 1}
-	end
-	levels[2] =  {globalCsv.pvp_division[findIdx], (globalCsv.pvp_division[findIdx + 1] or 100000000) - 1}
-	if globalCsv.pvp_division[findIdx - 1] then
-		levels[3] =  {globalCsv.pvp_division[findIdx - 1], globalCsv.pvp_division[findIdx] - 1}
-	end
-	local redirect = {}
-	for i = #levels , 1, -1 do
-		if not next(levels[i]) then
-			table.remove(levels, i)
-			redirect[i] = -1
-			for _, v in pairs(redirect) do
-				redirect[_] = v - 1
-			end
-		else
-			redirect[i] = i
-		end
-	end
-
-	local result = getPlayers(levels)
+	score =  score or self:unpackPvpScore(redisproxy:zscore(dbKey, roleId))
+	rank = rank or tonumber(redisproxy:zrevrank(dbKey, roleId) or -2) + 1
+	
 	local match = self:getProperty(mField)
 	local hadPlayer = {[roleId] = 1}
 	local hadRobot = {}
@@ -252,97 +222,261 @@ function Role:refreshPvpMatch(score, rankKey)
 		end
 	end
  
-	for _, temp in pairs(result) do
-		for i = #temp, 1, -1 do
-			local id = tonumber(temp[i])
-			if hadPlayer[id] then
-				table.remove(temp, i)
-			else
-				temp[i] = id
-				hadPlayer[id] = 1
-			end
+	local tempMatch = {}
+	local needRobot = 0
+	-- -1 没有上榜
+	if rank == -1 then
+		needRobot = NEED_MATCH
+	else
+		local need = PRE_RANGE_COUNT * NEED_MATCH
+		local low, heigh = math.floor(rank - need / 2 - 1), math.floor(rank + need / 2 - 1)
+		if low < 0 then
+			low = 0
 		end
-	end
-	-- 增加第几个
-	local function getPlayer(idx)
-		for i = idx, 3 do
-			if redirect[i] ~= -1 then
-				local curR = result[redirect[i]] or {}
-				if next(curR) then
-					local curIdx = math.randomInt(1, #curR)
-					local objId = curR[curIdx]
-					table.remove(curR, curIdx)
-					return objId
-				end
+		print(low, heigh)
+		local rangeIds = redisproxy:ZREVRANGE(dbKey, low, heigh)
+		local lastRangeIds = {}
+		for idx, one in ipairs(rangeIds) do
+			local cid = tonumber(one)
+			if not hadPlayer[cid] then
+				lastRangeIds[#lastRangeIds + 1] = cid
 			end
 		end
-	end
-
-	local tempMatch = {}
-	local curCount = 0
-	for i = 1, 3 do
-		local objId = getPlayer(i)
-		if objId then
-			tempMatch[i] = {t = 1, id = objId}
-			curCount = curCount + 1
+		if score < PVP_GET_ROBOT_SCORE then
+			needRobot = 1
 		end
-	end
-	
-	-- 正常的玩家不够了 低一档继续
-	if curCount < 3 then
-		local level = nil
-		if globalCsv.pvp_division[findIdx - 2] then
-			level =  {globalCsv.pvp_division[findIdx - 2], globalCsv.pvp_division[findIdx - 1] - 1}
+		local len = #lastRangeIds
+		if len < NEED_MATCH then
+			needRobot = NEED_MATCH - len
 		end
-		if level then
-			local result = getPlayers({level})[1] or {}
-			for i = #result, 1, -1 do
-				local id = tonumber(result[i])
-				if hadPlayer[id] then
-					table.remove(result, i)
-				else
-					result[i] = id
-					hadPlayer[id] = 1
-				end
+		local needPlayer = NEED_MATCH - needRobot
+		if needPlayer > 0 then
+			local pre = math.floor(len / needPlayer)
+			for i = 1, needPlayer do
+				local idx = math.randomInt((i - 1) * pre + 1, i * pre)
+				tempMatch[#tempMatch + 1] = {t = 1, id = lastRangeIds[idx]}
 			end
+		end
  
-			if next(result) then
-				for i = curCount + 1, 3 do
-					local curIdx = math.randomInt(1, #result)
-					local objId = result[curIdx]
-					table.remove(result, curIdx)
-					tempMatch[i] = {t = 1, id = objId}
-					curCount = curCount + 1
-					if not next(result) then
-						break
-					end
-				end
+	end
+	if needRobot > 0 then
+		local RobotPoolCount = 20
+		local max = #csvdb[robotCsv]
+		local min = 1
+		local mid
+		while min <= max do
+			mid = math.floor((min + max) / 2)
+			local tempPt = csvdb[robotCsv][mid].pt
+			if score == tempPt then
+				break
+			elseif score > tempPt then
+				min = mid + 1
+			elseif score < tempPt then
+				max = mid - 1
 			end
 		end
-	end
-
-	-- 增加机器人
-	if curCount < 3 then
-		for i = curCount + 1, 3 do
-			while true do
-				local id = math.randomInt(1, #csvdb[robotCsv])
-				if not hadRobot[id] then
-					hadRobot[id] = 1
-					tempMatch[i] = {t = 2, id = id}
-					break
-				end
+		assert(mid, "pvp no robot " .. robotCsv)
+		local low = mid - RobotPoolCount / 2
+		local heigh = mid + RobotPoolCount / 2
+		if low < 1 then
+			heigh = heigh + (1 - low)
+			low = 1
+		end
+		if heigh > #csvdb[robotCsv] then
+			heigh = #csvdb[robotCsv]
+		end
+		local pools = {}
+		for i = low, heigh do
+			if not hadRobot[i] then
+				pools[#pools + 1] = i
 			end
 		end
+		local pre = math.floor(#pools / needRobot)
+		for i = 1, needRobot do
+			local idx = math.randomInt((i - 1) * pre + 1, i * pre)
+			tempMatch[#tempMatch + 1] = {t = 2, id = pools[idx]}
+		end
 	end
 	self:setProperty(mField, tempMatch)
 end
  
-function Role:refreshPvpMatchC(score)
-	self:refreshPvpMatch(score, RANK_PVP_COMMON)
+-- function Role:refreshPvpMatch(score, rank, rankKey)
+
+-- 	local Fields = {
+-- 		[RANK_PVP_COMMON] = "pvpMC",
+-- 		[RANK_PVP_HIGHT] = "pvpMH",
+-- 	}
+-- 	local RobotCsvs = {
+-- 		[RANK_PVP_COMMON] = "pvp_robotCsv",
+-- 		[RANK_PVP_HIGHT] = "pvp_robotCsv",
+-- 	}
+-- 	local mField = Fields[rankKey]
+-- 	local robotCsv = RobotCsvs[rankKey]
+-- 	local dbKey = self:getPvpDBKey(rankKey)
+
+-- 	local roleId = self:getProperty("id")
+-- 	score =  score or self:unpackPvpScore(redisproxy:zscore(dbKey, roleId))
+
+-- 	local function getPlayers(levels)
+-- 		local redret = redisproxy:pipelining(function(red)
+-- 			for _, level in ipairs(levels) do
+-- 				local low, high = table.unpack(level)
+-- 				red:zadd(dbKey, low * PVP_RANK_TIME_SORT_PLACE, "std_temp1")
+-- 				red:zadd(dbKey, high * PVP_RANK_TIME_SORT_PLACE + PVP_RANK_TIME_SORT_PLACE - 1, "std_temp2")
+-- 				red:ZREVRANK(dbKey, "std_temp1")
+-- 				red:ZREVRANK(dbKey, "std_temp2")
+-- 			end
+-- 			red:zrem(dbKey, "std_temp1", "std_temp2")
+-- 		end)
+
+-- 		local PreGetCount = 7 
+-- 		local redret = redisproxy:pipelining(function(red)
+-- 			for idx, level in ipairs(levels) do
+-- 				local rank1 = tonumber(redret[(idx - 1) * 4 + 3])
+-- 				local rank2 = tonumber(redret[(idx - 1) * 4 + 4])
+-- 				if rank1 - rank2 > PreGetCount then
+-- 					rank2 = math.randomInt(rank2, rank1 - PreGetCount + 1)
+-- 					rank1 = rank2 + PreGetCount - 1
+-- 				end
+-- 				red:ZREVRANGE(dbKey, rank2, rank1)
+-- 			end
+-- 		end)
+-- 		return redret
+-- 	end
+
+-- 	local findIdx = #globalCsv.pvp_division
+-- 	for idx, limit in ipairs(globalCsv.pvp_division) do
+-- 		if score < limit then
+-- 			findIdx = idx - 1
+-- 			break
+-- 		end
+-- 	end
+-- 	local levels = {
+-- 		{}, {}, {}
+-- 	}
+-- 	if globalCsv.pvp_division[findIdx + 1] then
+-- 		levels[1] = {globalCsv.pvp_division[findIdx + 1], (globalCsv.pvp_division[findIdx + 2] or 100000000) - 1}
+-- 	end
+-- 	levels[2] =  {globalCsv.pvp_division[findIdx], (globalCsv.pvp_division[findIdx + 1] or 100000000) - 1}
+-- 	if globalCsv.pvp_division[findIdx - 1] then
+-- 		levels[3] =  {globalCsv.pvp_division[findIdx - 1], globalCsv.pvp_division[findIdx] - 1}
+-- 	end
+-- 	local redirect = {}
+-- 	for i = #levels , 1, -1 do
+-- 		if not next(levels[i]) then
+-- 			table.remove(levels, i)
+-- 			redirect[i] = -1
+-- 			for _, v in pairs(redirect) do
+-- 				redirect[_] = v - 1
+-- 			end
+-- 		else
+-- 			redirect[i] = i
+-- 		end
+-- 	end
+
+-- 	local result = getPlayers(levels)
+-- 	local match = self:getProperty(mField)
+-- 	local hadPlayer = {[roleId] = 1}
+-- 	local hadRobot = {}
+-- 	for _, one in pairs(match) do
+-- 		if one.t == 1 then
+-- 			hadPlayer[one.id] = 1
+-- 		elseif one.t == 2 then
+-- 			hadRobot[one.id] = 1
+-- 		end
+-- 	end
+
+-- 	for _, temp in pairs(result) do
+-- 		for i = #temp, 1, -1 do
+-- 			local id = tonumber(temp[i])
+-- 			if hadPlayer[id] then
+-- 				table.remove(temp, i)
+-- 			else
+-- 				temp[i] = id
+-- 				hadPlayer[id] = 1
+-- 			end
+-- 		end
+-- 	end
+-- 	-- 增加第几个
+-- 	local function getPlayer(idx)
+-- 		for i = idx, 3 do
+-- 			if redirect[i] ~= -1 then
+-- 				local curR = result[redirect[i]] or {}
+-- 				if next(curR) then
+-- 					local curIdx = math.randomInt(1, #curR)
+-- 					local objId = curR[curIdx]
+-- 					table.remove(curR, curIdx)
+-- 					return objId
+-- 				end
+-- 			end
+-- 		end
+-- 	end
+
+-- 	local tempMatch = {}
+-- 	local curCount = 0
+-- 	for i = 1, 3 do
+-- 		local objId = getPlayer(i)
+-- 		if objId then
+-- 			tempMatch[i] = {t = 1, id = objId}
+-- 			curCount = curCount + 1
+-- 		end
+-- 	end
+	
+-- 	-- 正常的玩家不够了 低一档继续
+-- 	if curCount < 3 then
+-- 		local level = nil
+-- 		if globalCsv.pvp_division[findIdx - 2] then
+-- 			level =  {globalCsv.pvp_division[findIdx - 2], globalCsv.pvp_division[findIdx - 1] - 1}
+-- 		end
+-- 		if level then
+-- 			local result = getPlayers({level})[1] or {}
+-- 			for i = #result, 1, -1 do
+-- 				local id = tonumber(result[i])
+-- 				if hadPlayer[id] then
+-- 					table.remove(result, i)
+-- 				else
+-- 					result[i] = id
+-- 					hadPlayer[id] = 1
+-- 				end
+-- 			end
+
+-- 			if next(result) then
+-- 				for i = curCount + 1, 3 do
+-- 					local curIdx = math.randomInt(1, #result)
+-- 					local objId = result[curIdx]
+-- 					table.remove(result, curIdx)
+-- 					tempMatch[i] = {t = 1, id = objId}
+-- 					curCount = curCount + 1
+-- 					if not next(result) then
+-- 						break
+-- 					end
+-- 				end
+-- 			end
+-- 		end
+-- 	end
+
+-- 	-- 增加机器人
+-- 	if curCount < 3 then
+-- 		for i = curCount + 1, 3 do
+-- 			while true do
+-- 				local id = math.randomInt(1, #csvdb[robotCsv])
+-- 				if not hadRobot[id] then
+-- 					hadRobot[id] = 1
+-- 					tempMatch[i] = {t = 2, id = id}
+-- 					break
+-- 				end
+-- 			end
+-- 		end
+-- 	end
+-- 	self:setProperty(mField, tempMatch)
+-- end
+
+function Role:refreshPvpMatchC(score, rank)
+	self:refreshPvpMatch(score, rank, RANK_PVP_COMMON)
 end
  
-function Role:refreshPvpMatchH(score)
-	self:refreshPvpMatch(score, RANK_PVP_HIGHT)
+function Role:refreshPvpMatchH(score, rank)
+	self:refreshPvpMatch(score, rank, RANK_PVP_HIGHT)
 end
  
 function Role:getPvpDBKey(ptype)
@@ -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)
@@ -464,6 +466,7 @@ function Store:data()
         --packTrigger = self:getProperty("packTrigger"),
         actGoodsFlag = self:getProperty("actGoodsFlag"),
         bpInfo = self:getProperty("bpInfo"),
+        totalRR = self:getProperty("totalRR"),
 	}
 end