wasteland / server

Commit f28058a05378d9a68e51553bb96bc99a1c68b458

Authored by liuzujun
2 parents c72853af 720eab03

Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/adv/AdvMap.lua
  Show/Hide comments   View file @f28058a
... ... @@ -553,7 +553,11 @@ createMap = function(self, mapId, isEnter, isNewRelay)
553 553 if randomCommon() == false then
554 554 return false
555 555 end
556   - table.insert(monsterEvents, event)
  556 + local curData = csvdb["event_monsterCsv"][event.id]
  557 + if curData.noKey and curData.noKey == 1 then
  558 + else
  559 + table.insert(monsterEvents, event)
  560 + end
557 561 end
558 562  
559 563 --选择点
... ...
src/models/RoleLog.lua
  Show/Hide comments   View file @f28058a
... ... @@ -664,7 +664,7 @@ function RoleLog.bind(Role)
664 664 for field, tag in pairs(schema) do
665 665 if not contents[field] then
666 666 if tag == "ucode" then
667   - contents[field] = self:getActionUcode()
  667 + doc[field] = self:getActionUcode()
668 668 elseif tag == "auto" then
669 669 else
670 670 printError(string.format("LOG ERROR: logType [%s] lose field [%s].", logType, field))
... ...