Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
e7bc8b0aff
|
|
@ -95,4 +95,5 @@ SoundConfig = {
|
||||||
Sound_dntg_qj ="UI_dntg_qj",
|
Sound_dntg_qj ="UI_dntg_qj",
|
||||||
Sound_dntg_cy ="UI_dntg_cy",
|
Sound_dntg_cy ="UI_dntg_cy",
|
||||||
Sound_all_switch ="UI_all_switch",
|
Sound_all_switch ="UI_all_switch",
|
||||||
|
Sound_interface ="UI_interface",
|
||||||
}
|
}
|
||||||
|
|
@ -1014,6 +1014,8 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function this:OnShow()
|
function this:OnShow()
|
||||||
|
-- 音效
|
||||||
|
SoundManager.PlaySound(SoundConfig.Sound_interface)
|
||||||
isRefeshIcon = true
|
isRefeshIcon = true
|
||||||
this.vipLevelText.sprite = VipManager.SetVipLevelImg()
|
this.vipLevelText.sprite = VipManager.SetVipLevelImg()
|
||||||
timePressStarted = Time.realtimeSinceStartup
|
timePressStarted = Time.realtimeSinceStartup
|
||||||
|
|
|
||||||
|
|
@ -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_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
|
end
|
||||||
|
|
||||||
|
|
@ -786,9 +786,9 @@ function this.GuildChallengeBuyBuffIndication(buffer)
|
||||||
-- LogGreen("%%%%%%%%%%%msg.buffCount: "..msg.buffCount.." msg.buffTime: "..msg.buffTime)
|
-- LogGreen("%%%%%%%%%%%msg.buffCount: "..msg.buffCount.." msg.buffTime: "..msg.buffTime)
|
||||||
GuildTranscriptManager.RefreshGuildTranscriptBuffInfo(msg)
|
GuildTranscriptManager.RefreshGuildTranscriptBuffInfo(msg)
|
||||||
end
|
end
|
||||||
function this.GuildChallengeFiveIndication(buffer)
|
-- function this.GuildChallengeFiveIndication(buffer)
|
||||||
-- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ")
|
-- -- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ")
|
||||||
GuildTranscriptManager.GuildChallengeFiveIndication()
|
-- GuildTranscriptManager.GuildChallengeFiveIndication()
|
||||||
end
|
-- end
|
||||||
|
|
||||||
return this
|
return this
|
||||||
|
|
@ -27,7 +27,11 @@ local jumpDic = {
|
||||||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||||
-- 进入公会界面之前初始化一遍数据
|
-- 进入公会界面之前初始化一遍数据
|
||||||
MyGuildManager.InitAllData(function()
|
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)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue