wasteland / server

Commit dd42c06e129670e232ca5e64cc7a8e5743aa300a

Authored by zhouhaihai
2 parents 8c0b461b ed20b43c

Merge branch 'develop' into tr/cb 

* develop:
  冒险bug
Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/adv/AdvBattle.lua
  Show/Hide comments   View file @dd42c06
... ... @@ -14,7 +14,6 @@ function Battle:ctor(adv)
14 14 self:initAfter()
15 15 if self.isNewPlayer then
16 16 self.player:triggerPassive(Passive.BORN_ONCE)
17   - self.player:addExp((self.adv.level - 1) * 40)
18 17 end
19 18 end
20 19  
... ...
src/adv/AdvMap.lua
  Show/Hide comments   View file @dd42c06
... ... @@ -523,7 +523,7 @@ createMap = function(self, mapId, isEnter, isNewRelay)
523 523 --开放出口
524 524 randomFunc[AdvEventType.Diner] = function()
525 525 -- if not self.adv.isRelay or isEnter or isNewRelay then return false end
526   - if not self.adv.isRelay or isEnter then return false end
  526 + -- if not self.adv.isRelay or isEnter then return false end
527 527 end
528 528  
529 529 --boss
... ... @@ -567,7 +567,7 @@ createMap = function(self, mapId, isEnter, isNewRelay)
567 567 end
568 568 --建筑
569 569 randomFunc[AdvEventType.Build] = function()
570   - if self.adv.isRelay and isEnter then return false end
  570 + -- if self.adv.isRelay and isEnter then return false end
571 571 return randomCommon()
572 572 end
573 573 --陷阱
... ...