From c7860fec990da574942740e2bad59723be1f7a57 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Sat, 13 Mar 2021 14:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=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
---
Assets/ManagedResources/~Lua/Common/functions.lua | 3 +++
.../~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua
index ecca3f368f..8f7f7b7e0d 100644
--- a/Assets/ManagedResources/~Lua/Common/functions.lua
+++ b/Assets/ManagedResources/~Lua/Common/functions.lua
@@ -164,6 +164,7 @@ function TextHelper_Get24HourTimeStr(time)
end
function PrintWanNum(num)
+ num = tonumber(num)
if num >= 100000000 then
return string.format("%.1f", num / 100000000) .. Language[11028]
elseif num >= 1000000 then
@@ -173,6 +174,7 @@ function PrintWanNum(num)
end
end
function PrintWanNum2(num)
+ num = tonumber(num)
if num >= 100000000 then
return string.format("%.1f", num / 100000000) .. Language[11028]
elseif num >= 100000 then
@@ -183,6 +185,7 @@ function PrintWanNum2(num)
end
end
function PrintWanNum3(num)
+ num = tonumber(num)
if num >= 100000000 then
return string.format("%.2f", num / 100000000) .. Language[11028]
elseif num >= 100000 then
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
index 83fab8c663..b4ff1de8b3 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
@@ -200,14 +200,14 @@ function HongMengEnvoyPanel:UpdateTextColor()
local data = HarmonyManager:GetHongMengUpData()
if Gold >= data.LevelUp[1][2] then
-- 是否变色
- self.TextGold.text = string.format("%d",data.LevelUp[1][2])
+ self.TextGold.text = string.format("%d",PrintWanNum(data.LevelUp[1][2]))
else
- self.TextGold.text = string.format("%d",data.LevelUp[1][2])
+ self.TextGold.text = string.format("%d",PrintWanNum(data.LevelUp[1][2]))
end
if GrowthAmulet >= data.LevelUp[2][2] then
- self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
+ self.TextGrowthAmulet.text = string.format("%d",PrintWanNum(data.LevelUp[2][2]))
else
- self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
+ self.TextGrowthAmulet.text = string.format("%d",PrintWanNum(data.LevelUp[2][2]))
end
end
function HongMengEnvoyPanel:UpdateGoldVal()