From 9345c31d8bddc86cb3eba75fc945cae0a45d02f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AA?= <2han9b1a0@gmial.com> Date: Mon, 21 Feb 2022 10:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E5=8A=9B=E5=86=B2=E5=88=BA?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/PowerRice/PowerRicePanel.prefab | 36 +++++++++---------- .../~Lua/Modules/PowerRice/PowerRicePanel.lua | 13 ++++--- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab b/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab index 47288ec314..ebe3114310 100644 --- a/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab @@ -546,7 +546,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1700717659683241118} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -764,6 +764,7 @@ RectTransform: m_Children: - {fileID: 3821167780554179188} - {fileID: 6991887406947613301} + - {fileID: 7113522986544161244} - {fileID: 6299137775443855104} - {fileID: 5703870284674408078} - {fileID: 3494299099718931292} @@ -1414,7 +1415,6 @@ RectTransform: - {fileID: 1711363629007474723} - {fileID: 4238880091648937923} - {fileID: 7153099400467144522} - - {fileID: 7113522986544161244} m_Father: {fileID: 1700717659683241118} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1648,12 +1648,12 @@ RectTransform: - {fileID: 121086063726210905} - {fileID: 4356974947603394339} m_Father: {fileID: 1700717659683241118} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1108, y: -49} - m_SizeDelta: {x: 900, y: 140} + m_SizeDelta: {x: 1000, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3257478417192666744 GameObject: @@ -1905,12 +1905,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8470557795340520745} - m_Father: {fileID: 3821167780554179188} - m_RootOrder: 9 + m_Father: {fileID: 1700717659683241118} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -274, y: 802} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 204, y: -126} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1926422399288210892 @@ -2000,7 +2000,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1700717659683241118} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2212,7 +2212,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -545} + m_AnchoredPosition: {x: 0, y: -624} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &122424317090520997 @@ -2894,7 +2894,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1700717659683241118} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3204,7 +3204,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -379.74002} - m_SizeDelta: {x: 912.8, y: 859.52} + m_SizeDelta: {x: 1000, y: 859.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8384265009896266693 CanvasRenderer: @@ -3276,12 +3276,12 @@ RectTransform: - {fileID: 9217716073908009951} - {fileID: 2786481321683172066} m_Father: {fileID: 1700717659683241118} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1108, y: -272} - m_SizeDelta: {x: 900, y: 140} + m_SizeDelta: {x: 1000, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7075936682646143345 GameObject: @@ -3392,7 +3392,7 @@ RectTransform: - {fileID: 264047954469941067} - {fileID: 4900932309319581792} m_Father: {fileID: 1700717659683241118} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3656,7 +3656,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 369, y: 37} + m_AnchoredPosition: {x: 417, y: 27} m_SizeDelta: {x: 186, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5006147964805573017 @@ -3852,7 +3852,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8113595644961861806 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua b/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua index 5f52705027..852314e5e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua @@ -3,7 +3,7 @@ local PowerRice = Inherit(BasePanel) local globalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) local this = PowerRice local STATE = { - [0] = {Img = "s_slbz_1anniuhuangse",text = Language[11948]}, + [0] = {Img = "s_slbz_1anniuhuangse",text = Language[10556]}, [1] = {Img = "s_slbz_1anniuongse",text = Language[11948]}, [2] = {Img = "s_slbz_1anniuhuise",text = Language[10101]}, } @@ -27,7 +27,7 @@ function PowerRice:InitComponent() self.leftTime = Util.GetGameObject(self.gameObject,"bg/timeBg/LeftTime"):GetComponent("Text") self.text1 = Util.GetGameObject(self.gameObject,"bg/tiao/Text1"):GetComponent("Text") self.text2 = Util.GetGameObject(self.gameObject,"bg/tiao/Text4"):GetComponent("Text") - self.power = Util.GetGameObject(self.gameObject,"bg/power"):GetComponent("Text") + self.power = Util.GetGameObject(self.gameObject,"power"):GetComponent("Text") self.grid = Util.GetGameObject(self.gameObject,"bg/ren") self.Scroll = Util.GetGameObject(self.gameObject,"Scroll") @@ -104,7 +104,7 @@ end function this.SwitchView(index) --先执行上一面板关闭逻辑 curIndex = index - this:OnShow() + PowerRice:Refresh(curIndex,true,true) end --界面打开时调用(用于子类重写) @@ -113,7 +113,11 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function PowerRice:OnShow() + curIndex = 1 PowerRice:Refresh(curIndex,true,true) + if this.TabCtrl then + this.TabCtrl:ChangeTab(curIndex) + end end function PowerRice:Refresh(_curIndex,isTop,isAni) @@ -145,7 +149,7 @@ end function PowerRice:SetLive2D() --设置立绘 if not self.Live then - self.Live = poolManager:LoadLive("live2d_h_puti", self.grid.transform, Vector3.one*0.8, Vector2.zero) + self.Live = poolManager:LoadLive("live2d_h_puti", self.grid.transform, Vector3.one*0.9, Vector2.zero) self.Live:GetComponent("SkeletonGraphic").AnimationState:SetAnimation(0, "idle", true) end end @@ -217,7 +221,6 @@ function PowerRice:SingleDataShow2(item,data,index) local reward = Util.GetGameObject(item,"reward") local sort4Text = Util.GetGameObject(sortNumTabs[4],"TitleText"):GetComponent("Text") local mark = Util.GetGameObject(item,"mark") - LogGreen("self.myRank:"..tostring(self.myRank)) mark:SetActive(self.myRank > 0 and self.myRank >= data.MinRank and self.myRank <= data.MaxRank) if data.MinRank == data.MaxRank then