diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png index 2d23ede46c..d8f5181102 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png index 56e6943cd9..bac0f36d0c 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png differ diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 1372ee06e6..401d0ff177 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -90,7 +90,7 @@ function GMPanel:InitComponent() {type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "跳转测试", inputTip = {"输入跳转ID"}, callBack = this.TestJump}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = "逍遥游", inputTip = {"类型#mapId#bossId"}, callBack = nil}, - {type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "功能引导测试", inputTip = {"请输入引导ID"}, callBack = this.TestFuncGuide}, + {type = GMType.Function, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "功能引导测试", inputTip = {"请输入功能ID", "1去主界面2去挂机界面"}, callBack = this.TestFuncGuide}, {type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "红点Debug", inputTip = {""}, callBack = this.OpenRedDebug}, @@ -319,9 +319,20 @@ function this.TestJump(text) JumpManager.GoJump(tonumber(text)) end -- 测试功能引导 -function this.TestFuncGuide(text) +function this.TestFuncGuide(text, goType) + local gid = tonumber(text) - GuideManager.AddFuncGuide(gid) + -- 判断要前往的界面 + if goType == "1" then + GuideManager.AddFuncGuide(gid) + this:ClosePanel() + elseif goType == "2" then + GuideManager.AddFuncGuide(gid) + UIManager.OpenPanel(UIName.FightPointPassMainPanel) + else + PopupTipPanel.ShowTip("请输入要前往的界面") + end + end -- 红点Debug function this.OpenRedDebug() diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua index 3533726842..d8e1ff4cd3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua @@ -2,7 +2,7 @@ local this = StoryMapManager this.groupConfigs = {} this.isShowStory = 0 ---local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig) +local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig) --初始化 function this.Initialize()