From 5c11a67393cab632ac0ab63fc88a8376ed2d3ad3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 23 Sep 2021 12:01:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/RewardItemPopup.prefab | 16 +++--- .../GeneralPanel/GeneralRankRewardPanel.lua | 1 + .../GeneralPanel/GeneralTreasurePanel.lua | 4 +- .../Modules/JumpServer/JumpServerPanel.lua | 56 ++++++++++++------- .../~Lua/Modules/Player/RedpotManager.lua | 2 +- .../QiJieShiLian/QiJieShiLianManager.lua | 2 + 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index 4acd5b98c5..803d616c27 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -6478,8 +6478,8 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 30 - m_Bottom: 30 + m_Top: 10 + m_Bottom: 10 m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 @@ -13020,10 +13020,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 60 m_Alignment: 3 m_AlignByGeometry: 0 @@ -13597,10 +13597,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 60 m_Alignment: 3 m_AlignByGeometry: 0 @@ -13894,10 +13894,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 60 m_Alignment: 3 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 5c523e7fbe..088b814b2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -162,6 +162,7 @@ function GeneralRankRewardPanel:OnOpen(Type,myRank,activityId) this.scrollRect.transform.sizeDelta = vec[curRankType] this.ScrollView.transform.sizeDelta = vec[curRankType] this.RefreshMyInfo() + this.text.text = "排行奖励将在周日23:30后通过邮件发放" end this.ShowRewardInfo() end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index e12feb20e5..62887b16fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -2,7 +2,7 @@ require("Base/BasePanel") local GeneralTreasurePanel = Inherit(BasePanel) local itemnum = 0 local LocalData = { - [ActivityTypeDef.QiJieTreasure] = {hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 + [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 } --初始化组件(用于子类重写) function GeneralTreasurePanel:InitComponent() @@ -93,7 +93,7 @@ end --任务列表 function GeneralTreasurePanel:showTaskList(isTop,isAni) - self.scoreText.text = self.treasureData.value + self.scoreText.text = BagManager.GetTotalItemNum(LocalData[self.curType].itemId) if not self.itemsList then self.itemsList = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index 04f221892a..c205b90961 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -1,9 +1,12 @@ require("Base/BasePanel") JumpServerPanel = Inherit(BasePanel) local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) +local globalSys = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) local type = { - [1] = { + [JumpServer_Type.HightLadder] = { id = JumpServer_Type.HightLadder, --跨服天梯 + funcId = FUNCTION_OPEN_TYPE.JumpServer_HightLadder, + sort = 1, bg = "r_Dungeon_rendi_01", name = "k_kuafuwanfa_luofuzhengfeng", live = "m_chsm_0035_png", @@ -16,8 +19,10 @@ local type = { tipStr = "", state = 0 }, - [3] = { - id = -1, + [JumpServer_Type.YuXuLunDao] = { + id = JumpServer_Type.YuXuLunDao, + funcId = FUNCTION_OPEN_TYPE.JumpServer_YuXu, + sort = 3, bg = "r_Dungeon_rendi_01", name = "y_yuxulundao_yuxurukou_zh", live = "m_chsm_0035_png", @@ -28,10 +33,12 @@ local type = { tip = string.format("%s",specialConfig[127].Value), redPointType = RedPointType.JumpServer_HightLadder, tipStr = "", - state = 1 + state = 0, }, - [2] = { + [JumpServer_Type.QiJieShiLian] = { id = JumpServer_Type.QiJieShiLian, + funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN, + sort = 2, bg = "q_qjsl_rikou_di", name = "q_qjsl_rikou_ysz", live = "m_chsm_0035_png", @@ -42,10 +49,11 @@ local type = { tip = "", redPointType = RedPointType.QiJieShiLian, tipStr = "", - state = 1 + state = 0, }, [4] = { id = -1, + sort = 4, bg = "r_Dungeon_rendi_01" }, } @@ -59,10 +67,10 @@ function JumpServerPanel:InitComponent() self.carbons = {} self.carbonsRedPoint = {} - for i = 1, #type do - local btn = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/otherBtn"..i) - table.insert(self.carbons, btn) - table.insert(self.carbonsRedPoint, Util.GetGameObject(btn, "bg/carbon/redPoint")) + for k,v in pairs(type) do + local btn = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/otherBtn"..v.sort) + self.carbons[k] = btn + self.carbonsRedPoint[k] = Util.GetGameObject(btn, "bg/carbon/redPoint") end self.effect = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect") @@ -78,9 +86,9 @@ function JumpServerPanel:BindEvent() Util.AddClick(self.backBtn,function() self:ClosePanel() end) - for i = 1, #type do - if type[i].redPointType and self.carbons[i] then - BindRedPointObject(type[i].redPointType, self.carbonsRedPoint[i]) + for k,v in pairs(type) do + if v.redPointType and self.carbons[k] then + BindRedPointObject(v.redPointType, self.carbonsRedPoint[k]) end end end @@ -100,9 +108,9 @@ end --界面打开时调用(用于子类重写) function JumpServerPanel:OnShow(...) - for i = 1, #type do - if type[i].redPointType and self.carbons[i] then - CheckRedPointStatus(type[i].redPointType) + for k,v in pairs(type) do + if v.redPointType and self.carbons[k] then + CheckRedPointStatus(v.redPointType) end end self:UpdateCarbonContent() @@ -114,7 +122,7 @@ function JumpServerPanel:UpdateCarbonContent() for k,v in ipairs(self.carbons) do local data = type[k] Util.GetGameObject(v, "bg"):GetComponent("Image").sprite = self.spLoader:LoadSprite(data.bg) - if data.id == -1 then + if data.id == -1 or globalSys[data.funcId].IsOpen == 0 then Util.GetGameObject(v, "bg/carbon"):SetActive(false) Util.GetGameObject(v, "bg/InfoBg"):SetActive(false) Util.GetGameObject(v, "bg/Text").gameObject:SetActive(true) @@ -186,13 +194,14 @@ function JumpServerPanel:SystemState(id,fun) fun() fun = nil end - return end if id == JumpServer_Type.HightLadder then --判断功能是否开启 if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then type[id].state = -1 type[id].tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.JumpServer_HightLadder) + func() + return end --判断世界等级是否够 local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel @@ -200,12 +209,14 @@ function JumpServerPanel:SystemState(id,fun) type[id].state = -2 type[id].tipStr = string.format("世界等级到达%s后开启!",conFigWorldLevel) func() + return end --判断是否在赛季中 if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁 type[id].state = -3 type[id].tipStr = "赛季过渡中!" func() + return end JumpServerManager.GetWorldArenaInfoRequest(function() if not JumpServerManager.GetHightLadderDataIsStart() then @@ -219,6 +230,7 @@ function JumpServerPanel:SystemState(id,fun) type[id].tipStr = "" end func() + return end) elseif id== JumpServer_Type.YuXuLunDao then -- 判断功能是否开启 @@ -241,6 +253,7 @@ function JumpServerPanel:SystemState(id,fun) type[id].tipStr = "" end func() + return end) elseif id== JumpServer_Type.QiJieShiLian then -- 判断功能是否开启 @@ -263,6 +276,7 @@ function JumpServerPanel:SystemState(id,fun) type[id].tipStr = "" end func() + return end) end end @@ -274,9 +288,9 @@ end --界面销毁时调用(用于子类重写) function JumpServerPanel:OnDestroy() self.carbons = {} - for i = 1, #type do - if type[i].redPointType and self.carbons[i] then - ClearRedPointObject(type[i].redPointType, self.carbonsRedPoint[i]) + for k,v in pairs(type) do + if v.redPointType and self.carbons[k] then + ClearRedPointObject(v.redPointType, self.carbonsRedPoint[k]) end end self.spLoader:Destroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 5fa3c0b3fe..562feb7a27 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -570,7 +570,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong) RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu) --七界试炼 - RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint) + RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN) end -- 向红点绑定物体 diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index cb43d77c8f..8eba2ef6ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -202,6 +202,8 @@ function this.GetBattleResult() bonue = config.RoundReward[i][2] if config.RoundReward[i+1] then bonue = config.RoundReward[i][2] + else + bonue = 0 end end end