Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
b281d6e5cb
|
@ -79,7 +79,7 @@ function this.InitData(guideData)
|
||||||
funcDic = {}
|
funcDic = {}
|
||||||
--this.RefreshTriggerListen(1701, 35, { 17,})
|
--this.RefreshTriggerListen(1701, 35, { 17,})
|
||||||
--只有勾了新手引导,才会读取引导数据,否则置为-1
|
--只有勾了新手引导,才会读取引导数据,否则置为-1
|
||||||
if not AppConst.isGuide then
|
if not AppConst.isGuide or PlayerManager.level == 200 then
|
||||||
openDic[GuideType.Force] = -1
|
openDic[GuideType.Force] = -1
|
||||||
NetManager.SaveGuideDataRequest(GuideType.Force, -1)
|
NetManager.SaveGuideDataRequest(GuideType.Force, -1)
|
||||||
return
|
return
|
||||||
|
|
|
@ -487,7 +487,7 @@ function this.ExecuteLoading()
|
||||||
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
|
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||||
|
|
||||||
if AppConst.isGuide then
|
if AppConst.isGuide then
|
||||||
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then
|
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) and PlayerManager.level == 1 then
|
||||||
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
|
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
|
||||||
StoryManager.EventTrigger(100001, function()
|
StoryManager.EventTrigger(100001, function()
|
||||||
PatFaceManager.isLogin = true
|
PatFaceManager.isLogin = true
|
||||||
|
|
Loading…
Reference in New Issue