--(24暂时关闭)
parent
206c3d93a0
commit
f1755d0efa
|
@ -1,7 +1,4 @@
|
|||
require("Base/BasePanel")
|
||||
-- local ctrlView = require("Modules/Guild/View/GuildSceneView")
|
||||
-- local _IsMapView = false
|
||||
-- local _IsWalkData = false
|
||||
|
||||
local _GuildBuildConfig = {
|
||||
[GUILD_MAP_BUILD_TYPE.HOUSE] = {
|
||||
|
@ -12,10 +9,6 @@ local _GuildBuildConfig = {
|
|||
UIManager.OpenPanel(UIName.GuildInfoPopup)
|
||||
end,
|
||||
},
|
||||
-- [GUILD_MAP_BUILD_TYPE.LOGO] = { --图腾
|
||||
-- isOpen = false,
|
||||
-- btnName = "btnLogo",
|
||||
-- },
|
||||
[GUILD_MAP_BUILD_TYPE.STORE] = {
|
||||
isOpen = true,
|
||||
rpType = RedPointType.Guild_Shop,
|
||||
|
@ -29,19 +22,6 @@ local _GuildBuildConfig = {
|
|||
UIManager.OpenPanel(UIName.MainShopPanel, SHOP_TYPE.GUILD_SHOP)
|
||||
end,
|
||||
},
|
||||
-- [GUILD_MAP_BUILD_TYPE.DOOR] = { --公会战
|
||||
-- },
|
||||
-- [GUILD_MAP_BUILD_TYPE.LOGO_IMG] = {
|
||||
-- bgImg = "gh_tt_1",
|
||||
-- nameImg = nil,
|
||||
-- pos = Vector3.New(495, -750, 0),
|
||||
-- },
|
||||
-- [GUILD_MAP_BUILD_TYPE.BOSS] = { --试练
|
||||
-- rpType = RedPointType.Guild_Boss,
|
||||
-- liveName = "live2d_huyao",
|
||||
-- livePos = Vector3.New(0, -84, 0),
|
||||
-- liveScale = Vector3.New(0.15, 0.15, 0.15),
|
||||
-- },
|
||||
[GUILD_MAP_BUILD_TYPE.FETE] = { --祭祀
|
||||
isOpen = true,
|
||||
rpType = RedPointType.Guild_Fete,
|
||||
|
@ -265,19 +245,13 @@ function GuildMainCityPanel:AddListener()
|
|||
-- ctrlView.AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Guild.OnQuitGuild, this.OnQuitGuild)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Guild.BeKickOut, this.OnQuitGuild)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Guild.DataUpdate, this.RefreshLogoShow)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Guild.DismissStatusChanged, this.RefreshStageShow)
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.GuildFight.FightBaseDataUpdate, this.RefreshStageShow)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.GuildFight.EnemyBaseDataUpdate, this.RefreshGuildInfo)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.GuildFight.ResultDataUpdate, this.RefreshGuildInfo)
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.GuildFight.AttackStageDefendDataUpdate, this.RefreshGetStar)
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.GuildRedPacket.OnCloseRedPointClick, this.CloseRedPointClick)
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshDeathPos)
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnChangeName, this.FreshPlayerInfo)
|
||||
end
|
||||
|
||||
|
@ -286,19 +260,13 @@ function GuildMainCityPanel:RemoveListener()
|
|||
-- ctrlView.RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.OnQuitGuild, this.OnQuitGuild)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.BeKickOut, this.OnQuitGuild)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.DataUpdate, this.RefreshLogoShow)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.DismissStatusChanged, this.RefreshStageShow)
|
||||
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.FightBaseDataUpdate, this.RefreshStageShow)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.EnemyBaseDataUpdate, this.RefreshGuildInfo)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.ResultDataUpdate, this.RefreshGuildInfo)
|
||||
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.AttackStageDefendDataUpdate, this.RefreshGetStar)
|
||||
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildRedPacket.OnCloseRedPointClick, this.CloseRedPointClick)
|
||||
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshDeathPos)
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnChangeName, this.FreshPlayerInfo)
|
||||
end
|
||||
|
||||
|
@ -320,100 +288,25 @@ function GuildMainCityPanel:OnShow()
|
|||
Log(Language[10405])
|
||||
return
|
||||
end
|
||||
|
||||
-- if not _IsMapView then
|
||||
-- _IsMapView = true
|
||||
-- Log("公会地图创建")
|
||||
-- ctrlView.Init()
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.HOUSE, function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildInfoPopup)
|
||||
-- end)
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.LOGO, function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildLogoPopup)
|
||||
-- end)
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.DOOR, function ()
|
||||
-- local curStage = GuildFightManager.GetCurFightStage()
|
||||
-- if curStage == GUILD_FIGHT_STAGE.CLOSE then
|
||||
-- local stageData = GuildFightManager.GetGuildFightData()
|
||||
-- if stageData.joinType == 1 then
|
||||
-- PopupTipPanel.ShowTip("公会战期间加入的新成员无法参与本次公会战")
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip("公会战未开启,敬请期待")
|
||||
-- end
|
||||
-- return
|
||||
-- end
|
||||
-- if curStage == GUILD_FIGHT_STAGE.DISSMISS then
|
||||
-- PopupTipPanel.ShowTip("公会解散中,无法参与公会战")
|
||||
-- return
|
||||
-- end
|
||||
-- UIManager.OpenPanel(UIName.GuildFightPopup)
|
||||
-- end)
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.STORE, function ()
|
||||
-- local isActive = ShopManager.IsActive(SHOP_TYPE.GUILD_SHOP)
|
||||
-- if not isActive then
|
||||
-- PopupTipPanel.ShowTip("公会商店尚未解锁")
|
||||
-- return
|
||||
-- end
|
||||
-- UIManager.OpenPanel(UIName.MainShopPanel, SHOP_TYPE.GUILD_SHOP)
|
||||
-- end)
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.BOSS, function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildBossPanel)
|
||||
-- end)
|
||||
-- --公会祭祀
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.FETE, function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildFetePopup)
|
||||
-- end)
|
||||
-- --十绝阵
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.TENPOS,function ()
|
||||
-- if DeathPosManager.status==DeathPosStatus.Death then
|
||||
-- PopupTipPanel.ShowTip("十绝阵在开服3天后开启!")
|
||||
-- return
|
||||
-- elseif DeathPosManager.status==DeathPosStatus.Close then
|
||||
-- PopupTipPanel.ShowTip("未在挑战时间!")
|
||||
-- return
|
||||
-- end
|
||||
-- UIManager.OpenPanel(UIName.DeathPosPanel)
|
||||
-- end)
|
||||
-- --技能
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.SKILL,function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildSkillUpLvPopup)
|
||||
-- end)
|
||||
-- --车迟
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.CARDELAY,function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
|
||||
-- end)
|
||||
-- --援助
|
||||
-- ctrlView.AddPointFunc(GUILD_MAP_BUILD_TYPE.AID,function ()
|
||||
-- UIManager.OpenPanel(UIName.GuildAidMainPopup)
|
||||
-- end)
|
||||
-- end
|
||||
-- 刷新一遍公会数据,这里主要是为了刷新玩家位置信息,避免返回地图界面出现的问题
|
||||
NetManager.RequestMyGuildInfo(function()
|
||||
-- if not _IsWalkData then
|
||||
-- ctrlView.InitWalkData()
|
||||
-- _IsWalkData = true
|
||||
-- end
|
||||
-- 刷洗图腾显示
|
||||
this.RefreshLogoShow()
|
||||
end)
|
||||
|
||||
NetManager.RequestMyGuildInfo()
|
||||
-- 刷新公会战阶段信息
|
||||
this.RefreshStageShow()
|
||||
-- 开始定时刷新聊天数据
|
||||
this.ChatTipView:StartCheck()
|
||||
-- 刷新十绝阵是否开启
|
||||
this.RefreshDeathPos()
|
||||
|
||||
-- 开始吧
|
||||
this._TimeUpdate()
|
||||
if not this._TimeCounter then
|
||||
this._TimeCounter = Timer.New(this._TimeUpdate, 1, -1, true)
|
||||
this._TimeCounter:Start()
|
||||
end
|
||||
|
||||
|
||||
this.FreshPlayerInfo()
|
||||
this.SetPlayerHead()
|
||||
|
||||
--(24暂时关闭)删除这里就行
|
||||
this.btnRedPacket:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
|
@ -438,15 +331,6 @@ function this.SetPlayerHead()
|
|||
|
||||
end
|
||||
|
||||
-- 刷新公会地图图腾显示
|
||||
function this.RefreshLogoShow()
|
||||
-- if ctrlView and _IsMapView then
|
||||
-- local guildData = MyGuildManager.GetMyGuildInfo()
|
||||
-- ctrlView.SetGuildLogo(guildData.icon)
|
||||
-- end
|
||||
end
|
||||
|
||||
--
|
||||
function this.RefreshStageShow()
|
||||
-- 关闭按钮显示
|
||||
this.btnOneKeyDefend:SetActive(false)
|
||||
|
|
|
@ -252,18 +252,16 @@ function OperatingPanel:RefreshTabStatus()
|
|||
|
||||
end
|
||||
--(24暂时关闭)删除这里就行
|
||||
--活动暂时关闭,开启时删掉就好了==========================================================================================================================
|
||||
self.operateTabs[1]:SetActive(false)
|
||||
self.operateTabs[2]:SetActive(false)
|
||||
self.operateTabs[9]:SetActive(false)
|
||||
self.operateTabs[3]:SetActive(false)
|
||||
self.operateTabs[10]:SetActive(false)
|
||||
self.operateTabs[11]:SetActive(false)
|
||||
self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128
|
||||
self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328
|
||||
|
||||
--==红点也解绑了,记得恢复,最后俩个
|
||||
--活动暂时关闭==========================================================================================================================
|
||||
--==========================================================================================================================
|
||||
self.operateTabs[1]:SetActive(false)
|
||||
self.operateTabs[2]:SetActive(false)
|
||||
self.operateTabs[9]:SetActive(false)
|
||||
self.operateTabs[3]:SetActive(false)
|
||||
self.operateTabs[10]:SetActive(false)
|
||||
self.operateTabs[11]:SetActive(false)
|
||||
self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128
|
||||
self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328
|
||||
--==========================================================================================================================
|
||||
end
|
||||
|
||||
function OperatingPanel:GetPriorityIndex()
|
||||
|
|
Loading…
Reference in New Issue