diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua
index 3ee0ea0954..ac8f02e084 100644
--- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua
@@ -35,6 +35,8 @@ function EightDayGiftPanel:InitComponent()
this.show = Util.GetGameObject(this.gameObject,"panel/show")--根节点
this.itemPre = Util.GetGameObject(this.gameObject,"panel/show/itemPre")--预设
this.effect = Util.GetGameObject(this.gameObject,"panel/effect")
+ this.badeffect = Util.GetGameObject(this.effect,"Partical/uv_zi")
+ this.badeffect:SetActive(false)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua
index 6882008215..40cc9cd0fb 100644
--- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua
@@ -119,7 +119,7 @@ function FirstRechargePanel:OnShow()
AccumRecharge = missInfo.progress
end
end
- self.reChargeTips.text = string.format(Language[10663], AccumRecharge)
+ self.reChargeTips.text = Language[11642]..string.format(MoneyUtil.GetMoneyUnitName(),AccumRecharge)--string.format(Language[10663], AccumRecharge)
for i = 1, kMaxTab do
self:SetTabRedPointStatus(i)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
index 28bfc5ce3b..136216dddf 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
@@ -172,7 +172,7 @@ function this.SetInfo(id)
this.sendBtn:GetComponent("Button").interactable=surplusNum>0
Util.SetGray(this.sendBtn,surplusNum<1)
- this.sendBtnText.text=recharge.Price..Language[11077]
+ this.sendBtnText.text=string.format(MoneyUtil.GetMoneyUnitName(),recharge.Price)..Language[11062]
--发红包按钮
Util.AddOnceClick(this.sendBtn,function()
diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua
index b7c92fe4ff..c246c9f38a 100644
--- a/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua
@@ -180,7 +180,7 @@ function LuckyCatPanel:OnRefresh()
end
end
end
- this.rechargeNumberText.text = string.format("%s", againRechargeMoney) .. Language[11136] .. string.format(Language[11137], canGetTime)
+ this.rechargeNumberText.text = "$"..string.format("%s", againRechargeMoney) .. "即可再抽取" .. string.format(Language[11137], canGetTime)
if (this.isEnter == false) then
this.rechargeNumberText.text = ""
this.textShow.text = ""
diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
index 1be8113cb2..6489179af2 100644
--- a/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
@@ -455,7 +455,7 @@ function GiftPackPage:RefreshShowData(item, data, type, DataTypeIndex)
else
str=" "
end
- price.text = finalNum..str
+ price.text = string.format(MoneyUtil.GetMoneyUnitName(),finalNum)..str
else
local str=""
local index= string.len(tostring(finalNum))
@@ -467,7 +467,7 @@ function GiftPackPage:RefreshShowData(item, data, type, DataTypeIndex)
str=" "
end
icon:SetActive(false)
- price.text = finalNum..Language[11453]..str
+ price.text = string.format(MoneyUtil.GetMoneyUnitName(),finalNum)..str--..Language[11453]
end
buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
index 3cc2009a8c..0fa2ea1505 100644
--- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
@@ -226,7 +226,7 @@ function GrowthGiftPage:SetBtnInvestState()
local packageInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward)--packageInfo:当前成长基金礼包ID(ID:101、102、103、104、105)
if packageInfo and packageInfo.buyTimes == 0 then
self.btnInvest:GetComponent("Button").enabled = true
- self.btnInvestText.text = Language[11471]
+ self.btnInvestText.text = "$98"
Util.SetGray(self.btnInvest, false)
curGiftsId = packageInfo.goodsId
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
index 3e91b37075..bd4c5df764 100644
--- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
@@ -47,7 +47,7 @@ function MonthCardPage:RefreshStoneShow()
local curAllMonthCardData = OperatingManager.GetMonthCardData()
--月卡
local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0
- self.smallDay1.text = Language[11476].. monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].Price ..Language[11477]
+ self.smallDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].Price) .."即可激活30天月卡"--Language[11477]
self.smallDay2.text = Language[11478]..monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][2] ..""
self.smallDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][1]).ResourceID))
self.smallProgress:SetActive(not curMonthCardOpenState)
@@ -101,7 +101,7 @@ function MonthCardPage:RefreshStoneShow()
self.bigProgress:GetComponent("Text").text = "("..OperatingManager.GetsmonthSaveAmt().."/"..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price..")"
self.bigDayRightUpText = monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].ContiueDays * monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2]
self.bigDayRightUpIcon = SetIcon(monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1])
- self.bigDay1.text = Language[11476].. monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price ..Language[11477]
+ self.bigDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price) .."即可激活30天月卡"--Language[11477]
self.bigDay2.text = Language[11478]..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2] ..""
self.bigDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1]).ResourceID))
self.bigMonthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(MONTH_CARD_TYPE.LUXURYMONTHCARD))
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua
index a3b823c035..164e0eb33c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua
@@ -48,7 +48,7 @@ function this:OnShow(_parent,...)
this.titleText.text=Language[11638]
this.text1.text=string.format(Language[11639],s)
this.text2.text=Language[11640] --后续改成读表
- this.text3.text=string.format(Language[11641],b)
+ this.text3.text="需要充值"..string.format(MoneyUtil.GetMoneyUnitName(),b).."以上才可打开"
this.curNum.text=string.format(Language[11637],BagManager.GetItemCountById(94))
Util.SetGray(this.okBtn,VipManager.GetChargedNum()=b