From caaf50cf917d2261962eac0cc80c0b51ffd0caf5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 3 Mar 2021 11:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/DamageResult.prefab | 26 +++++-------------- .../LuckyTurnTable/LuckyTurnTablePanel.prefab | 2 +- .../Modules/Operating/UppperMonthCard.lua | 8 +++++- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 4bd47bc317..7d5c7c7b83 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -731,7 +731,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: 0, y: -0.000002430129} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &3862377207947909055 @@ -1234,7 +1234,6 @@ GameObject: m_Component: - component: {fileID: 6157465187858473583} - component: {fileID: 1528867972333169377} - - component: {fileID: 233634622663741207} - component: {fileID: 2973703377663166994} m_Layer: 5 m_Name: Text @@ -1259,8 +1258,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: 8.129997, y: -3.415985} - m_SizeDelta: {x: 114.24, y: 74} + m_AnchoredPosition: {x: 0.0049973, y: -1.67} + m_SizeDelta: {x: 130.49, y: 77.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1528867972333169377 CanvasRenderer: @@ -1270,19 +1269,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3398454044819625746} m_CullTransparentMesh: 0 ---- !u!114 &233634622663741207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3398454044819625746} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -7.08 --- !u!114 &2973703377663166994 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1315,8 +1301,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5916 \u654C" + m_LineSpacing: 0.7 + m_Text: "\u5916\u654C" LanguageIndex: 10035 --- !u!1 &3427918476382766549 GameObject: @@ -2879,7 +2865,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: 0, y: -0.000002430129} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &4404827482751521593 diff --git a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab index c5ce101491..98a6194a7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab @@ -3677,7 +3677,7 @@ 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: -443, y: -601.4} + m_AnchoredPosition: {x: -443, y: -594} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &944776569104769742 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 1908367e03..b44bea7c59 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -153,7 +153,6 @@ end --- 设置不同的显示界面 function UpperMonthCard:SetPanelType(type) self.chargeType.sprite = Util.LoadSprite(ImgType[type].moneyTag) - self.chargeType.gameObject:GetComponent("RectTransform").anchoredPosition = GetCurLanguage() ~= 2 and Vector2.New(-30.5,-272.9) or Vector2.New(-30.5,-347) self.valueIcon.sprite = SetIcon(16) self.valueMask = Util.LoadSprite(ImgType[type].valueMask) self.Bg.sprite = Util.LoadSprite(ImgType[type].bg) @@ -165,6 +164,13 @@ function UpperMonthCard:SetPanelType(type) self.tipIcon.sprite = SetIcon(chargeConfig[self.baseType].RewardShow[1][1]) self.totalValue.text = chargeConfig[self.baseType].RewardShow[1][2] self.charmyNum.text = " " .. chargeConfig[self.baseType].BaseReward[1][2] + if GetCurLanguage() == 0 then + self.chargeType.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-30.5,-272.9) + elseif GetCurLanguage() == 1 then + self.chargeType.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-30.5,-400) + elseif GetCurLanguage() == 2 then + self.chargeType.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-30.5,-347) + end end