diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 25dc03431b..c5d39bf21d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3368,7 +3368,8 @@ PlayerTitleRideSkinRedPointTypeStr = { MoneyType = { RMB = 1, -- 人民币 - USD = 2 -- 美元 + USD = 2, -- 美元 + MM = 9 -- 美元 } -- 金钱文字界面相关常量----------------- diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index a35c92d8bb..3033da686a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -36,6 +36,12 @@ local TipConfig = { [3] = "s_shouchong_anniuzi200_zh", [4] = "s_shouchong_anniuzi500_zh", }, + [MoneyType.MM] = { + [1] = "s_shouchong_anniuzi6_zh", + [2] = "s_shouchong_anniuzi100_zh", + [3] = "s_shouchong_anniuzi200_zh", + [4] = "s_shouchong_anniuzi500_zh", + }, } local heroImage={ @@ -333,7 +339,8 @@ function FirstRechargePanel:OnTabChanged(index) if isPay then self.reChargeTxt.text=Language[10491] else - self.reChargeTxt.text=rechargeConfig[money].Price..Language[10856] + --self.reChargeTxt.text=rechargeConfig[money].Price..Language[10856] + self.reChargeTxt.text=string.format(MoneyUtil.GetMoneyUnitName(), MoneyUtil.GetMoney(rechargeConfig[money].Price)) end if self.offsetIndex == 0 then self.offsetIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index d7a0d25fbc..5dddd5bff9 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -651,7 +651,7 @@ function this.GetMissionData(indexType,actType) curData.rewards[i].state = 1 end end - curData.rewards[i].title = string.format(Language[11916],curData.rewards[i].value) + curData.rewards[i].title = string.format(Language[11916],MoneyUtil.GetMoney(curData.rewards[i].value)) curData.rewards[i].buyInfo = string.format("(%s/%s)",curData.rewards[i].progress,curData.rewards[i].value) curData.rewards[i].shows = actRewardConfigs[j].Reward curData.rewards[i].jump = actRewardConfigs[j].Jump[1]