map 传参错误

zhouhaihai
1 parent 51f42130
Showing 2 changed files with 8 additions and 3 deletions Show diff stats
src/adv/Adv.lua
src/adv/AdvMap.lua
@@ -1191,6 +1191,10 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 					target:addBuff(effect[2])
 				end
 			end,
+			[13] = function()
+				self:getCurMap():showMap()
+				self:backMapShow()
+			end,
 		}
 		assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
 		doEffect[effect[1]]()
@@ -23,14 +23,15 @@ function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 end
 function Map:loadRooms(rooms, isNewRelay)
-	local mapData = csvdb["map_" .. csvdb["mapCsv"][self.mapId]["path"] .. "Csv"]
+	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, mapData.type)
+			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, mapData.type)
+			self.rooms[roomId] = Room.new(self, roomId, csvdb["room_" .. roomName .. "Csv"], rooms[roomId], false, isNewRelay, mapInfoCsv.type)
 		end
 	end 
 end