From 6a815718594e695ec1f5d5a7820a6e59d339d4ab Mon Sep 17 00:00:00 2001
From: "PC-202302260912\\Administrator" <419983115@qq.com>
Date: Fri, 22 Nov 2024 18:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BC=8F=E4=BC=A0=E7=9A=84lu?=
=?UTF-8?q?a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab | 2 +-
Assets/ManagedResources/~Lua/Common/Language.lua | 2 +-
Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua | 4 ++--
Assets/ManagedResources/~Lua/View/ItemView.lua | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab
index 51ddc43633..175aed8032 100644
--- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab
@@ -1824,7 +1824,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: edcb694b0b09af246ab5576b6265566d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 92063aac157e9124694cac8a8100b85c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index 73203e9c57..95dee11b16 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -2234,7 +2234,7 @@
[12233] = GetLanguageStrById("星解锁)"),
[12234] = GetLanguageStrById(" (精炼"),
[12235] = GetLanguageStrById("级解锁)"),
- [12236] = GetLanguageStrById(" 潜能 +%s(%s%%)"),
+ [12236] = GetLanguageStrById(" 潜能 +%s(%s%%)"),
[12237] = GetLanguageStrById("(四灵试炼%s层解锁)"),
[12238] = GetLanguageStrById("强化大师%s级"),
[12239] = GetLanguageStrById("精炼大师%s级"),
diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
index 392c182c84..677d16827b 100644
--- a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
@@ -11,7 +11,7 @@ function this.Initialize()
if GetCurLanguage() == 0 then
this.MT = MoneyType.RMB
elseif GetCurLanguage() == 1 then
- this.MT = MoneyType.RMB
+ this.MT = MoneyType.USD
elseif GetCurLanguage() == 2 then
this.MT = MoneyType.MM
else
@@ -76,7 +76,7 @@ function this.GetMoneyUnitName(mt)
end
function this.GetMoneyUnitNameWithMoney(money)
- local formater = this.GetMoneyUnitName()
+ local formater = this.GetMoneyUnitName(this.Mt)
return string.format(formater, this.GetMoney(money))
end
diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua
index cf6080b64a..b7a74e9000 100644
--- a/Assets/ManagedResources/~Lua/View/ItemView.lua
+++ b/Assets/ManagedResources/~Lua/View/ItemView.lua
@@ -451,7 +451,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
end
elseif _itemData.itemType == 5 then
self.num:SetActive(false)
- self.name:GetComponent("Text").text = GetCutOutStr(_itemData.name, 5)
+ self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(_itemData.name), 5)
--self.resetLv:GetComponent("Text").text = "+" .._itemData.lv.." ".._itemData.refineLv
self.resetLv:SetActive(false)
self.fragmentIcon:SetActive(true)
@@ -472,7 +472,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
elseif _itemData.configData then
str = _itemData.configData.Name
end
- self.name:GetComponent("Text").text = GetCutOutStr(str, 5)
+ self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(str), 5)
-- self.resetLv:GetComponent("Text").text = "+" ..1
self.resetLv:SetActive(false)
self.fragmentIcon:SetActive(false)
@@ -1186,7 +1186,7 @@ function ItemView:ResetNameSize(v2, v3)
end
function ItemView:ResetName(nameStr)
- self.name:GetComponent("Text").text = nameStr
+ self.name:GetComponent("Text").text = GetLanguageStrById(nameStr)
end
function ItemView:OnClose()