diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 46f8a18807..82f6946f03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -66,12 +66,12 @@ function this.OnLevelChange() -- 首充引导特殊处理到十级开放 if PlayerManager.level == 10 then LogError(" 首充加入引导") - if CheckListIsContainValue1(_FuncGuideList, 100200) == false then + --if CheckListIsContainValue1(_FuncGuideList, 100200) == false then --if PlayerPrefs.GetInt(PlayerManager.uid.."isGMEsp")==0 then --GuideManager.ShowGuide(100200) - table.insert(_FuncGuideList, 100200) + --table.insert(_FuncGuideList, 100200) --end - end + --end this.CheckFuncGuide() --解开孙悟空封印的剧情 StoryMapManager.isShowStory = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index f78c7ee81c..97b28c51c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -578,20 +578,23 @@ function this.ShowStory(nextId, OnFocus) local isShowStory = 1 if PlayerPrefs.HasKey("StoryMapPanel" .. StoryMapManager.isShowStory .. PlayerManager.uid) then isShowStory = PlayerPrefs.GetInt("StoryMapPanel" .. StoryMapManager.isShowStory .. PlayerManager.uid) + --LogWarn("dddddddddddddddddddddddddddd") end if isShowStory == 1 then this.gameObject:SetActive(false) local function onCloseStoryMapPanel() + --LogWarn("dddddddddddddddddddddddddddd") this.GameSetActive(nextId, OnFocus) Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel, onCloseStoryMapPanel) end Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel, onCloseStoryMapPanel) PlayerPrefs.SetInt("StoryMapPanel" .. StoryMapManager.isShowStory .. PlayerManager.uid, 0) StoryMapManager.InitData(StoryMapManager.isShowStory) + --LogWarn("dddddddddddddddddddddddddddd") else - this.NextGuide(nextId) - Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus) - Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus) + --this.NextGuide(nextId) + --Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus) + --Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus) end else this.NextGuide(nextId) @@ -602,6 +605,7 @@ end function this.GameSetActive(nextId, OnFocus) this.gameObject:SetActive(true) + --LogWarn("===================================") this.NextGuide(nextId) Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus) Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus) @@ -654,6 +658,7 @@ end -- 下一个 function this.NextGuide(nextId) + LogWarn("===================================") if audio then SoundManager.StopSound(audio) end diff --git a/BuildABs/Android/lz4/artfont_en.unity3d b/BuildABs/Android/lz4/artfont_en.unity3d index d787e7a244..9b36a2a796 100644 Binary files a/BuildABs/Android/lz4/artfont_en.unity3d and b/BuildABs/Android/lz4/artfont_en.unity3d differ diff --git a/BuildABs/Android/lz4/artfont_vi.unity3d b/BuildABs/Android/lz4/artfont_vi.unity3d index 545156bd5d..a5f5855e38 100644 Binary files a/BuildABs/Android/lz4/artfont_vi.unity3d and b/BuildABs/Android/lz4/artfont_vi.unity3d differ diff --git a/BuildABs/Android/lz4/atlas/publicatlas.unity3d b/BuildABs/Android/lz4/atlas/publicatlas.unity3d index 0c7ba30ae1..b2e2112a97 100644 Binary files a/BuildABs/Android/lz4/atlas/publicatlas.unity3d and b/BuildABs/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/BuildABs/Android/lz4/atlas/qijieshilianatlas.unity3d b/BuildABs/Android/lz4/atlas/qijieshilianatlas.unity3d index 7ecd25f21b..b65d39062e 100644 Binary files a/BuildABs/Android/lz4/atlas/qijieshilianatlas.unity3d and b/BuildABs/Android/lz4/atlas/qijieshilianatlas.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/live2d/live2d_c_0035_s1.unity3d b/BuildABs/Android/lz4/prefabs/live2d/live2d_c_0035_s1.unity3d index a346c977d6..08f3f4aa15 100644 Binary files a/BuildABs/Android/lz4/prefabs/live2d/live2d_c_0035_s1.unity3d and b/BuildABs/Android/lz4/prefabs/live2d/live2d_c_0035_s1.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d b/BuildABs/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d index ee3fed8d30..f29b62e7f0 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d and b/BuildABs/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/BuildABs/Android/lz4/prefabs/ui/dynamicacticity.unity3d index da3df238eb..e6d9e69e4e 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/BuildABs/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/guide.unity3d b/BuildABs/Android/lz4/prefabs/ui/guide.unity3d index 98a2808173..04a52e3087 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/guide.unity3d and b/BuildABs/Android/lz4/prefabs/ui/guide.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/harmony.unity3d b/BuildABs/Android/lz4/prefabs/ui/harmony.unity3d index baae47ffa7..89813c0036 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/harmony.unity3d and b/BuildABs/Android/lz4/prefabs/ui/harmony.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/linglong.unity3d b/BuildABs/Android/lz4/prefabs/ui/linglong.unity3d index 9fbdcd021c..833092eefe 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/linglong.unity3d and b/BuildABs/Android/lz4/prefabs/ui/linglong.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/popup.unity3d b/BuildABs/Android/lz4/prefabs/ui/popup.unity3d index 3eda2f3ce1..b31ff1c02d 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/popup.unity3d and b/BuildABs/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/qijieshilian.unity3d b/BuildABs/Android/lz4/prefabs/ui/qijieshilian.unity3d index 6e02c036b1..fdc2832a18 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/qijieshilian.unity3d and b/BuildABs/Android/lz4/prefabs/ui/qijieshilian.unity3d differ