From 46cc1d95911b4730300596719a483beb87e18e1d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 20 May 2021 18:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E9=99=90?= =?UTF-8?q?=E5=88=B6=E7=89=B9=E6=9D=83=E5=85=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BB=99=E5=B0=98=E5=8A=A0=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 ++ .../~Lua/Modules/Practice/PracticeImprintPanel.lua | 2 +- .../ManagedResources/~Lua/Modules/Practice/PracticePanel.lua | 2 +- Assets/ManagedResources/~Lua/View/PlayerInfoView.lua | 4 ++-- Assets/ManagedResources/~Lua/View/UpView.lua | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 04e0ffba9e..dbfc8f1b03 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -484,6 +484,7 @@ PanelType = { XinJiangLaiXi = {14,16,1210},--新将来袭 XiangYaoDuoBao = {14,16,1220},--降妖夺宝 NiuQiChongTian = {14,16,1300},--牛气冲天 + XiuXing = {14,16,1226},--修行 } @@ -545,6 +546,7 @@ UpViewRechargeType = { DingKunShenChu = 1004,-- 定卦神锄 XuanHuangZhiQi = 100,--玄黄之气 YeQiuQuan = 1220,--野球拳法 + XiuXian = 1226,--修仙花费 } SHOP_PAGE = { diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 00ab052eba..4d7d92744e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -53,7 +53,7 @@ end --待功能扩展(试图打开某个状态) function PracticeImprint:OnOpen() - self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.XiuXing }) -- self.Scrollgrid:GetComponent("RectTransform").pivot = Vector2.New(1,1) end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 1a80657f26..039ea2c3cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -112,7 +112,7 @@ end --待功能扩展(试图打开某个状态) function Practice:OnOpen() - self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main }) + self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.XiuXing }) self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice }) end diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index dd9d6d0c91..a820ab3a87 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -85,7 +85,7 @@ function PlayerInfoView:OnOpen(...) self:OnShow() self:RefreshPower() -- 默认关闭特权显示 - self:SetPrivilegeShow(true) + self:SetPrivilegeShow(false) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) @@ -137,7 +137,7 @@ function PlayerInfoView:SetLayer(sortingOrder) end function PlayerInfoView:SetPrivilegeShow(isShow) - -- self.vipPrivilegeBtn:SetActive(not not isShow) + self.vipPrivilegeBtn:SetActive(not not isShow) end return PlayerInfoView \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 8967204ba4..4b9b16b1cc 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -53,6 +53,7 @@ local _ShowPlusType = { UpViewRechargeType.YeQiuQuan, UpViewRechargeType.HuaLingFu, UpViewRechargeType.XuanHuangZhiQi, + UpViewRechargeType.XiuXian, } -- 判断是否显示加号 @@ -361,7 +362,8 @@ function UpView:RechargeType(_type) _type==UpViewRechargeType.YHMF or _type==UpViewRechargeType.EndlessCoin or _type==UpViewRechargeType.QuLingBi or - _type==UpViewRechargeType.XuanHuangZhiQi then + _type==UpViewRechargeType.XuanHuangZhiQi or + _type==UpViewRechargeType.XiuXian then UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type) end end