diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 91887688ae..3626ed5249 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -491,13 +491,13 @@ function this.ExecuteLoading() if AppConst.isGuide then if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) and PlayerManager.level == 1 then -- 新的引导 - -- StoryManager.EventTrigger(300001) + StoryManager.EventTrigger(300001) --创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面 - StoryManager.EventTrigger(100001, function() - PatFaceManager.isLogin = true - UIManager.OpenPanel(UIName.FightPointPassMainPanel) - LoadingPanel.End() - end) + -- StoryManager.EventTrigger(100001, function() + -- PatFaceManager.isLogin = true + -- UIManager.OpenPanel(UIName.FightPointPassMainPanel) + -- LoadingPanel.End() + -- end) else PatFaceManager.isLogin = true UIManager.OpenPanel(UIName.FightPointPassMainPanel) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index 028061f2f8..f4d1897fa1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -50,10 +50,10 @@ function this.EventTrigger(eventId, callBack) elseif showType == 10 then -- 起名字界面 UIManager.OpenPanel(UIName.CreateNamePopup, showType, eventId, showValues, options) elseif showType == 14 then -- 引导战斗 - local fb = ConfigManager.GetConfigData(ConfigName.FakeBattle, 1004) + local fdata, fseed = BattleManager.GetFakeBattleData(1017) local testFightData = { - fightData = loadstring("return "..fb.FightData)(), - fightSeed = fb.TimeSeed, + fightData = fdata, + fightSeed = fseed, fightType = 0, maxRound = 20 }