diff --git a/Assets/ManagedResources/Atlas/TreasureOfHeaven.meta b/Assets/ManagedResources/Atlas/TreasureOfHeaven.meta deleted file mode 100644 index 27e5af2050..0000000000 --- a/Assets/ManagedResources/Atlas/TreasureOfHeaven.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8caebb1f24cd114ebc6fd41468c2df2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/atlas/treasureofheaven - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua index b541b027a4..38f204d1f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua @@ -50,8 +50,8 @@ end -- 获取货币单位名称 local _t2n = { - [1] = "元", - [2] = "美元", + [1] = "%s元", + [2] = "$%s", } function this.GetMoneyUnitName(mt) if not mt then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 29d98c8e65..4e19c83b82 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -109,7 +109,7 @@ function this.SingleDataShow(pre,value) local shows = shopItemData.RewardShow buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")" if shopItemData.Limit - boughtNum > 0 then - price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName() + price.text = string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price)--shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 530a36f020..4d26e18820 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -108,7 +108,7 @@ function this.SingleDataShow(pre,value) local shows = shopItemData.RewardShow buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")" if shopItemData.Limit - boughtNum > 0 then - price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName() + price.text = string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price)--shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua index 2c1b5c4de5..101aebee05 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua @@ -87,13 +87,13 @@ function this.SingleDataShow(go, data) LimitText.text = shopItemData.Limit buyInfo:SetActive( shopItemData.IsDiscount ~= 0 ) if shopItemData.IsDiscount and shopItemData.IsDiscount > 0 then - buyInfo:GetComponent("Text").text = Language[10537]..shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() + buyInfo:GetComponent("Text").text = Language[10537]..string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price / (shopItemData.IsDiscount/10))--shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() end if goodData then endTime = goodData.endTime end if shopItemData.Limit - boughtNum > 0 then - price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName() + price.text = string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price)--..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua b/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua index bc3ee4b364..24b3a25dbd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua @@ -198,7 +198,7 @@ function HeroStarFeedPage:SetGfitShow() _ItemViewList[i].gameObject:SetActive(true) end self.times.text = Language[10535]..curGiftList[curIndex].dynamicBuyTimes..Language[10054] - self.price.text = RechargeConfig[curGiftId].Price..MoneyUtil.GetMoneyUnitName() + self.price.text = string.format(MoneyUtil.GetMoneyUnitName(), RechargeConfig[curGiftId].Price)--..MoneyUtil.GetMoneyUnitName() end diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua index 9aa41e03bf..42226b2472 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua @@ -82,7 +82,7 @@ function this.SetShow(root,data) stateBtn:GetComponent("Button").interactable=data.server.buyTimes< data.native.Limit if data.server.buyTimes< data.native.Limit then--未购买 stateBtnImage.sprite=Util.LoadSprite(StateImageName[1]) - stateBtnText.text=data.native.Price..MoneyUtil.GetMoneyUnitName() + stateBtnText.text=string.format(MoneyUtil.GetMoneyUnitName(), data.native.Price)--..MoneyUtil.GetMoneyUnitName() else Util.SetGray(stateBtn,true) stateBtnText.text=Language[10638] diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua index 9aaf69301d..a9c0b6894a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua @@ -48,8 +48,8 @@ function this.OnShowPanelData() conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,ids[1] ) shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type,conFigData.Id) if shopItemData == nil then return end - this.oldPurchaseText.text = Language[10537]..conFigData.Price/(conFigData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() - this.curPurchaseText.text = Language[10640]..conFigData.Price..MoneyUtil.GetMoneyUnitName() + this.oldPurchaseText.text = Language[10537]..string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price/(conFigData.IsDiscount/10))--..MoneyUtil.GetMoneyUnitName() + this.curPurchaseText.text = Language[10640]..string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price)--..MoneyUtil.GetMoneyUnitName() this.buyNumText.text = Language[10556]..shopItemData.buyTimes.."/"..conFigData.Limit if shopItemData.buyTimes <= 0 then this.buyText.text = Language[10641] diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua index e93d5c251e..d1663349a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua @@ -60,11 +60,11 @@ function this.OnShowPanelData(i) local itemRewardParent=Util.GetGameObject(preGrid[i],"itemRewardParent") local buyBtn=Util.GetGameObject(preGrid[i],"BuyBtn") local buyNumText=Util.GetGameObject(preGrid[i],"buyNumText"):GetComponent("Text") - oldPurchaseText.text = Language[10643]..conFigData.Price/(conFigData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() + oldPurchaseText.text = Language[10643]..string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price/(conFigData.IsDiscount/10))--..MoneyUtil.GetMoneyUnitName() buyNumText.text = Language[10556]..shopItemData.buyTimes.."/"..conFigData.Limit -- Log("购买次数 "..shopItemData.buyTimes) if shopItemData.buyTimes <= 0 then - curPurchaseText.text = conFigData.Price..MoneyUtil.GetMoneyUnitName() + curPurchaseText.text = string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price)--..MoneyUtil.GetMoneyUnitName() buyBtn:GetComponent("Button").enabled = true Util.SetGray(buyBtn, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index bc4e36afa0..d2ac91c456 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -218,7 +218,8 @@ function UpperMonthCard:SetBuyState() self.boughtPanel:SetActive(isBought) self.buyPanel:SetActive(not isBought) Util.SetGray(self.btnBuy, not isActive) - self.textBuy.text = isActive and self.panelType .. MoneyUtil.GetMoneyUnitName() or self.panelType .. MoneyUtil.GetMoneyUnitName() + -- self.textBuy.text = isActive and (self.panelType .. MoneyUtil.GetMoneyUnitName()) or (self.panelType .. MoneyUtil.GetMoneyUnitName()) + self.textBuy.text = isActive and (string.format(MoneyUtil.GetMoneyUnitName(),self.panelType)) or (string.format(MoneyUtil.GetMoneyUnitName(),self.panelType))-- .. MoneyUtil.GetMoneyUnitName()) if not isBought then self:SetBuyPanelInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua index 5da9047470..9c5d026c2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua @@ -146,7 +146,7 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data) Util.SetGray(btnBuy,not isCanBuy) icon:GetComponent("Image").enabled=isCanBuy if isCanBuy then - price.text = finalNum..MoneyUtil.GetMoneyUnitName() + price.text = string.format(MoneyUtil.GetMoneyUnitName(), finalNum)--..MoneyUtil.GetMoneyUnitName() buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum else price.alignment="MiddleCenter" diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index c811474c6b..9c7984359a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -505,7 +505,7 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex) -- end price.alignment = "MiddleCenter" icon:SetActive(false) - price.text = finalNum..MoneyUtil.GetMoneyUnitName()--..str + price.text = string.format(MoneyUtil.GetMoneyUnitName(), finalNum) 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/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua index 4eebb6cfec..8591d58ebd 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua @@ -280,7 +280,7 @@ function TreasureOfSomebodyRewardPageV2:InitUnlockCost() if not TreasureOfSomebodyManagerV2.hadBuyTreasure then local gameSettingConfig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) -- self.unlockCostIcon.sprite = SetIcon(gameSettingConfig.TreasurePrice[1]) - self.unlockCostValue.text = gameSettingConfig.TreasurePrice[2]..MoneyUtil.GetMoneyUnitName() + self.unlockCostValue.text = string.format(MoneyUtil.GetMoneyUnitName(), gameSettingConfig.TreasurePrice[2])--..MoneyUtil.GetMoneyUnitName() end end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua index 713dd97c48..325df6446d 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua @@ -140,7 +140,7 @@ function UnlockExtraRewardPanel:SetCostValues() local gameSettingConfig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) local propId = gameSettingConfig.TreasurePrice[1] -- self.costIcon.sprite = SetIcon(propId) - self.costValue.text = gameSettingConfig.TreasurePrice[2]..MoneyUtil.GetMoneyUnitName() + self.costValue.text = string.format(MoneyUtil.GetMoneyUnitName(), gameSettingConfig.TreasurePrice[2])--..MoneyUtil.GetMoneyUnitName() self.enoughStatus = BagManager.GetItemCountById(propId) >= gameSettingConfig.TreasurePrice[2] end diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index a4f36e8eec..7dbc34f51a 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -200,7 +200,7 @@ function this:SetGfitShow(rechargeData) _ItemViewList[i].gameObject:SetActive(true) end this.times.text = Language[10535]..rechargeData.dynamicBuyTimes..Language[10054] - this.price.text = RechargeConfig[curGiftId].Price..MoneyUtil.GetMoneyUnitName() + this.price.text = string.format(MoneyUtil.GetMoneyUnitName(), RechargeConfig[curGiftId].Price)--..MoneyUtil.GetMoneyUnitName() --this.oriPrice.gameObject:SetActive(activityType[curType].price) end