Merge branch 'develop' into tr/publish

熊润斐
2 parents 75f56020 fea3baab
Showing 20 changed files with 726 additions and 297 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/EmailAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBuff.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
src/models/HeroPlugin.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
@@ -214,6 +214,7 @@ AdvBackEventType = {
 	Level = 25, -- 升级
 	LinkChooseOver = 26, -- 连锁事件结束
 	BuffEffect = 27, -- buff 效果
+	PassiveEffect = 28, -- 被动 效果
 }
 AdvScoreType = {
@@ -221,6 +221,8 @@ actionCodes = {
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
 	Activity_exchangeRpc = 657,
+	Activity_gachakonRpc = 658,
+	Activity_hangDropRpc = 659,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -268,7 +268,7 @@ function _M.exchangeRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
 	local id = msg.id
-	if not role.activity:isOpen("Exchange") then return 1 end
+	if not role.activity:isOpenById(actid) then return 1 end
 	local exchangeCfg = csvdb["activity_exchangeCsv"][actid]
 	if not exchangeCfg then return 2 end
@@ -277,7 +277,8 @@ function _M.exchangeRpc(agent, data)
 	local exchangeData = curData[actid] or {}
 	local curCount = exchangeData[id] or 0
 	local actCfg = exchangeCfg[id]
-	if curCount >= actCfg then return 4 end
+	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
@@ -295,4 +296,123 @@ function _M.exchangeRpc(agent, data)
 	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
@@ -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}))
@@ -534,7 +534,7 @@ function _M.test(role, pms)
 	--local hero = require ("actions.HeroAction")
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
-	role:sendMail(13, nil, "1=2", {111})
+	--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)))
@@ -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
 	-- 加入战斗记录
@@ -402,18 +402,24 @@ 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
+	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 cfg = csvdb["Csv"][index]
-	if not cfg then return 2 end
+	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, _ = role:award(cfg.reward, {log = {desc = "totalRecharge", int1 = index}})
-	SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack({reward = reward}))
+	local reward, change = role:award(main, {log = {desc = "totalRecharge", int1 = index}})
+	SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -1388,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,
 		}
@@ -1526,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)
@@ -1960,6 +1990,7 @@ function Adv:enemyDead(enemy, escape)
 					break
 				end
 			end
+
 			if isMine then
 				local advMine = self.owner:getProperty("advMine")
 				advMine[1] = advMine[1] or {}
@@ -1986,16 +2017,14 @@ function Adv:enemyDead(enemy, escape)
 							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
+				else
+					block:clear()
+					mineCh = math.min(mineCh + globalCsv.adv_egg_treasureLayer_showup_add, 100)
 				end
 				local drops = {}
@@ -463,7 +463,7 @@ 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)
@@ -483,7 +483,7 @@ 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
+	for _, enemy in ipairs(self.enemys[self.adv:getCurMapIdx()]) do
 		enemy:checkAuraBuff(buffs)
 	end
 	self:setMapAuras(auras)
@@ -489,6 +489,7 @@ function Buff:createAfter(layer)
 	if self._init then
 		self:_init()
 	end
+	self:pushBackEffect(1)
 end
 function Buff:initByDB(data)
@@ -620,11 +621,19 @@ 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()
 	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
@@ -698,6 +707,8 @@ function Buff:overlay(releaser, data, layer)
 		if self._overlay then
 			self:_overlay()
 		end
+
+		self:pushBackEffect(1)
 	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
@@ -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,46 +811,47 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 			end
 		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))
+	if self.mapIdx == 1 and not self.adv.isRelay 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)
-				ln = ln - 1
-				had = true
 			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 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
@@ -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,13 @@ 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})
+	end
 	if self.count > 0 then
 		self.count = self.count < 999 and self.count - 1 or self.count
 		self.round = self.passiveData.round
@@ -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 897a3e0e4afa8217614a9ecf199d54b0ca641bab
+Subproject commit 295feade86593a4793972e2cd2d83135d8aee247
@@ -54,10 +54,10 @@ Activity.schema = {
 	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", {}},	  -- {挂机信息}
+	act17		= {"table", {}},	  -- {id=关卡星数, totalDmg=Boss总伤害}
+	act18		= {"table", {}, true},	  -- {id=兑换数量}
+	act19		= {"number", 0},	  -- {挂机信息}
+	act20		= {"table", {}},	  -- {id=扭蛋抽出数量}
 }
 function Activity:data()
@@ -71,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
@@ -148,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)
@@ -422,13 +431,34 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 -- 兑换
 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,
+	["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,
 }
 -- 扭蛋机
@@ -441,6 +471,19 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 	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
@@ -469,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
@@ -486,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)
@@ -569,7 +612,7 @@ function Activity:recycleActItem(actId)
 	if not actCfg then return end
 	local gift = {}
 	local costs = {}
-	for _, arr in ipairs(role:getItemCount(actCfg.recycle):toTableArray(true)) do
+	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
@@ -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
@@ -46,6 +46,7 @@ local ItemReason = {
 	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)