From c2f6c54063260bf1b0829900c6d8deab700e672a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 21 Jun 2021 10:22:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90ID1016741=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E7=95=8C=E9=9D=A2UI=E3=80=91=E5=85=A8=E9=9D=A2=E5=B1=8F?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/CommonActPage.prefab | 8 ++++---- .../~Lua/Modules/NewActivity/CommonActPage.lua | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab index e5a3ce7a6d..e6a55002c9 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab @@ -666,10 +666,10 @@ RectTransform: m_Father: {fileID: 2384432804281337260} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -192.6} - m_SizeDelta: {x: -2, y: -719.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -192.59998} + m_SizeDelta: {x: 1078, y: 1830.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3090490801835799772 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 3f2d936a52..9c77e2a3dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -36,6 +36,7 @@ function CommonActPage:InitComponent() self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem") self.scrollItemPos = self.scrollItem.transform.localPosition + self.scrollItemRect = self.scrollItem.transform.rect self.time = Util.GetGameObject(self.gameObject, "time") self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text") self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp") @@ -131,8 +132,8 @@ function CommonActPage:OnShow(_sortingOrder) end if not self.scrollView then - local rootHight = self.scrollItem.transform.rect.height - local width = self.scrollItem.transform.rect.width + local rootHight = self.scrollItemRect.height + local width = self.scrollItemRect.width if self.actType == ActivityTypeDef.DynamicAct then self.itemPre:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,225) local vec = self.scrollItem.transform.localPosition From 343b92aff9e1c41b59fb629d6f19efb59cf10c82 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 21 Jun 2021 10:36:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90ID1016740=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=B1=AA=E7=A4=BC=E3=80=91=E5=85=88=E9=81=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8C=85=E7=A4=BC=E6=96=87=E6=A1=88=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=EF=BC=8C=E6=9C=AC=E5=9C=B0=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyRecharge/DailyRechargePanel.prefab | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab index 0fff98d58e..6b5140273a 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -53858,7 +53858,6 @@ GameObject: - component: {fileID: 1244728192338505999} - component: {fileID: 5638498405040071937} - component: {fileID: 4876988735756239449} - - component: {fileID: 4690614078576488616} m_Layer: 5 m_Name: tip m_TagString: Untagged @@ -53927,43 +53926,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5373\u53EF\u9886\u53D6\u8D85\u7EA7\u8C6A\u793C" ---- !u!114 &4690614078576488616 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6603672230595922921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 32b38abb043994c4e9b0c2803951e69c, type: 3} - m_Name: - m_EditorClassIdentifier: - curveForText: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -50.945557 - inSlope: 0.27903298 - outSlope: 0.27903298 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0.1356021 - - serializedVersion: 3 - time: 760.2 - value: -51.218292 - inSlope: -0.32014272 - outSlope: -0.32014272 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.1653921 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - curveMultiplier: 1 --- !u!1 &7119351493522324219 GameObject: m_ObjectHideFlags: 0 From e5ff298534e9c30e11d978bef15c6ef43e853373 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 21 Jun 2021 10:38:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"=E3=80=90ID1016740=E3=80=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 343b92aff9e1c41b59fb629d6f19efb59cf10c82. --- .../DailyRecharge/DailyRechargePanel.prefab | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab index 6b5140273a..0fff98d58e 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -53858,6 +53858,7 @@ GameObject: - component: {fileID: 1244728192338505999} - component: {fileID: 5638498405040071937} - component: {fileID: 4876988735756239449} + - component: {fileID: 4690614078576488616} m_Layer: 5 m_Name: tip m_TagString: Untagged @@ -53926,6 +53927,43 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5373\u53EF\u9886\u53D6\u8D85\u7EA7\u8C6A\u793C" +--- !u!114 &4690614078576488616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603672230595922921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 32b38abb043994c4e9b0c2803951e69c, type: 3} + m_Name: + m_EditorClassIdentifier: + curveForText: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -50.945557 + inSlope: 0.27903298 + outSlope: 0.27903298 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.1356021 + - serializedVersion: 3 + time: 760.2 + value: -51.218292 + inSlope: -0.32014272 + outSlope: -0.32014272 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.1653921 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curveMultiplier: 1 --- !u!1 &7119351493522324219 GameObject: m_ObjectHideFlags: 0 From 8152d96e1e930456faa263281fe388c12fae65c4 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 21 Jun 2021 10:42:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E7=A6=8F=E6=98=9F=E9=AB=98?= =?UTF-8?q?=E7=85=A7=E3=80=91=E9=A2=86=E5=8F=96=E5=AE=8C=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=90=8E=EF=BC=8C=E6=8C=89=E9=92=AE=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E4=B8=8D=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 2c57ac9350..1d7bab5184 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -55,6 +55,7 @@ function FuXingGaoZhaoPanel:BindEvent() self.timer = nil end self:Refresh() + CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel) end) end) end @@ -62,6 +63,7 @@ function FuXingGaoZhaoPanel:BindEvent() NetManager.GetActivityRewardRequest(-1,self.data.activityId,function (drop) UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function() self:Refresh() + CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel) end) end) end