merge code

测试
2 parents 16634605 4615ea54
Showing 12 changed files with 491 additions and 179 deletions Show diff stats
src/GlobalVar.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/models/HeroPlugin.lua
src/models/RolePlugin.lua
@@ -126,6 +126,7 @@ ItemId = {
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
 	BoxKey = 60, -- 拆解工具
+	AdvPower = 4701, -- 拾荒体力
 }
 TimeReset = {
@@ -527,25 +527,8 @@ function _M.useItemRpc(agent, data)
 		adv:cost({[itemId] = count}, {log = {desc = "useItem", int1 = itemId, int2 = count}})
 		adv:backUse({[itemId] = count})
 	end
-
-	if itemId == 5020 then
-		role:finishGuide(53)
-	end
-	adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
-	adv:mylog({desc = "useItem", int1 = itemId, int2 = count})
-
-	role:log("mission_pick_use", {
-		mission_threadid = adv.chapterId, -- 大地图ID
-		mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
-		mission_id = adv.level, -- 关卡ID
-		item_id = itemId, -- 道具ID
-		mission_pick_use_num = count, -- 道具使用量
-		mission_sequenceid = adv.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
-	})
-
-	for i = 1, count do
-		adv:doActive(itemData.effect, target) -- target
-	end
+	
+	adv:useItem(itemId, count, target)
 	adv:afterRound()
 	adv:saveDB()
@@ -402,20 +402,20 @@ function _M.advl(role, pms)
 	return "成功"
 end
-table.insert(helpDes, {"冒险内等级增加", "advcl", "经验值"})
-function _M.advcl(role, pms)
-	local exp = tonum(pms.pm1)
-	local advData = role:getAdvData()
+-- table.insert(helpDes, {"冒险内等级增加", "advcl", "经验值"})
+-- function _M.advcl(role, pms)
+-- 	local exp = tonum(pms.pm1)
+-- 	local advData = role:getAdvData()
-	if not advData.chapterId then
-		return "先随便开启一关"
-	end
-	advData.battle.player:addExp(exp)
-	advData:saveDB()
-	role:mylog("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
+-- 	if not advData.chapterId then
+-- 		return "先随便开启一关"
+-- 	end
+-- 	advData.battle.player:addExp(exp)
+-- 	advData:saveDB()
+-- 	role:mylog("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
-	return "成功"
-end
+-- 	return "成功"
+-- end
 table.insert(helpDes, {"挂机清除"	, "idlec"})
 function _M.idlec(role, pms)
@@ -936,7 +936,7 @@ end
 -- log long1 字段被征用！！！
 -- 在冒险中获得的物品都发放在冒险背包内
-function Adv:award(gift, params)
+function Adv:award(gift, params, backRewardParams)
 	params = params or {}
 	local tgift = {}
 	if type(gift) == "string" then
@@ -948,6 +948,8 @@ function Adv:award(gift, params)
 	end
 	local items = self.owner:getProperty("advItems")
 	local oldItems = items
+
+	local autoUse = {}
 	for itemId, count in pairs(tgift) do
 		if count > 0 then
 			local buffAdd = self.battle.player:getRewardChange(itemId)
@@ -956,41 +958,45 @@ function Adv:award(gift, params)
 			self:checkAchievement(Adv.AchievType.GetItem, count, itemId)
 		end
 		tgift[itemId] = count
-		local origin = items:getv(itemId, 0)
-		local nums = origin + count
-
-		if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
-			self:awardArtifact(itemId, params)
-			if not self.owner:checkOverGuide(55) then
-				self.owner:saveGuide(55,1,true)
-			end
+		if globalCsv.adv_auto_useItem[itemId] and count > 0 then
+			autoUse[itemId] = count
 		else
-			if nums <= 0 then
-				items = items:delk(itemId)
-				nums = 0
+			local origin = items:getv(itemId, 0)
+			local nums = origin + count
+
+			if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
+				self:awardArtifact(itemId, params)
+				if not self.owner:checkOverGuide(55) then
+					self.owner:saveGuide(55,1,true)
+				end
 			else
-				items = items:setv(itemId, nums)
-			end
+				if nums <= 0 then
+					items = items:delk(itemId)
+					nums = 0
+				else
+					items = items:setv(itemId, nums)
+				end
-			if itemId == 16 and not self.owner:checkOverGuide(51,4) then
-				self.owner:saveGuide(51,4)
-			end
-			if params.log then
-				local log = clone(params.log)
-				if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
-					print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
+				if itemId == 16 and not self.owner:checkOverGuide(51,4) then
+					self.owner:saveGuide(51,4)
 				end
-				log["cint1"] = itemId
-				log["cint2"] = math.abs(count)
-				log["cint3"] = self.chapterId
-				log["long1"] = self.level
-				if count >= 0 then
-					self.owner:mylog("in_adv", log)
+				if params.log then
+					local log = clone(params.log)
+					if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
+						print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
+					end
+					log["cint1"] = itemId
+					log["cint2"] = math.abs(count)
+					log["cint3"] = self.chapterId
+					log["long1"] = self.level
+					if count >= 0 then
+						self.owner:mylog("in_adv", log)
+					else
+						self.owner:mylog("out_adv", log)
+					end
 				else
-					self.owner:mylog("out_adv", log)
+					print("addAdvItem no log ", debug.traceback())
 				end
-			else
-				print("addAdvItem no log ", debug.traceback())
 			end
 		end
 	end
@@ -1001,10 +1007,48 @@ function Adv:award(gift, params)
 	if tgift[ItemId.OldCoin] then
 		self.battle.player:attrChangeCondBuffCheck(0)
 	end
+
+	if backRewardParams then
+		self:backReward(tgift, backRewardParams)
+	end
+
+	if next(autoUse) then
+		for itemId, count in pairs(autoUse) do
+			self:useItem(itemId, count)
+		end
+		self:backUse(autoUse, 1)
+	end
 	return tgift
 end
+function Adv:useItem(itemId, count, target)
+	local itemData = csvdb["adv_itemCsv"][itemId] 
+	if not itemData then return end
+
+	if itemData["function"] == 0 or itemData["function"] == 2 then count = 1 end
+
+	if itemId == 5020 then
+		role:finishGuide(53)
+	end
+
+	self:checkAchievement(self.AchievType.UseItem, count, itemId)
+	self:mylog({desc = "useItem", int1 = itemId, int2 = count})
+
+	self.owner:log("mission_pick_use", {
+		mission_threadid = self.chapterId, -- 大地图ID
+		mission_threadname = (csvdb["adv_chapterCsv"][self.chapterId] or {})["chapter"] or "auto", -- 大地图名称
+		mission_id = self.level, -- 关卡ID
+		item_id = itemId, -- 道具ID
+		mission_pick_use_num = count, -- 道具使用量
+		mission_sequenceid = self.logid, -- 本次拾荒ID，用于关联一次拾荒产生多条不同类型的日志
+	})
+
+	for i = 1, count do
+		self:doActive(itemData.effect, target) -- target
+	end
+end
+
 -- 消耗物品 优先冒险背包  --check 只是检查够不够
 function Adv:cost(item, params, check)
 	local items = self.owner:getProperty("advItems")
@@ -1071,7 +1115,7 @@ local function clickOut(self, room, block, params, isExit)
 				self.battle.player:triggerPassive(Passive.DOWN_LAYER)
 				if curFloorData then
-					self:backReward(self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}))
+					self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}, {})
 				end
 				local isHaveRelay = self:isHaveRelay(self.level)
@@ -1255,7 +1299,7 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 						skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  effect[2], tag, chooseData.id))
 					end
 				end
-				self:backReward(self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}), {roomId = room.roomId, blockId = block.blockId})
+				self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, {roomId = room.roomId, blockId = block.blockId})
 			end,
 			[2] = function() --获得冒险buff
 				local layer = effect[3] or 1
@@ -1419,14 +1463,12 @@ local function clickDrop(self, room, block, params)
 	if not self.battle or not self.battle.player then return end
 	self.battle.player:triggerPassive(Passive.CLICK_DROP)
-	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
-	-- local reward = self:award({[5801] = 1})
-	-- 获取绷带的引导
+	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}}, {roomId = room.roomId, blockId = block.blockId})
+
 	if block.event.item[1] == 5020 and not self.owner:checkOverGuide(53,2) then
 		self.owner:saveGuide(53,2)
 	end
 	block:clear()
-	self:backReward(reward, {roomId = room.roomId, blockId = block.blockId})
 	return true
 end
@@ -1447,7 +1489,7 @@ local function clickTrader(self, room, block, params)
 	local costCount = math.ceil(goodsData.price * (block.event.shop[buyId][2] or 100) / 100)
 	if not self:cost({[goodsData.currency] = costCount}, {log = {desc = "clickTrader", int1 = block.event.id}}) then return false, 6 end --不够
 	self:backCost({[goodsData.currency] = costCount})
-	local reward = self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}})
+	self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}}, {})
 	if goodsData.restrict == 1 then
 		self.shopStatus[goodsData.goods] = (self.shopStatus[goodsData.goods] or 0) + 1
 	elseif goodsData.restrict == 2 then
@@ -1459,7 +1501,6 @@ local function clickTrader(self, room, block, params)
 	buyCount = buyCount + 1
 	self:checkTask(Adv.TaskType.Shop, 1, block.event.id)
 	self:checkAchievement(Adv.AchievType.Shop, 1, block.event.id)
-	self:backReward(reward)
 	if (traderData.purchasetime ~= 0 and traderData.purchasetime <= buyCount) or #block.event.shop <= buyCount then
 		block:clear()
@@ -1501,7 +1542,7 @@ local function clickClick(self, room, block, params)
 				local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true)
 				reward[item[1]] = (reward[item[1]] or 0) + item[2]
 			end
-			self:backReward(self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}), {roomId = room.roomId, blockId = block.blockId})
+			self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}, {roomId = room.roomId, blockId = block.blockId})
 		end,
 		[3] = function()
 			for _, buffId in ipairs(clickData.effect:toArray(true, "=")) do
@@ -1842,23 +1883,31 @@ end
 -- 地图上物品变化
 function Adv:mapItemChange(ctype)
+	local blocks = {}
+	for roomId, room in pairs(self:getCurMap().rooms) do
+		for blockId, block in pairs(room.blocks) do
+			table.insert(blocks, block)
+		end
+	end
+	self:blockDropChange(ctype, blocks)
+end
+
+function Adv:blockDropChange(ctype, blocks)
 	local clist = csvdb["transform_itemCsv"][ctype]
 	if clist then
-		for roomId, room in pairs(self:getCurMap().rooms) do
-			for blockId, block in pairs(room.blocks) do
-				if block:getEventType() == AdvEventType.Drop and block.event.item then
-					local id = block.event.item[1]
-					local count = block.event.item[2]
-					local changeTo = nil
-					if clist[id] then
-						changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
-					elseif clist[-1] then
-						changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
-					end
-					if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
-						block.event.item = changeTo
-						self:backBlockChange(roomId, blockId, ctype)
-					end
+		for _, block in ipairs(blocks) do
+			if block:getEventType() == AdvEventType.Drop and block.event.item then
+				local id = block.event.item[1]
+				local count = block.event.item[2]
+				local changeTo = nil
+				if clist[id] then
+					changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
+				elseif clist[-1] then
+					changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
+				end
+				if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
+					block.event.item = changeTo
+					self:backBlockChange(block.room.roomId, block.blockId, ctype)
 				end
 			end
 		end
@@ -1887,8 +1936,9 @@ function Adv:enemyDead(enemy, escape)
 			else
 				self:scoreChange(AdvScoreType.Kill, monsterData.advScore)
 			end
-			local changeV = self.battle.player:addExp(monsterData.exp)
-			self:backDead(enemyId, changeV)
+			-- local changeV = self.battle.player:addExp(monsterData.exp)
+			-- self:backDead(enemyId, changeV)
+			self:backDead(enemyId)
 			local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
 			if toClick then
@@ -1989,10 +2039,13 @@ end
 function Adv:pushBackEvent(btype, params)
 	table.insert(self.backEvents, {btype = btype, params = params})
 end
-
+--[=[
+tag
+1 自动拾取
+--]=] 
 function Adv:backReward(items, params)
 	params = params or {}
-	self:pushBackEvent(AdvBackEventType.Reward, {items = items, roomId = params.roomId, blockId = params.blockId})
+	self:pushBackEvent(AdvBackEventType.Reward, {items = items, roomId = params.roomId, blockId = params.blockId, tag = params.tag})
 end
 -- if is player enemyId is nil 
@@ -2009,8 +2062,8 @@ function Adv:backBlockChange(roomId, blockId, itemChangeType)
 	self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId, itemChangeType = itemChangeType})
 end
-function Adv:backDead(enemyId, exp)
-	self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId, exp = exp})
+function Adv:backDead(enemyId)
+	self:pushBackEvent(AdvBackEventType.Dead, {enemyId = enemyId})
 end
 function Adv:backTrap()
@@ -2033,8 +2086,12 @@ function Adv:backCost(items)
 	self:pushBackEvent(AdvBackEventType.Cost, {items = items})
 end
-function Adv:backUse(items)
-	self:pushBackEvent(AdvBackEventType.Use, {items = items})
+--[=[
+tag
+1 自动使用
+--]=] 
+function Adv:backUse(items, tag)
+	self:pushBackEvent(AdvBackEventType.Use, {items = items, tag = tag})
 end
@@ -67,17 +67,17 @@ function Battle:initPlayer()
 		local advAddAttrs = self.adv.owner:getAdvLvAddAttrs()
 		player = {}
-		player.level = 1
-		if self.adv.level ~= 1 then
-			local relayData = self.adv:isHaveRelay()
-			if relayData then
-				player.level = relayData.level
-			end
-		end
-		player.exp = 0
+		-- player.level = 1
+		-- if self.adv.level ~= 1 then
+		-- 	local relayData = self.adv:isHaveRelay()
+		-- 	if relayData then
+		-- 		player.level = relayData.level
+		-- 	end
+		-- end
+		-- player.exp = 0
 		player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100)
 		player.spMax = player.sp
-		player.growth = {}
+		-- player.growth = {}
 		player.passives = {}
 		for slot, heroId in pairs(advTeam.heros) do
@@ -100,8 +100,8 @@ function Battle:initPlayer()
 				player[attrName] = (player[attrName] or 0) + hero[attrName]
 			end
 			player[attrName] = getAdvLvAttrUp(advAddAttrs, attrName, player[attrName]) * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
-			player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
-			player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
+			-- player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
+			-- player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
 		end
 		player.hpMax = player.hp or 0
@@ -48,6 +48,8 @@ function Block:updateEvent(event, isInit)
 			end
 		end
 	end
+	local oldet = self:getEventType()
+
 	self.event = event
 	if not isInit and self.event then
 		-- 判断下类型是不是错的
@@ -58,18 +60,49 @@ function Block:updateEvent(event, isInit)
 		end
 		self:randomEvent()
 	end
+	self:quickDrop()
+
+	if not isInit and self.isOpen then
+		local newet = self:getEventType()
+		if oldet ~= newet then
+			local em = {}
+			if oldet then
+				em[oldet] =1 
+			end
+			if newet then
+				em[oldet] =1 
+			end
+
+			local player = self.room.map.adv.battle.player
+			player:attrChangeCondBuffCheck(4, em)
+			for _, monster in pairs(player:getTeam(2)) do
+				monster:attrChangeCondBuffCheck(4, em)
+			end
+		end
+	end
 end
 function Block:clear()
-	if self:getEventType() == AdvEventType.Trap then 
+	local et = self:getEventType()
+	if et == AdvEventType.Trap then 
 		self.trapId = self.event.id
-	elseif self:getEventType() == AdvEventType.Build then
+	elseif et == AdvEventType.Build then
 		local build = self.room.map.adv.battle:getBuild(self.room.roomId, self.blockId, self.room.map.mapIdx)
 		if build then
 			build.isDead = true
 		end
 	end
 	self.event = nil
+
+
+	if et then
+		local em = {[et] = 1}
+		local player = self.room.map.adv.battle.player
+		player:attrChangeCondBuffCheck(4, em)
+		for _, monster in pairs(player:getTeam(2)) do
+			monster:attrChangeCondBuffCheck(4, em)
+		end
+	end
 end
@@ -90,8 +123,10 @@ function Block:randomEvent()
 		enemy:triggerPassive(Passive.BORN_ONCE)
 		adv.battle.player:triggerPassive(Passive.OPEN_MONSTER, {trigger = enemy})
+		adv.battle.player:attrChangeCondBuffCheck(3, enemy:getClassify())
 		for _, monster in pairs(adv.battle.player:getTeam(2)) do
-			adv.battle.player:triggerPassive(Passive.OPEN_MONSTER, {trigger = enemy})
+			monster:triggerPassive(Passive.OPEN_MONSTER, {trigger = enemy})
+			monster:attrChangeCondBuffCheck(3, enemy:getClassify())
 		end
 	end
 	randomFunc[AdvEventType.BOSS] = randomFunc[AdvEventType.Monster]
@@ -208,6 +243,13 @@ function Block:randomEvent()
 					e:addBuff(buffId)
 				end
 			end
+		elseif data.target == 4 then
+			local enemys = self.room.map.adv:getCurMap():openBlocksIsMonsterByRoom(self.room.roomId)
+			for _, e in ipairs(enemys) do
+				for _, buffId in ipairs(buffs) do
+					e:addBuff(buffId)
+				end
+			end
 		end
 		if data.specialEff ~= "" then
@@ -263,10 +305,35 @@ function Block:open()
 	local adv = map.adv
 	self.isOpen = true
 	self:randomEvent()
+	self:quickDrop()
+
+	local et = self:getEventType()
+	if et then
+		local em = {[et] = 1}
+		local player = self.room.map.adv.battle.player
+		player:attrChangeCondBuffCheck(4, em)
+		for _, monster in pairs(player:getTeam(2)) do
+			monster:attrChangeCondBuffCheck(4, em)
+		end
+	end
 	return true
 end
+function Block:quickDrop()
+	if self:getEventType() == AdvEventType.Drop and self.event.item then
+		local itemId, count = table.unpack(self.event.item)
+		if globalCsv.adv_auto_collect[itemId] then
+			self.room.map.adv:award({[itemId] = count}, {log = {desc = "clickDrop"}}, {roomId = self.room.roomId, blockId = self.blockId, tag = 1})
+			self:clear()
+		end
+	end
+end
+
 function Block:getObstacle()
+	if self:isMonster() then
+		local enemy = self.room.map.adv.battle:getEnemy(self.room.roomId, self.blockId)
+		return enemy:getObstacle()
+	end
 	local data = self:getEventData()
 	if not data then return 0 end
 	return data.obstacle or 0
@@ -20,7 +20,7 @@ Buff.HP_CHANGE_NOW = 16 -- 生命变化（每回合生效,立刻生效）
 Buff.BATTLE_BUFF = 17 -- 切换为战斗中的buff
 Buff.CHANGE_DROP = 18 -- 转换掉落
 Buff.BATTLE_PASSIVE = 19 -- 切换为战斗中的被动技
-Buff.EXP_ADD = 20 -- 增加exp（每回合）
+-- Buff.EXP_ADD = 20 -- 增加exp（每回合）
 Buff.DONT_DEFEND = 21 -- 不看守地板 -- 怪周围点半可点击
 Buff.SHOW_DANGER = 22 -- 扫雷 展示地上怪物和陷阱数量的标记
 Buff.SHOW_MONSTER_POS = 23 -- 蓝臂章训练场 感知
@@ -34,6 +34,8 @@ Buff.Buff_EFFECT_CHANGE = 30 -- 改变 buff 效果
 Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物
 Buff.SNEAK = 32 --潜行
 Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成  -- 怪物使用
+Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效
+Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  0 - 1
 --角色一些属性的变化
@@ -87,13 +89,24 @@ local function commonAttCond(_Buff, attrName)
 			if buff then
 				effectCount = buff.layer
 			end
+		elseif self.buffData.effectValue4 == 3 then
+			local classify = tonumber(self.buffData.effectValue5) -- 怪标签
+			local enemy = self.owner.battle.player:getTeam(2)
+			for _, one in pairs(enemy) do
+				if one.isClassify and one:isClassify(classify) then
+					effectCount = effectCount + 1
+				end
+			end
+		elseif self.buffData.effectValue4 == 4 then
+			local eventType = tonumber(self.buffData.effectValue5) -- event 类型
+			effectCount = #self.owner.battle.adv:getCurMap():getEventTypeAllMap(eventType)
 		end
 		return self.buffData.effectValue2 * effectCount 
 	end
 	_Buff.getEffectBy = function(self)
 		local cond = nil
-		if self.buffData.effectValue4 == 2 then
+		if self.buffData.effectValue4 == 2 or self.buffData.effectValue4 == 3 or self.buffData.effectValue4 == 4 then
 			cond = tonumber(self.buffData.effectValue5)
 		end
 		return self.buffData.effectValue4, attrName, cond
@@ -302,16 +315,16 @@ local BuffFactory = {
 		end
 	end,
-	[Buff.EXP_ADD] = function(_Buff)
-		_Buff._afterRound = function(self)
-			local value = self:effect()
-			self.owner.battle.player:addExp(value)
-		end
-		_Buff._effectValue = function(self)
-			-- 经验值
-			return self.buffData.effectValue1 * self.layer
-		end
-	end,
+	-- [Buff.EXP_ADD] = function(_Buff)
+	-- 	_Buff._afterRound = function(self)
+	-- 		local value = self:effect()
+	-- 		self.owner.battle.player:addExp(value)
+	-- 	end
+	-- 	_Buff._effectValue = function(self)
+	-- 		-- 经验值
+	-- 		return self.buffData.effectValue1 * self.layer
+	-- 	end
+	-- end,
 	[Buff.DISABLE_BUFF] = function(_Buff)
 		_Buff._effectValue = function(self)
@@ -378,6 +391,14 @@ local BuffFactory = {
 			self.layer = self.buffData.effectValue1
 		end
 	end,
+	[Buff.GET_PASSIVE] = function( _Buff )
+		_Buff._init = function(self)
+			self.owner:addPassive({id = self.buffData.effectValue1})
+		end
+		_Buff._endBuff = function(self)
+			self.owner:delPassiveById(self.buffData.effectValue1)
+		end
+	end
 }
 -- 同样的返回  effectValue1, effectValue2 * self.layer 类型的buff
@@ -256,7 +256,7 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 	if status then
 		if isPlayer then
-			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK)
+			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK, {roomId = roomId, blockId = blockId})
 			self.adv.owner:checkTaskEnter("AdvOpenBlock")
 			-- 潜行检查
@@ -272,8 +272,8 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
-
 	end
+	return status
 end
 function Map:openBlocksBySize(roomId, blockId, size, isPlayer, ignoreBack)
@@ -292,6 +292,41 @@ function Map:openBlocksByRoom(roomId, isPlayer, ignoreBack)
 	end
 end
+function Map:openBlocksIsMonsterByRoom(roomId, count, isPlayer, ignoreBack)
+	local room = self.rooms[roomId]
+	if not room then return end 
+
+	local allBlock = {}
+	for blockId, block in pairs(room.blocks) do
+		if block:isMonster() and not block.isOpen then
+			table.insert(allBlock, blockId)
+		end
+	end
+
+	local enemys = {}
+	local openBlock = function(blockId)
+		if self:openBlock(roomId, blockId, isPlayer, ignoreBack) then
+			local e = self.adv.battle:getEnemy(roomId, blockId)
+			if e then
+				table.insert(enemys, e)
+			end
+		end
+	end
+
+	if not count or count == -1 or count >= len(allBlock) then
+		for _, blockId in ipairs(allBlock)  do
+			openBlock(blockId)
+		end
+	else
+		for i = 1, count do
+			local idx = math.randomInt(1, len(allBlock))
+			openBlock(allBlock[idx])
+			table.remove(allBlock, idx)
+		end
+	end
+	return enemys
+end
+
 function Map:openAllBlocks(isPlayer, ignoreBack)
 	for roomId, room in pairs(self.rooms) do
 		self:openBlocksByRoom(room.roomId, isPlayer, ignoreBack)
@@ -309,6 +344,22 @@ function Map:getRBByPos(c, r)
 	end
 end
+function Map:getDistance(froomId, fblockId, troomId, tblockId)
+	local distance = -1
+	local room1 = self.rooms[froomId]
+	local room2 = self.rooms[troomId]
+	if room1 and room2 then
+		local block1 = room1[fblockId]
+		local block2 = room2[tblockId]
+		if block1 and block2 then
+			local c1, r1 = room1:tranLtoG(block1.col, block1.row)
+			local c2, r2 = room2:tranLtoG(block2.col, block2.row)
+			distance = math.max(math.abs(c1 - c2), math.abs(r1 - r2))
+		end
+	end
+	return distance
+end
+
 function Map:getAroundBlocks(room, block)
 	local blocks = {}
 	local range = {1, -1}
@@ -412,6 +463,18 @@ function Map:getEnemysBySize(roomId, blockId, size)
 	return enemys
 end
+function Map:getEventTypeAllMap(eventType)
+	local blocks = {}
+	if not eventType then return blocks end
+	for roomId, room in pairs(self.rooms) do
+		for blockId, block in pairs(room.blocks) do
+			if block.isOpen and block:getEventType() == eventType then
+				table.insert(blocks, block)
+			end
+		end
+	end
+	return blocks
+end
 -----------------------------随机地图-----------------------------
 -- isEnter isNewRelay 区分中继层的类型   --是否是开始进入  是否是第一次进入
@@ -7,6 +7,8 @@ Filter.HP_LOW = 4 -- 血量&lt;value%
 Filter.BUFF_BY_TYPE = 5 -- 指定类型buff
 Filter.BUFF_BY_ID = 6 -- 指定id的buff
 Filter.CAMP = 7 -- 玩家是指定阵营
+Filter.RANGE = 8 -- 筛选范围 （触发是地块）
+Filter.CLASSIFY = 9 -- 标签
 local FilterFactory = {}
 FilterFactory[Filter.HP_UP_WITH_EQUAL] = function (_Filter)
@@ -46,6 +48,21 @@ FilterFactory[Filter.CAMP] = function (_Filter)
 	end
 end
+FilterFactory[Filter.RANGE] = function (_Filter)
+	_Filter._execute = function (self, target, params)
+		if self.owner.blockId and self.owner.roomId  and params.blockId and params.roomId then
+			local distance = self.owner.battle.adv:getCurMap():getDistance(self.owner.roomId, self.owner.blockId, params.roomId, params.blockId)
+			return distance ~= -1 and distance <= self.value
+		end
+		return false
+	end
+end
+
+FilterFactory[Filter.CLASSIFY] = function (_Filter)
+	_Filter._execute = function (self, target)
+		return target.isClassify and target:isClassify(self.value)
+	end
+end
 function Filter:ctor(params)
 	self.owner = params.owner
@@ -79,7 +96,7 @@ function Filter:execute(params)
 		return
 	end
 	if self:_execute(target) then
-		return self:_execute(target)
+		return self:_execute(target, params)
 	end
 end
@@ -120,6 +137,7 @@ Passive.GET_BUFF = 28 --获得指定buff
 Passive.OPEN_BLOCK = 29 --翻开格子
 Passive.OPEN_MONSTER = 30 --翻开怪物
 Passive.PLAYER_BUFF = 31 --玩家获得buff
+
 Passive.PLAYER_BUFF_CLASSIFY = 35 -- 获得指定标签的buff
 -- 不同的开启条件
@@ -442,6 +460,7 @@ end
 --3=翻开自己所在格子
 function Passive:effect3(value)
+	if not self.owner.roomId or not self.owner.blockId then return end
 	if value == 0 then
 		self.owner.battle.adv:getCurMap():openBlock(self.owner.roomId, self.owner.blockId)
 	elseif value > 0 then
@@ -494,7 +513,7 @@ function Passive:effect8(dropId)
 		skynet.error(string.format("CSVDATA Error  adv_map_passive %s effect 8 not id %s in event_drop", self.id, dropId))
 	end
 	local item = dropData["range"]:randWeight(true)
-	self.owner.battle.adv:backReward(self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}), {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
 end
@@ -509,7 +528,7 @@ function Passive:effect9(itemId, triggerPms, ratio, max)
 		return
 	end
 	if not cond then return end
-	self.owner.battle.adv:backReward(self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}), {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
 end
 --10=战斗额外掉落次数
@@ -561,5 +580,22 @@ function Passive:effect14(value, triggerPms, enemyId)
 	end
 end
+--15=翻开房间内的count 个怪 并且增加一个buff
+function Passive:effect15(count, triggerPms, buffId)
+	local roomId = self.owner.roomId
+	if not roomId then return end
+	local enemys = self.owner.battle.adv:getCurMap():openBlocksIsMonsterByRoom(roomId, count)
+	for _, e in ipairs(enemys) do
+		e:addBuff(buffId)
+	end
+end
+
+--16=转变 value 范围内的掉落物 为 id count
+function Passive:effect16(value, triggerPms, changeType)
+	if not self.owner.roomId or not self.owner.blockId then return end
+	local blocks = self.owner.battle.adv:getCurMap():getBlocksBySize(self.owner.roomId, self.owner.blockId, value)
+	self.owner.battle.adv:blockDropChange(changeType, blocks)
+end
+
 return Passive
 \ No newline at end of file
@@ -90,6 +90,12 @@ end
 function BaseObject:clear()
 	self.buffs = {}
 	self.passives = {}
+	if self:is("Enemy") then
+		self.battle.player:attrChangeCondBuffCheck(3, self:getClassify())
+		for _, monster in pairs(self.battle.player:getTeam(2)) do
+			monster:attrChangeCondBuffCheck(3, self:getClassify())
+		end
+	end
 end
 function BaseObject:addPassive(params)
@@ -165,6 +171,7 @@ function BaseObject:addBuff(buffId, releaser)
 	end
 	self:triggerPassive(Passive.GET_BUFF, {trigger = releaser, buffId = buffId})
 	self:triggerPassive(Passive.PLAYER_BUFF_CLASSIFY, {trigger = releaser, classify = buffData.classify})
+	self:attrChangeCondBuffCheck(2, buffId)
 	return true
 end
@@ -417,7 +424,7 @@ function BaseObject:hurt(value, releaser, params)
 	if self.hp == 0 then
 		self:triggerPassive(Passive.SELF_DEAD)
 		for _, team in ipairs(self:getTeam(1, true)) do
-			team:triggerPassive(Passive.TEAM_DEAD)
+			team:triggerPassive(Passive.TEAM_DEAD, {trigger = self})
 		end
 		if (params.hurtType == 6 or params.hurtType == 2) and self ~= self.battle.player then
@@ -505,6 +512,50 @@ function BaseObject:getTeam(nType, noSelf, mapIdx, includeLock)
 	return team
 end
+function BaseObject:attrChangeCondBuffCheck(etype, cond)
+	local effect = {}
+	if etype == 3 then
+		if type(cond) ~= "string" then
+			return
+		end
+		local temp = cond:toArray(true, " ")
+		cond = {}
+		for _, one in pairs(temp) do
+			cond[one] = 1
+		end
+	elseif etype == 4 then
+		if not cond then
+			cond = {}
+		end
+		if type(cond) == "number" then
+			cond = {[cond] = 1}
+		end
+	end
+	for _, buff in ipairs(self.buffs) do
+		if not buff:isHide() and (buff:getType() == Buff.ATTR_CHANGE_COND) then
+			local _et, _attr, _co = buff:getEffectBy()
+			if etype == _et then
+				if etype == 3 or etype == 4 then
+					if cond[_co] then
+						effect[_attr] = 1
+					end
+				else
+					if (not _co or _co == cond) then
+						effect[_attr] = 1
+					end
+				end
+			end
+		end
+	end
+	for attrName, _ in pairs(effect) do
+		if attrName == "hp" then
+			self:reSetHpMax()
+		else
+			self:reSetAttr(attrName)
+		end
+	end
+end
+
 function BaseObject:getDB()
 	local db = {}
 	db.hp = self.hp
@@ -557,6 +608,24 @@ function Enemy:isEnemy()
 	return true
 end
+function Enemy:getObstacle()
+	local obstacle = csvdb["event_monsterCsv"][self.monsterId].obstacle
+	if obstacle == 0 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
+		obstacle = 1
+	end
+	return obstacle
+end
+
+function Enemy:isClassify(check)
+	local classify = self:getClassify()
+	return classify and classify:sismember(check, " ")
+end
+
+function Enemy:getClassify()
+	return csvdb["event_monsterCsv"][self.monsterId].classify
+end
+
+
 function Enemy:kill()
 	self:hurt(self.hp, self.battle.player, {hurtType = 5})
 end
@@ -569,44 +638,44 @@ end
 function Player:initData(data)
 	Player.super.initData(self, data)
-	self.level = data.level or 1  --level 每增加1级  属性增长 growth * baseAttr
+	-- self.level = data.level or 1  --level 每增加1级  属性增长 growth * baseAttr
 	self.growth = data.growth
-	self.exp = data.exp or 0
+	-- self.exp = data.exp or 0
 	self.sp = data.sp or 100
 	self.spMax = data.spMax or 100
 	self._spMax = data._spMax or 100
 end
-function Player:addExp(value)
-	-- buff 经验加成
-	local up = self:getCommonBuffEffect(Buff.EXP_UP)
-	value = math.ceil((value + up[0]) * (1 + up[1]))
-
-	if value <= 0 then return end
-	local newExp = self.exp + value
-	local level = self.level
-	if level >= #csvdb["adv_levelCsv"] then return end
-	while true do
-		local curData = csvdb["adv_levelCsv"][level]
-		if newExp < curData.exp then break end
-		level = level + 1
-		newExp = newExp - curData.exp
-		if level >= #csvdb["adv_levelCsv"] then break end
-	end
-	local delta = level - self.level
-
-	self.battle.adv:pushBackEvent(AdvBackEventType.Exp, {delta = value})
-
-	if delta > 0 then
-		for attr, _ in pairs(AdvAttsEnum) do
-			self:addBaseAttr(attr, self.growth[attr] * delta, 0, true)
-		end
-		self.battle.adv:pushBackEvent(AdvBackEventType.Level, {level = level, delta = delta})
-	end
-	self.level = level
-	self.exp = newExp
-	return value
-end
+-- function Player:addExp(value)
+-- 	-- buff 经验加成
+-- 	local up = self:getCommonBuffEffect(Buff.EXP_UP)
+-- 	value = math.ceil((value + up[0]) * (1 + up[1]))
+
+-- 	if value <= 0 then return end
+-- 	local newExp = self.exp + value
+-- 	local level = self.level
+-- 	if level >= #csvdb["adv_levelCsv"] then return end
+-- 	while true do
+-- 		local curData = csvdb["adv_levelCsv"][level]
+-- 		if newExp < curData.exp then break end
+-- 		level = level + 1
+-- 		newExp = newExp - curData.exp
+-- 		if level >= #csvdb["adv_levelCsv"] then break end
+-- 	end
+-- 	local delta = level - self.level
+
+-- 	self.battle.adv:pushBackEvent(AdvBackEventType.Exp, {delta = value})
+
+-- 	if delta > 0 then
+-- 		for attr, _ in pairs(AdvAttsEnum) do
+-- 			self:addBaseAttr(attr, self.growth[attr] * delta, 0, true)
+-- 		end
+-- 		self.battle.adv:pushBackEvent(AdvBackEventType.Level, {level = level, delta = delta})
+-- 	end
+-- 	self.level = level
+-- 	self.exp = newExp
+-- 	return value
+-- end
 --vtype 0/1 值/%
 function Player:addBaseAttr(attr, value, vtype, ignoreBack)
 	local attrName = attr
@@ -696,7 +765,6 @@ end
 function Player:addBuff(buffId, releaser)
 	local status = Player.super.addBuff(self, buffId, releaser)
 	if  status then
-		self.battle.player:attrChangeCondBuffCheck(2, buffId)
 		self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId)
 		self.battle.adv:pushBackEvent(AdvBackEventType.Buff, {buffId = buffId})
 		self.battle:triggerPassive(Passive.PLAYER_BUFF, {buffId = buffId})
@@ -708,33 +776,14 @@ function Player:addBuff(buffId, releaser)
 	return status
 end
-function Player:attrChangeCondBuffCheck(etype, cond)
-	local effect = {}
-	for _, buff in ipairs(self.buffs) do
-		if not buff:isHide() and (buff:getType() == Buff.ATTR_CHANGE_COND) then
-			local _et, _attr, _co = buff:getEffectBy()
-			if etype == _et and (not _co or _co == cond) then
-				effect[_attr] = 1
-			end
-			
-		end
-	end
-	for attrName, _ in pairs(effect) do
-		if attrName == "hp" then
-			self:reSetHpMax()
-		else
-			self:reSetAttr(attrName)
-		end
-	end
-end
-
 function Player:isPlayer()
 	return true
 end
 function Player:getDB()
 	local db = Player.super.getDB(self)
-	for _ , field in pairs({"level", "exp", "growth", "sp", "spMax"}) do
+	-- for _ , field in pairs({"level", "exp", "growth", "sp", "spMax"}) do
+	for _ , field in pairs({"level", "growth", "sp", "spMax"}) do
 		db[field] = self[field]
 	end
 	db["_spMax"] = self._spMax
@@ -247,6 +247,37 @@ function HeroPlugin.bind(Hero)
 		return level
 	end
+	-- 天赋获得的技能
+	function Hero:getTalentSkill()
+		local TalentEnum = {
+			[1] = 1,			-- 血量
+			[2] = 2,			-- 攻击
+			[3] = 3,			-- 物理防御
+			[4] = 4,			-- 命中
+			[5] = 5, 			-- 闪避
+		}
+	    local talentCsv = csvdb["unit_talent_" .. self:getProperty("type") .. "Csv"]
+	    local curLv = self:getProperty("talent"):getv(1,1) - 1
+	    local curRan = self:getProperty("talent"):getv(0,1)
+	    local skills = {}
+	    for ran, data in ipairs(talentCsv) do
+	        if ran <= curRan then
+	            for lv, value in ipairs(data) do
+	                if ran < curRan or lv <= curLv then
+	                    if not TalentEnum[value.effect] then
+	                        skills[value.strength] = true
+	                    end
+	                else
+	                    break
+	                end
+	            end
+	        else
+	            break
+	        end
+	    end
+	    return skills
+	end
+
 	function Hero:getSkillData(idx)
 		local unitData = csvdb["unitCsv"][self:getProperty("type")]
 		if idx == 1 then
@@ -64,6 +64,9 @@ function RolePlugin.bind(Role)
 			[ItemId.PlayerExp] = function()
 				self:addPlayExp(count, pms)
 			end,
+			[ItemId.AdvPower] = function()
+				self:changeAdvCount(-count)
+			end,
 		}
 		local itemTypeAward = {
@@ -1280,6 +1283,7 @@ function RolePlugin.bind(Role)
 			info.specialLevel = hero:getSkillLevel(1)
 			info.passiveLevel = hero:getSkillLevel(3)
 			info.runeSkill = hero:getRuneSkill(102)
+			info.talentSkills = hero:getTalentSkill()
 			teamInfo.heros[slot] = info
 		end
 		for slot, id in pairs(team.supports or {}) do