冒险地图刷新需求

zhouhaihai
1 parent ca865c7e
Showing 2 changed files with 67 additions and 28 deletions Show diff stats
src/adv/AdvMap.lua
src/adv/AdvRoom.lua
@@ -24,12 +24,13 @@ end
  
 function Map:loadRooms(rooms, isNewRelay)
 	local mapData = csvdb["map_" .. csvdb["mapCsv"][self.mapId]["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, mapData.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, mapData.type)
 		end
 	end 
 end
@@ -250,6 +251,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,22 +296,42 @@ 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
  
 		--入口
@@ -581,15 +627,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
@@ -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)
@@ -15,10 +15,10 @@ function Room:ctor(map, roomId, csvData, info, isPath, isNewRelay)
 	self.battleAfterCall = {}
  
 	self.blocks = {}
-	self:loadBlocks(csvData, info, isNewRelay)
+	self:loadBlocks(csvData, info, isNewRelay, mapType)
 end
  
-function Room:loadBlocks(csvData, info, isNewRelay)
+function Room:loadBlocks(csvData, info, isNewRelay, mapType)
 	local isFirstOpen = false
 	for blockId, _ in pairs(csvData["blocks"]) do
 		self.blocks[blockId] = Block.new(self, blockId, info.event[blockId], info.open == 1 or info.open[blockId], info.trap[blockId])
@@ -38,7 +38,7 @@ function Room:loadBlocks(csvData, info, isNewRelay)
 		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 mapType == 2  or (isFirstOpen and mapType == 1) then
 		table.insert(self.battleAfterCall, function()
 			for _, block in pairs(self.blocks) do
 				self:openBlock(block)