From b1fcc5d4e5d457597b5d2fd99117fb09c0533aa5 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 29 May 2021 20:36:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=B4=BB=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=BA=A2=E5=8C=85]=3D=3D=3D=3D=3D=3D=3Dbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 30 +++++++++---------- .../DynamicActivity/QianKunBoxBuyOnePanel.lua | 2 ++ .../View/GeneralBigPopup_RecrutDetail.lua | 5 +++- .../Guild/RedPacketView/RedPacket_GetView.lua | 3 -- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index fd8ac6d462..08731b6fc9 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -726,7 +726,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: 478.37, y: -181.18} + m_AnchoredPosition: {x: 478.37, y: -181} m_SizeDelta: {x: 876.74, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7315193775080684413 @@ -1610,7 +1610,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: 458.5, y: 0} + m_AnchoredPosition: {x: 458.5, y: -0.000015258789} m_SizeDelta: {x: 917, y: 45} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5582656793896342774 @@ -3137,7 +3137,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: 478.37, y: -231.23999} + m_AnchoredPosition: {x: 478.37, y: -231} m_SizeDelta: {x: 876.74, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2151967174801510196 @@ -3563,7 +3563,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: 478.37, y: -281.3} + m_AnchoredPosition: {x: 478.37, y: -281} m_SizeDelta: {x: 876.74, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &418754132621401042 @@ -3739,7 +3739,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 458.5, y: -837} - m_SizeDelta: {x: 917, y: 315.1} + m_SizeDelta: {x: 917, y: 309.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5787845084316277716 MonoBehaviour: @@ -4075,7 +4075,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -364.6, y: 0} + m_AnchoredPosition: {x: -364.59998, y: 0} m_SizeDelta: {x: -774.9, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7052788287217176819 @@ -4818,8 +4818,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 916, y: 331.36} + m_AnchoredPosition: {x: 0, y: 0.00004163427} + m_SizeDelta: {x: 916, y: 351} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5918842748614186787 MonoBehaviour: @@ -4837,9 +4837,9 @@ MonoBehaviour: m_Left: 40 m_Right: 0 m_Top: 31 - m_Bottom: 0 + m_Bottom: 20 m_ChildAlignment: 0 - m_Spacing: 50.06 + m_Spacing: 50 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -5489,7 +5489,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -1.7999878, y: -413} - m_SizeDelta: {x: 917, y: 1152.1} + m_SizeDelta: {x: 917, y: 1146.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2484587132639556036 MonoBehaviour: @@ -6012,7 +6012,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: 478.37, y: -331.36} + m_AnchoredPosition: {x: 478.37, y: -331} m_SizeDelta: {x: 876.74, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3669278989709283071 @@ -6934,7 +6934,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: 540, y: -434.96982} + m_AnchoredPosition: {x: 540, y: -434.96985} m_SizeDelta: {x: 800, y: 64.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &181288018036704300 @@ -7286,7 +7286,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: 478.37, y: -81.06} + m_AnchoredPosition: {x: 478.37, y: -81} m_SizeDelta: {x: 876.74, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5022706840854498964 @@ -10501,7 +10501,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: 478.37, y: -131.12} + m_AnchoredPosition: {x: 478.37, y: -131} m_SizeDelta: {x: 876.74, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7288597641011106736 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index be98a0a7b4..4df974d0a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -60,6 +60,8 @@ function QianKunBoxBuyOnePanel:BindEvent() Util.AddClick(this.openOneAgainButton, function () if isLimitUpHero then if this.func then + self.bg.gameObject:SetActive(false) + self.bg.gameObject:SetActive(true) this.func() end return diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index ab1d472324..7c06dab2c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -109,9 +109,12 @@ function this:ReFreshUpItem(UpItem,rateList) end end +local hero --限时up英雄 function this:ShowUpItem(config,actId) - local hero=SubUIManager.Open(SubUIConfig.ItemView,this.itemGrid.transform) + if not hero then + hero=SubUIManager.Open(SubUIConfig.ItemView,this.itemGrid.transform) + end local wishUpConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",actId) local num=0 for i = 1, #wishUpConfig.UpList do diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua index a0353b9747..bd6887943c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua @@ -87,7 +87,6 @@ function this:InitGetView() if value.isGet==0 and (config.Num-value.getCount)>0 and isAuto then if config.BaseType~=2 or PlayerManager.dailyRedPack< tonumber(SpecialConfig.Value) then isAuto=false - --LogError("redid============"..value.redId) NetManager.GetRobRedPackageRequest(value.redId,function(msg) local success=msg.isSuccess local itemId=msg.itemId @@ -105,8 +104,6 @@ function this:InitGetView() LogError(Language[11047]) PopupTipPanel.ShowTip(Language[11047]) end - this:InitGetView() - --检测可领取红包的数量 end) return end