Merge branch 'develop' into player

zhouhaihai
2 parents d05a6958 c2e42a2d
Showing 46 changed files with 1845 additions and 830 deletions Show diff stats
skynet
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.lua
src/actions/FriendAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/HttpAction.lua
src/actions/RoleAction.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
-Subproject commit dce531485f84bb7a555e9bb35b22c58fb469192c
+Subproject commit 6c778575d99577c0c653b65b4025e2a88e6ce705
@@ -134,6 +134,9 @@ TimeReset = {
 	DailyBattle2 = 14, -- 特殊-每日副本（贴纸）
 	DailyBattle1 = 15, -- 特殊-每日副本（装备）
 	DailyBattle3 = 16, -- 特殊-每日副本（时钟箱）
+	DrawType1 = 17, -- 变异 抽卡加成
+	DrawType2 = 18, -- 通常 抽卡加成
+	DrawType3 = 19, -- 魔法 抽卡加成
 }
 GuideStep = {
@@ -191,7 +194,7 @@ AdvBackEventType = {
 	Trader = 12, -- 召唤商人
 	Monster = 13, -- 召唤怪物
 	RelayReward = 14, -- 中级层奖励
-
+	Exp = 15, -- 经验飘字
 	Cost = 16, -- 消耗道具
 	Trap = 17, --陷阱
 	Layer = 18, --切换层
@@ -41,6 +41,7 @@ actionCodes = {
 	Role_changeHeadRpc = 127,
 	Role_openSpeedUpBoxRpc = 128,
 	Role_guideRpc = 129,
+	Role_getRandomNameRpc = 130,
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -97,6 +98,7 @@ actionCodes = {
 	Hang_buyBonusCountRpc = 259,
 	Hang_startBonusBattleRpc = 260,
 	Hang_endBonusBattleRpc = 261,
+	Hang_hangGiftRpc = 262,
 	Diner_updateProperty = 300,
 	Diner_addSellRpc = 301,
@@ -179,6 +181,9 @@ actionCodes = {
 	Email_checkRpc = 603,
 	Email_delRpc = 604,
+	Activity_sudokuRpc = 650,
+	Activity_signRpc = 651,
+	Activity_sudokuRewardRpc = 652,
 }
 rpcResponseBegin = 10000
@@ -0,0 +1,138 @@
+local ipairs = ipairs
+local table = table
+local math = math
+local string = string
+local redisproxy = redisproxy
+local MsgPack = MsgPack
+local string_format = string.format
+local tonumber = tonumber
+local table_insert = table.insert
+local table_unpack = table.unpack
+local table_find = table.find
+local table_nums = table.nums
+local math_random = math.randomInt
+
+
+local _M = {}
+
+
+function _M.sudokuRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+
+	local sudoku = role:getProperty("sudoku")
+	local phase = sudoku[-1] or 1
+	local curData = (csvdb["guide_sudokuCsv"][phase] or {})[id]
+	if phase == -1 or not curData then return 1 end
+
+	sudoku.task = sudoku.task or {}
+	sudoku.task[phase] = sudoku.task[phase] or {}
+
+	if (sudoku.task[phase][id] or 0) < curData.con1 then return 2 end
+
+	sudoku.task[phase][id] = -1
+	local task = role:award(curData.reward, {log = {desc = "sudoku", int1 = id, int2 = phase}}) -- 任务奖励
+
+	local reward = {}
+	local rId = {}
+	for pid, pdata in pairs(csvdb["guide_sudoku_rewardCsv"][phase] or {}) do
+		local pos = pdata.pos:toArray(true, "=")
+		local ok, is = true, false
+		for _, one in pairs(pos) do
+			if one == id then
+				is = true
+			end
+			if sudoku.task[phase][one] ~= -1 then
+				ok = false
+				break
+			end
+		end
+
+		if ok and is then
+			for itemId, count in pairs(pdata.reward:toNumMap()) do
+				reward[itemId] = (reward[itemId] or 0) + count
+			end
+			table.insert(rId, pid)
+		end
+	end
+
+	if not next(reward) then
+		reward = nil
+	else
+		reward = role:award(reward, {log = {desc = "sudokuR", int1 = id, int2 = phase}})
+	end
+
+	role:updateProperty({field = "sudoku", value = sudoku})
+
+	role:log("act_action", {desc = "sudoku", int1 = id, int2 = phase})
+
+	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = task, reward = reward, rId = rId}))
+	return true
+end
+
+function _M.sudokuRewardRpc(agent, data)
+	local role = agent.role
+
+
+	local sudoku = role:getProperty("sudoku")
+	local phase = sudoku[-1] or 1
+
+	local curData = csvdb["guide_sudokuCsv"][phase]
+	if not curData then return end
+	if not globalCsv.guide_sudoku_reward[phase] then return end
+
+	local curTask = (sudoku.task or {})[phase] or {}
+
+	for id, _ in pairs(curData) do
+		if curTask[id] ~= -1 then
+			return
+		end
+	end
+
+	local reward = role:award(globalCsv.guide_sudoku_reward[phase], {log = {desc = "sudokuRP", int1 = phase}})
+
+	sudoku[-1] = phase + 1
+	sudoku.task[phase] = nil
+	if not csvdb["guide_sudokuCsv"][sudoku[-1]] then
+		sudoku[-1] = -1
+		sudoku.task = nil
+	end
+	role:updateProperty({field = "sudoku", value = sudoku})
+
+	SendPacket(actionCodes.Activity_sudokuRewardRpc, MsgPack.pack(reward))
+	return true
+end
+
+
+function _M.signRpc(agent, data)
+	local role = agent.role
+
+	local serverT = skynet.timex()
+	local tm = os.date("*t", serverT)
+
+	local curDay = tm.day
+	
+	local yearMonth = tm.year * 100 + tm.month
+	local monthData = csvdb["daily_signInCsv"][yearMonth]
+	if not monthData or not monthData[curDay] then
+		return 1
+	end
+
+	local signs = role:getProperty("sign")
+	if signs[curDay] == yearMonth then  -- 未重置的还可以签到正常（本月已经签到）
+		return 2
+	end
+	signs[curDay] = yearMonth
+
+	local raward = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
+	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
+
+	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(raward))
+	return true
+end
+
+
+
+
+return _M
 \ No newline at end of file
@@ -104,21 +104,24 @@ function _M.startAdvRpc( agent, data )
 		if not role:isFuncOpen(FuncOpenType.AdvEndless) then return 11 end -- 无尽模式 才可以玩儿无尽模式
 		local advElM = role:getProperty("advElM")  --最高通关的层数
+		if not role:advChapterIsOpen(chapterId) then return 13 end
-		if layer == 1 then
-			if not role:advChapterIsOpen(chapterId, layer) then return 13 end
-		else
+		if layer ~= 1 then
 			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
-			if not relayData then return end  -- 不是中继层
-			if advElM < relayData.unlockfloor then return end --未解锁
+			if not relayData then return 14 end  -- 不是中继层
+			if advElM < relayData.unlockfloor then return 15 end --未解锁
 		end 
 	else   -- 普通模式判断
 		if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return 2 end -- 是否有体力
-		if layer > chapterData.limitlevel  then return 4 end
+		if layer >= chapterData.limitlevel  then return 4 end
 		-- 关卡开放判断
-		if not role:advChapterIsOpen(chapterId, layer) then return 5 end
-		-- 普通模式没有中继 只能从1 开始 中继开放判断
-		if layer ~= 1 then return 6 end
+		if not role:advChapterIsOpen(chapterId) then return 5 end
+
+		if layer ~= 1 then
+			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
+			if not relayData then return 6 end  -- 不是中继层
+			if (advPass[chapterId] or 0) < relayData.floor then return 21 end
+		end
 	end
 	if not checkFormat(role, format) then return 7 end
@@ -158,8 +161,13 @@ function _M.startAdvRpc( agent, data )
 			end
 		end
 	end
-
-	role:getAdvData():initByChapter(chapterId, layer, false, false, layer ~= 1, true, support)
+	role:getAdvData():initByChapter({
+		chapterId = chapterId, 
+		level = layer, 
+		isRelay = layer ~= 1, 
+		isEnter = true, 
+		support = support,
+	})
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
@@ -242,11 +250,11 @@ function _M.quickHangRpc(agent, data)
 	local cost = math.ceil((info.time - skynet.timex()) / chapterData.idleTime * chapterData.accelerate)
 	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return end
-	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "quickHang", int1 = chapterId}})
+	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "advQuickHang", int1 = chapterId}})
 	info.time = 0
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
-	role:log("adv_action", {desc = "quickHang", int1 = chapterId})
+	role:log("adv_action", {desc = "advQuickHang", int1 = chapterId})
 	SendPacket(actionCodes.Adv_quickHangRpc, '')
 	return true
@@ -511,6 +519,8 @@ function _M.upArtifactRpc(agent, data)
 	adv:backCost(cost)
 	if status == 1 then -- 现在穿着呢。更新下
 		adv:saveDB()
+	else
+		adv:updateAchievement()
 	end
 	SendPacket(actionCodes.Adv_upArtifactRpc, '')
 	return true
@@ -103,7 +103,7 @@ function _M.runeUpRpc( agent, data )
 	local uid = msg.uid
 	local ownRune = role.runeBag[uid]
 	if not ownRune then return 1 end
-	if ownRune:getProperty("refer") ~= 0 then return 2 end
+
 	local typ = ownRune:getProperty("type")
 	local id = ownRune:getProperty("id")
@@ -126,6 +126,12 @@ function _M.runeUpRpc( agent, data )
 	ownRune:updateProperty({field = "level",value = level+1})
 	role:checkTaskEnter("RuneUp")
+	if ownRune:getProperty("refer") ~= 0 then
+		local hero = role.heros[ownRune:getProperty("refer")]
+		if hero then
+			hero:updateProperty({field = "battleV", value = hero:getBattleValue()})
+		end
+	end
 	ownRune:log({desc = "runeUp", int1 = level + 1})
 	SendPacket(actionCodes.Car_runeUpRpc, '')
@@ -364,8 +364,7 @@ function _M.talentUpRpc( agent, data )
 	end
 	if talentData.levelFront ~= "" then
-		local hangPass = role:getProperty("hangPass")
-		if not hangPass[tonumber(talentData.levelFront)] then
+		if not role:checkHangPass(tonumber(talentData.levelFront)) then
 			return 9
 		end
 	end
@@ -399,7 +398,7 @@ function _M.talentUpRpc( agent, data )
 	-- 	role:award(treePoint)
 	-- end
-	role:checkTaskEnter("DinerTalentUp", {type = talentData.effect:toArray(true,"=")[1]})
+	role:checkTaskEnter("DinerTalentUp", {type = talentData.effect:toArray(true,"=")[1], level = dishLevel + 1})
 	role:log("diner_action", {desc = "talentUp", int1 = dish, int2 = dishLevel + 1})
@@ -635,8 +634,7 @@ function _M.addWantFoodRpc(agent , data)
 		local foodData = csvdb["diner_materialCsv"][itemId]
 		if not foodData then return 3 end
 		if foodData.unlock ~= 0 then
-			local hangPass = role:getProperty("hangPass")
-			if not hangPass[foodData.unlock] then
+			if not role:checkHangPass(foodData.unlock) then
 				return 4
 			end
 		end
@@ -683,7 +681,7 @@ function _M.getGreenhouseRpc( agent, data )
 		end
 	end
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
-	local reward = role:award(reward, {log = {desc = "greenHourse"}})
+	local reward = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
 	role:checkTaskEnter("FoodMGet")
 	role:log("diner_action", {desc = "greenHourse"})
@@ -316,11 +316,15 @@ function _M.handleApplyRpc(agent, data)
 		end
 		redisproxy:pipelining(function (red)
-			red:ZREM(FRIEND_APPLY_KEY:format(roleId), table_unpack(needAdd))
-			red:HMSET(FRIEND_KEY:format(roleId), table_unpack(needAddMy))
-			for _, objectId in pairs(needAdd) do
-				red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
-				red:hsetnx(FRIEND_KEY:format(objectId), roleId, newTag)--告知对放有新好友
+			if next(needAdd) then
+				red:ZREM(FRIEND_APPLY_KEY:format(roleId), table_unpack(needAdd))
+				for _, objectId in pairs(needAdd) do
+					red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
+					red:hsetnx(FRIEND_KEY:format(objectId), roleId, newTag)--告知对放有新好友
+				end
+			end
+			if next(needAddMy) then
+				red:HMSET(FRIEND_KEY:format(roleId), table_unpack(needAddMy))
 			end
 		end)
 		local myInfo = role:friendSInfo()
@@ -16,7 +16,7 @@ function _M.clientRequest(agent, data)
 end
 function _M.testhotfix(role, pms)
-	return csvdb["itemCsv"][1]["name"] .. " -=- " .. csvdb["itemCsv"][2]["name"] .. " -=- " .. role:getItemCount(123) .. " -=- " .. table.pack(next(role.heros))[2]:getBattleValue()
+	return csvdb["itemCsv"][1]["name"] .. " -=- " .. globalCsv["codeVersion"] .. " -=- " .. role:getItemCount(123) .. " -=- " .. table.pack(next(role.heros))[2]:getBattleValue()
 end
 function _M.ignoreout(role, pms)
@@ -178,19 +178,17 @@ table.insert(helpDes, {&quot;通关挂机副本&quot;, &quot;fb&quot;, &quot;挂卡id&quot;})
 function _M.fb(role, pms) -- 直接通关
 	local carbonId = tonum(pms.pm1)
 	if not csvdb["idle_battleCsv"][carbonId] then return "不存在的carbon" end
-	local passCarbon = role:getProperty("hangPass")
 	local addPre 
 	addPre = function(carbonId)
 		local carbonData = csvdb["idle_battleCsv"][carbonId]
 		for _, pre in ipairs(carbonData.prepose:toArray(true, "=")) do
-			passCarbon[pre] = 1
+			role:hangFinish(pre)
 			role:checkTaskEnter("HangPass", {id = pre})
 			addPre(pre)
 		end
 	end
-	passCarbon[carbonId] = 1
+	role:hangFinish(carbonId)
 	addPre(carbonId)
-	role:updateProperty({field = "hangPass", value = passCarbon})
 	role:log("gm_action", {desc = "fb", int1 = carbonId, key1 = pms.sender})
@@ -207,14 +205,14 @@ function _M.fbc(role, pms) -- 直接通关
 	addPre = function(carbonId)
 		local carbonData = csvdb["idle_battleCsv"][carbonId]
 		for _, pre in ipairs(carbonData.prepose:toArray(true, "=")) do
-			passCarbon[pre] = 1
+			role:hangFinish(pre)
 			role:checkTaskEnter("HangPass", {id = pre})
 			addPre(pre)
 		end
 	end
+	role:updateProperty({field = "hangPass", value = {}})
 	addPre(carbonId)
-	role:updateProperty({field = "hangInfo", value = {}})
-	role:updateProperty({field = "hangPass", value = passCarbon})
+	
 	role:checkTaskEnter("HangPass", {id = carbonId})
 	role:log("gm_action", {desc = "fbc", int1 = carbonId, key1 = pms.sender})
@@ -355,24 +353,14 @@ function _M.adv(role, pms)
 	local layer = tonum(pms.pm2)
 	local advCsv = csvdb["adv_chapterCsv"][chapterId]
-	if not advCsv then return end
+	if not advCsv then return "不存在的章节" end
 	if math.floor(chapterId / 100) ~= 2 then
 		layer = math.min(layer, advCsv.limitlevel)
 	end
 	local advPass = role:getProperty("advPass")
-	local addPre 
-	addPre = function(chapterId)
-		local advCsv = csvdb["adv_chapterCsv"][chapterId]
-		for pre, l in ipairs(advCsv.prepose:toNumMap()) do
-			if (advPass[pre] or 0) < l then
-				advPass[pre] = l
-				addPre(pre)
-			end
-		end
-	end
+
 	if (advPass[chapterId] or 0) < layer then
 		advPass[chapterId] = layer
-		addPre(chapterId)
 		role:updateProperty({field = "advPass", value = advPass})
 	end
 	role:log("gm_action", {desc = "advf", int1 = chapterId, int2 = layer, key1 = pms.sender})
@@ -380,30 +368,29 @@ function _M.adv(role, pms)
 	return "成功"
 end
-table.insert(helpDes, {"冒险到达指定层", "advt", "章节id", "层数"})
+table.insert(helpDes, {"冒险到达指定层", "advt", "章节id", "层数", "地图id(选)"})
 function _M.advt(role, pms)
 	local chapterId = tonum(pms.pm1)
 	local layer = tonum(pms.pm2)
+	local mapId = tonum(pms.pm3)
 	local advCsv = csvdb["adv_chapterCsv"][chapterId]
 	if not advCsv then return "不存在的章节" end
+	local status = _M.adv(role, {pm1 = chapterId, pm2 = layer - 1})
+	if status ~= "成功" then return status end
+
 	local advData = role:getAdvData()
-	if not advData.chapterId then
-		return "先随便开启一关"
-	end
-	if not advData:isEndless() then
-		layer = math.min(layer, advCsv.limitlevel)
+	if advData:isRunning() then
+		advData:forceOver()
 	end
-	
-	_M.adv(role, {pm1 = chapterId, pm2 = layer - 1})
-	
-	advData.chapterId = chapterId
-	advData.level = layer
-
-	advData:saveDB()
+	advData:initByChapter({
+		chapterId = chapterId, 
+		level = layer, 
+		isEnter = true,
+		debugMapId = mapId,
+	})
 	role:log("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
-
 	return "成功"
 end
@@ -75,10 +75,9 @@ function _M.startRpc( agent, data )
 		if not role:isFuncUnlock(FuncUnlock.DifficultHang) then return end
 	end
-	local hangPass = role:getProperty("hangPass")
 	for _, preCarbonId in ipairs(carbonData.prepose:toArray(true, "=")) do
-		if not hangPass[preCarbonId] then return 2 end
+		if not role:checkHangPass(preCarbonId) then return 2 end
 	end
 	if checkReward(role) then
@@ -98,7 +97,7 @@ function _M.startRpc( agent, data )
 		hangInfo.coinTime = math.min(nowTime, hangInfo.endCoinTime)
 		hangInfo.itemTime = math.min(nowTime, hangInfo.endItemTime)
 	end
-	if not hangPass[carbonId] then
+	if not role:checkHangPass(carbonId) then
 		hangInfo.bossTime = nowTime + carbonData.idle_time
 	else
 		hangInfo.bossTime = nil
@@ -140,8 +139,7 @@ function _M.startBattleRpc(agent, data)
 		end
 	end
-	local hangPass = role:getProperty("hangPass")
-	if hangPass[carbonId] then 
+	if role:checkHangPass(carbonId) then 
 		return 3
 	end
@@ -169,14 +167,13 @@ function _M.endBattleRpc(agent, data)
 			return 3
 		end
 	end
-	local hangPass = role:getProperty("hangPass")
-	if hangPass[carbonId] then 
+
+	if role:checkHangPass(carbonId) then 
 		return 4
 	end
 	local reward
 	if msg.starNum and msg.starNum > 0 then --win
-		hangPass[carbonId] = 1
-		role:updateProperty({field = "hangPass", value = hangPass})
+		role:hangFinish(carbonId)
 		if carbonData.main ~= 1 then
 			hangInfo.bossTime = nil
 		end
@@ -193,8 +190,9 @@ function _M.endBattleRpc(agent, data)
 		role:checkTaskEnter("HangPass", {id = carbonId})
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
-
-	role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId})
+	
+	local team = role:getProperty("pvpTC")
+	role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
@@ -439,8 +437,7 @@ function _M.startBonusBattleRpc(agent, data)
 	if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return end
 	if not bonusData then return 1 end
-	local hangPass = role:getProperty("hangPass")
-	if not hangPass[bonusData.unlock] then return 2 end
+	if not role:checkHangPass(bonusData.unlock) then return 2 end
 	if not next(role:getProperty("bTeam")) then return 3 end
@@ -489,6 +486,25 @@ function _M.endBonusBattleRpc(agent, data)
 	return true
 end
+function _M.hangGiftRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local id = msg.id
+	local carbonData = csvdb["idle_battleCsv"][id]
+	if not carbonData or carbonData.item_clear_special == "" then return 1 end
+
+	local hangGift = role:getProperty("hangGift")
+	if hangGift[id] then return 2 end
+
+	local reward = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
+	role:log("hang_action", {desc = "hangGift",  int1 = id})
+
+	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
+
+	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack(reward))
+	return true
+end
 return _M
 \ No newline at end of file
@@ -233,7 +233,7 @@ function _M.commentHeroRpc(agent, data)
 		result.status = 1
 	else
 		local commentKey = getCommentKey(heroType)
-		local SERV = string.format(".NAMED%d", math.random(1, 5))
+		local SERV = string.format(".chated%d", math.random(1, 5))
 		local legal, mod = skynet.call(SERV, "lua", "check", content)
 		if not legal then
 			content = mod or ""
@@ -536,13 +536,29 @@ function _M.referRunesRpc(agent, data)
 	local runes = msg.runes
 	if not runes or not next(runes) then return 11 end
+	local used = {}
 	for typ = 1, 6 do
 		if runes[typ] and runes[typ] ~= 0 then
 			local ownRune = role.runeBag[runes[typ]]
 			if not ownRune then return end
-			if ownRune:getProperty("refer") ~= 0 then return end
+			if ownRune:getProperty("refer") ~= 0 then 
+				used[ownRune:getProperty("refer")] = used[ownRune:getProperty("refer")] or {}
+				used[ownRune:getProperty("refer")][runes[typ]] = 1
+			end
+		end
+	end
+
+	for cheroId, cIds in pairs(used) do
+		local chero = role.heros[cheroId] 
+		local hrunes = chero:getProperty("rune")
+		for slot, rId in pairs(hrunes:toNumMap()) do
+			if cIds[rId] then
+				hrunes = hrunes:delk(slot)
+			end
 		end
+		chero:updateProperty({field = "rune", value = hrunes})
 	end
+
 	local curRune = hero:getProperty("rune")
 	for typ = 1, 6 do
 		if runes[typ] then
@@ -668,208 +684,261 @@ function _M.getResetRewardRpc(agent, data)
 end
-local function randomDrawCondition(pool, condition)
-	local value = {}
-	for idx, field in ipairs(condition) do
-		local lpool = {}
-		local curIdx = 1
-		while pool[field .. "_" .. curIdx] do
-			table.insert(lpool, {pool[field .. "_" .. curIdx]})
-			curIdx = curIdx + 1
-		end
-		if next(lpool) then
-			value[idx] =  math.randWeight(lpool, 1)
-		end
-	end
-	return value
-end
-
-
-local function fillDrawPool(curPool, resultPool, isNeedFunc)
-	for itemId, oneData in pairs(csvdb["build_poolCsv"]) do
-		if oneData["pool_" .. curPool] and oneData["pool_" .. curPool] ~= "" then
-			local itemData = csvdb["itemCsv"][itemId]
-			if itemData and isNeedFunc(itemData) then
-				for _, one in ipairs(oneData["pool_" .. curPool]:toTableArray(true)) do
-					table.insert(resultPool, {itemId, one[1], one[2]})  -- itemId, count, 概率
-				end
-			end
-		end
-	end
-end
 function _M.drawHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
-	local pool = msg.pool	-- 1 2 3
+	local btype = msg.pool	-- 1 2 3 4
 	local drawType = msg.type -- 1 单抽 2 十连
+	local guide = msg.guide -- 是否是引导抽的
-	local buildTypeData = csvdb["build_typeCsv"][pool]
+	local buildTypeData = csvdb["build_typeCsv"][btype]
 	if not buildTypeData then return 1 end
-	local costs = {{"draw_card", "draw_coin"}, {"draw10_card", "draw10_coin"}}  -- 抽取消耗
 	local drawCount = {1, 10} -- 抽取次数
+	if not drawCount[drawType] then return 2 end
-	local costT = costs[drawType]
-	if not costT then return 2 end
-	local cost = buildTypeData[costT[1]]:toNumMap()
-	if not role:checkItemEnough(cost) then
-		cost = buildTypeData[costT[2]]:toNumMap()
-		if not role:checkItemEnough(cost) then
-			return 3
+	local newerDraw
+	if btype == 4 then
+		newerDraw = role:getProperty("newerDraw")
+		if math.illegalNum(globalCsv.draw_newer[2] - (newerDraw[1] or 0),  drawCount[drawType],  globalCsv.draw_newer[2]) then return 11 end
+	end
+	
+	local cost = {}
+	local lastCount = drawCount[drawType]
+	for _, costType in ipairs({"draw_card", "draw_coin"}) do
+		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
+				break
+			elseif curCount > 0 then
+				cost[curCost[1]] = curCost[2] * curCount
+				lastCount = lastCount - curCount
+			end
 		end
 	end
+	if lastCount > 0 then -- 钱不够
+		return 3
+	end
-	-- 开始抽
-	local rateTypes = {"unitRate", "fragmentRate", "itemRate"}
+	-- pool 固定的
+	local poolEnum = {
+		[1] = {
+			[1] = 1,
+			[2] = 2,
+			[3] = 3,
+		},
+		[2] = 10,
+		[3] = 11,
+		[4] = 12,
+	}
-	local typePool = {}
-	for _, rateType in ipairs(rateTypes) do
-		table.insert(typePool, {buildTypeData[rateType]})
+	-- 抽取的池子
+	local pool = poolEnum[btype]
+	if btype == 1 then
+		-- 超级卡池子 每周轮换 有活动覆盖之
+		--TODO 活动判断
+		if false then
+		else
+			for idx, poolId in pairs(pool) do
+				if role:isTimeResetOpen(TimeReset["DrawType" .. idx]) then
+					pool = poolId
+					break
+				end
+			end
+			if type(pool) ~= "number" then
+				pool = -1
+			end
+		end
 	end
+	local unitPool = csvdb["build_unitCsv"][pool]
+	if not unitPool then return 4 end
+	-- 开始抽
 	local resultPool = {}
+	local function fillDrawPool(fixRare, fixCamp, ssrUp)
+		local condition = {"rare", "camp"}
+		local values = {fixRare, fixCamp}
+
+		for idx, field in ipairs(condition) do
+			if not values[idx] then
+				local lpool = {}
+				local curIdx = 1
+				while unitPool[field .. "_" .. curIdx] do
+					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+					curIdx = curIdx + 1
+				end
-	local fillPoolFunc = {
-		unitRate = function(fixRare, fixCamp, fixJob)
-			local condition = {"rare", "camp", "job"}
-			local values = randomDrawCondition(csvdb["build_unitCsv"][pool], condition)
-			values[1] = fixRare or values[1]
-			values[2] = fixCamp or values[2]
-			values[3] = fixJob or values[3]
-			fillDrawPool(pool, resultPool, function(itemData)
-				if itemData.type ~= ItemType.Hero then return end
-				local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
-				if not heroData then return end
-				for idx, field in ipairs(condition) do
-					if heroData[field] ~= values[idx] then return end
+				-- 稀有度 ssr up
+				if field == "rare" then
+					local all = 0
+					for _, weight in pairs(lpool) do
+						all = all + weight[1]
+					end
+
+					lpool[4][1] = lpool[4][1] + (ssrUp or 0) * all
 				end
-				return true
-			end)
-		end,
-		fragmentRate = function(fixRare, fixCamp, fixJob)
-			local condition = {"rare", "camp", "job"}
-			local values = randomDrawCondition(csvdb["build_fragmentCsv"][pool], condition)
-			values[1] = fixRare or values[1]
-			values[2] = fixCamp or values[2]
-			values[3] = fixJob or values[3]
-			fillDrawPool(pool, resultPool, function(itemData)
-				if itemData.type ~= ItemType.HeroFragment then return end
-				local heroData = csvdb["unitCsv"][itemData.id]
-				if not heroData then return end
-				for idx, field in ipairs(condition) do
-					if heroData[field] ~= values[idx] then return end
+
+				if next(lpool) then
+					values[idx] =  math.randWeight(lpool, 1)
 				end
-				return true
-			end)
-		end,	
-		itemRate = function()
-			fillDrawPool(pool, resultPool, function(itemData)
-				if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.Hero then return end
-				return true
-			end)
-		end,
-	}
+			end
+		end
+
+		for itemId, oneData in pairs(csvdb["build_poolCsv"]) do
+			if oneData["pool_" .. pool] and oneData["pool_" .. pool] ~= "" then
+				local itemData = csvdb["itemCsv"][itemId]
+				while itemData do
+					if itemData.type ~= ItemType.Hero then break end
+					local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+					if not heroData then break end
+					local ok = true
+					for idx, field in ipairs(condition) do
+						if heroData[field] ~= values[idx] then ok = false break end
+					end
+					if not ok then break end
+					if oneData["pool_" .. pool] > 0 then
+						resultPool[itemId] = {oneData["pool_" .. pool]}  -- itemId, count, 概率
+					end
+					break
+				end
+			end
+		end
+	end
+
+	role:costItems(cost, {log = {desc = "drawHero", short1 = btype, int1 = pool}})
-	role:costItems(cost, {log = {desc = "drawHero", short1 = pool}})
-	local floorHeroCount = role:getProperty("floorHero")[pool] or 0
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
+	local draw_ssr_up_count_rate = globalCsv.draw_ssr_up_count_rate[btype]
+	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
+	local ssrUpCount = role:getProperty("ssrUp")[btype] or 0
+
+	local newerDrawCount, newerHadSSR  
+	if btype == 4 then
+		newerDrawCount = newerDraw[1] or 0
+		newerHadSSR = newerDraw[2] or 0
+	end
 	local ssrCount = 0
 	local reward = {}
 	for i = 1, drawCount[drawType] do
 		floorHeroCount = floorHeroCount + 1
+		if btype == 4 then
+			newerDrawCount =  newerDrawCount + 1
+		end
 		resultPool = {}
-		local isFloorBack = globalCsv.draw_floor_back_counts[pool] and floorHeroCount >= globalCsv.draw_floor_back_counts[pool]
-		while not next(resultPool) do
-			local rateType
+		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
+		local isNewerSSR = btype == 4 and (newerHadSSR == 0 and newerDrawCount >= globalCsv.draw_newer[1]) or false
-			if isFloorBack then
-				rateType = 1 --保底英雄
-			else
-				rateType = math.randWeight(typePool, 1)
-			end
-			if not fillPoolFunc[rateTypes[rateType]] then return 4 end
-			if isFloorBack then
-				fillPoolFunc[rateTypes[rateType]](3) -- 保底 sr 【郑斌】明确
+		local ssrUp = 0
+		if draw_ssr_up_count_rate then
+			ssrUp = math.floor(ssrUpCount / draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2] / 100
+		end
+		while not next(resultPool) do
+			if isNewerSSR then
+				fillDrawPool(4) -- 新手保底的 ssr 
+			elseif isFloorBack then
+				fillDrawPool(3) -- 保底 sr 【郑斌】明确
 			else
-				fillPoolFunc[rateTypes[rateType]]()
+				fillDrawPool(nil, nil, ssrUp)
 			end
 		end
-		local idx = math.randWeight(resultPool, 3)
-		local temp = resultPool[idx]
-		local itemData = csvdb["itemCsv"][temp[1]]
-
-		if itemData.type == ItemType.Hero then
-			if itemData.quality == 4 then
-				ssrCount = ssrCount + 1
-			elseif itemData.quality == 3 then
-				floorHeroCount = 0
+		-- 引导必送 613 丝路德
+		local itemId = guide and 613 or math.randWeight(resultPool, 1)
+		local itemData = csvdb["itemCsv"][itemId]
+		if itemData.quality == 4 then
+			ssrCount = ssrCount + 1
+			ssrUpCount = 0
+			
+			if btype == 4 then
+				newerHadSSR = newerHadSSR + 1
 			end
+		elseif itemData.quality == 3 then
+			floorHeroCount = 0
+			ssrUpCount = ssrUpCount + 1
+		else
+			ssrUpCount = ssrUpCount + 1
 		end
-		if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
 			local fragId = itemData.id - ItemStartId.Hero
 			local heroData = csvdb["unitCsv"][fragId]
-			local count = globalCsv.draw_unit_tofragment[heroData.rare] * temp[2]
-			role:award({[fragId] = count}, {log = {desc = "drawHero", short1 = pool}})
-			table.insert(reward, {id = fragId, count = count, from = temp[1], fcount = temp[2]})
+			local count = globalCsv.draw_unit_tofragment[heroData.rare]
+			role:award({[fragId] = count}, {log = {desc = "drawHero", short1 = btype, int1 = pool}})
+			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
 		else
-			role:award({[temp[1]] = temp[2]}, {log = {desc = "drawHero", short1 = pool}})
-			table.insert(reward, {id = temp[1], count = temp[2]})
+			role:award({[itemId] = 1}, {log = {desc = "drawHero", short1 = btype, int1 = pool}})
+			table.insert(reward, {id = itemId, count = 1})
 		end
 	end
-	if globalCsv.draw_floor_back_counts[pool] then
+	if draw_floor_back_counts then
 		local floorHero = role:getProperty("floorHero")
 		floorHero[pool] = floorHeroCount
-		role:updateProperty({field = "floorHero", value = floorHero})
+		role:setProperty("floorHero", floorHero)
 	end
-	if pool == 1 then
-		local repayHero = role:getProperty("repayHero")
-		repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType])
-		role:updateProperty({field = "repayHero", value = repayHero})
+	if draw_ssr_up_count_rate then
+		local ssrUp = role:getProperty("ssrUp")
+		ssrUp[pool] = ssrUpCount
+		role:setProperty("ssrUp", ssrUp)
 	end
+	if btype == 4 then
+		newerDraw[1] = newerDrawCount
+		newerDraw[2] = newerHadSSR
+		role:updateProperty({field = "newerDraw", value = newerDraw})
+	end
+
+	-- if pool == 1 then
+	-- 	local repayHero = role:getProperty("repayHero")
+	-- 	repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType])
+	-- 	role:updateProperty({field = "repayHero", value = repayHero})
+	-- end
+
 	role:checkTaskEnter("DrawHero", {pool = pool, count = drawCount[drawType]})
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
-	role:log("hero_action", {desc = "drawHero", short1 = pool, int1 = drawCount[drawType]})
+	role:log("hero_action", {desc = "drawHero", short1 = btype, int1 = drawCount[drawType], int2 = pool})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
 	return true
 end
-function _M.repayHeroRpc(agent, data)
-	local role = agent.role
-
-	local repayHero = role:getProperty("repayHero")
-	if repayHero < globalCsv.draw_super_repay_count then
-		return
-	end
+-- function _M.repayHeroRpc(agent, data)
+-- 	local role = agent.role
-	role:updateProperty({field = "repayHero", value = 0})
-	local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+-- 	local repayHero = role:getProperty("repayHero")
+-- 	if repayHero < globalCsv.draw_super_repay_count then
+-- 		return
+-- 	end
-	local reward = {}
-	local itemData = csvdb["itemCsv"][id]
-	if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
-		local fragId = itemData.id - ItemStartId.Hero
-		local heroData = csvdb["unitCsv"][fragId]
-		local count = globalCsv.draw_unit_tofragment[heroData.rare]
-		role:award({[fragId] = count}, {log = {desc = "heroRepay"}})
-		reward = {id = fragId, count = count, from = id, fcount = 1}
-	else
-		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
-		reward = {id = id, count = 1}
-	end
-	role:log("hero_action", {desc = "heroRepay"})
-	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
-	return true
-end
+-- 	role:updateProperty({field = "repayHero", value = 0})
+-- 	local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+
+-- 	local reward = {}
+-- 	local itemData = csvdb["itemCsv"][id]
+-- 	if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+-- 		local fragId = itemData.id - ItemStartId.Hero
+-- 		local heroData = csvdb["unitCsv"][fragId]
+-- 		local count = globalCsv.draw_unit_tofragment[heroData.rare]
+-- 		role:award({[fragId] = count}, {log = {desc = "heroRepay"}})
+-- 		reward = {id = fragId, count = count, from = id, fcount = 1}
+-- 	else
+-- 		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
+-- 		reward = {id = id, count = 1}
+-- 	end
+-- 	role:log("hero_action", {desc = "heroRepay"})
+-- 	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
+-- 	return true
+-- end
 return _M
 \ No newline at end of file
-local codecache = require "skynet.codecache"  -- 清空缓存用
-
 local _M = {}
@@ -19,45 +17,12 @@ local _M = {}
 ]=]
--- 清空缓存
-function _M.clearcache(query, body)
-	skynet.error(string.format("clearcache time: %s", skynet.timex()))
-	codecache.clear()
-	return 'success'
-end
-
---重新加载 需要修改的csvdb  -- 单字段修改 优先使用hotfix_csvdata
---[=[ eg:
-	body = """
-		csvdb["itemCsv"][1]["name"] = "测试一下"
-	"""
-]=]
-
-function _M.reload_csvdata(query, body)
-	if not body or body == "" then
-		return 'no body'
-	end
-
-	local ok = pcall(load, body)
-	if not ok then 
-		return "code error"
-	end
-
-	local ok, status = pcall(skynet.call, '.CSVDATA', "lua", "reload", body)
-	if status == "ok" then	
-		skynet.error(string.format("reload_csvdata time: %s, code: %s", skynet.timex(), body))
-		return 'success'
-	else
-		return 'error update'
-	end
-end
-
---指定更新某个字段值
 --[=[
 	解码后
 	body = {
-		{"itemCsv", 1, "name", "测试一下"},
-		{"itemCsv", 2, "name", "测试一下"}
+		"src/csvdata/init.lua",
+		"unitCsv",
+		"story_cgCsv",
 	}
 ]=]
 function _M.hotfix_csvdata(query, body)
@@ -69,14 +34,10 @@ function _M.hotfix_csvdata(query, body)
 	if not ok or type(result) ~= 'table' then
 		return "decode error"
 	end
-	local ok, status = pcall(skynet.call, '.CSVDATA', "lua", "hotfix", result)
-	if status == "ok" then	
-		skynet.error(string.format("hotfix_csvdata time: %s, code: %s", skynet.timex(), body))
-		return 'success'
-	else
-		return 'error update'
-	end
+	csvdb.hotfix(table.unpack(result))
+
+	return 'success'
 end
 -- 热更新代码  -- 针对 agent 执行发送过来的代码 -- 代码要规范~ 
@@ -150,7 +111,7 @@ function _M.hotfix_code(query, body)
 	skynet.error(string.format("hotfix_code time: %s, code: %s", skynet.timex(), body))
-	pcall(skynet.call, '.WATCHDOG', "lua", "hotfix", body)
+	pcall(skynet.call, '.watchdog', "lua", "hotfix", body)
 	return 'success'
 end
@@ -22,7 +22,7 @@ local function validName(name)
 	local exist = redisproxy:exists(string_format("user:%s", name))
 	if exist then return "existed" end
-	local SERV = string_format(".NAMED%d", math.random(1, 5))
+	local SERV = string_format(".named%d", math.random(1, 5))
 	local legal = skynet.call(SERV, "lua", "check", name)
 	return legal and "ok" or "illegal"
 end
@@ -217,7 +217,7 @@ function _M.loginRpc( agent, data )
 	-- 发下缓存的世界消息
 	local worldChatResponse = {worldChats = {}}
-	local ok, msgs = pcall(skynet.call, '.GLOBALD', "lua", "getWorldMsg", role._channelIdx)
+	local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
 	if not ok then 
 		msgs = {} 
 	end
@@ -245,8 +245,10 @@ function _M.loginRpc( agent, data )
 	-- 玩家登陆做的一些操作
 	role:saveHangTeam()
 	role:savePvpCTeam()
+	role:savePvpHTeam()
-	role:log("login", {key1 = agent.ip:toArray(false, ":")[1]})
+	local hangPass = role:getProperty("hangPass")
+	role:log("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
 	return true
 end
@@ -352,6 +354,12 @@ function _M.changeNameRpc(agent, data)
 	return true
 end
+function _M.getRandomNameRpc()
+	local name = randomRoleName()
+	SendPacket(actionCodes.Role_getRandomNameRpc, MsgPack.pack({name = name}))
+	return true
+end
+
 function _M.changeIntroRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
@@ -359,7 +367,7 @@ function _M.changeIntroRpc(agent, data)
 	local content = msg.content
 	if not content or type(content) ~= "string" then return end
-	local SERV = string_format(".CHATED%d", math.random(1, 5))
+	local SERV = string_format(".chated%d", math.random(1, 5))
 	local legal, mod = skynet.call(SERV, "lua", "check", content)
 	if not legal then
 		content = mod or ""
@@ -744,7 +752,7 @@ function _M.chatRpc(agent, data)
 	-- 判断禁言
 	local result = nil
-	local SERV = string_format(".CHATED%d", math.random(1, 5))
+	local SERV = string_format(".chated%d", math.random(1, 5))
 	local legal, mod = skynet.call(SERV, "lua", "check", content)
 	if not legal then
 		content = mod or ""
@@ -799,7 +807,7 @@ function _M.chatRpc(agent, data)
 				end
 			end
 			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
-			pcall(skynet.send, '.GLOBALD', "lua", "sendWorldMsg", role._channelIdx, response)
+			pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
 		end,
 		-- 私聊
 		[2] = function ()
@@ -74,7 +74,16 @@ function Adv:isHaveRelay(level, chapterId)
 end
 -- 随机新的地图
-function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnter, support)
+function Adv:initByChapter(params)
+	local chapterId = params.chapterId
+	local level = params.level 
+	local isToNext = params.isToNext 
+	local notNotify = params.notNotify 
+	local isRelay = params.isRelay 
+	local isEnter = params.isEnter 
+	local support = params.support
+	local debugMapId = params.debugMapId
+
 	if not self.chapterId then -- 开始新的章节
 		self.chapterId = chapterId
 		self:checkAchievement(Adv.AchievType.StartBattle, 1)
@@ -99,21 +108,23 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt
 	end
 	-- 随机出地图
-	local mapId 
-	if isRelay then
-		local relayData = self:isHaveRelay(level, chapterId)
-		if relayData then 
-			mapId = relayData.map
+	local mapId, relayData
+
+	if debugMapId and csvdb["mapCsv"][debugMapId] then
+		mapId = debugMapId
+	end
+	if not mapId then
+		if isRelay then
+			relayData = self:isHaveRelay(level, chapterId)
+			if relayData then 
+				mapId = relayData.map
+			else
+				isRelay = false
+				mapId = self:randomMapId(chapterId, level)
+			end
 		else
-			isRelay = false
 			mapId = self:randomMapId(chapterId, level)
 		end
-	else
-		mapId = self:randomMapId(chapterId, level)
-	end
-
-	if isEnter and not self.owner:checkOverGuide(GuideStep.AdvGuide) then
-		mapId = 101
 	end
 	self.isRelay = isRelay
@@ -141,9 +152,21 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
+
 	if isToNext then
 		self.battle.player:afterLayer() -- 玩家的buff 清理一下
 	end
+
+	-- 不是中继层  加上 层 和 地图的buff和被动
+	if not self.isRelay then
+		self.battle:initMapEffect()
+	end
+
+	-- 中继进入奖励
+	if relayData and isEnter then
+		self:awardRelay(relayData, notNotify)
+	end
+
 	if not notNotify then
 		self:saveDB(notNotify)
 	end
@@ -201,6 +224,44 @@ function Adv:saveDB(notNotify)
 	self.owner:updateProperties({advInfo = advInfo, advTeam = advTeam}, notNotify)
 end
+function Adv:awardRelay(relayData, notNotify)
+	local gift = {}
+
+	if relayData.artifact > 0 then
+		local pool = {}
+		for id, temp in pairs(csvdb["adv_artifactCsv"]) do
+			if not self:isHaveArtifact(id) and self.owner:isArtifactOpen(id, self:isEndless()) then
+				table.insert(pool, id)
+			end
+		end
+		for i = 1, math.min(relayData.artifact, #pool) do
+			local idx = math.randomInt(1, #pool)
+			gift[pool[idx]] = 1
+			table.remove(pool, idx)
+		end
+	end
+
+	if relayData.point > 0 then
+		gift[ItemId.AdvPoint] = relayData.point
+	end
+
+	if relayData.otherAward ~= "" then
+		for dropId, count in pairs(relayData.otherAward:toNumMap()) do
+			for i = 1, count do
+				local dropData = csvdb["event_dropCsv"][dropId]
+				if dropData then
+					local item = dropData["range"]:randWeight(true)
+					gift[item[1]] = (gift[item[1]] or 0) + item[2]
+				else
+					skynet.error(string.format("[ERROR]: event_dropCsv no id %s,  adv_chapter_campsite",  dropId))
+				end
+			end
+		end
+	end
+
+	self:award(gift, {notNotify = notNotify,  log = {desc = "relayEnter", int1 = self.chapterId, int2 = self.level}})
+end
+
 function Adv:initSupport(supports)
 	self.support = {}
@@ -743,6 +804,7 @@ function Adv:over(success, rewardRatio, overType)
 	self:log({desc = "over", short1 = success and 1 or 0, int1 = overType})
+	local chapterId = self.chapterId
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
@@ -751,7 +813,7 @@ function Adv:over(success, rewardRatio, overType)
 		advAFGet = {},
 		advAFWear = {},
 	})
-	self:backEnd(success, score, scoreInfo, reward, overType, scoreReward)
+	self:backEnd(success, score, scoreInfo, reward, overType, scoreReward, chapterId)
 end
 function Adv:exit()
@@ -787,7 +849,7 @@ function Adv:randomMapId(chapterId, level)
 		local temp = csvdb["mapCsv"][mapId]
 		if temp and not lastMapIds[mapId] then
 			if AdvCommon.checkIsIn(level, temp.leveltype, temp.levellimit) then
-				table.insert(pool, mapId)
+				pool[mapId] = {showup = temp.showup}
 			end
 		end
 	end
@@ -795,10 +857,10 @@ function Adv:randomMapId(chapterId, level)
 		error("mapIds is empty!")
 		return 
 	end
-	return pool[math.randomInt(1, #pool)]
+	return math.randWeight(pool, "showup")
 end
-
+-- log long1 字段被征用！！！
 -- 在冒险中获得的物品都发放在冒险背包内
 function Adv:award(gift, params)
 	params = params or {}
@@ -835,11 +897,13 @@ function Adv:award(gift, params)
 			if params.log then
 				local log = clone(params.log)
-				if log["cint1"] or log["cint2"] or log["cint3"] then
+				if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
 					print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
 				end
-				log["cint1"] = origin
+				log["cint1"] = itemId
 				log["cint2"] = math.abs(count)
+				log["cint3"] = self.chapterId
+				log["long1"] = self.level
 				if count >= 0 then
 					self.owner:log("in_adv", log)
 				else
@@ -921,7 +985,7 @@ local function clickOut(self, room, block, params, isExit)
 				self:scoreChange(AdvScoreType.Level, curFloorData.advScore) --增加层级加分
 			end
-			if not self:isEndless() and (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel or not self.owner:advChapterIsOpen(self.chapterId, self.level + 1)) then --关卡结束
+			if not self:isEndless() and (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
 				self:over(true)
 			else
 				self.battle.player:triggerPassive(Passive.DOWN_LAYER)
@@ -933,10 +997,21 @@ local function clickOut(self, room, block, params, isExit)
 				self.owner:getProperty("advTeam").player = self.battle.player:getDB()  -- 临时缓存住 battle 的player
 				if isHaveRelay and not self.isRelay then 
-					self:initByChapter(self.chapterId, self.level, true, true, true, false)
+					self:initByChapter({
+						chapterId = self.chapterId, 
+						level = self.level, 
+						isToNext = true, 
+						notNotify = true, 
+						isRelay = true,
+					})
 				else
 					self:log({desc = "pass"})
-					self:initByChapter(self.chapterId, self.level + 1, true, true, false, false)
+					self:initByChapter({
+						chapterId = self.chapterId, 
+						level = self.level + 1, 
+						isToNext = true, 
+						notNotify = true,
+					})
 				end
 				self:backNext() --下一关
 			end
@@ -958,9 +1033,10 @@ local function clickMonster(self, room, block, params)
 end
 local function chooseCommon(self, room, block, chooseData, choose, tag)
+	if not choose then return end
 	if not chooseData or not chooseData["button".. choose .."cond"] then return end
-	local cond = chooseData["button".. choose .."cond"]:toArray(true, "=")
+	local conds = chooseData["button".. choose .."cond"]:toTableArray(true)
 	local checkCond = {
 		-- 没有条件
 		[0] = function()
@@ -1035,10 +1111,54 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 		[10] = function(_, artifactId)
 			return not self:isHaveArtifact(artifactId)
 		end,
+		-- 11 = 地图上没有指定id 的怪
+		[11] = function(_, monsterId)
+			for _, room in pairs(self:getCurMap().rooms) do
+				for _, block in pairs(room.blocks) do
+					if block:isMonster() then
+						if not monsterId then return false end
+						if block.event.id == monsterId then
+							return false
+						end
+					end
+				end
+			end
+			return true
+		end,
+		-- 12 = 地图上没有指定id 的建筑
+		[12] = function(_, buildId)
+			for _, room in pairs(self:getCurMap().rooms) do
+				for _, block in pairs(room.blocks) do
+					if block:isBuild() then
+						if not buildId then return false end
+						if block.event.id == buildId then
+							return false
+						end
+					end
+				end
+			end
+			return true
+		end,
+		-- 13 = 地图上没有指定的 选择点
+		[13] = function(_, chooseId)
+			for _, room in pairs(self:getCurMap().rooms) do
+				for _, block in pairs(room.blocks) do
+					if block:isChoose() then
+						if not chooseId then return false end
+						if block.event.id == chooseId then
+							return false
+						end
+					end
+				end
+			end
+			return true
+		end,
  	}
-	assert(not cond[1] or checkCond[cond[1]], "error cond, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
-
-	if cond[1] and not checkCond[cond[1]](table.unpack(cond)) then return end
+ 	for _, cond in ipairs(conds) do
+ 		assert(not cond[1] or checkCond[cond[1]], "error cond, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
+		if cond[1] and not checkCond[cond[1]](table.unpack(cond)) then return end
+ 	end
+	
 	local clearBlock = chooseData.keep ~= 1
 	local effects = chooseData["button".. choose .."effect"]:toTableArray(true)
 	for _, effect in ipairs(effects) do
@@ -1047,8 +1167,13 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 				local count = effect[3] or 1
 				local reward = {}
 				for i = 1, count do
-					local item = csvdb["event_dropCsv"][effect[2]]["range"]:randWeight(true)
-					reward[item[1]] = (reward[item[1]] or 0) + item[2]
+					local dropData = csvdb["event_dropCsv"][effect[2]]
+					if dropData then
+						local item = dropData["range"]:randWeight(true)
+						reward[item[1]] = (reward[item[1]] or 0) + item[2]
+					else
+						skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  effect[2], tag, chooseData.id))
+					end
 				end
 				self:backReward(self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}), {roomId = room.roomId, blockId = block.blockId})
 			end,
@@ -1059,9 +1184,6 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 				end
 			end,
 			[3] = function() --发现怪物
-				if block:getEventType() == AdvEventType.Build then 
-					self.battle:removeBuildByPos(room.roomId, block.blockId)
-				end
 				self:getCurMap():addNewMonsterRand(effect[2], {room, block})
 				self:pushBackEvent(AdvBackEventType.Monster, {id = effect[2]})
 				clearBlock = false
@@ -1083,59 +1205,71 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 					etype = AdvEventType.Trader,
 					id = effect[2]
 				})
-				block:randomEvent()
 				self:pushBackEvent(AdvBackEventType.Trader, {id = effect[2]})
 				clearBlock = false
 			end,
 			[7] = function() -- 建筑
-				if block:getEventType() == AdvEventType.Build then 
-					self.battle:removeBuildByPos(room.roomId, block.blockId)
-				end
 				block:updateEvent({
 					etype = AdvEventType.Build,
 					id = effect[2]
 				})
-				block:randomEvent()
 				clearBlock = false
 			end,
 			[8] = function() -- 选择
-				if block:getEventType() == AdvEventType.Build then 
-					self.battle:removeBuildByPos(room.roomId, block.blockId)
-				end
 				block:updateEvent({
 					etype = AdvEventType.Choose,
 					id = effect[2]
 				})
-				block:randomEvent()
 				clearBlock = false
 			end,
 			[9] = function() -- click
-				if block:getEventType() == AdvEventType.Build then 
-					self.battle:removeBuildByPos(room.roomId, block.blockId)
-				end
 				block:updateEvent({
 					etype = AdvEventType.Click,
 					id = effect[2]
 				})
-				block:randomEvent()
 				clearBlock = false
 			end,
 			[10] = function() -- 陷阱
-				if block:getEventType() == AdvEventType.Build then 
-					self.battle:removeBuildByPos(room.roomId, block.blockId)
-				end
 				block:updateEvent({
 					etype = AdvEventType.Trap,
 					id = effect[2]
 				})
-				block:randomEvent()
 				clearBlock = false
 			end,
 			[11] = function()  -- 获得神器
 				self:waitChooseArtifact() --等待获取神器
-			end
+			end,
+			[12] = function()
+				-- buffId
+				local targers = self.battle.player:getTeam(2, nil, nil, true)
+				for _, target in pairs(targers) do
+					target:addBuff(effect[2])
+				end
+			end,
+			[13] = function() -- 显示地图
+				self:getCurMap():showMap()
+				self:backMapShow()
+			end,
+			[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)
+				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)
+				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)
+				end
+			end,
 		}
-		assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
+		assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. (block.event and block.event.id or 0) .. "effect  " .. effect[1])
 		doEffect[effect[1]]()
 	end
 	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
@@ -1201,7 +1335,9 @@ end
 local function clickDrop(self, room, block, params)
 	local reward = {}
 	if not block.event.item then return end
+	if not self.battle or not self.battle.player then return end
 	self.battle.player:triggerPassive(Passive.CLICK_DROP)
+
 	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
 	-- local reward = self:award({[5801] = 1})
 	block:clear()
@@ -1306,7 +1442,8 @@ local function clickLayer(self, room, block, params)
 		table.insert(self.mapStack, mapIdx)
 		self.maps[mapIdx] = AdvMap.new(self, mapIdx, mapId)
-		self.battle:initMapEnemys(mapIdx)
+		self.battle:initMapEnemys(mapIdx, true)
+		self.battle:initMapEffect(true)
 		self.maps[mapIdx]:initBattleAfter()
 		self:checkAchievement(Adv.AchievType.EnterILayer, 1, mapId)
 	end
@@ -1347,7 +1484,7 @@ function Adv:clickBlock(roomId, blockId, params)
 			if not ignoreGuard and _block:isGuard() then 
 				if _block:isMonster() then
 					local enemy = self.battle:getEnemy(_room.roomId, _block.blockId)
-					if not enemy:hadBuff(Buff.DONT_DEFEND) then
+					if not enemy:hadBuff(Buff.DONT_DEFEND) and not self.battle.player:hadBuff(Buff.SNEAK) then
 						return false
 					end
 				else
@@ -1485,7 +1622,6 @@ function Adv:doActive(activeId, target)
 					etype = AdvEventType.Trader,
 					id = traderId,
 				})
-				target:randomEvent()
 				self:backBlockChange(target.room.roomId, target.blockId)
 				self:pushBackEvent(AdvBackEventType.Trader, {id = traderId})
 			end
@@ -1497,7 +1633,6 @@ function Adv:doActive(activeId, target)
 	doActiveEffect[3] = function(_, monsterId)
 		for _,  target in ipairs(targers) do
 			if not target.lock and not target.isDead then
-				self.battle:removeEnemyById(target.id)
 				self:getCurMap():addNewMonsterRand(monsterId, {self:getRoom(target.roomId), self:getBlock(target.roomId, target.blockId)})
 				self:backBlockChange(target.roomId, target.blockId)
 				self:pushBackEvent(AdvBackEventType.Monster, {id = monsterId})
@@ -1515,7 +1650,7 @@ function Adv:doActive(activeId, target)
 	doActiveEffect[5] = function(_)
 		for _,  target in ipairs(targers) do
 			if not target.lock and not target.isDead then
-				target.isDead = true
+				target:kill()
 				self:backBlockChange(target.roomId, target.blockId)
 			end
 		end
@@ -1679,8 +1814,12 @@ function Adv:enemyDead(enemy, escape)
 					if buff then
 						item = table.pack(buff:effect())
 					else
-						local dropData = csvdb["event_dropCsv"][monsterData.dropid]
-						item = dropData["range"]:randWeight(true)
+						if monsterData.dropid == 0 then
+							item = {0, 0}
+						else
+							local dropData = csvdb["event_dropCsv"][monsterData.dropid]
+							item = dropData["range"]:randWeight(true)
+						end
 					end
 				end
@@ -1688,6 +1827,11 @@ function Adv:enemyDead(enemy, escape)
 					block:clear()
 					self.battle.player:triggerPassive(Passive.BATTLE_WIN)
 				else
+					local buff = enemy:hadBuff(Buff.DROP_BUFF_BY_ENEMY)  -- 根据敌人数量变化个数
+					if buff then 
+						local team = enemy:getTeam(1, true)
+						item[2] = math.floor(item[2] * (1 + 0.2 * #team))
+					end
 					block:updateEvent({
 						etype = AdvEventType.Drop,
 						item = item
@@ -1736,8 +1880,8 @@ function Adv:backNext()
 	self:pushBackEvent(AdvBackEventType.Next, {})
 end
-function Adv:backEnd(success, score, scoreInfo, reward, overType, scoreAward)
-	self:pushBackEvent(AdvBackEventType.End, {success = success, score = score, scoreInfo = scoreInfo, reward = reward, type = overType, scoreAward = scoreAward})
+function Adv:backEnd(success, score, scoreInfo, reward, overType, scoreAward, chapterId)
+	self:pushBackEvent(AdvBackEventType.End, {success = success, score = score, scoreInfo = scoreInfo, reward = reward, type = overType, scoreAward = scoreAward, chapterId = chapterId})
 end
 function Adv:backBlockChange(roomId, blockId, itemChangeType)
@@ -18,16 +18,22 @@ function Battle:ctor(adv)
 	end
 end
-function Battle:initAfter()
-	self.player:initAfter(self.adv.owner:getProperty("advTeam").player)
+function Battle:initAfter(mapIdx)
+	if not mapIdx then
+		self.player:initAfter(self.adv.owner:getProperty("advTeam").player)
+	end
 	for idx, mapEnemys in pairs(self.enemys) do
-		for _, enemy in ipairs(mapEnemys) do
-			enemy:initAfter(self.adv:getBlock(enemy.roomId, enemy.blockId, idx).event.enemy)
+		if not mapIdx or idx == mapIdx then
+			for _, enemy in ipairs(mapEnemys) do
+				enemy:initAfter(self.adv:getBlock(enemy.roomId, enemy.blockId, idx).event.enemy)
+			end
 		end
 	end	
 	for idx, mapBuilds in pairs(self.builds) do
-		for _, build in ipairs(mapBuilds) do
-			build:initAfter(self.adv:getBlock(build.roomId, build.blockId, idx).event.build)
+		if not mapIdx or idx == mapIdx then
+			for _, build in ipairs(mapBuilds) do
+				build:initAfter(self.adv:getBlock(build.roomId, build.blockId, idx).event.build)
+			end
 		end
 	end
 end
@@ -65,7 +71,9 @@ function Battle:initPlayer()
 		player.level = 1
 		if self.adv.level ~= 1 then
 			local relayData = self.adv:isHaveRelay()
-			player.level = relayData.level
+			if relayData then
+				player.level = relayData.level
+			end
 		end
 		player.exp = 0
 		player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100)
@@ -109,18 +117,21 @@ function Battle:initEnemys()
 	end
 end
-
-function Battle:initMapEnemys(mapIdx)
+-- after 是否是 后创建的夹层
+function Battle:initMapEnemys(mapIdx, after)
 	self.enemys[mapIdx] = {}
 	self.builds[mapIdx] = {}
 	local map = self.adv.maps[mapIdx]
 	if map then
 		for _, room in pairs(map.rooms) do
 			for _, block in pairs(room.blocks) do
-				self:addEnemy(room, block, mapIdx)	
+				self:addEnemy(room, block, mapIdx, true)	
 			end
 		end
 	end
+	if after then
+		self:initAfter(mapIdx)
+	end
 	if self.cachePassiveEvent[mapIdx] then
 		for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
 			for _, enemy in ipairs(self.enemys[mapIdx]) do
@@ -135,9 +146,10 @@ function Battle:initMapEnemys(mapIdx)
 	self.cachePassiveEvent[mapIdx] = nil
 end
-function Battle:addEnemy(room, block, mapIdx)
+function Battle:addEnemy(room, block, mapIdx, init)
 	mapIdx = mapIdx or self.adv:getCurMapIdx()
+	local isNew, player, data
 	if block:isMonster() then
 		if not block.event.enemy then
 			local enemyCsv = csvdb["event_monsterCsv"][block.event.id]
@@ -151,10 +163,15 @@ function Battle:addEnemy(room, block, mapIdx)
 				table.insert(enemy.passives, {id = id})
 			end
 			block.event.enemy = enemy
+			isNew = true
+		end
+		if not block.event.mId then
+			block.event.mId = self.adv.lastEnemyId
+			self.adv.lastEnemyId = self.adv.lastEnemyId + 1
 		end
-		local player = Enemy.new(self, block.event.mId or 999, block.event.id, room.roomId, block.blockId, not block.isOpen, block.event.enemy, mapIdx)
+		data = block.event.enemy
+		player = Enemy.new(self, block.event.mId, block.event.id, room.roomId, block.blockId, not block.isOpen, block.event.enemy, mapIdx)
 		table.insert(self.enemys[mapIdx], player)
-		return player
 	elseif block:isBuild() then
 		if not block.event.build then
 			local buildCsv = csvdb["event_buildingCsv"][block.event.id]
@@ -164,11 +181,28 @@ function Battle:addEnemy(room, block, mapIdx)
 				table.insert(build.passives, {id = id})
 			end
 			block.event.build = build
+			isNew = true
 		end
-		local player = Build.new(self, block.event.id, room.roomId, block.blockId, not block.isOpen, block.event.build, mapIdx)
+		data = block.event.build
+		player = Build.new(self, block.event.id, room.roomId, block.blockId, not block.isOpen, block.event.build, mapIdx)
 		table.insert(self.builds[mapIdx], player)
-		return player
 	end 
+	if not init then
+		player:initAfter(data)
+
+		-- 游戏中新创建的 加上地图 floor 效果
+		if isNew then
+			local passives, buffs = self:getMapEffect(2, true, mapIdx)
+			for _, passive in ipairs(passives) do
+				player:addPassive({id = passive})
+			end
+
+			for _, buff in ipairs(buffs) do
+				enemy:addBuff(buff)
+			end
+		end
+	end
+	return player
 end
 function Battle:getEnemy(roomId, blockId, mapIdx)
@@ -249,16 +283,29 @@ end
 --回合
 function Battle:afterRound()
 	local mapIdx = self.adv:getCurMapIdx()
-	self.player:afterRound()
+
 	table.sort(self.enemys[mapIdx], function(e1, e2)
 		return e1.id < e2.id
 	end)
+
+	self.player:afterRound("passive")
 	for _, enemy in ipairs(self.enemys[mapIdx]) do
-		enemy:afterRound()
+		enemy:afterRound("passive")
 	end
 	for _, build in ipairs(self.builds[mapIdx]) do
-		build:afterRound()
+		build:afterRound("passive")
+	end
+
+	self.player:afterRound("buff")
+	for _, enemy in ipairs(self.enemys[mapIdx]) do
+		enemy:afterRound("buff")
 	end
+	for _, build in ipairs(self.builds[mapIdx]) do
+		build:afterRound("buff")
+	end
+
+
+
 	self.player:clearRound()
 	for _, enemy in ipairs(self.enemys[mapIdx]) do
 		enemy:clearRound()
@@ -292,9 +339,10 @@ function Battle:battleBegin(roomId, blockId, params)
 	local enemy = self:getEnemy(roomId, blockId)
 	if not enemy then return end
 	local player = params.player
+	if not player then return end
 	-- 玩家没死就是怪死了
 	if player.hp > 0 then
-		enemy:hurt(enemy.hp, self.player, {hurtType = 5})
+		enemy:kill()
 		self.player:effectBattleBuff()
 		self.adv.owner:checkTaskEnter("AdvBattleWin", {id = self.adv.chapterId})
@@ -312,6 +360,63 @@ function Battle:battleBegin(roomId, blockId, params)
 end
+function Battle:getMapEffect(ctype, ilayer, mapIdx)
+	mapIdx = mapIdx or self.adv:getCurMapIdx()
+	local mapData = self.adv.maps[mapIdx]:getMapInfoCsv() or {}
+	local floorData = self.adv:getCurFloorData() or {}
+
+	local passives = {}
+	local buffs = {}
+
+	for _type, temp in ipairs({mapData, floorData}) do
+		for _, one in ipairs((temp.passive or ""):toTableArray(true)) do
+			passives[one[1]] = passives[one[1]] or {}
+			if ilayer and one[1] == 1 and _type == 2 then
+			else
+				table.insert(passives[one[1]], one[2])
+			end
+		end
+		for _, one in ipairs((temp.buff or ""):toTableArray(true)) do
+			buffs[one[1]] = buffs[one[1]] or {}
+			if ilayer and one[1] == 1 and _type == 2 then
+			else
+				table.insert(buffs[one[1]], one[2])
+			end
+		end
+	end
+	if ctype then
+		passives = passives[ctype] or {}
+		buffs = buffs[ctype] or {}
+	end
+	return passives, buffs
+end
+-- 夹层玩家 不重复加 floor
+function Battle:initMapEffect(ilayer)
+	local passives, buffs = self:getMapEffect(nil, ilayer)
+	local mapIdx = self.adv:getCurMapIdx()
+
+	for _, passive in ipairs(passives[1] or {}) do
+		self.player:addPassive({id = passive})
+	end
+
+	for _, passive in ipairs(passives[2] or {}) do
+		for _, enemy in ipairs(self.enemys[mapIdx]) do
+			enemy:addPassive({id = passive})
+		end
+	end
+
+	for _, buff in ipairs(buffs[1] or {}) do
+		self.palyer:addBuff(buff)
+	end
+
+	for _, buff in ipairs(buffs[2] or {}) do
+		for _, enemy in ipairs(self.enemys[mapIdx]) do
+			enemy:addBuff(buff)
+		end
+	end
+end
+
+
 --写入数据
 function Battle:saveDB()
 	for idx, mapEnemys in pairs(self.enemys) do
@@ -25,12 +25,39 @@ function Block:isBuild()
 	return self:getEventType() == AdvEventType.Build
 end
+function Block:isChoose()
+	return self:getEventType() == AdvEventType.Choose
+end
+
 function Block:getEventType()
 	return self.event and self.event.etype
 end
+function Block:getStageType()
+	return self.room:getStageType(self.blockId)
+end
+
 function Block:updateEvent(event, isInit)
+	if not isInit then
+		-- 有些事件删除 需要处理
+		if self:isBuild() then 
+			self.room.map.adv.battle:removeBuildByPos(self.room.roomId, self.blockId)
+		elseif self:isMonster() then
+			if self.event.mId then
+				self.room.map.adv.battle:removeEnemyById(self.event.mId)
+			end
+		end
+	end
 	self.event = event
+	if not isInit and self.event then
+		-- 判断下类型是不是错的
+		if not self:getEventData() and (self:getEventType() ~= AdvEventType.Drop or not self.event.item) then
+			self:clear()
+			assert(false, "updateEvent error, : event " .. (event.etype or "nil"))
+			return
+		end
+		self:randomEvent()
+	end
 end
 function Block:clear()
@@ -54,14 +81,11 @@ function Block:randomEvent()
 	local randomFunc = {}
 	--怪
 	randomFunc[AdvEventType.Monster] = function()
-		self.event.mId = adv.lastEnemyId  --给怪一个有序id 回合逻辑时使用
-		adv.lastEnemyId = adv.lastEnemyId + 1
 		local enemy = adv.battle:getEnemy(room.roomId, self.blockId, map.mapIdx)
 		if enemy then
-			enemy:unlock(self.event.mId)
+			enemy:unlock()
 		else
 			enemy = adv.battle:addEnemy(room, self, map.mapIdx)
-			enemy:initAfter(self.event.enemy)
 		end
 		enemy:triggerPassive(Passive.BORN_ONCE)
@@ -73,7 +97,9 @@ function Block:randomEvent()
 	randomFunc[AdvEventType.BOSS] = randomFunc[AdvEventType.Monster]
 	--掉落
 	randomFunc[AdvEventType.Drop] = function()
-		self.event.item = csvdb["event_dropCsv"][self.event.id]["range"]:randWeight(true)
+		if not self.event.item then
+			self.event.item = csvdb["event_dropCsv"][self.event.id]["range"]:randWeight(true)
+		end
 	end
 	--交易
 	randomFunc[AdvEventType.Trader] = function()
@@ -144,7 +170,6 @@ function Block:randomEvent()
 			build:unlock()
 		else
 			build = adv.battle:addEnemy(room, self, map.mapIdx)
-			build:initAfter(self.event.build)
 		end
 		build:triggerPassive(Passive.BORN_ONCE)
 	end
@@ -155,13 +180,18 @@ function Block:randomEvent()
 		adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
 		local buffs = data.effect:toArray(true, "=")
-		for _, buffId in ipairs(buffs) do
-			adv.battle.player:addBuff(buffId)
-		end
+		
 		local backTrap = true
-		if data.target == 1 then-- 给所有敌人同样增加buff
+		if data.target == 0 then  -- 给玩家增加buff
+			for _, buffId in ipairs(buffs) do
+				adv.battle.player:addBuff(buffId)
+			end
+		elseif data.target == 1 then-- 给玩家 和 所有敌人同样增加buff
 			local enemys = adv.battle.player:getTeam(2)
+			for _, buffId in ipairs(buffs) do
+				adv.battle.player:addBuff(buffId)
+			end
 			for k , enemy in ipairs(enemys) do
 				for _, buffId in ipairs(buffs) do
 					enemy:addBuff(buffId)
@@ -170,6 +200,14 @@ function Block:randomEvent()
 		elseif data.target == 2 then -- 翻开房间
 			self.room.map.adv:getCurMap():openBlocksByRoom(self.room.roomId)
 			backTrap = false
+		elseif data.target == 3 then -- 翻开周围8格，并给怪物附带buff（不伤害玩家）
+			self.room.map.adv:getCurMap():openBlocksBySize(self.room.roomId, self.blockId, 2)
+			local enemys = self.room.map.adv:getCurMap():getEnemysBySize(self.room.roomId, self.blockId, 2)
+			for _, e in ipairs(enemys) do
+				for _, buffId in ipairs(buffs) do
+					e:addBuff(buffId)
+				end
+			end
 		end
 		if data.specialEff ~= "" then
@@ -223,8 +261,8 @@ function Block:open()
 	local room = self.room
 	local map = room.map
 	local adv = map.adv
-	self:randomEvent()
 	self.isOpen = true
+	self:randomEvent()
 	return true
 end
@@ -22,7 +22,8 @@ Buff.CHANGE_DROP = 18 -- 转换掉落
 Buff.BATTLE_PASSIVE = 19 -- 切换为战斗中的被动技
 Buff.EXP_ADD = 20 -- 增加exp（每回合）
 Buff.DONT_DEFEND = 21 -- 不看守地板 -- 怪周围点半可点击
-
+Buff.SHOW_DANGER = 22 -- 扫雷 展示地上怪物和陷阱数量的标记
+Buff.SHOW_MONSTER_POS = 23 -- 蓝臂章训练场 感知
 Buff.EXP_UP = 24 -- 杀敌经验提高
 Buff.DISABLE_BUFF = 25 -- 禁用固有技
 Buff.ATTR_CHANGE_COND = 26 --属性变化（状态)有条件
@@ -31,6 +32,8 @@ Buff.SP_MAX_CHANGE = 28 -- 魔法上限
 Buff.ITEM_GET_UP = 29 -- 获得道具数量增加
 Buff.Buff_EFFECT_CHANGE = 30 -- 改变 buff 效果
 Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物
+Buff.SNEAK = 32 --潜行
+Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成  -- 怪物使用
 --角色一些属性的变化
@@ -81,7 +84,9 @@ local function commonAttCond(_Buff, attrName)
 			effectCount = self.owner.battle.adv.level
 		elseif self.buffData.effectValue4 == 2 then
 			local buff = self.owner.battle.player:getBuffById(tonumber(self.buffData.effectValue5))
-			effectCount = buff.layer
+			if buff then
+				effectCount = buff.layer
+			end
 		end
 		return self.buffData.effectValue2 * effectCount 
 	end
@@ -153,11 +158,15 @@ local BuffFactory = {
 	[Buff.HP_MAX_CHANGE] = function(_Buff)
 		_Buff._init = function(self) --初始化变化值
 			self._changeV = self:_calculate()
+			local old = self.owner.hpMax
 			self.owner:reSetHpMax()
+			self:_addHpByMax(old)
 		end
 		_Buff._overlay = function(self)
 			self._changeV = (self._changeV or 0) + self:_calculate()
+			local old = self.owner.hpMax
 			self.owner:reSetHpMax()
+			self:_addHpByMax(old)
 		end
 		_Buff._uncover = function(self)
@@ -170,7 +179,7 @@ local BuffFactory = {
 			if self.buffData.effectValue1 == 0 then --固定值
 				curValue = self.buffData.effectValue2
 			elseif self.buffData.effectValue1 == 1 then
-				local baseOwner = self.buffData.effectValue4 == 1 and self.owner or self.release
+				local baseOwner = self.buffData.effectValue4 == 1 and self.owner or self.release 
 				local attrs = {[0] = "hp", [1] = "hpMax", [2] = "atk"}
 				curValue = baseOwner[attrs[self.buffData.effectValue3]] * self.buffData.effectValue2 / 100
 			end
@@ -181,6 +190,15 @@ local BuffFactory = {
 			return self:doEffectChange(self._changeV)
 		end
+		_Buff._addHpByMax = function(self, old)
+			if self.buffData.effectValue5 == "1" then
+				local change = self.owner.hpMax - old
+				if change > 0 then
+					self.owner:recover(change, self.release) -- 防止release不存在，地图点buff
+				end
+			end
+		end
+
 		_Buff._endBuff = function(self)
 			self.owner:reSetHpMax()
 		end
@@ -355,7 +373,11 @@ local BuffFactory = {
 			return self.buffData.effectValue1
 		end
 	end,
-
+	[Buff.SNEAK] = function(_Buff)
+		_Buff._init = function(self)
+			self.layer = self.buffData.effectValue1
+		end
+	end,
 }
 -- 同样的返回  effectValue1, effectValue2 * self.layer 类型的buff
@@ -472,6 +494,7 @@ function Buff:checkKeep()
 		2=建筑id；
 		3=事件id
 		4=队伍为特定属性时
+		5=拥有指定buff
 	--]]
 	local checkFunc = {}
@@ -508,6 +531,13 @@ function Buff:checkKeep()
 		local role = self.owner.battle.adv.owner
 		return role:getHerosCamp(role:getProperty("advTeam").heros) == teamAttr
 	end
+	checkFunc[5] = function(_, buffId)
+		local buff = self.owner:getBuffById(buffId)
+		if buff and not buff.isDel then
+			return true
+		end
+		return false
+	end
 	local keepTerm = self.buffData.keepTerm:toArray(true, "=")
 	if not checkFunc[keepTerm[1]] then return true end
@@ -526,7 +556,7 @@ end
 function Buff:afterLayer()
 	-- 持续一层
-	if self.buffData.round == 0 then
+	if self.buffData.round == 0 or self.buffData.mapLock == 1 then
 		self.isDel = true
 	end
 end
@@ -2,6 +2,8 @@
 local Room = require "adv.AdvRoom"
 local Passive = require "adv.AdvPassive"
 local AdvCommon = require "adv.AdvCommon"
+
+local Buff = require "adv.AdvBuff"
 -- 一层地图
 local Map = class("AdvMap")
 -- 内部方法声明
@@ -10,7 +12,8 @@ local createMap, getEventLib
 function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 	self.adv = adv
-	if type(mapInfo) == "number" then -- mapInfo 传入 id
+	local isNew = type(mapInfo) == "number"
+	if isNew then -- mapInfo 传入 id
 		mapInfo = createMap(self, mapInfo, isEnter, isNewRelay)  -- 生成地图
 	end
 	if not mapInfo then return end
@@ -19,19 +22,25 @@ function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 	self.mapId = mapInfo.mapId
 	self.isShow = mapInfo.isShow  -- 是否全部展示 -- 客户端用
 	self.rooms = {}
-	self:loadRooms(mapInfo.rooms, isNewRelay)
+	self:loadRooms(mapInfo.rooms, isNew, isNewRelay)
 end
-function Map:loadRooms(rooms, isNewRelay)
-	local mapData = csvdb["map_" .. csvdb["mapCsv"][self.mapId]["path"] .. "Csv"]
+function Map:loadRooms(rooms, isNew, isNewRelay)
+	local mapInfoCsv = csvdb["mapCsv"][self.mapId]
+	local mapData = csvdb["map_" .. mapInfoCsv["path"] .. "Csv"]
+
 	for roomId, roomName in pairs(mapData["rooms"]) do
 		if roomName == "path" then
-			self.rooms[roomId] = Room.new(self, roomId, mapData["path"], rooms[roomId], true, isNewRelay)
+			self.rooms[roomId] = Room.new(self, roomId, mapData["path"], rooms[roomId], true, isNewRelay, mapInfoCsv.type)
 		else
 			roomName = roomName:gsub("/", "_")
-			self.rooms[roomId] = Room.new(self, roomId, csvdb["room_" .. roomName .. "Csv"], rooms[roomId], false, isNewRelay)
+			self.rooms[roomId] = Room.new(self, roomId, csvdb["room_" .. roomName .. "Csv"], rooms[roomId], false, isNewRelay, mapInfoCsv.type)
 		end
 	end 
+
+	if mapInfoCsv.type == 2 and isNew then
+		self:showMap()
+	end
 end
 function Map:initBattleAfter()
@@ -40,6 +49,11 @@ function Map:initBattleAfter()
 	end
 end
+
+function Map:getMapInfoCsv()
+	return csvdb["mapCsv"][self.mapId]
+end
+
 function Map:getDB()
 	local map = {}
 	map.mapId = self.mapId
@@ -108,16 +122,104 @@ function Map:addNewMonsterRand(monsterId, where)
 		monsterId = math.randWeight(eventLib[AdvEventType.Monster][0], "showup")
 	end
-	local event = {etype = AdvEventType.Monster, mId = self.adv.lastEnemyId}
-	self.adv.lastEnemyId = self.adv.lastEnemyId + 1
-	event.id = monsterId
+	local event = {
+		etype = AdvEventType.Monster,
+		id = monsterId,
+	}
 	block:updateEvent(event)
-	self.adv.battle:addEnemy(room, block):triggerPassive(Passive.BORN_ONCE)
-
 	return room, block
 end
+-- 在指定地块类型上 放置指定类型事件id
+function Map:layEventToStage(eventType, eventId, count, stage)
+	local pool = {}
+	for _, room_ in pairs(self.rooms) do
+		for _, block_ in pairs(room_.blocks) do
+			if block_.isOpen and not block_.event and block_:getStageType() == stage then
+				table.insert(pool, {room_, block_})
+			end
+		end
+	end
+	if not next(pool) then return {} end
+	local change = {}
+	count = math.min(#pool, count) 
+	for i = 1, count do
+		local idx = math.randomInt(1, #pool)
+		local room, block = pool[idx][1], pool[idx][2]
+		table.remove(pool, idx)
+
+		local event = {
+			etype = eventType,
+			id = eventId,
+		}
+		block:updateEvent(event)
+		table.insert(change, {room, block})
+	end
+	return change
+end
+
+-- 地图中指定事件 切换为另一个事件
+function Map:eventChangeToOther(eventTypeF, eventIdF, eventTypeT, eventIdT, count)
+	count = count or 1
+	local pool = {}
+	for _, room_ in pairs(self.rooms) do
+		for _, block_ in pairs(room_.blocks) do
+			if block_.isOpen and block_:getEventType() == eventTypeF and block_.event.id == eventIdF then
+				table.insert(pool, {room_, block_})
+			end
+		end
+	end
+	if not next(pool) then return {} end
+	local change = {}
+	count = math.min(#pool, count) 
+	for i = 1, count do
+		local idx = math.randomInt(1, #pool)
+		local room, block = pool[idx][1], pool[idx][2]
+		table.remove(pool, idx)
+
+		local event = {
+			etype = eventTypeT,
+			id = eventIdT,
+		}
+		block:updateEvent(event)
+		table.insert(change, {room, block})
+	end
+	return change
+end
+
+function Map:clearEventById(eventType, eventId, count, exclude)
+	count = count or 0
+	eventId = eventId or 0
+	exclude = exclude or {}
+
+	local pool = {}
+	for roomId, room_ in pairs(self.rooms) do
+		exclude[roomId] = exclude[roomId] or {}
+		for blockId, block_ in pairs(room_.blocks) do
+			if not exclude[roomId][blockId] and block_.isOpen and block_:getEventType() == eventType and (eventId == 0 or block_.event.id == eventId) then
+				table.insert(pool, {room_, block_})
+			end
+		end
+	end
+	if not next(pool) then return {} end
+	local change = {}
+	if count == 0 then
+		count = #pool
+	else
+		count = math.min(#pool, count) 
+	end
+	for i = 1, count do
+		local idx = math.randomInt(1, #pool)
+		local room, block = pool[idx][1], pool[idx][2]
+		table.remove(pool, idx)
+
+		block:updateEvent(nil)
+		table.insert(change, {room, block})
+	end
+	return change
+end
+
 -- 随机翻开 num 个 以开放的房间的 地块
 function Map:openBlockRand(num, isPlayer, ignoreBack)
 	local pool = {}
@@ -156,11 +258,21 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if isPlayer then
 			self.adv.battle.player:triggerPassive(Passive.OPEN_BLOCK)
 			self.adv.owner:checkTaskEnter("AdvOpenBlock")
+
+			-- 潜行检查
+		 	local sneakBuff = self.adv.battle.player:hadBuff(Buff.SNEAK)
+		 	if sneakBuff then
+		 		local enemys = self:getEnemysBySize(roomId, blockId, 2)
+		 		if #enemys > 0 then
+		 			sneakBuff:uncover()
+		 		end
+		 	end
 		end
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
+
 	end
 end
@@ -237,6 +349,20 @@ function Map:getBlocksBySize(roomId, blockId, size)
 	return blocks
 end
+function Map:getEnemysBySize(roomId, blockId, size)
+	local blocks = self:getBlocksBySize(roomId, blockId, size)
+	local enemys = {}
+	for _, block in ipairs(blocks) do
+		if block:isMonster() then
+			local e = self.adv.battle:getEnemy(block.room.roomId, block.blockId)
+			if e then
+				table.insert(enemys, e)
+			end
+		end
+	end
+	return enemys
+end
+
 -----------------------------随机地图-----------------------------
 -- isEnter isNewRelay 区分中继层的类型   --是否是开始进入  是否是第一次进入
@@ -250,6 +376,31 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		error("mapId " .. mapId .. " dont exist!")
 		return 
 	end
+
+	local etypeToStr = {
+		[AdvEventType.Choose] = "choose",
+		[AdvEventType.Drop] = "drop",
+		[AdvEventType.Monster] = "monster",
+		[AdvEventType.Trader] = "trader", 
+		[AdvEventType.Build] = "building",
+		[AdvEventType.Trap] = "trap",
+		[AdvEventType.Click] = "click",
+	}
+
+	local highLevelEvent = {}
+	for _etype, _str in pairs(etypeToStr) do
+		if mapCsvData[_str] ~= "" then
+			highLevelEvent[_etype] = {}
+		end
+		for _id, _count in pairs(mapCsvData[_str]:toNumMap()) do
+			local _curData = csvdb["event_" .. _str .. "Csv"][_id]
+			if _curData then
+				highLevelEvent[_etype][_curData.BlockEventType] = highLevelEvent[_etype][_curData.BlockEventType] or {}
+				highLevelEvent[_etype][_curData.BlockEventType][_id] = {showup = _curData.showup, limit = _count, dlimit = _curData.limit}
+			end
+		end
+	end
+
 	--事件随机
 	local eventLib = getEventLib(self)  -- 同时记录出现次数
 	local monsterEvents = {}  --处理钥匙掉落
@@ -270,42 +421,60 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		local randomFunc = {}
 		local function randomCommon()
-			if not eventLib[etype] or not next(eventLib[etype]) or not eventLib[etype][especial] or not next(eventLib[etype][especial]) then return false end
-			event.id = math.randWeight(eventLib[etype][especial], "showup")
-			if not event.id then return false end
-
-			-- 不是 0 才会记录
-			if eventLib[etype][especial][event.id].dlimit ~= 0 then
-				eventLimit[etype] = eventLimit[etype] or {}
-				eventLimit[etype][event.id] = (eventLimit[etype][event.id] or 0) + 1
+			-- 刷新地图专属的
+
+			local function randomByLevelLib(lib)
+				-- 刷新通用的
+				if not lib[etype] or not next(lib[etype]) or not lib[etype][especial] then return false end
+				-- 清一下全关卡次数用完的
+				for _eid, _edata in pairs(lib[etype][especial]) do
+					if _edata.dlimit ~= 0 and ((eventLimit[etype] or {})[_eid] or 0) >=  _edata.dlimit then
+						lib[etype][especial][_eid] = nil
+					end
+				end
+
+				if not next(lib[etype][especial]) then return false end
+				event.id = math.randWeight(lib[etype][especial], "showup")
+				if not event.id then return false end
+
+				-- 不是 0 才会记录
+				if lib[etype][especial][event.id].dlimit ~= 0 then
+					eventLimit[etype] = eventLimit[etype] or {}
+					eventLimit[etype][event.id] = (eventLimit[etype][event.id] or 0) + 1
+				end
+
+				-- 消除单层次数用完的
+				if lib[etype][especial][event.id].limit > 1 then
+					lib[etype][especial][event.id].limit = lib[etype][especial][event.id].limit - 1
+				elseif lib[etype][especial][event.id].limit == 1 then
+					lib[etype][especial][event.id] = nil
+				end
+				return true
 			end
-			-- 消除
-			if eventLib[etype][especial][event.id].limit > 1 then
-				eventLib[etype][especial][event.id].limit = eventLib[etype][especial][event.id].limit - 1
-			elseif eventLib[etype][especial][event.id].limit == 1 then
-				eventLib[etype][especial][event.id] = nil
+			local status = randomByLevelLib(highLevelEvent)
+			if not status then
+				status = randomByLevelLib(eventLib)
 			end
+			return status
 		end
 		--入口
 		randomFunc[AdvEventType.In] = function()end
 		--出口
-		randomFunc[AdvEventType.Out] = function() 
-			if not self.adv:isEndless() and self.adv.isRelay and not self.adv.owner:checkOverGuide(GuideStep.AdvRelay) then
-				return false
-			end
-		end
-		--中继点出口
-		randomFunc[AdvEventType.Exit] = function() 
-			if not self.adv.isRelay or self.adv.owner:checkOverGuide(GuideStep.AdvRelay) then return false end
-		end
+		randomFunc[AdvEventType.Out] = function()end
+		-- --中继点出口
+		-- randomFunc[AdvEventType.Exit] = function() 
+		-- 	-- if not self.adv.isRelay or self.adv.owner:checkOverGuide(GuideStep.AdvRelay) then return false end
+		-- 	return false
+		-- end
 		--开放出口
 		randomFunc[AdvEventType.InOut] = function() end
 		--开放出口
 		randomFunc[AdvEventType.Diner] = function() 
-			if not self.adv.isRelay or isEnter or isNewRelay then return false end
+			-- if not self.adv.isRelay or isEnter or isNewRelay then return false end
+			if not self.adv.isRelay or isEnter then return false end
 		end
 		--boss
@@ -344,7 +513,8 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		randomFunc[AdvEventType.Drop] = randomCommon
 		--交易所
 		randomFunc[AdvEventType.Trader] = function()
-			if self.adv.isRelay and isNewRelay then return false end
+			-- if self.adv.isRelay and isNewRelay then return false end
+			if self.adv.isRelay then return false end
 			return randomCommon()
 		end
 		--建筑
@@ -584,15 +754,8 @@ getEventLib = function(self, needEventType) -- needEventType  需要的事件
 						end
 					end
-					-- data.limit 改为 整个冒险全程
-					local limit = data.limit
-					if data.limit ~= 0 then
-						limit = data.limit - ((eventLimit[etype] or {})[id] or 0)
-						if limit <= 0 then
-							add = false
-						end
-					end
-
+					-- limit 单次上限 默认无限
+					local limit = 0
 					if add and (etype == AdvEventType.LinkChoose or etype == AdvEventType.Choose) then  --只能有一次
 						limit = 1
 					end
@@ -6,6 +6,7 @@ Filter.HP_LOW_WITH_EQUAL = 3 -- 血量&lt;=value%
 Filter.HP_LOW = 4 -- 血量<value%
 Filter.BUFF_BY_TYPE = 5 -- 指定类型buff
 Filter.BUFF_BY_ID = 6 -- 指定id的buff
+Filter.CAMP = 7 -- 玩家是指定阵营
 local FilterFactory = {}
 FilterFactory[Filter.HP_UP_WITH_EQUAL] = function (_Filter)
@@ -38,6 +39,13 @@ FilterFactory[Filter.BUFF_BY_ID] = function (_Filter)
 		return target:hadBuffById(self.value)
 	end
 end
+FilterFactory[Filter.CAMP] = function (_Filter)
+	_Filter._execute = function (self, target)
+		local role = self.owner.battle.adv.owner
+		return role:getHerosCamp(role:getProperty("advTeam").heros) == self.value
+	end
+end
+
 function Filter:ctor(params)
 	self.owner = params.owner
@@ -145,7 +153,9 @@ PassiveCondFactory[Passive.OPEN_BLOCK] = PassiveCondFactory[Passive.HURT_PERCENT
 PassiveCondFactory[Passive.SELF_HURT] = function(_Passive)
 	_Passive._trigger = function(self, params)
 		local buffId = params.buffId
+		if not buffId then return end
 		local data = csvdb["adv_map_buffCsv"][buffId]
+		if not data then return end
 		if data.classify:sismember(self.passiveData.value, " ") then
 			return true
 		end
@@ -297,7 +307,7 @@ function Passive:canEffect(effType, effValue)
 end
 function Passive:effect(triggerPms)
-	for _, effect in pairs(self.effects) do
+	for _, effect in ipairs(self.effects) do
 		local effType = effect[1]
 		local effValue = effect[2]
 		local otherPms = {}
@@ -314,7 +324,7 @@ function Passive:effect(triggerPms)
 		self.round = self.passiveData.round
 	end
-	if self.count <= 0 and self.passiveData.refresh == 1 then  -- 次数 <= 0 并且一次冒险内不刷新，被动可以直接移除
+	if self.count <= 0 then  -- 次数 <= 0 并且一次冒险内不刷新，被动可以直接移除
 		self.isDel = true
 	end
 end
@@ -332,6 +342,12 @@ function Passive:afterRound()
 	end
 end
+function Passive:afterLayer()
+	if self.passiveData.mapLock == 1 or self.passiveData.floorType == 1 then
+		self.isDel = true
+	end
+end
+
 -- 可以触发
 function  Passive:canTrigger( )
 	return self.count > 0 and self.delay <= 0
@@ -427,11 +443,13 @@ function Passive:effect5(monsterId)
 end
---6=给所有场上怪物增加buff
-function Passive:effect6(value)
+--6=给所有场上怪物增加buff 《 限定 怪 id》
+function Passive:effect6(value, triggerPms, enemyId)
 	local aims = self.owner.battle.player:getTeam(2)
 	for k , aim in pairs(aims) do
-		aim:addBuff(value, self.owner)
+		if not enemyId or enemyId == 0 or aim.monsterId == enemyId then
+			aim:addBuff(value, self.owner)
+		end
 	end
 end
@@ -471,4 +489,33 @@ function Passive:effect10(count, triggerPms)
 	end
 end
+-- 将地图上的A事件替换成B事件					
+function Passive:effect11(eventTypeF, triggerPms, eventIdF, eventTypeT, eventIdT, count)
+	local change = self.owner.battle.adv:getCurMap():eventChangeToOther(eventTypeF, eventIdF, eventTypeT, eventIdT, count)
+	for _, one in ipairs(change) do
+		self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId)
+	end
+end
+
+-- 在指定地点召唤event项目							
+function Passive:effect12(eventType, triggerPms, eventId, count, stage)
+	local change = self.owner.battle.adv:getCurMap():layEventToStage(eventType, eventId, count, stage)
+	for _, one in ipairs(change) do
+		self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId)
+	end
+end
+
+-- 移除指定项目					
+function Passive:effect13(eventType, triggerPms, eventId, count)
+	local exclude = {}
+	if self.owner:is("Enemy") then
+		exclude[self.owner.roomId] = {[self.owner.blockId] = 1}
+	end
+	local change = self.owner.battle.adv:getCurMap():clearEventById(eventType, eventId, count, exclude)
+	for _, one in ipairs(change) do
+		self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId)
+	end
+end
+
+
 return Passive
 \ No newline at end of file
@@ -50,19 +50,21 @@ function BaseObject:reset(data)
 	self:initAfter(data)
 end
-function BaseObject:afterRound()
-	for _, passive in ipairs(self.passives) do
-		passive:afterRound(self)
-	end
-	for _, buff in ipairs(self.buffs) do
-		buff:afterRound()
+function BaseObject:afterRound(roundType)
+	if roundType == "passive" then
+		for _, passive in ipairs(self.passives) do
+			passive:afterRound(self)
+		end
+	elseif roundType == "buff" then
+		for _, buff in ipairs(self.buffs) do
+			buff:afterRound()
+		end
 	end
 end
 function BaseObject:clearRound()
 	for i = #self.passives, 1, -1 do
 		if self.passives[i].isDel then
-			self.passives[i]:endPassive()
 			table.remove(self.passives, i)
 		end
 	end
@@ -82,33 +84,33 @@ function BaseObject:clear()
 	self.passives = {}
 end
-function BaseObject:battleBegin()
-	for _, passive in ipairs(self.passives) do
-		passive:battleBegin()
-	end
-end
-
-function BaseObject:battleEnd()
-	for _, buff in ipairs(self.buffs) do
-		buff:battleEnd()
-	end
-end
-
 function BaseObject:addPassive(params)
 	local skillId = params.id
 	local skillData = csvdb["adv_map_passiveCsv"][skillId]
 	if not skillData then return end
 	local level = params.level or 1
 	if not skillData[level] then return end
+
+	if self:getPassiveById(skillId) then return end -- 被动技不能重复
+
 	table.insert(self.passives, Passive.new(self, { id = skillId, level = level }))
 end
+function BaseObject:getPassiveById(bId)
+	for idx, passive in ipairs(self.passives) do
+		if passive.id == bId then
+			return passive
+		end
+	end
+end
+
 function BaseObject:getPassiveIdx(passive)
 	for idx, passive_ in ipairs(self.passives) do
 		if passive_ == passive then
 			return idx
 		end
 	end
+	return 999
 end
 function BaseObject:getDisablePassiveCount()
@@ -524,8 +526,7 @@ function Enemy:ctor(battle, mId, monsterId, roomId, blockId, lock, enemy, mapIdx
 	self.mapIdx = mapIdx
 	self:initData(enemy)
 end
-function Enemy:unlock(id)
-	self.id = id
+function Enemy:unlock()
 	self.lock = nil
 end
@@ -533,6 +534,10 @@ function Enemy:isEnemy()
 	return true
 end
+function Enemy:kill()
+	self:hurt(self.hp, self.battle.player, {hurtType = 5})
+end
+
 local Player = class("Player", BaseObject)
 function Player:ctor(battle, data)
 	Player.super.ctor(self, battle)
@@ -566,6 +571,9 @@ function Player:addExp(value)
 		if level >= #csvdb["adv_levelCsv"] then break end
 	end
 	local delta = level - self.level
+
+	self.battle.adv:pushBackEvent(AdvBackEventType.Exp, {delta = value})
+
 	if delta > 0 then
 		for attr, _ in pairs(AdvAttsEnum) do
 			self:addBaseAttr(attr, self.growth[attr] * delta, 0, true)
@@ -643,11 +651,18 @@ function Player:effectBattleBuff()
 end
 function Player:afterLayer()
+	for _, passive in ipairs(self.passives) do
+		if not passive.isDel then
+			passive:afterLayer()
+		end
+	end
 	for _, buff in ipairs(self.buffs) do
 		if not buff.isDel then
 			buff:afterLayer()
 		end
 	end	
+
+	self:clearRound()
 end
 function Player:addBuff(buffId, releaser)
@@ -5,7 +5,7 @@ local Block = require &quot;adv.AdvBlock&quot;
 local Passive = require "adv.AdvPassive"
 local Room = class("AdvRoom")
-function Room:ctor(map, roomId, csvData, info, isPath, isNewRelay)
+function Room:ctor(map, roomId, csvData, info, isPath, isNewRelay, mapType)
 	self.map = map
 	self.roomId = roomId
 	self.col, self.row = AdvCommon.getCrById(self.roomId)
@@ -13,14 +13,15 @@ function Room:ctor(map, roomId, csvData, info, isPath, isNewRelay)
 	self.isBossRoom = false -- boss房间   --击败boss 以后重置为false
 	self.isShow = false
 	self.battleAfterCall = {}
+	self.csvData = csvData
 	self.blocks = {}
-	self:loadBlocks(csvData, info, isNewRelay)
+	self:loadBlocks(info, isNewRelay, mapType)
 end
-function Room:loadBlocks(csvData, info, isNewRelay)
+function Room:loadBlocks(info, isNewRelay, mapType)
 	local isFirstOpen = false
-	for blockId, _ in pairs(csvData["blocks"]) do
+	for blockId, _ in pairs(self.csvData["blocks"]) do
 		self.blocks[blockId] = Block.new(self, blockId, info.event[blockId], info.open == 1 or info.open[blockId], info.trap[blockId])
 		if not self.isPath and self.blocks[blockId]:isBoss() then
 			self.isBossRoom = true 
@@ -32,19 +33,29 @@ function Room:loadBlocks(csvData, info, isNewRelay)
 				self.isShow = true
 				self.blocks[blockId].isOpen = true
 				isFirstOpen = true
-				--入口房间只会在这里首次展示开放 --触发固有技
-				self.map.adv:triggerPassive(Passive.ROOM_SHOW, {roomId = self.roomId})
 			end
 		end
 	end
 	--中继层全部开放   boss 房间 开启所有的地块
-	if  (self.map.adv.isRelay and not isNewRelay) or (self.isBossRoom and self.isShow and isFirstOpen) then
+	if  (self.map.adv.isRelay and not isNewRelay) or (self.isBossRoom and self.isShow and isFirstOpen) or (isFirstOpen and mapType == 1) then
 		table.insert(self.battleAfterCall, function()
 			for _, block in pairs(self.blocks) do
 				self:openBlock(block)
 			end
 		end)
 	end
+	if isFirstOpen then
+		table.insert(self.battleAfterCall, function()
+			--入口房间只会在这里首次展示开放 --触发固有技
+			self.map.adv:triggerPassive(Passive.ROOM_SHOW, {roomId = self.roomId})
+		end)
+	end
+end
+
+function Room:getStageType(blockId)
+	if not self.blocks[blockId] then return end
+	if not self.csvData["blocks"][blockId] then return end
+	return self.csvData["blocks"][blockId]
 end
 function Room:initBattleAfter()	
@@ -248,18 +248,33 @@ function AdvTask.bind(Adv)
 	local advAchievChange = {}
-	local function insertChange(chapterId, taskId, value, pts)
+	local function insertChange(self, chapterId, taskId, value, pts)
 		local achievField = AdvCommon.isEndless(chapterId) and "advEAchiev" or "advAchiev"
+		local dbData = self.owner:getProperty(achievField)
 		if pts then
-			table.insert(advAchievChange, {type = achievField, field = {chapterId, "pts", taskId}, value = value})
+			advAchievChange[achievField] = advAchievChange[achievField] or {}
+			advAchievChange[achievField][chapterId] = advAchievChange[achievField][chapterId] or {}
+			advAchievChange[achievField][chapterId]["pts"] = advAchievChange[achievField][chapterId]["pts"] or {}
+			advAchievChange[achievField][chapterId]["pts"][taskId] = value
+
+			dbData[chapterId] = dbData[chapterId] or {}
+			dbData[chapterId]["pts"] = dbData[chapterId]["pts"] or {}
+			dbData[chapterId]["pts"][taskId] = value
 		else
-			table.insert(advAchievChange, {type = achievField, field = {chapterId, taskId}, value = value})
+			advAchievChange[achievField] = advAchievChange[achievField] or {}
+			advAchievChange[achievField][chapterId] = advAchievChange[achievField][chapterId] or {}
+			advAchievChange[achievField][chapterId][taskId] = value
+
+			dbData[chapterId] = dbData[chapterId] or {}
+			dbData[chapterId][taskId] = value
 		end
 	end
 	function Adv:checkAchievement(taskType, count, cond, cond2)
 		local achievField = self:isEndless() and "advEAchiev" or "advAchiev"
-		local advAchiev = self.owner:getProperty(achievField)[self.chapterId] or {}
+		local dbData = self.owner:getProperty(achievField)
+		dbData[self.chapterId] = dbData[self.chapterId] or {}
+		local advAchiev = dbData[self.chapterId]
 		for taskId , data in pairs(csvdb["adv_achievementCsv"][self.chapterId] or {}) do
 			local oldStatus = advAchiev[taskId] or 0
 			if oldStatus ~= -1 and data.type == taskType then
@@ -332,18 +347,19 @@ function AdvTask.bind(Adv)
 				if self:isEndless() then
 					if status and status ~= oldStatus then
-						insertChange(self.chapterId, taskId, status)
+						insertChange(self, self.chapterId, taskId, status)
 					end
 				else
 					if (status or -1) >= data.value1 then
 						status = -1
+						self.owner:log("adv_action", {desc = "finishAchiev", short1 = 1, int1 = self.chapterId, int2 = taskId})
 					end
 					if status and status ~= oldStatus then
-						insertChange(self.chapterId, taskId, status)
+						insertChange(self, self.chapterId, taskId, status)
 						if status == -1 then
-							local ptcount = (self.owner:getProperty(achievField)[self.chapterId] or {})[-1] or 0
+							local ptcount = advAchiev[-1] or 0
 							ptcount = ptcount + data.pt
-							insertChange(self.chapterId, -1, ptcount)
+							insertChange(self, self.chapterId, -1, ptcount)
 						end
 					end
 				end
@@ -361,10 +377,10 @@ function AdvTask.bind(Adv)
 		local reward = {}
 		if status >= achievData.value1 then
-			insertChange(chapterId, taskId, -1)
+			insertChange(self, chapterId, taskId, -1)
 			local count = (self.owner:getProperty(achievField)[chapterId] or {})[-1] or 0
 			count = count + achievData.pt
-			insertChange(chapterId, -1, count)
+			insertChange(self, chapterId, -1, count)
 			-- 发放奖励
 			reward = self.owner:award(achievData.reward, {log = {desc = "advAchiev", int1 = chapterId, int2 = taskId}})
@@ -380,13 +396,14 @@ function AdvTask.bind(Adv)
 		if status == -1 or count < achievData.pt then return end
 		local reward = self.owner:award(achievData.reward, {log = {desc = "advAchievReward", int1 = chapterId, int2 = taskId}})
-		insertChange(chapterId, taskId, -1, true)
+		insertChange(self, chapterId, taskId, -1, true)
 		return true, reward
 	end
 	function Adv:updateAchievement(notNotify)
 		if not next(advAchievChange) then return end
-		self.owner:changeUpdates(advAchievChange, notNotify)
+		self.owner:changeMapUpdates(advAchievChange, notNotify)
+		advAchievChange = {}
 	end
 end
@@ -8,14 +8,13 @@ require &quot;skynet.manager&quot;
 local queue = require "skynet.queue"
 local netpack = require "skynet.netpack"
 local socket = require "skynet.socket"
-local sharedata = require "skynet.sharedata"
 local xxtea = require "xxtea"
 skynet = require "skynet"
 redisproxy = require "shared.redisproxy"
 datacenter = require "skynet.datacenter"
 mcast_util = require "services/mcast_util"
-globalCsv = require "csvdata/GlobalDefine"
+csvdb = require "shared.csvdata"
 local CMD = {}
 local agentInfo = {}  -- { client_fd, role, gate_serv, open_timer}
@@ -217,7 +216,7 @@ skynet.register_protocol {
 skynet.register_protocol {
 	name = "role",
-	id = 13,
+	id = 101,
 	pack = skynet.pack,
 	unpack = skynet.unpack,
 	dispatch = function(session, address, submethod, ...)
@@ -326,20 +325,28 @@ skynet.start(function()
 		end
 	end)
-	redisd = skynet.localname(".REDIS")
+	skynet.info_func(function()
+		local info = {}
+		info.ip = agentInfo.ip
+		if agentInfo.role then
+			info.roldId = agentInfo.role:getProperty("id")
+		end
+		return info
+	end)
+
+	redisd = skynet.localname(".redis")
 	if tonumber(skynet.getenv "logd") == 1 then
-		logd = skynet.localname(".LOGD")
+		logd = skynet.localname(".log")
 	end
 	cs = queue()
-	csvdb = sharedata.query("csvdata")
-	pvpd = skynet.localname(".PVPCROSS")
+	pvpd = skynet.localname(".pvpcross")
 	-- 错误码特殊处理
 	-- todo
 	-- for key, value in pairs(csvdb["sys_codesCsv"]) do
 	-- 	_G[string.upper(value.varname)] = key
 	-- end
-
+	globalCsv = csvdb["GlobalDefineCsv"]
 	agent_util = require "services/agent_util"
 end)
@@ -28,7 +28,6 @@ function Diner:refreshDailyData(notify)
 	-- 委托
 	local entrust = self:getProperty("entrust")
-	local hangPass = self.owner:getProperty("hangPass")
 	local entrustB = self:getProperty("entrustB")
 	local had = {}
 	local pool = {}
@@ -41,11 +40,11 @@ function Diner:refreshDailyData(notify)
 					if data.show ~= "" then
 						-- 不填=默认刷出，1=达成前置任务，2=通关关卡
 						local showC = data.show:toArray(true, "=")
-						if showC[1] == 1 then
-							if not hangPass[showC[2]] then
+						if showC[1] == 2 then
+							if not self.owner:checkHangPass(showC[2]) then
 								show = false
 							end
-						elseif showC[1] == 2 then
+						elseif showC[1] == 1 then
 							if not entrustB[showC[2]] then
 								show = false
 							end
@@ -70,6 +69,18 @@ function Diner:refreshDailyData(notify)
 			had[entrust[i]] = 1
 		end
 	end
+
+	local guide = self.owner:getProperty("newerGuide")
+	local master, slave = string.match(guide,"(%d+)=(%d+)")
+	if tonumber(master) <= 26 then
+		entrust[1] = 1031
+		entrust[2] = 3
+	elseif tonumber(master) <= 29 then
+		local temp = entrust[1]
+		entrust[1] = 3
+		entrust[2] = temp
+	end
+
 	self:updateProperty({field = "entrust", value = entrust, notNotify = not notify})
 	-- 每日加速次数
@@ -301,9 +312,8 @@ end
 function Diner:getMaxSlots()
 	local slotCount = globalCsv.diner_sell_slots_init
-	local hangPass = self.owner:getProperty("hangPass")
 	for _, carbonId in ipairs(globalCsv.diner_sell_slots_unlock) do
-		if hangPass[carbonId] then
+		if self.owner:checkHangPass(carbonId) then
 			slotCount = slotCount + 1
 		end
 	end
@@ -18,6 +18,28 @@ function HeroPlugin.bind(Hero)
 		return math.min(#csvdb["unit_expCsv"], csvdb["unit_breakCsv"][self:getProperty("breakL")].levelLimit)
 	end
+
+	-- 纯% 的属性
+	local PercentAttr = {
+		crit = 6, 			-- 暴击
+		critHurt = 8, 		-- 暴伤
+		vampire = 9, 		-- 吸血
+		pierce = 10, 		-- 穿透
+	}
+	-- base 原, add 增加值 ，atype 增加类型(0 值 1%)
+	local function addAttr(base, add, atype, attrName)
+		base = base or 0
+		add = add or 0
+		if PercentAttr[attrName] then
+			atype = 0
+		end
+		if atype == 1 then
+			return base * add / 100
+		else
+			return add
+		end
+	end
+
 	--角色自身 = 初始 *（1+升级）*（1+突破）*（1+觉醒）+ 天赋升级 + 天赋阶段
 	function Hero:getBaseAttrs(params)
 		params = params or {}
@@ -53,7 +75,7 @@ function HeroPlugin.bind(Hero)
 		for _, attrName in pairs(AttsEnumEx) do
 			if talentAttrS[attrName] then
-				talentAttrS[attrName] = (unitData[attrName] or 0) * talentAttrS[attrName]
+				talentAttrS[attrName] = addAttr(unitData[attrName], talentAttrS[attrName], 1, attrName)
 			end
 		end
@@ -66,16 +88,16 @@ function HeroPlugin.bind(Hero)
 		local blData = csvdb["unit_breakCsv"][breakL]
 		local wData = csvdb["unit_wakeCsv"][wakeL]
 		for attr, value in pairs(attrs) do
-			attrs[attr] = attrs[attr] * (1 + (lData[attr .. "Level"] or 0) / 100)
-			* (1 + (blData[attr .. "Level"] or 0) / 100)
-			* (1 + (wData[attr .. "Level"] or 0) / 100) + (talentAttrS[attr] or 0)
+			attrs[attr] = attrs[attr] + addAttr(attrs[attr], lData[attr .. "Level"], 1, attr)
+			attrs[attr] = attrs[attr] + addAttr(attrs[attr], blData[attr .. "Level"], 1, attr)
+			attrs[attr] = attrs[attr] + addAttr(attrs[attr], wData[attr .. "Level"], 1, attr) + (talentAttrS[attr] or 0)
 		end
 		return attrs
 	end
-	--当前属性 = [ 角色属性值 + 基础装备（固定）+ 专属装备（固定）] * [ 1 + 基础装备（百分比） + 专属装备（百分比）]
+	--当前属性 = 角色属性值 * （1 + 装备套装（百分比） + 铭文套装（百分比））+ （装备（固定）+ 铭文（固定））
 	function Hero:getTotalAttrs(params)
 		params = params or {}
 		local attrs = self:getBaseAttrs()
@@ -83,13 +105,15 @@ function HeroPlugin.bind(Hero)
 		local equipAttrs = self:getRuneEquipAttrs()
 		for _, attName in pairs(AttsEnumEx) do
-			attrs[attName] = ((attrs[attName] or 0) + equipAttrs.value[attName]) * (1 + equipAttrs.percent[attName] / 100)
+			attrs[attName] = attrs[attName] or 0
+			attrs[attName] = attrs[attName] + addAttr(attrs[attName], equipAttrs.percent[attName], 1, attName)
+			attrs[attName] = attrs[attName] + addAttr(attrs[attName], equipAttrs.value[attName], 0, attName)
 		end
 		-- 羁绊加成
 	    if params.activeRelation then
-	        for k, v in pairs(AttsEnumEx) do
-	            attrs[v] = (attrs[v] or 0) * (1 + (params.activeRelation[v] or 0) / 100)
+	        for k, attName in pairs(AttsEnumEx) do
+				attrs[attName] = attrs[attName] + addAttr(attrs[attName], params.activeRelation[attName], 1, attName)
 	        end
 	    end
 		return attrs
@@ -137,20 +161,32 @@ function HeroPlugin.bind(Hero)
 			end
 		end
 		-- 零件效果
-		local suits = {}
-		for _, uid in pairs(self:getProperty("rune"):toNumMap()) do
-			if uid > 0 then
-				local rune = self.owner.runeBag[uid]
-				local buildData = csvdb["rune_buildCsv"][rune:getProperty("level")]
-				for k,v in pairs(rune:getProperty("attrs"):toNumMap()) do
-					attrs.value[AttsEnumEx[k]] = attrs.value[AttsEnumEx[k]] + (v / 10 * (1 + buildData.effect/100))  -- 零件的加成属性有特殊需求 填的是 10倍的值
-					
-				end
-				local csvData = csvdb["runeCsv"][rune:getProperty("type")][rune:getProperty("id")]
-				if not suits[csvData.suit] then suits[csvData.suit] = {} end
-				table.insert(suits[csvData.suit],csvData)
-			end
-		end
+	    local suits = {}
+	    for _, uid in pairs(self:getProperty("rune"):toNumMap()) do
+	        if uid > 0 then
+	            local rune = self.owner.runeBag[uid]
+	            local csvData = csvdb["runeCsv"][rune:getProperty("type")][rune:getProperty("id")]
+	            local runeRareData = csvdb["rune_rareCsv"][csvData.rarity]
+	            local buildData = csvdb["rune_buildCsv"][rune:getProperty("level")]
+	            for k, v in pairs(rune:getProperty("attrs"):toNumMap()) do
+	                local attName = AttsEnumEx[k]
+	                --零件的加成属性有特殊需求 填的是 10倍的值
+	                --rare的effect不影响 特殊属性
+
+	                --铭文单件普通属性=attr*(1+[rune_build表effect]/100*[rune_rare表effect]/100)
+					--铭文单件特殊属性=attr+[rune_build表effect]
+
+	                local effect = buildData[attName]
+	                if not PercentAttr[attName] then
+	                    effect = buildData[attName] * runeRareData.effect / 100
+	                end
+	                attrs.value[attName] = attrs.value[attName] + (v / 100) + addAttr(v / 100, effect, 1, attName)
+	            end
+	            
+	            if not suits[csvData.suit] then suits[csvData.suit] = {} end
+	            table.insert(suits[csvData.suit],csvData)
+	        end
+	    end
 		-- 零件套装效果
 		for suitId,runeDatas in pairs(suits) do
 			local suitCsv = csvdb["rune_suitCsv"][tonumber(suitId)]
@@ -214,6 +250,52 @@ function HeroPlugin.bind(Hero)
 		end
 		return {}
 	end
+
+	function Hero:getRunes()
+	    local rune = self:getProperty("rune")
+	    if not rune or rune == "" then
+	        rune = "1=0 2=0 3=0 4=0 5=0 6=0"
+	    end
+	    local result = rune:toNumMap()
+	    for i = 1, 6 do
+	        if not result[i] then
+	            result[i] = 0
+	        end
+	    end
+	    return result
+	end
+
+	-- 101 冒险战斗被动技
+	-- 102 挂机战斗被动技
+	function Hero:getRuneSkill(skillType)
+	    local suits = {}
+	    for _,uid in pairs(self:getRunes()) do
+	        if uid > 0 then
+	            local runeData = self.owner.runeBag[uid]
+	            if not runeData then return  end
+	            local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")]
+	            if not suits[csvData.suit] then suits[csvData.suit] = {} end
+	            table.insert(suits[csvData.suit],csvData)
+	        end
+	    end
+
+	    for suitId,runes in pairs(suits) do
+	        local suitCsv = csvdb["rune_suitCsv"][tonumber(suitId)]
+	        if not suitCsv then return  end
+	        local effects = suitCsv.effect:toTableArray(true)
+	        local count = #runes
+	        if count >= 2 and effects[1][1] == skillType then
+	            return effects[1][2]
+	        end
+	        if count >= 4 and effects[2][1] == skillType then
+	            return effects[2][2]
+	        end
+	        if count >= 6 and effects[3][1] == skillType then
+	            return effects[3][2]
+	        end
+	    end
+	    return
+	end
 end
@@ -4,7 +4,6 @@ local RoleLog = import(&quot;.RoleLog&quot;)  --日志相关
 local RolePlugin = import(".RolePlugin")  --基础功能
 local RoleTimeReset = import(".RoleTimeReset")  --时间重置相关
 local RoleTask = import(".RoleTask") --角色任务
-local RoleActivity = import(".RoleActivity") --活动相关
 local RoleChangeStruct = import(".RoleChangeStruct") --角色数据额结构更改
 local RolePvp = import(".RolePvp")  -- pvp
 local RoleCross = import(".RoleCross") -- 跨服务请求相关
@@ -13,7 +12,6 @@ RoleLog.bind(Role)
 RolePlugin.bind(Role)
 RoleTimeReset.bind(Role)
 RoleTask.bind(Role)
-RoleActivity.bind(Role)
 RoleChangeStruct.bind(Role)
 RolePvp.bind(Role)
 RoleCross.bind(Role)
@@ -88,6 +86,7 @@ Role.schema = {
 	--挂机相关
 	hangPass 			= {"table", {}}, -- 挂机通过的最大关卡
+	hangGift			= {"table", {}}, -- 挂机奖励 {id = 1}
 	hangTeam 			= {"table", {}}, -- 挂机队伍
 	hangTS				= {"table", {}}, -- 挂机队伍他人可读的队伍信息
 	hangTB 				= {"table", {}}, -- 挂机队伍他人可用的战斗信息mao
@@ -144,8 +143,13 @@ Role.schema = {
 	emailSync			= {"number", 0}, -- 已经同步到的邮件Id
-	repayHero			= {"number", 0}, -- 超级招募 回馈
+	-- repayHero			= {"number", 0}, -- 超级招募 回馈
 	floorHero			= {"table", {}}, -- 招募保底 -- {[poolId] = count}
+	ssrUp				= {"table", {}}, -- ssr up -- {[poolId] = count}
+	newerDraw			= {"table", {}}, -- 新手池子 {N, 1} 抽了多少次, 是否出了ssr
+
+	sudoku				= {"table", {}}, -- 九宫格   {[-1] = 1, task = {[1] = {}, [2] = {}}}} -- [-1] 阶段 如果为 -1 关闭(都做完了), task 当前阶段任务进度， reward  连串奖励领取情况
+	sign 				= {"table", {}}, -- 签到记录 {[1] = 20181029}
 }
@@ -192,8 +196,39 @@ function Role:notifyUpdateProperties(params)
 	SendPacket(actionCodes.Role_updateProperties, MsgPack.pack(params))
 end
+local mapToList
+mapToList = function(map)
+	local result = {}
+	if type(map) == "table" then
+		for k, v in pairs(map) do
+			for _, _one in ipairs(mapToList(v)) do
+				table.insert(result, {k, table.unpack(_one)})
+			end
+		end
+	else
+		table.insert(result, {map})
+	end
+	return result
+end
+
+function Role:changeMapUpdates(params, notNotify)
+	local changes = {}
+	for _, one in ipairs(mapToList(params)) do
+		local ftype = table.remove(one, 1)
+		local value = table.remove(one, #one)
+		if ftype and value and #one > 0 then
+			table.insert(changes, {type = ftype, field = #one > 1 and one or one[1], value = value})
+		else
+			print("ERROR: changeMapUpdates")
+			dump(params)
+		end
+	end
+	self:changeUpdates(changes, notNotify)
+end
+
 -- 某些字段 更新改变量 改变量的定义由字段自身决定 {{type = ""}, }
 function Role:changeUpdates(params, notNotify)
+	local needSetProperty = {}
 	local changeUpdateFunc = {
 		-- ["loveStatus"] = function(info)
 		-- 	self:setProperty("loveStatus", self:getProperty("loveStatus"):setv(info["field"], info["value"]))
@@ -219,7 +254,7 @@ function Role:changeUpdates(params, notNotify)
 			else
 				curValue[info["field"]] = info["value"]
 			end
-			self:setProperty(fieldType)
+			needSetProperty[fieldType] = 1
 			return {type = fieldType, field = info["field"], value = info["value"]}
 		end,
 		["onlyToC"] = function(info)
@@ -238,6 +273,10 @@ function Role:changeUpdates(params, notNotify)
 			table.insert(updates, changeUpdateFunc["tableCommon"](one["type"], one))
 		end
 	end
+
+	for fieldType, _ in pairs(needSetProperty) do
+		self:setProperty(fieldType)
+	end
 	if not notNotify and next(updates) then
 		SendPacket(actionCodes.Role_changeUpdate, MsgPack.pack(updates))
 	end
@@ -283,6 +322,7 @@ function Role:data()
 		advSup = self:getProperty("advSup"),
 		hangPass = self:getProperty("hangPass"),
+		hangGift = self:getProperty("hangGift"),
 		hangTeam = self:getProperty("hangTeam"),
 		hangInfo = self:getProperty("hangInfo"),
 		hangBag = self:getProperty("hangBag"),
@@ -314,8 +354,11 @@ function Role:data()
 		dinerS = self:getProperty("dinerS"),
 		rmbC = self:getProperty("rmbC"),
-		repayHero = self:getProperty("repayHero"),
-		floorHero = self:getProperty("floorHero"),
+		-- repayHero = self:getProperty("repayHero"),
+		newerDraw = self:getProperty("newerDraw"),
+
+		sudoku = self:getProperty("sudoku"),
+		sign = self:getProperty("sign"),
 	}
 end
+local Activity = class("Activity", require("shared.ModelBase"))
-local RoleActivity = {}
+Activity.ActivityType = {
-function RoleActivity.bind(Role)
+}
+local function checkActivityType(activityType)
+	if type(activityType) == "string" then
+		activityType = Activity.ActivityType[activityType]
+	end
+	return activityType
+end
+
+
+function Activity:ctor(properties)
+	Activity.super.ctor(self, properties)
+
+	self.open = {}
+
+end
+Activity.schema = {
+	_1		= {"table", {}},
+}
+function Activity:data()
+	return {
+		_1 = self:getProperty("_1"),
+	}
 end
-return RoleActivity
 \ No newline at end of file
+
+
+return Activity
 \ No newline at end of file
@@ -144,19 +144,17 @@ RoleCross.bind = function (Role)
 		-- fb
 		local carbonId = initData.fb
-		local passCarbon = self:getProperty("hangPass")
 		local addPre 
 		addPre = function(carbonId)
 			local carbonData = csvdb["idle_battleCsv"][carbonId]
 			for _, pre in ipairs(carbonData.prepose:toArray(true, "=")) do
-				passCarbon[pre] = 1
+				self:checkHangPass(pre)
 				self:checkTaskEnter("HangPass", {id = pre})
 				addPre(pre)
 			end
 		end
-		passCarbon[carbonId] = 1
+		self:checkHangPass(carbonId)
 		addPre(carbonId)
-		self:updateProperty({field = "hangPass", value = passCarbon})
 		self:checkTaskEnter("HangPass", {id = carbonId})
 		-- talent
@@ -32,6 +32,7 @@ local LogType = {
 	diner_action = "common",
 	tower_action = "common",
 	gm_action = "common",
+	act_action = "common",
 }
 -- 如要修改 要提前修改 _template mapping -- 对应 mapping 为 gamelog-*
@@ -401,10 +401,18 @@ function RolePlugin.bind(Role)
 		redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
+		local wakeL = 1
+		if unitData.rare == 3 then
+			wakeL = 2
+		elseif unitData.rare == 4 then
+			wakeL = 3
+		end
+
 		local heroInfo = {
 			key = string.format(R_HERO, roleId, heroId),
 			id 	= heroId,
 			type= heroType,
+			wakeL = wakeL,
 		}
 		local newHero = require("models.Hero").new(heroInfo)
@@ -837,8 +845,7 @@ function RolePlugin.bind(Role)
 		local data = csvdb["guide_unlockCsv"][func]
 		if not data then return true end  -- 没有就是解锁了
-		local hangPass = self:getProperty("hangPass")
-		if hangPass[data.carbonId] then 
+		if self:checkHangPass(data.carbonId) then 
 			return true
 		else
 			return false
@@ -916,25 +923,10 @@ function RolePlugin.bind(Role)
 		end
 	end
-	function Role:advChapterIsOpen(chapterId, layer)
-		layer = layer or 1
-		local exlayer = math.floor((layer - 1)  / 10) * 10 + 1
-
-		if exlayer == 1 then --第一层判断前置
-			local advPass = self:getProperty("advPass")
-			local chapterData = csvdb["adv_chapterCsv"][chapterId]
-			for id, l in pairs(chapterData.prepose:toNumMap()) do
-				if (advPass[id] or 0) < l then return false end -- 前置
-			end
-			return true
-		end
-
-		local unlock = {}
-		for func , data in pairs(csvdb["unlockCsv"]) do
-			if data.type == 1 and chapterId == data.value1 and exlayer == data.value2 then
-				return self:isFuncOpen(func)
-			end
-		end
+	function Role:advChapterIsOpen(chapterId)
+		local chapterData = csvdb["adv_chapterCsv"][chapterId]
+		if chapterData.prepose ~= 0 and not self:checkHangPass(chapterData.prepose) then return false end
+		return true
 	end
 	function Role:advEventOpenStatus()
@@ -995,7 +987,7 @@ function RolePlugin.bind(Role)
 		for id, status in pairs(advEAchiev[self.advElChapter] or {}) do
 			if status == -1 then
 				local achvData = csvdb["adv_achievementCsv"][id]
-				if achvData.support ~= 0 then
+				if achvData and achvData.support ~= 0 then
 					effect[achvData.support] = 1
 				end
 			end
@@ -1198,8 +1190,10 @@ function RolePlugin.bind(Role)
 			end
 			info.type = hero:getProperty("type")
 			info.level = hero:getProperty("level")
+			info.wakeL = hero:getProperty("wakeL")
 			info.blockLevel = hero:getSkillLevel(4)
 			info.specialLevel = hero:getSkillLevel(1)
+			info.runeSkill = hero:getRuneSkill(102)
 			teamInfo.heros[slot] = info
 		end
 		for slot, id in pairs(team.supports or {}) do
@@ -1267,9 +1261,11 @@ function RolePlugin.bind(Role)
 		local pvpTSH, pvpTBH, pvpTBVH = {}, {}, {}
 		for i = 1, 3 do
-			pvpTSH[i] = self:getTeamHerosInfo(team[i].heros)
-			pvpTBH[i] = self:getTeamBattleInfo(team[i])
-			pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
+			if team[i] then
+				pvpTSH[i] = self:getTeamHerosInfo(team[i].heros)
+				pvpTBH[i] = self:getTeamBattleInfo(team[i])
+				pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
+			end
 		end
 		self:setProperties({
@@ -1363,6 +1359,21 @@ function RolePlugin.bind(Role)
 		end
 	end
+	function Role:checkHangPass(carbonId)
+		local hangPass = self:getProperty("hangPass")
+		local diff = math.floor(carbonId / 10000)
+		return (hangPass[diff] or 0) >= carbonId
+	end
+
+	function Role:hangFinish(carbonId)
+		local hangPass = self:getProperty("hangPass")
+		local diff = math.floor(carbonId / 10000)
+		if (hangPass[diff] or 0) < carbonId then
+			hangPass[diff] = carbonId
+			self:updateProperty({field = "hangPass", value = hangPass})
+		end
+	end
+
 	function Role:getAdvRankKey()
 		local round = self:getProperty("advElS")
 		local idx = 1
@@ -59,11 +59,12 @@ local TaskType = {
 	FoodSellGold = 607, 		-- 贩卖获得齿轮		- count	
 	DinerPopular = 608,			-- 人气值			- count
 	DinerLevelUp = 609,			-- 餐厅升级			- level type
-	DinerTalentUp = 610,		-- 天赋升级			- type
+	DinerTalentUp = 610,		-- 天赋升级			- type level
 	-- 车厢相关
 	PotionMake = 701, 			-- 营养剂制作			- id	count
 	OpenBox = 702,				-- 拆解时间箱			- id
+	SupportSkill = 703, 		-- 后勤支援技升级		- id   level
 	-- pvp相关
@@ -87,8 +88,8 @@ local TaskType = {
 	ShopAll = 1013,				-- 在任意商店购买 	
 }
-local function f(field)
-	return {type = "field", value = field}
+local function f(field, func)
+	return {type = "field", value = field, func = func}
 end
 -- 剧情任务监听
@@ -183,11 +184,33 @@ local AchievListener = {
 	}
 }
+local SudokuListerer = {
+	func = "checkSudokuTask",
+	listen = {
+		[TaskType.HangPass] = {{1, 1, f("id")}},
+		[TaskType.DrawHero] = {{4, f("count")}},
+		[TaskType.HeroLevelUp] = {{5, f("level")}},
+		[TaskType.Wake] = {{6, f("wakeL")}},
+		[TaskType.AddFriend] = {{7, f("count")}},
+		[TaskType.GetFriendP] = {{8, f("count")}},
+		[TaskType.AdvStart] = {{9, 1}},
+		[TaskType.AdvDraw] = {{10, f("count")}},
+		[TaskType.DinerLevelUp] = {{11, f("level"), f("type")}},
+		[TaskType.FoodSell] = {{12, f("count")}},
+		[TaskType.OpenBox] = {{13, 1}},
+		[TaskType.TowerPass] = {{14, f("level")}},
+		[TaskType.PvpWin] = {{15, 1}},
+		[TaskType.DinerTalentUp] = {{16, f("level"), f("type")}},
+		[TaskType.RuneUp] = {{17, 1}},
+	}
+}
+
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
 	AchievListener,
+	SudokuListerer,
 }
 local RoleTask = {}
@@ -207,7 +230,11 @@ function RoleTask.bind(Role)
 					for __, v in ipairs(vs) do
 						if type(v) == "table" and v.type then
 							if v.type == "field" then
-								table.insert(pms, params[v.value])
+								local value = params[v.value]
+								if v.func then
+									value = v.func(value)
+								end
+								table.insert(pms, value)
 							else
 								table.insert(pms, v)
 							end
@@ -442,6 +469,54 @@ function RoleTask.bind(Role)
 		end
 	end
+	-- 九宫格任务 
+	function Role:checkSudokuTask(notNotify, stype, count, cond)
+		local change = false
+		local sudoku = self:getProperty("sudoku")
+
+		local curPhase = sudoku[-1] or 1
+		if curPhase == -1 then return end
+
+		local IsFindMax = {
+			[5] = true,
+			[6] = true,
+			[7] = true,
+			[11] = true,
+			[14] = true,
+			[16] = true,
+		}
+
+		sudoku.task = sudoku.task or {}
+		for pause, guide_sudokuData in pairs(csvdb["guide_sudokuCsv"]) do
+			if pause >= curPhase then
+				sudoku.task[pause] = sudoku.task[pause] or {}
+				for id , sudikuData in pairs(guide_sudokuData) do
+					local curStatus = sudoku.task[pause][id] or 0
+
+					if curStatus ~= -1 and sudikuData.type == stype and (sudikuData.unlock == 0 or self:checkHangPass(sudikuData.unlock)) then 
+						if IsFindMax[sudikuData.type] then -- 最大值
+							if sudikuData.con2 == 0 or sudikuData.con2 == cond then
+								if (count or 0) > curStatus then
+									change = true
+									sudoku.task[pause][id] = count
+								end
+							end
+						else --通用增加
+							if sudikuData.con2 == 0 or sudikuData.con2 == cond then 
+								change = true
+								sudoku.task[pause][id] = curStatus + (count or 1)
+							end
+						end
+					end
+				end
+			end
+		end
+
+		if change then
+			self:updateProperty({field = "sudoku", value = sudoku, notNotify = notNotify})
+		end
+	end
+
 end
 return RoleTask
 \ No newline at end of file
@@ -63,14 +63,16 @@ end
 -- types 类型=权重"2=100 3=100 4=100"  value最大值=最小值 "50=100 50=100 100=200"
 local function getRandomValue(types,values)
-	local typeMap = types:toNumMap()
+	local typeMap = types:toArray()
 	local valueArry = values:toArray()
-	if table.nums(typeMap) ~= #valueArry then return nil end
+	if #typeMap ~= #valueArry then return nil end
+
 	local typ, value
 	local typTab = {}
-	for t,w in pairs(typeMap) do
-		table.insert(typTab,{t=t,w=w})
+	for _,w in ipairs(typeMap) do
+		w = w:toArray(true, "=")
+		table.insert(typTab,{t=w[1],w=w[2]})
 	end
 	local tk = math.randWeight(typTab, "w")
@@ -89,7 +91,7 @@ function Rune:generateAttrs()
 	local attrs = ""
 	local typ, value = getRandomValue(runeData.attr1,runeData.range1)
 	attrs = attrs:setv(typ, value)
-	local typ, value = getRandomValue(runeData.attr1,runeData.range1)
+	local typ, value = getRandomValue(runeData.attr2,runeData.range2) 
 	attrs = attrs:setv(typ, value)
 	self:setProperty("attrs",attrs)
 end
@@ -11,7 +11,7 @@ local string_format = string.format
 local poold
+-- agent过期时间 5分钟
 local AGENT_EXPIRE_TIME				= 300
 local _M = {
@@ -35,12 +35,13 @@ if mode == &quot;sub&quot; then
 			skynet.ret(skynet.pack(f(...)))
 		end)
-		skynet.register(string.format(".CHATED%d", id))
+		skynet.register(string.format(".chated%d", id))
 	end)
 else
 	skynet.start(function()
-		local ok, forbidNames = pcall(require, "csvdata.forbid_chat")
-		if not ok then forbidNames = {} end
+		local csvdb = require "shared.csvdata"
+		local forbidNames = csvdb["forbid_chatCsv"]
+		if not forbidNames then forbidNames = {} end
 		local words = {}
 		for _, data in ipairs(forbidNames) do
@@ -52,5 +53,6 @@ else
 		for i = 1, 5 do
 			skynet.newservice(SERVICE_NAME, "sub", i, d)
 		end
+		skynet.exit()
 	end)
 end
@@ -1,115 +0,0 @@
-local sharedata = require "skynet.sharedata"
-local skynet = require "skynet"
-local lfs = require "lfs"
-local redisproxy = require "shared.redisproxy"
-require "shared.init"
-require "utils.init"
-require "csvdata.init"
-require "skynet.manager"
-require "RedisKeys"
-
--- local csvdb = {}
-
-local function formatFileName(filename)
-	filename = string.trim(filename)
-	local basename = filename:match("([^/]+)%.lua$")
-	if not basename then return end
-	local loadname = filename:match("^src/([^.]+)%.lua$")
-	loadname = loadname:gsub('/', '.')
-	return basename, loadname
-end
-
-local function travCsv(rootPath, pathes)
-	pathes = pathes or {}
-	local modified = false
-	local ok, files, iter = pcall(lfs.dir, rootPath)
-	if not ok then return modified end
-	for entry in files, iter do
-		-- 过滤 . 开始的字符串包括 . .. .git .开头的文件名
-		if string.byte(entry, 1) ~= 46 then
-			local pathfile = rootPath .. '/' .. entry
-			local attrs = lfs.attributes(pathfile)
-			if attrs.mode == 'directory' then
-				modified = travCsv(pathfile, pathes) or modified
-			else
-				local basename, loadname = formatFileName(pathfile)
-				if basename then
-					if tonum(pathes[loadname]) < attrs.modification then
-						modified = true
-						pathes[loadname] = attrs.modification
-					end
-					if basename == "init" or basename == "init_adv" then
-						require(loadname)
-					end
-				end
-			end
-		end
-	end
-	return modified
-end
-
--- 每分钟检查是否有更改
-local file2timeMap = {}
-local function handle_timeout()
-	if travCsv("src/csvdata", file2timeMap) then
-		sharedata.update("csvdata", csvdb)
-	end
-	skynet.timeout(100*5, handle_timeout)
-end
-
--- 重新加载csvdb
-
-
-local CMD = {}
-
-function CMD.reload(code)
-	csvdb = csvdb or {}
-	
-	local ok, func = pcall(load, code)
-	if ok then
-		ok = pcall(func)
-	end
-	if not ok then
-		skynet.error("reload_csvdata error by code " .. code)
-		return 'error'
-	end
-
-	sharedata.update("csvdata", csvdb)
-	return 'ok'
-end
-
---更新已经存在的
-function CMD.hotfix(fieldss)
-	csvdb = csvdb or {}
-	for _, fields in ipairs(fieldss) do
-		if #fields >= 3 and (type(fields[#fields]) == 'number' or type(fields[#fields]) == 'string') then
-			local temp = csvdb
-			local ok = false
-			for i = 1, #fields - 1 do
-				if type(temp) ~= 'table' then break end
-				if type(fields[i]) ~= 'number' and type(fields[i]) ~= 'string' then break end
-				if i == #fields - 1 then
-					if type(temp[fields[i]]) ~= 'number' and type(temp[fields[i]]) ~= 'string' then break end
-					temp[fields[i]] = fields[#fields]
-				else
-					temp = temp[fields[i]]
-				end
-			end
-		end
-	end
-	sharedata.update("csvdata", csvdb)
-	return 'ok'
-end
-
-skynet.start(function ()
-	travCsv("src/csvdata", file2timeMap)
-	sharedata.new("csvdata", csvdb)
-	-- handle_timeout()
-
-	skynet.dispatch("lua", function(_, _, command, ...)
-		local f = CMD[command]
-		skynet.ret(skynet.pack(f(...)))
-	end)
-
-	skynet.register(".CSVDATA")
-end)
-require "csvdata.init"
 require "shared.init"
 require "utils.init"
 require "GlobalVar"
@@ -9,7 +8,6 @@ require &quot;skynet.manager&quot;
 skynet = require "skynet"
 redisproxy = require("shared.redisproxy")
-globalCsv = require "csvdata/GlobalDefine"
 SendPacket = function ( ... ) end
@@ -36,7 +34,7 @@ local steps = {
 }
 skynet.start(function ()
-	redisd = skynet.localname(".REDIS")
+	redisd = skynet.localname(".redis")
 	redisproxy = require("shared.redisproxy")
@@ -46,6 +44,8 @@ skynet.start(function ()
 		skynet.exit()
 		return
 	end
+	csvdb = require "shared.csvdata"
+	globalCsv = csvdb["GlobalDefineCsv"]
 	for _, action in ipairs(steps) do
 		print(action.desc .. "start ...")
@@ -129,8 +129,8 @@ local function __init__()
 			end
 		end
 	end)
-	redisd = skynet.localname(".REDIS")
-	skynet.register(".GLOBALD")
+	redisd = skynet.localname(".redis")
+	skynet.register(".globald")
 end
@@ -8,9 +8,8 @@ skynet = require &quot;skynet&quot;
 redisproxy = require "shared.redisproxy"
 netpack = require "skynet.netpack"
 datacenter = require "skynet.datacenter"
-sharedata = require "skynet.sharedata"
 mcast_util = require "services/mcast_util"
-globalCsv = require "csvdata/GlobalDefine"
+csvdb = require "shared.csvdata"
 local socket = require "skynet.socket"
@@ -33,7 +32,7 @@ local string = string
 skynet.register_protocol {
 	name = "role",
-	id = 13,
+	id = 101,
 	pack = skynet.pack,
 	unpack = skynet.unpack,
 }
@@ -54,8 +53,12 @@ end
 local CMD = require "actions.HttpAction"
 local function start()
-	redisd = skynet.localname(".REDIS")
-	csvdb = sharedata.query("csvdata")
+	redisd = skynet.localname(".redis")
+	globalCsv = csvdb["GlobalDefineCsv"]
+	
+	if tonumber(skynet.getenv "logd") == 1 then
+		logd = skynet.localname(".log")
+	end
 	local listen_socket = socket.listen("0.0.0.0", port)
 	print("Listen web port " .. port)
@@ -83,7 +86,7 @@ local function start()
 				if not content then
 					code = 404
 				end
-				response(id, code, content)
+				response(id, code, tostring(content))
 			end
 		else
 			if url == sockethelper.socket_error then
@@ -108,7 +108,7 @@ local function __init__()
 	end)
 	cs = queue()
-	skynet.register(".LOGD")
+	skynet.register(".log")
 end
 skynet.start(__init__)
@@ -35,12 +35,13 @@ if mode == &quot;sub&quot; then
 			skynet.ret(skynet.pack(f(...)))
 		end)
-		skynet.register(string.format(".NAMED%d", id))
+		skynet.register(string.format(".named%d", id))
 	end)
 else
 	skynet.start(function()
-		local ok, forbidNames = pcall(require, "csvdata.forbid_name")
-		if not ok then forbidNames = {} end
+		local csvdb = require "shared.csvdata"
+		local forbidNames = csvdb["forbid_nameCsv"]
+		if not forbidNames then forbidNames = {} end
 		local words = {}
 		for _, data in ipairs(forbidNames) do
@@ -52,5 +53,6 @@ else
 		for i = 1, 5 do
 			skynet.newservice(SERVICE_NAME, "sub", i, d)
 		end
+		skynet.exit()
 	end)
 end
@@ -3,13 +3,12 @@ local json = require(&quot;shared.json&quot;)
 redisproxy = require("shared.redisproxy")
 local cluster = require "skynet.cluster"
 local serverId = tonumber(skynet.getenv("servId"))
-local sharedata = require "skynet.sharedata"
 datacenter = require "skynet.datacenter"
+csvdb = require "shared.csvdata"
 require "shared.init"
 require "utils.init"
 require "RedisKeys"
 require "skynet.manager"
-globalCsv = require "csvdata/GlobalDefine"
 require "GlobalVar"
@@ -30,7 +29,7 @@ end
 skynet.register_protocol {
 	name = "role",
-	id = 13,
+	id = 101,
 	pack = skynet.pack,
 	unpack = skynet.unpack,
 	dispatch = function(session, address, submethod, ...)
@@ -294,7 +293,9 @@ end
 ------------------------------------------------------
 function CMD.start()
-	redisd = skynet.localname(".REDIS")
+	redisd = skynet.localname(".redis")
+	globalCsv = csvdb["GlobalDefineCsv"]
+	
 	pvpInfo = require("models.Pvpd").new({key = "cross:pvpInfo"})
 	pvpInfo:load()
 end
@@ -308,9 +309,8 @@ local function __init__()
 			skynet.ret(skynet.pack(f(...)))
 		end
 	end)
-	csvdb = sharedata.query("csvdata")
-	skynet.register(".PVPCROSS")
+	skynet.register(".pvpcross")
 end
 skynet.start(__init__)
@@ -24,5 +24,5 @@ skynet.start(function()
 			skynet.ret(skynet.pack(db[string.lower(cmd)](db, ...)))
 		end
 	end)
-	skynet.register ".REDIS"
+	skynet.register ".redis"
 end)
 \ No newline at end of file
@@ -1,143 +0,0 @@
-require "shared.init"
-require "utils.init"
-require "ProtocolCode"
-require "GlobalVar"
-require "RedisKeys"
-require "skynet.manager"
-
-local sharedata = require "sharedata"
-local redisproxy = require "shared.redisproxy"
-local datacenter = require "datacenter"
-local queue = require "skynet.queue"
-
-skynet = require "skynet"
-globalCsv = require "csvdata.GlobalDefine"
-
-local table_pack = table.pack
-local table_unpack = table.unpack
-local string_format = string.format
-local pairs = pairs
-local ipairs = ipairs
-local tonumber = tonumber
-
--- 维护在线状态
-
-local unionInfo, CMD, cs = {}, {}
-
-skynet.register_protocol {
-	name = "role",
-	id = 13,
-	pack = skynet.pack,
-	unpack = skynet.unpack,
-}
-
-local function handle_timeout()
-	local now = skynet.timex()
-	unionInfo:onTimer(now)
-	skynet.timeout(100, handle_timeout)
-end
-
---[[
-getProperties({"field1", "field2", ...})
-return: {field1 = value1, field2 = value2, ...}
--------
-setProperties({field1 = value1, field2 = value2, ...})
-]]
-function rpcRole(roleId, funcName, ...)
-	if not unionInfo.members[roleId] then return end
-	local serv = unionInfo.members[roleId].serv
-	if serv then
-		if funcName == "getProperties" then
-			return skynet.call(serv, "role", funcName, table_unpack(...))
-		else
-			return skynet.call(serv, "role", funcName, ...)
-		end
-	else
-		local rediskey = string_format("role:%d", roleId)
-		if funcName == "getProperty" then
-			return redisproxy:hget(rediskey, ...)
-		elseif funcName == "setProperty" then
-			return redisproxy:hset(rediskey, ...)
-		elseif funcName == "getProperties" then
-			local sRole = require "models.Role"
-			local fields = table_pack(...)
-			local rets = redisproxy:hmget(rediskey, table_unpack(fields, 1, fields.n))
-			local result = {}
-			for i=1, fields.n do
-				local typ = sRole.schema[fields[i]][1]
-			    local def = sRole.schema[fields[i]][2]
-			    if typ == "number" then
-			    	result[fields[i]] = tonumber(rets[i] or def)
-				else
-			    	result[fields[i]] = rets[i]
-			    end
-			end
-			return result
-		elseif funcName == "setProperties" then
-			local fields = ...
-			local params = {}
-			for field, value in pairs(fields) do
-				params[#params+1] = field
-				params[#params+1] = value
-			end
-			return redisproxy:hmset(rediskey, table_unpack(params))
-		end
-	end
-end
-
--- 加载联盟数据
-function CMD.load(unionId)
-	unionInfo = require("models.Union").new({key = UNION_KEY:format(unionId)})
-	unionInfo:load()
-	unionInfo:loadMembers()
-end
-
--- 创建一个联盟
-function CMD.new(roleId)
-	local unionId = redisproxy:hincrby("autoincrement_set", "union", 1)
-	unionInfo = require("models.Union").new({
-		key = UNION_KEY:format(unionId),
-		master = roleId
-	})
-	unionInfo:create()
-	unionInfo:addMember(roleId, true)
-	redisproxy:sadd(UNION_SET, unionId)
-	return unionId
-end
-
--- 登录/登出 需要向联盟服务报备
-function CMD.sign(cmd, roleId, serv)
-    if not unionInfo.members[roleId] then return end
-    if cmd == "login" then
-        unionInfo.members[roleId].serv = serv
-    elseif cmd == "logout" then
-        unionInfo.members[roleId].serv = nil
-    end
-end
-
-local function __init__()
-	skynet.dispatch("lua", function(_, _, command, ...)
-		cs(function (...)
-			if CMD[command] then
-				skynet.ret(skynet.pack(CMD[command](...)))
-				return
-			else
-				if unionInfo and unionInfo[submethod] then
-					if command == 'dismiss' then
-						unionInfo:dismiss(...)
-						return
-					end
-					local result = unionInfo[submethod](unionInfo, ...)
-					skynet.ret(skynet.pack(result))
-					return
-				end
-			end
-			skynet.error("uniond commond error cmd=", command)
-		end)
-	end)
-	skynet.register("UNIOND")
-	csvdb = sharedata.query("csvdata")
-	cs = queue()
-end
-
-skynet.start(__init__)
 \ No newline at end of file
@@ -9,6 +9,7 @@ local agent_ctrl = require &quot;services.agent_ctrl&quot;
 local xxtea = require "xxtea"
 local mc = require "skynet.multicast"
 local cluster = require "skynet.cluster"
+local csvdata = require "shared.csvdata"
 require "ProtocolCode"
 require "GlobalVar"
@@ -50,7 +51,7 @@ local use_logd = tonumber(skynet.getenv &quot;logd&quot;)
 -- @desc: agent状态定时检测
 function check_agent_status()
 	pcall(agent_ctrl.check_agent_status, agent_ctrl)
-	skynet.timeout(1, check_agent_status)
+	skynet.timeout(100, check_agent_status)
 end
 -- 创建world以及union channel 用于广播
@@ -107,12 +108,12 @@ skynet.start(function()
 			skynet.ret(skynet.pack(f(subcmd, ...)))
 		end
 	end)
-	skynet.register ".WATCHDOG"
+	skynet.register ".watchdog"
 	-- 数据库服务
 	redisd = skynet.newservice("services/redisd")
-	-- load all csv data
-	skynet.newservice("services/csvdatad")
+	-- 提前加载好
+	csvdata.init()
 	print("launch csvdatad ...")
 	-- 日志服务
@@ -0,0 +1,183 @@
+-- 对sharetable 的一层封装 实现热更新
+
+local skynet = require "skynet"
+local service = require "skynet.service"
+local sharetable = require "skynet.sharetable"
+
+local function sharetable_service()
+	local skynet = require "skynet"
+	local sharetable = require "skynet.sharetable"
+
+	local files = {}	-- filename
+	local csvdata = {}
+
+	local initfile = {
+		["src/csvdata/init.lua"] = {},
+		["src/csvdata/init_adv.lua"] = {},
+	}
+
+	function csvdata.query(source, filename)
+		files[filename] = files[filename] or {}
+		files[filename][source] = 1
+	end
+
+	function csvdata.close(source)
+		for filename, info in pairs(files) do
+			info[source] = nil
+		end
+	end
+
+	function csvdata.realName(file)
+		if string.match(file, "Csv$") then
+			if initfile["src/csvdata/init.lua"] and initfile["src/csvdata/init.lua"][file] then
+				file = initfile["src/csvdata/init.lua"][file]
+			elseif initfile["src/csvdata/init_adv.lua"] and initfile["src/csvdata/init_adv.lua"][file] then
+				file = initfile["src/csvdata/init_adv.lua"][file]
+			end
+			file = "src/" .. file .. ".lua"
+		end
+		return file
+	end
+
+	function csvdata.hotfix(_, ...)
+		local now = skynet.timex()
+
+		local filenames = {...}
+
+		local needHotfix = {}
+		for _, filename in ipairs(filenames) do
+			-- 更新下
+			skynet.error(string.format("hotfix_csvdata time: %s, file: %s", now, filename))
+
+			if initfile[filename] then
+				sharetable.loadfile(filename)
+				sharetable.update(filename)
+			else
+				sharetable.loadfile(csvdata.realName(filename))
+			end
+
+			if files[filename] then
+				for source, _ in pairs(files[filename]) do
+					needHotfix[source] = needHotfix[source] or {}
+					table.insert(needHotfix[source], filename)
+				end
+			end
+		end
+
+		for source, files in pairs(needHotfix) do
+			skynet.send(source, "csvdata", "hotfix", table.unpack(files))
+		end
+	end
+
+	skynet.dispatch("lua", function(_,source,cmd,...)
+		skynet.ignoreret()
+		csvdata[cmd](source,...)
+	end)
+
+	skynet.register_protocol {
+		name = "csvdata",
+		id = 102,
+		pack = skynet.pack,
+		unpack = skynet.unpack,
+	}
+
+	-- 初始化csvdata
+	skynet.start(function()
+		for file, _ in pairs(initfile) do
+			sharetable.loadfile(file)
+			local init = sharetable.query(file)
+			if not init then
+				error("csvdata load init file error " .. file)
+				return
+			end
+			initfile[file] = init
+			for _, one in pairs(init) do
+				sharetable.loadfile("src/" .. one .. ".lua")
+			end
+		end
+	end)
+end
+
+
+local cache = {}
+local csvdata
+
+local function load_csvdata(t, key)
+	if key == "address" then
+		t.address = service.new("csvdata", sharetable_service)
+		return t.address
+	else
+		if cache[key] then return cache[key] end
+
+		local realName = csvdata.realName(key)
+
+		local tab = sharetable.query(realName)
+		if not tab then
+			error("dont have csvdata :  " .. realName)
+			return
+		end
+		cache[key] = tab
+		-- 增加引用
+		skynet.send(csvdata.address, "lua", "query", key)
+		return tab
+	end
+end
+
+local function close_hotfix(t)
+	local addr = rawget(t, "address")
+	if addr then
+		skynet.send(addr, "lua", "close")
+	end
+end
+
+csvdata = setmetatable ( {} , {
+	__index = load_csvdata,
+	__gc = close_hotfix,
+})
+
+function csvdata.init()
+	return csvdata.address
+end
+
+function csvdata.hotfix(...)
+	skynet.send(csvdata.address, "lua", "hotfix", ...)
+end
+
+function csvdata.realName(file)
+	if string.match(file, "Csv$") then
+		if csvdata["src/csvdata/init.lua"] and csvdata["src/csvdata/init.lua"][file] then
+			file = csvdata["src/csvdata/init.lua"][file]
+		elseif csvdata["src/csvdata/init_adv.lua"] and csvdata["src/csvdata/init_adv.lua"][file] then
+			file = csvdata["src/csvdata/init_adv.lua"][file]
+		end
+		file = "src/" .. file .. ".lua"
+	end
+	return file
+end
+
+local function update(file)
+	-- 更新一下
+	if cache[file] then
+		sharetable.update(csvdata.realName(file))
+	end
+end
+
+skynet.register_protocol {
+	name = "csvdata",
+	id = 102,
+	pack = skynet.pack,
+	unpack = skynet.unpack,
+	dispatch = function(_, _, cmd, ...)
+		skynet.ignoreret()
+		if cmd == "hotfix" then
+			-- skynet.error("csvdara hotfix update", ...)
+			local files = {...}
+			for _, file in ipairs(files) do
+				update(file)
+			end
+			return
+		end
+	end,
+}
+
+return csvdata
@@ -5,6 +5,10 @@ local table_insert = table.insert
 local redisproxy = {}
+
+local isUsePika = false
+
+
 setmetatable(redisproxy, { __index = function(t, k)
 	local cmd = string.upper(k)
 	local f = function (self, ...)
@@ -38,14 +42,61 @@ function redisproxy:runScripts(name, ...)
 end
 local meta = {__index = function (tab, name) return function (_, ...) tab[#tab+1]={name, ...} end end}
-function redisproxy:pipelining(block)
-	local ops = setmetatable({{"multi"}}, meta)
+function redisproxy:pipelining(block, transaction)
+	if transaction == nil then transaction = true end  -- 默认具有事务性
+	if isUsePika then transaction = false end
+
+	local ops = setmetatable({}, meta)
+	if transaction then
+		ops[#ops+1]={"multi"}
+	end
 	block(ops)
-	if #ops == 1 then return end
-	ops[#ops+1]={"exec"}
-	return self:pipeline(ops)
+	if transaction then
+		if #ops == 1 then return end
+		ops[#ops+1]={"exec"}
+	else
+		if #ops == 0 then return end
+	end
+	return self:pipeline(ops, transaction)
+end
+
+if isUsePika then
+
+function redisproxy:insertEmail(params)
+	local roleId = params.roleId
+	local emailId = params.emailId
+	local createtime = params.createtime or skynet.timex()
+	local contentPms = params.contentPms or {}
+	local rewardPms = params.rewardPms or {}
+	local title = params.title or ""
+	local stitle = params.stitle or ""
+	local content = params.content or ""
+	local attachments = params.attachments or ""
+
+	local id = self:HINCRBY(string.format("role:%d:autoincr", roleId), "email", 1)
+	self:LPUSH(string.format("role:%d:emailIds", roleId), id)
+	local deleteIds = self:LRANGE(string.format("role:%d:emailIds", roleId), EMAIL_LIMIT, -1)
+	self:pipelining(function(red)
+		for _, deleteId in ipairs(deleteIds) do
+			red:DEL(string.format("email:%d:%d", roleId, deleteId))
+		end
+		red:LTRIM(string.format("role:%d:emailIds", roleId), 0, EMAIL_LIMIT - 1)
+		red:HMSET(string.format("email:%d:%d", roleId, id), 
+			"id", tostring(id), 
+			"emailId", emailId,
+			"status", "0", 
+			"createtime", createtime,
+			"contentPms", MsgPack.pack(contentPms), 
+			"rewardPms", MsgPack.pack(rewardPms), 
+			"title", title, 
+			"stitle", stitle, 
+			"content", content, 
+			"attachments", attachments)
+	end)
 end
+else
+
 function redisproxy:insertEmail(params)
 	local pms = {
 		roleId = params.roleId,
@@ -64,4 +115,7 @@ function redisproxy:insertEmail(params)
 	return true
 end
+
+end
+
 return redisproxy
 \ No newline at end of file