Merge branch 'develop' into player

zhouhaihai
2 parents 6f6be528 41e118a5
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
src/GlobalVar.lua
src/actions/AdvAction.lua
@@ -138,7 +138,7 @@ TimeReset = {
 GuideStep = {
 	AdvGuide = 1010,
-	AdvRelay = 1012,
+	AdvRelay = 1011,
 }
 --客户端不需要知道这个
@@ -454,13 +454,13 @@ function _M.chooseArtifactRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-	if not isCanContinue(role) then return end
+	if not isCanContinue(role) then return 1 end
 	local adv = role:getAdvData()
-	if not msg.idx then return end
-	if not adv:isWaitChooseArtifact() then return end
+	if not msg.idx then return 2 end
+	if not adv:isWaitChooseArtifact() then return 3 end
 	local status = adv:chooseArtifact(msg.idx)
-	if not status then return end
+	if not status then return 4 end
 	adv:saveDB()
 	SendPacket(actionCodes.Adv_chooseArtifactRpc, '')