From f0b2448bf3eaa04dada215600b7ad3bab62ef96f Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Fri, 20 Sep 2024 18:03:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E5=85=B5=E5=90=8D=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightPointPassMainPanel.prefab | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index e70ede19bd..5aa7552328 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -37802,10 +37802,10 @@ RectTransform: m_Father: {fileID: 6035928346442226049} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 29.71} + m_SizeDelta: {x: 120, y: 59.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7170575689222955656 CanvasRenderer: @@ -37837,15 +37837,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -69419,10 +69419,10 @@ RectTransform: m_Father: {fileID: 6273053659416594963} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 120, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1711886698924446773 CanvasRenderer: @@ -69454,15 +69454,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -75094,10 +75094,10 @@ RectTransform: m_Father: {fileID: 3282806257799198579} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30.17} + m_SizeDelta: {x: 120, y: 60.34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2165980520961424500 CanvasRenderer: @@ -75129,15 +75129,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -90003,10 +90003,10 @@ RectTransform: m_Father: {fileID: 4819200128724592751} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 29.76} + m_SizeDelta: {x: 120, y: 59.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4434787947225850350 CanvasRenderer: @@ -90038,15 +90038,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -115265,10 +115265,10 @@ RectTransform: m_Father: {fileID: 471215880121819251} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 120, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8015444118565294912 CanvasRenderer: @@ -115300,15 +115300,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -157817,10 +157817,10 @@ RectTransform: m_Father: {fileID: 8804829127216541687} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 29.163} + m_SizeDelta: {x: 120, y: 58.325} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6001549113703724145 CanvasRenderer: @@ -157852,15 +157852,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -179328,10 +179328,10 @@ RectTransform: m_Father: {fileID: 1177600030108842559} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30.078} + m_SizeDelta: {x: 120, y: 60.155} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2113030921483348717 CanvasRenderer: @@ -179363,15 +179363,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 @@ -184969,9 +184969,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -208207,10 +208207,10 @@ RectTransform: m_Father: {fileID: 1154005965462122886} m_RootOrder: 3 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: 26, y: -37} - m_SizeDelta: {x: 47.5, y: 30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 120, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1754709626428150164 CanvasRenderer: @@ -208242,15 +208242,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10 From 24e99112fe34f56d6f16bd9930aa258e1166864f Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Mon, 23 Sep 2024 13:56:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- .../~Lua/Modules/Operating/UppperMonthCard.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 4acdab9058..d22e8abd31 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -2049,7 +2049,7 @@ function this.RefreshEightGiftPreview() if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.qiandaohaoli) then this.FestevaBtn:SetActive(true) Util.GetGameObject(this.FestevaBtn, "Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite( - "q_baichoupaisong_rukou") + "r_shouchao_xiaozidi") else this.FestevaBtn:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 002c1970ac..35da9f55cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -10,8 +10,8 @@ local ImgType = { mask = "y_yjj_128dikuang001", rewardBg = "y_yjj_128kuang", downBg = "y_yjj_128kuang001", - rewardPreview = "y_yjj_128kuang004", - rewardPreviewText = "y_yjj_128kuang005", + rewardPreview = "s_sanshibei_xiaobiaodi", + rewardPreviewText = "s_sanshibei_biaotizi_zh", reward = "y_yjj_1280", iconId = 15, },