Commit dd42c06e129670e232ca5e64cc7a8e5743aa300a
Merge branch 'develop' into tr/cb
* develop: 冒险bug
Showing
2 changed files
with
2 additions
and
3 deletions
Show diff stats
src/adv/AdvBattle.lua
| @@ -14,7 +14,6 @@ function Battle:ctor(adv) | @@ -14,7 +14,6 @@ function Battle:ctor(adv) | ||
| 14 | self:initAfter() | 14 | self:initAfter() |
| 15 | if self.isNewPlayer then | 15 | if self.isNewPlayer then |
| 16 | self.player:triggerPassive(Passive.BORN_ONCE) | 16 | self.player:triggerPassive(Passive.BORN_ONCE) |
| 17 | - self.player:addExp((self.adv.level - 1) * 40) | ||
| 18 | end | 17 | end |
| 19 | end | 18 | end |
| 20 | 19 |
src/adv/AdvMap.lua
| @@ -523,7 +523,7 @@ createMap = function(self, mapId, isEnter, isNewRelay) | @@ -523,7 +523,7 @@ createMap = function(self, mapId, isEnter, isNewRelay) | ||
| 523 | --开放出口 | 523 | --开放出口 |
| 524 | randomFunc[AdvEventType.Diner] = function() | 524 | randomFunc[AdvEventType.Diner] = function() |
| 525 | -- if not self.adv.isRelay or isEnter or isNewRelay then return false end | 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 | end | 527 | end |
| 528 | 528 | ||
| 529 | --boss | 529 | --boss |
| @@ -567,7 +567,7 @@ createMap = function(self, mapId, isEnter, isNewRelay) | @@ -567,7 +567,7 @@ createMap = function(self, mapId, isEnter, isNewRelay) | ||
| 567 | end | 567 | end |
| 568 | --建筑 | 568 | --建筑 |
| 569 | randomFunc[AdvEventType.Build] = function() | 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 | return randomCommon() | 571 | return randomCommon() |
| 572 | end | 572 | end |
| 573 | --陷阱 | 573 | --陷阱 |