wasteland / server

Commit 4993ba1cfed90199f1b1a77afdb1060e8dcde110

Authored by zhouhaihai
2 parents 6f6be528 41e118a5

Merge branch 'develop' into player

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/GlobalVar.lua
  Show/Hide comments   View file @4993ba1
... ... @@ -138,7 +138,7 @@ TimeReset = {
138 138  
139 139 GuideStep = {
140 140 AdvGuide = 1010,
141   - AdvRelay = 1012,
  141 + AdvRelay = 1011,
142 142 }
143 143  
144 144 --客户端不需要知道这个
... ...
src/actions/AdvAction.lua
  Show/Hide comments   View file @4993ba1
... ... @@ -454,13 +454,13 @@ function _M.chooseArtifactRpc(agent, data)
454 454 local role = agent.role
455 455 local msg = MsgPack.unpack(data)
456 456  
457   - if not isCanContinue(role) then return end
  457 + if not isCanContinue(role) then return 1 end
458 458  
459 459 local adv = role:getAdvData()
460   - if not msg.idx then return end
461   - if not adv:isWaitChooseArtifact() then return end
  460 + if not msg.idx then return 2 end
  461 + if not adv:isWaitChooseArtifact() then return 3 end
462 462 local status = adv:chooseArtifact(msg.idx)
463   - if not status then return end
  463 + if not status then return 4 end
464 464 adv:saveDB()
465 465  
466 466 SendPacket(actionCodes.Adv_chooseArtifactRpc, '')
... ...