diff --git a/Assets/ManagedResources/~Lua/Data/SoundData.lua b/Assets/ManagedResources/~Lua/Data/SoundData.lua index b7600e200d..ff5a1f21e9 100644 --- a/Assets/ManagedResources/~Lua/Data/SoundData.lua +++ b/Assets/ManagedResources/~Lua/Data/SoundData.lua @@ -95,4 +95,5 @@ SoundConfig = { Sound_dntg_qj ="UI_dntg_qj", Sound_dntg_cy ="UI_dntg_cy", Sound_all_switch ="UI_all_switch", + Sound_interface ="UI_interface", } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index bc5d358ed0..b214d299c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1014,6 +1014,8 @@ end --界面打开时调用(用于子类重写) function this:OnShow() + -- 音效 + SoundManager.PlaySound(SoundConfig.Sound_interface) isRefeshIcon = true this.vipLevelText.sprite = VipManager.SetVipLevelImg() timePressStarted = Time.realtimeSinceStartup diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 8b545a1db0..184c9a9f7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -115,7 +115,7 @@ function this.RegisterMessage(network) --公户副本推送 socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_BUY_BUFF_INDICATION, this.GuildChallengeBuyBuffIndication) --公户副本推送 - socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_FIVE_INDICATION, this.GuildChallengeFiveIndication) + -- socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_FIVE_INDICATION, this.GuildChallengeFiveIndication) end @@ -786,9 +786,9 @@ function this.GuildChallengeBuyBuffIndication(buffer) -- LogGreen("%%%%%%%%%%%msg.buffCount: "..msg.buffCount.." msg.buffTime: "..msg.buffTime) GuildTranscriptManager.RefreshGuildTranscriptBuffInfo(msg) end -function this.GuildChallengeFiveIndication(buffer) - -- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ") - GuildTranscriptManager.GuildChallengeFiveIndication() -end +-- function this.GuildChallengeFiveIndication(buffer) +-- -- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ") +-- GuildTranscriptManager.GuildChallengeFiveIndication() +-- end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 7c1cb37892..048a953f93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -27,7 +27,11 @@ local jumpDic = { UIManager.OpenPanel(UIName.GuildMainCityPanel) -- 进入公会界面之前初始化一遍数据 MyGuildManager.InitAllData(function() - UIManager.OpenPanel(UIName.GuildMainCityPanel) + -- UIManager.OpenPanel(UIName.GuildMainCityPanel) + local openPanel = UIManager.GetOpenPanel(UIName.GuildMainCityPanel) + if openPanel then + openPanel:OnShow() + end end) end else