diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index f8b49eb7d9..240f5406c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -60,9 +60,9 @@ function this.InitData(guideData) end -- 测试功能引导用 - --Timer.New(function() - -- this.OnFunctionOpen(67) - --end, 1):Start() + Timer.New(function() + this.OnFunctionOpen(86) + end, 1):Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua index 0487769af5..9f72d09ba4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua @@ -66,7 +66,7 @@ function HarmonyPanel:BindEvent() --共鸣按钮 Util.AddClick(self.GongMingBtn,function() local count = HarmonyManager:IsEnvoyCount() - if count == 6 then + if count >= 6 then -- body UIManager.OpenPanel(UIName.GongMingResultTips) else diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua index 15a43ff400..6c5a17ddae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua @@ -22,7 +22,7 @@ HeroData.__get__.lv = function(self) endLv = HarmonyManager.hongmengTablet else local curlvEen = HeroManager.heroLvEnd[self.id] - print(curlvEen," "..self.heroConfig.ReadingName) + --print(curlvEen," "..self.heroConfig.ReadingName) endLv = temp_lv > curlvEen and curlvEen or temp_lv end diff --git a/Assets/ManagedResources/~Lua/View/HarmonyView.lua b/Assets/ManagedResources/~Lua/View/HarmonyView.lua index 51a37cb93a..acaa069c8f 100644 --- a/Assets/ManagedResources/~Lua/View/HarmonyView.lua +++ b/Assets/ManagedResources/~Lua/View/HarmonyView.lua @@ -69,9 +69,13 @@ function HarmonyView:OnOpen() end) end for i = 1, #self.HongMengData do - for i = 1, #self.HongMengData[i].equipIdList do - HarmonyManager.equipCount= HarmonyManager.equipCount+1 + if self.HongMengData[i] then + -- body + for i = 1, #self.HongMengData[i].equipIdList do + HarmonyManager.equipCount= HarmonyManager.equipCount+1 + end end + end -- self.count = 1;