diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab index 05c04e07fe..acb83bcb43 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab @@ -111,7 +111,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: -0.000012218952, y: 537.4} + m_AnchoredPosition: {x: -0.000012218952, y: 521} m_SizeDelta: {x: 897, y: 40.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7138066295411708012 @@ -149,7 +149,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 100 - m_Alignment: 1 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -191,7 +191,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.000012218952, y: 1196.1} + m_AnchoredPosition: {x: -0.000012218952, y: 1171} m_SizeDelta: {x: 1010, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3446764593967627788 @@ -310,8 +310,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, y: -61.1} - m_SizeDelta: {x: 934.4, y: 1090.1} + m_AnchoredPosition: {x: 0, y: -58} + m_SizeDelta: {x: 934.4, y: 1096.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &817148689261127693 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab index e206251249..dddd6aa379 100644 --- a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab @@ -505,7 +505,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 300 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -8381,7 +8381,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 300 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -12253,7 +12253,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 98, y: -14.900002} + m_AnchoredPosition: {x: 108.29999, y: -14.900002} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9022720752967085249 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 8de2d79049..e9f9d75aea 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2231,4 +2231,5 @@ [12230] = GetLanguageStrById("竞技守卫"), [12231] = GetLanguageStrById("$99.99抢购"), [12232] = GetLanguageStrById("每周限购 %s 个"), + [12233] = GetLanguageStrById("核心神将:"), } diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index cff25f6dcd..5396e6a214 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -474,10 +474,10 @@ function this.ShowRmdPanel(index) local childBox = Util.GetGameObject(node, "childbox") local childName = Util.GetGameObject(childBox, "name"):GetComponent("Text") local childContent = Util.GetGameObject(childBox, "content"):GetComponent("Text") - title.text = ""--GetLanguageStrById(data.DescFirst) + title.text = GetLanguageStrById(data.DescFirst) local strList = string.split(GetLanguageStrById(data.DescSecond), "#") - childName.text = GetLanguageStrById(data.DescFirst).." : "..strList[1]--"      "..strList[1] -- 空格用于调整文字的起始位置 - childContent.text = "       "..strList[2] -- 全角空格可以避免自动换行 + childName.text = Language[12233].."\n  "..strList[1]--"      "..strList[1] -- 空格用于调整文字的起始位置 + childContent.text = "\n  "..strList[2] -- 全角空格可以避免自动换行 for index, heroId in ipairs(data.ItemId) do local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroId) local node = heroBox.transform:GetChild(index - 1).gameObject diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs index 946d13b321..eefd2e4999 100644 --- a/Assets/Scripts/GameInit/UpdatePanel.cs +++ b/Assets/Scripts/GameInit/UpdatePanel.cs @@ -292,7 +292,7 @@ namespace GameLogic void OnResUpdateProgress(ResUpdateProgress progress) { slider.UpdateValue(progress.Progress); - tipsText.text = string.Format(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.DOWNLOAD_PROGRESS), progress.SizeMB, progress.TotalSizeMB, (progress.SizeMB/progress.TotalSizeMB)*100); + tipsText.text = string.Format(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.DOWNLOAD_PROGRESS), progress.SizeMB.ToString("f2"), progress.TotalSizeMB.ToString("f2"), (progress.SizeMB/progress.TotalSizeMB)*100); } /// diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 0491c3d587..f86369cb66 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2230,3 +2230,4 @@ 12230, 12231,$99.99 12232,ÿ޹ %s +12233,񽫣