From a544abe9cc2dd7cd1c9383abc3cfb789f1a129f9 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 19 Jan 2022 17:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=97=E5=BF=97=E6=88=90=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 4 ++++ .../~Lua/Modules/Guild/MyGuildManager.lua | 12 ++++++++++++ .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 ++ .../~Lua/Modules/Net/IndicationManager.lua | 8 ++++++++ .../~Lua/Modules/NewActivity/ExpertPage.lua | 7 +++++++ .../~Lua/Modules/Player/JumpManager.lua | 3 +++ 6 files changed, 36 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 612848862e..a15a12c40d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1041,6 +1041,7 @@ RedPointType = { HomeLand = 700,--主城家园红点 FestevalRed = 9501, + zhognzhichengcheng = 9601, } RedPointStatus = { @@ -1207,6 +1208,8 @@ JumpType = { tehuishangcheng = 18888,--特惠商城 TreasureStoreSeason2 = 20300,--新百宝商会 + + zhongzhichengcheng = 96001, --众志成城 } NPCPosType={ @@ -1420,6 +1423,7 @@ ActivityTypeDef = { yunmenghaoli = 93, --云梦好礼 qiandaohaoli = 95, --节日签到 + zhongzhichengcheng = 96, } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index f97e4e17da..e223787682 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -2,6 +2,7 @@ local this = MyGuildManager local guildSacrificeRewardConfig=ConfigManager.GetConfig(ConfigName.GuildSacrificeRewardConfig) local guildHelpConfig=ConfigManager.GetConfig(ConfigName.GuildHelpConfig) +this.exploreNums = {} function this.Initialize() this.MyGuildInfo = nil this.MyMemInfo = nil @@ -46,6 +47,7 @@ end function MyGuildManager.SetMyGuildInfo(msg) -- 公会信息 this.MyGuildInfo = msg.familyBaseInfo + MyGuildManager.SetMyGuildExploreNums(this.MyGuildInfo.id,this.MyGuildInfo.exploreTimes) this.MyFeteInfo.score= this.MyGuildInfo.fete --登录时的奖励进度信息 后续数据刷新由MyGuildManager.MyFeteInfo.score操作 --Log("我的公会ID:"..this.MyGuildInfo.id) if this.MyGuildInfo.id then @@ -954,4 +956,14 @@ function MyGuildManager.ShowGuildAidCdTime(_isShowTips) end return true end + +-- 设置我的公会信息 +function MyGuildManager.SetMyGuildExploreNums(id,nums) + this.exploreNums[id] = nums + +end + +function MyGuildManager.GetMyGuildExploreNums() + return this.exploreNums[this.MyGuildInfo.id] or 0 +end return this \ 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 c4190e4db7..b076677ee8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1111,6 +1111,8 @@ function this:TabBtnAction(id,actType,data) CheckRedPointStatus(RedPointType.chaozhifanli) elseif id == ActivityTypeDef.yunmenghaoli then UIManager.OpenPanel(UIName.DailyRechargePanel,id) + elseif id == ActivityTypeDef.zhongzhichengcheng then + UIManager.OpenPanel(UIName.ActivityMainPanel,id) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 6f89d5c442..5e4bc2288c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -1108,5 +1108,13 @@ function this.HomeLandIndication(buffer) -- end HomeLandManager.GetServerData(msg) end +-- 家园功能解锁 +function this.HomeLandIndication(buffer) + local data = buffer:DataByte() + local msg = PlayerInfoProto_pb.ArchitectureUnlockIndication() + msg:ParseFromString(data) + MyGuildManager.SetMyGuildExploreNums(msg.id,msg.exploreTimes) + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityProgressStateChange) +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index 1ec3d6c48c..de3593d580 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -118,6 +118,12 @@ function ExpertPage:OnShow(_sortingOrder) Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder) self.sortingOrder = _sortingOrder end + + if self.actType == ActivityTypeDef.zhongzhichengcheng then + self.parent.tabbox.gameObject:SetActive(false) + else + self.parent.tabbox.gameObject:SetActive(true) + end end function ExpertPage:RefreshBtns() @@ -201,6 +207,7 @@ end function ExpertPage:OnClose() self.gameObject:SetActive(false) + self.parent.tabbox.gameObject:SetActive(true) end function ExpertPage:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 5787551ea3..aad2848bb3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -883,6 +883,9 @@ local jumpDic = { PopupTipPanel.ShowTip("活动尚未开启") end end, + [JumpType.zhongzhichengcheng] = function(data,args) + this.JumpActivity(ActivityTypeDef.zhongzhichengcheng,data[1]) + end, } function this.JumpActivity(data,skipfactor)