From 7ca463331712c8e448bdadedb22613cd6586f6dd Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Fri, 5 Jun 2020 13:57:16 +0800 Subject: [PATCH] map 传参错误 --- src/adv/Adv.lua | 4 ++++ src/adv/AdvMap.lua | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index 988c336..cdfb720 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.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]]() diff --git a/src/adv/AdvMap.lua b/src/adv/AdvMap.lua index d24efc6..0ce063c 100644 --- a/src/adv/AdvMap.lua +++ b/src/adv/AdvMap.lua @@ -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 -- libgit2 0.21.2