From f0485649abe22eb6dd16b38c28746c11d43320f7 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 20 Feb 2021 14:40:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Login/ServerListSelectPanel.prefab | 46 +- .../Prefabs/UI/Main/MainRechargePanel.prefab | 480 +++++++++--------- .../UpdatePanel/UpdatePanel.prefab | 8 +- .../~Lua/Modules/Recharge/View/GiftView.lua | 19 +- 4 files changed, 282 insertions(+), 271 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab index e84b9906d9..227969ed8c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab @@ -234,8 +234,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5982\u6765\u795E\u638C" LanguageIndex: 0 @@ -314,8 +314,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7206\u6EE1" LanguageIndex: 0 @@ -694,8 +694,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6D41\u7545" LanguageIndex: 0 @@ -774,8 +774,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5DF2\u6709\u89D2\u8272" LanguageIndex: 0 @@ -1208,8 +1208,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u62E5\u6324" LanguageIndex: 0 @@ -1928,8 +1928,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7EF4\u62A4" LanguageIndex: 0 @@ -2422,8 +2422,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E00\u533A" LanguageIndex: 0 @@ -2540,8 +2540,8 @@ 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: 2.7, y: 501.8} - m_SizeDelta: {x: 360, y: 80} + m_AnchoredPosition: {x: 2.7, y: 500.9} + m_SizeDelta: {x: 360, y: 78.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2259725793524912200 CanvasRenderer: @@ -2581,8 +2581,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u9009\u62E9\u670D\u52A1\u5668" LanguageIndex: 0 @@ -2697,7 +2697,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.00000013942312} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &749186115632240796 @@ -2901,8 +2901,8 @@ MonoBehaviour: m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5427\u5566\u5427\u5566\u6A31\u4E4B\u82B1 100\u7EA7" LanguageIndex: 0 @@ -3509,8 +3509,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5FEB\u6377\u767B\u5F55" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index 9801041be2..32be4971e5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -4666,7 +4666,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.3 - m_Text: Summon Powerful Hero A Must Buy! Great discounts, one purchase every week! + m_Text: "\u5FC5\u8D2D\u793C\u5305\uFF0C\u8D85\u503C\u4F18\u60E0\uFF0C\u6BCF" LanguageIndex: 0 --- !u!1 &1505358539907469629 GameObject: @@ -8014,7 +8014,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -0.000010530516, y: 0} + m_AnchoredPosition: {x: 0.00004564907, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -11575,7 +11575,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.3 - m_Text: After purchase,daily free quick exploration x3,and summoning benefits! + m_Text: "\u7D2F\u8BA1\u8D44\u6E90\u5FC5\u5907\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 --- !u!1 &5744721822292471445 GameObject: @@ -14193,7 +14193,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.3 - m_Text: After purchase,daily the first time not free refresh guaranteed purple task! + m_Text: "\u9AD8\u7EA7\u793C\u5305\u5185\u542B\u9AD8\u7EA7\u5BFB\u5B9D\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 --- !u!1 &7993559501960941660 GameObject: @@ -15162,7 +15162,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.3 - m_Text: After purchase,daily the third time not free refresh guaranteed golden task! + m_Text: "\u8C6A\u534E\u793C\u5305\u5185\u542B\u8C6A\u534E\u5BFB\u5B9D\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 --- !u!1 &8491038565068444751 GameObject: @@ -15900,241 +15900,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 53820364} m_Modifications: - - target: {fileID: 4066533111738427026, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_Name - value: NumTextPre - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 194 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -21.5 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.y - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 124 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 61 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 103 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_AnchorMin.y @@ -16260,6 +16025,241 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 46 objectReference: {fileID: 0} + - target: {fileID: 4066533111738427026, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_Name + value: NumTextPre + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 103 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 194 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -21.5 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 61 + objectReference: {fileID: 0} + - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 124 + objectReference: {fileID: 0} + - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} --- !u!224 &4783028765771595832 stripped diff --git a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab index c8b1aa5086..d5145a7f3b 100644 --- a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab +++ b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab @@ -1420,8 +1420,8 @@ 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.016276836, y: -39.485413} - m_SizeDelta: {x: 720, y: 30} + m_AnchoredPosition: {x: 0.000099182, y: -39.485413} + m_SizeDelta: {x: 859.11, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222500918672205174 CanvasRenderer: @@ -1458,10 +1458,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u68C0\u6D4B\u66F4\u65B0\u6E38\u620F\u8D44\u6E90..." diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index 342814bc72..d7d4c37e91 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -584,8 +584,9 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex) end) end local offSetX = { - [0] = { icon = Vector3.New(15.3,8,0),txt = Vector3.New(83.4,0.5,0),ima = Vector3.New(0,0,0)}, - [1] = { icon = Vector3.New(219.86,8,0),txt = Vector3.New(288.5,0.5,0),ima = Vector3.New(20.19,0,0)} + [0] = { icon = Vector3.New(15.3,8,0),txt = Vector3.New(83.4,0.5,0),ima = Vector3.New(0,0,0),txt1 = Vector3.New(-162,0.5,0),icon1 = Vector3.New(-219.6,8,0)}, + [1] = { icon = Vector3.New(219.86,8,0),txt = Vector3.New(288.5,0.5,0),ima = Vector3.New(20.19,0,0),txt1 = Vector3.New(-162,0.5,0),icon1 = Vector3.New(-219.6,8,0)}, + [2] = { icon = Vector3.New(30,8,0),txt = Vector3.New(86.4,0.5,0),ima = Vector3.New(30,0,0),txt1 = Vector3.New(-105.7,0.5,0),icon1 = Vector3.New(-155.7,8,0)} } function GiftView:SetTipShow(tipRoot, data, buyType, DataTypeIndex) if buyType == DirectBuyType.DAILY_GIFT then @@ -613,13 +614,23 @@ function GiftView:SetTipShow(tipRoot, data, buyType, DataTypeIndex) tip2Text.text=shopItemData.Rebate end if GetCurLanguage() == 0 then + tip1Text1.gameObject:GetComponent("RectTransform").localPosition = offSetX[0].txt1 + Util.GetGameObject(tipRoot,"tip1/icon_1"):GetComponent("RectTransform").localPosition = offSetX[0].icon1 tip1Text2.gameObject:GetComponent("RectTransform").localPosition = offSetX[0].txt Util.GetGameObject(tipRoot,"tip1/icon_2"):GetComponent("RectTransform").localPosition = offSetX[0].icon Util.GetGameObject(tipRoot,"tip1/Image"):GetComponent("RectTransform").localPosition = offSetX[0].ima - else + elseif GetCurLanguage() == 1 then + tip1Text1.gameObject:GetComponent("RectTransform").localPosition = offSetX[1].txt1 + Util.GetGameObject(tipRoot,"tip1/icon_1"):GetComponent("RectTransform").localPosition = offSetX[1].icon1 tip1Text2.gameObject:GetComponent("RectTransform").localPosition = offSetX[1].txt Util.GetGameObject(tipRoot,"tip1/icon_2"):GetComponent("RectTransform").localPosition = offSetX[1].icon - Util.GetGameObject(tipRoot,"tip1/Image"):GetComponent("RectTransform").localPosition = offSetX[1].ima + Util.GetGameObject(tipRoot,"tip1/Image"):GetComponent("RectTransform").localPosition = offSetX[1].ima + else + tip1Text1.gameObject:GetComponent("RectTransform").localPosition = offSetX[2].txt1 + Util.GetGameObject(tipRoot,"tip1/icon_1"):GetComponent("RectTransform").localPosition = offSetX[2].icon1 + tip1Text2.gameObject:GetComponent("RectTransform").localPosition = offSetX[2].txt + Util.GetGameObject(tipRoot,"tip1/icon_2"):GetComponent("RectTransform").localPosition = offSetX[2].icon + Util.GetGameObject(tipRoot,"tip1/Image"):GetComponent("RectTransform").localPosition = offSetX[2].ima end elseif buyType == DirectBuyType.FINDTREASURE_GIFT then local tip1 = Util.GetGameObject(tipRoot,"tip1")