diff --git a/Assets/ManagedResources/ArtFont_en/r_youjian_zhiding_en.png b/Assets/ManagedResources/ArtFont_en/r_youjian_zhiding_en.png
new file mode 100644
index 0000000000..5f518d184a
Binary files /dev/null and b/Assets/ManagedResources/ArtFont_en/r_youjian_zhiding_en.png differ
diff --git a/Assets/ManagedResources/ArtFont_en/r_youjian_zhiding_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_youjian_zhiding_en.png.meta
new file mode 100644
index 0000000000..5a3eb5e7bb
--- /dev/null
+++ b/Assets/ManagedResources/ArtFont_en/r_youjian_zhiding_en.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: e9fde547af374c34fbafc92611a15bce
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 69e35ccea6ab7a54ba497f32400dad40
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/ArtFont_vi/r_youjian_zhiding _vi.png b/Assets/ManagedResources/ArtFont_vi/r_youjian_zhiding _vi.png
new file mode 100644
index 0000000000..352c476136
Binary files /dev/null and b/Assets/ManagedResources/ArtFont_vi/r_youjian_zhiding _vi.png differ
diff --git a/Assets/ManagedResources/ArtFont_vi/r_youjian_zhiding _vi.png.meta b/Assets/ManagedResources/ArtFont_vi/r_youjian_zhiding _vi.png.meta
new file mode 100644
index 0000000000..2106ea04bd
--- /dev/null
+++ b/Assets/ManagedResources/ArtFont_vi/r_youjian_zhiding _vi.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: f4bd859b1685fec459eb2ee3d45c09f2
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 71271714780e6dd488b4c268077a901d
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding_zh.png
similarity index 100%
rename from Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding.png
rename to Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding_zh.png
diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding_zh.png.meta
similarity index 96%
rename from Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding.png.meta
rename to Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding_zh.png.meta
index 75929e4f13..61506c856b 100644
--- a/Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding.png.meta
+++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_youjian_zhiding_zh.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: edcb694b0b09af246ab5576b6265566d
+guid: 92063aac157e9124694cac8a8100b85c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: d444aa903a2bd594d93e236d7dcd37ed
+ spriteID: 7be537f56c8440a43bc10d52202377c0
vertices: []
indices:
edges: []
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/Modules/Mail/MailManager.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua
index f51b3b23db..877a133614 100644
--- a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua
@@ -31,7 +31,7 @@ function this.UpdateMialData(_mial,isAdd)
local title = string.split(_mial.head,"|")
singleMail.head = title[GetCurLanguage()+1] or title[1]
singleMail.head = this.GetStringByStringformat(singleMail.head)
- local content = string.split(_mial.content,"|")
+ local content = string.split(_mial.content,"|")
singleMail.content = content[GetCurLanguage()+1] or content[1]--详情
singleMail.content = this.GetStringByStringformat(singleMail.content)
-- --LogGreen("singleMail.content:"..singleMail.content)
@@ -85,11 +85,11 @@ function this.GetStringByStringformat(inputStr)
end
local returnStr = string.format(
GetLanguageStrById(msgStr[1]),
- tostring(msgStr[2]),
- tostring(msgStr[3]),
- tostring(msgStr[4]),
- tostring(msgStr[5]),
- tostring(msgStr[6])
+ GetLanguageStrById(tostring(msgStr[2])),
+ GetLanguageStrById(tostring(msgStr[3])),
+ GetLanguageStrById(tostring(msgStr[4])),
+ GetLanguageStrById(tostring(msgStr[5])),
+ GetLanguageStrById(tostring(msgStr[6]))
)
-- LogPink("returnStr:"..returnStr)
return returnStr
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()