From 4e17b829ba706f8aebc1884e0c834ad0d53cddeb Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 27 Sep 2021 10:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E6=8C=82=E6=9C=BA=E7=95=8C=E9=9D=A2=E9=A2=84?= =?UTF-8?q?=E8=A7=88=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/Fight/FightAreaRewardPopup.prefab | 6 +++--- .../~Lua/Modules/Fight/FightAreaRewardPopup.lua | 10 ++++++---- .../ManagedResources/~Lua/Modules/Net/NetManager.lua | 1 + .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab index 04118a757f..f16b0abdf6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab @@ -109,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00003435052} + m_AnchoredPosition: {x: 0, y: -0.00006020476} m_SizeDelta: {x: 925.1, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2443668873975028990 @@ -333,7 +333,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000004479818, y: 0.000034399924} + m_AnchoredPosition: {x: 0.000004479818, y: -0.000024262075} m_SizeDelta: {x: 924.2, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2775142083553738788 @@ -2795,7 +2795,7 @@ MonoBehaviour: m_Padding: m_Left: 80 m_Right: 0 - m_Top: 20 + m_Top: 50 m_Bottom: 60 m_ChildAlignment: 0 m_Spacing: 10 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index 88bd6f98d1..385d52ef81 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -141,10 +141,12 @@ function FightAreaRewardPopup:OnShow() value = config.Condition[i][2] end end - data.content = string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, value)) - data.type = 2 - this.PriAdapter(num,data) - num = num + 1 + if value - 1 > 0 then + data.content = string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, value)) + data.type = 2 + this.PriAdapter(num,data) + num = num + 1 + end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index af11456e3c..0546cb5e30 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5887,6 +5887,7 @@ function NetManager.HeroUpLikableRequest(heroId,itemId,itemNum,func) HeroPropManager.SetDirtyByType(v.dynamicId, Hero_Prop_Type.LikeAbility) end end + CheckRedPointStatus(RedPointType.LikeabilityRed) if func then func() end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 72fa8cb8ed..b4b6e15539 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -42,7 +42,7 @@ function RoleListPanel:InitComponent() this.haogandu = Util.GetGameObject(self.gameObject, "haogandu") this.haoganduLv = Util.GetGameObject(this.haogandu, "lv"):GetComponent("Text") --this.haogandu.gameObject:SetActive(false) - this.haoganduRed = Util.GetGameObject(this.treeBtn, "redPoint") + this.haoganduRed = Util.GetGameObject(this.haogandu, "redPoint") if not this.playerInfoView then this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform) @@ -120,6 +120,7 @@ function RoleListPanel:BindEvent() PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.LikeAbility)) end end) + CheckRedPointStatus(RedPointType.LikeabilityRed) BindRedPointObject(RedPointType.LikeabilityRed,this.haoganduRed) end