wasteland / server

Commit eb87ab7dc07411d9693f39b55c6572bc46a1ecaa

Authored by 测试
2 parents 4f7cffe5 c3b1fa38

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

Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/actions/PvpAction.lua
  Show/Hide comments   View file @eb87ab7
@@ -735,6 +735,7 @@ function _M.endBattleHRpc(agent, data) @@ -735,6 +735,7 @@ function _M.endBattleHRpc(agent, data)
735 myRank = myRank, 735 myRank = myRank,
736 oldMyRank = oldMyRank, 736 oldMyRank = oldMyRank,
737 video = video, 737 video = video,
  738 + headers = headers,
738 isWin = isWin, 739 isWin = isWin,
739 })) 740 }))
740 return true 741 return true
src/adv/AdvBlock.lua
  Show/Hide comments   View file @eb87ab7
@@ -332,7 +332,9 @@ end @@ -332,7 +332,9 @@ end
332 function Block:getObstacle() 332 function Block:getObstacle()
333 if self:isMonster() then 333 if self:isMonster() then
334 local enemy = self.room.map.adv.battle:getEnemy(self.room.roomId, self.blockId) 334 local enemy = self.room.map.adv.battle:getEnemy(self.room.roomId, self.blockId)
335 - return enemy:getObstacle() 335 + if enemy then
  336 + return enemy:getObstacle()
  337 + end
336 end 338 end
337 local data = self:getEventData() 339 local data = self:getEventData()
338 if not data then return 0 end 340 if not data then return 0 end