0312 0.1折显示优化

hch

2024-12-12 bb27d828e8d294ac90b231173d010522c6a3c2e3

0312 0.1折显示优化

 Core/GameEngine/Model/Config/OrderInfoConfig.cs

@@ -16,14 +16,14 @@
    public readonly int id;

    public readonly string OrderInfo;

    public readonly string AppId;

    public readonly float PayRMBNum; //0.1折

    public readonly float m_PayRMBNum; //原价



    //0.1折的原价

    public float m_PayRMBNum

    //0.1折

    public float PayRMBNum

    {

        get

        {

            return PayRMBNum * 100;

            return m_PayRMBNum * 0.01f;

        }

    }



@@ -50,7 +50,7 @@


            AppId = tables[2];



            float.TryParse(tables[3],out PayRMBNum); 
            float.TryParse(tables[3],out m_PayRMBNum); 


            int.TryParse(tables[4],out CTGID); 




 LogicProject/System/MergeServerActivity/MergeServerLimitedTimePackageItemBehaviour.cs

@@ -60,7 +60,7 @@
                if (index < reward.gifts.Length)
                {
                    var recharge = reward.gifts[index];
                    var showNum = UIHelper.GetMoneyFormat(reward.gifts[index].rmb);
                    var showNum = UIHelper.GetMoneyFormat(reward.gifts[index].rmb * 0.01f);
                    m_MoneyClose.text = Language.Get("ArtFontMoney", showNum);
                    m_MoneyOpen.text = Language.Get("ArtFontMoney", showNum);


 LogicProject/System/MergeServerActivity/MergeServerLimitedTimePackageWin.cs

@@ -141,14 +141,7 @@
                if (gift.gifts.Length > 0 && _index < gift.gifts.Length)
                {
                    string str = string.Empty;
                    float rmb = gift.gifts[_index].rmb;

                    if (PlayerDatas.Instance.baseData.IsActive90Off)
                    {
                        OrderInfoConfig orderInfo = null;
                        vipModel.TryGetOrderInfoByOrderInfo(gift.gifts[_index].OrderInfo, out orderInfo);
                        rmb = orderInfo.PayRMBNum;
                    }
                    var curMoneyStr = UIHelper.GetMoneyFormat(rmb);

                    var curMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmb * 0.01f);

 
                    var orgMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmbOriginal);
                    str = Language.Get("TimeLimitGoods", curMoneyStr);
@@ -180,7 +173,7 @@
                            {
                                m_Buy_Btn.interactable = false;
                                time = 0;
                                vipModel.OpenFreePlat(str, rmb, gift.gifts[_index].OrderInfo);
                                vipModel.OpenFreePlat(str, gift.gifts[_index].rmb, gift.gifts[_index].OrderInfo);
                                return;
                            }


 LogicProject/System/Recharge/CelestialStarTowerWin.cs

@@ -56,7 +56,7 @@
        imgBuy.SetActiveIL(isBuyZhanLing);

        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(CelestialStarTowerModel.Instance.ctgIdDict[3], out orderCfg);

        txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

        txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

        if (orgPrice != null)

        {

            orgPrice.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);


 LogicProject/System/Recharge/DailySpecialsWin.cs

@@ -144,7 +144,7 @@


        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(DailySpecialsModel.Instance.packRechargeIdList[0], out orderCfg);

        txtAllBuy.text = Language.Get("winfix15", orderCfg.PayRMBNum, DailySpecialsModel.Instance.maxDay);

        txtAllBuy.text = Language.Get("winfix15", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum), DailySpecialsModel.Instance.maxDay);

        txtRemaindays.text = Language.Get("TheRemainingNumberDays_Z", DailySpecialsModel.Instance.maxDay - (TimeUtility.ServerNow.Date - TimeUtility.GetTime(DailySpecialsModel.Instance.PackBuyTime).Date).Days);

        if (orgAllPrice != null)

        {

@@ -176,7 +176,7 @@
            {

                ctgID = DailySpecialsModel.Instance.ctgIdDict[i][0];

                vipModel.TryGetOrderInfo(ctgID, out orderCfg);

                txtBuyList[i].text = Language.Get("NeedMoney", orderCfg.PayRMBNum);

                txtBuyList[i].text = Language.Get("NeedMoney", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

                txtHaveList[i].text = Language.Get("RealmPractice109");

                if (orgPriceList[i] != null)

                {


 LogicProject/System/Recharge/GuBaoTotalStarsWin.cs

@@ -56,7 +56,7 @@
        imgBuy.SetActiveIL(isBuyZhanLing);

        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(GuBaoTotalStarsModel.Instance.ctgIdDict[4], out orderCfg);

        txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

        txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

        if (orgPrice != null)

        {

            orgPrice.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);


 LogicProject/System/Recharge/LimitedTimeLuxuryGiftButtonCell.cs

@@ -21,7 +21,7 @@


        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(ctgId, out orderCfg);

        txtMoney.text = Language.Get("NeedMoney", orderCfg.PayRMBNum);

        txtMoney.text = Language.Get("NeedMoney", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

        imgMoney.sprite = UILoader.LoadSprite("XSHL2");

        if (ctgId == showCtgID)

        {


 LogicProject/System/Recharge/LimitedTimeLuxuryGiftWin.cs

@@ -177,7 +177,7 @@


        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(showCtgID, out orderCfg);

        txtBuyNow.text = Language.Get("NeedMoney", orderCfg.PayRMBNum);

        txtBuyNow.text = Language.Get("NeedMoney", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

        if (orgPrice != null)

        {

            orgPrice.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);


 LogicProject/System/Recharge/LvZhanlingWin.cs

@@ -56,7 +56,7 @@
        imgBuy.SetActiveIL(isBuyZhanLing);

        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(LvZhanlingModel.Instance.ctgIdDict[1], out orderCfg);

        txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

        txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

        if (orgPrice != null)

        {

            orgPrice.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);


 LogicProject/System/Recharge/RealmLVZhanlingWin.cs

@@ -56,7 +56,7 @@
        imgBuy.SetActiveIL(isBuyZhanLing);

        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(RealmLVZhanlingModel.Instance.ctgIdDict[2], out orderCfg);

        txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

        txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));



        if (orgPrice != null)

        {


 LogicProject/System/TongTianLing/TTLBattlePassWin.cs

@@ -282,7 +282,7 @@
        { 

            OrderInfoConfig orderConfig;
            vipModel.TryGetOrderInfo(TTLBattlePassModel.Instance.ttlCTGID, out orderConfig);
            (buyTTL.FindComponent("TextEx", "TextEx") as TextEx).text = Language.Get("PriceBuy", orderConfig.PayRMBNum);

            (buyTTL.FindComponent("TextEx", "TextEx") as TextEx).text = Language.Get("PriceBuy", UIHelper.GetMoneyFormat(orderConfig.PayRMBNum));



            if (orgPrice != null)
            {


 System/BlessedLand/BlessedLandCornucopiaWin.cs

@@ -75,7 +75,7 @@
            {

                OrderInfoConfig orderCfg;

                vipModel.TryGetOrderInfo(blessedLandModel.rechargeIDListForActivatingTreasureBowlArr[blessedLandModel.cornucopiaIndex][0], out orderCfg);

                txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum.ToString());

                txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));



                if (orgPrice != null)

                {


 System/HolidayWishes/HolidayLimitedTimePackageItemBehaviour.cs

@@ -64,7 +64,7 @@
                {
                    if (index < reward.gifts.Length)
                    {
                        var showNum = UIHelper.GetMoneyFormat(reward.gifts[index].rmb);
                        var showNum = UIHelper.GetMoneyFormat(reward.gifts[index].rmb * 0.01f);
                        m_MoneyClose.text = Language.Get("ArtFontMoney", showNum);
                        m_MoneyOpen.text = Language.Get("ArtFontMoney", showNum);
                        DisplayRedpoint();

 System/HolidayWishes/HolidayLimitedTimePackageWin.cs

@@ -133,14 +133,7 @@
                    if (gift.gifts.Length > 0 && _index < gift.gifts.Length)
                    {
                        string str = string.Empty;

                        float rmb = gift.gifts[_index].rmb;

                        if (PlayerDatas.Instance.baseData.IsActive90Off)

                        {

                            OrderInfoConfig orderInfo = null;

                            vipModel.TryGetOrderInfoByOrderInfo(gift.gifts[_index].OrderInfo, out orderInfo);

                            rmb = orderInfo.PayRMBNum;

                        }
                        var curMoneyStr = UIHelper.GetMoneyFormat(rmb);
                        var curMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmb * 0.01f);
                        var orgMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmbOriginal);
                        str = Language.Get("HolidayTimeLimitGoods", curMoneyStr);
                        m_Text_PackageName.text = str;
@@ -171,7 +164,7 @@
                                {
                                    m_Buy_Btn.interactable = false;
                                    time = 0;
                                    vipModel.OpenFreePlat(str, rmb, gift.gifts[_index].OrderInfo);
                                    vipModel.OpenFreePlat(str, gift.gifts[_index].rmb, gift.gifts[_index].OrderInfo);
                                    return;
                                }


 System/LoopAct/FairyAffinity/FairyAffinityLoginActWin.cs

@@ -102,7 +102,7 @@
                return;

            OrderInfoConfig orderCfg;

            vipModel.TryGetOrderInfo(holiday.awardExCTGID, out orderCfg);

            txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

            txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

            if (orgPrice != null)
            {

                orgPrice.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);


 System/LoopAct/FairyAffinity/FairyAffinityMissionActWin.cs

@@ -101,7 +101,7 @@
            imgBuy.SetActiveIL(isBuyZhanLing);

            OrderInfoConfig orderCfg;

            vipModel.TryGetOrderInfo(fairyAffinityZhanLingModel.ctgIdDict[fairyAffinityZhanLingModel.ZhanLingType], out orderCfg);

            txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

            txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));



            if (orgPrice != null)
            {


 System/LoopAct/FairyAffinity/FairyAffinityZhanLingWin.cs

@@ -45,7 +45,7 @@
            imgBuy.SetActiveIL(isBuyZhanLing);

            OrderInfoConfig orderCfg;

            vipModel.TryGetOrderInfo(model.ctgIdDict[model.ZhanLingType], out orderCfg);

            txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);

            txtBuy.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.PayRMBNum));

            if (orgPrice != null)

            {

                orgPrice.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);


 System/Vip/DayGoods.cs

@@ -54,7 +54,7 @@
            }
            else
            {
                title = Language.Get("DayGoods_1", UIHelper.GetMoneyFormat(goods.money));
                title = Language.Get("DayGoods_1", UIHelper.GetMoneyFormat(goods.money * 0.01f));
            }

            m_BuyLimitCnt.text = Language.Get("LimitGiftCnt", goods.buyCountLimit - goods.getCount);
@@ -99,7 +99,7 @@
            }
            else

            {
                m_BuyText.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(goods.money));
                m_BuyText.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(goods.money * 0.01f));
                onSaleImg.SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);
            }


 System/Vip/DayPackageModel.cs

@@ -195,7 +195,7 @@


                m_WeekRechargeDict[ctgConfig.RecordID] = new DayGift()

                {

                    money = orderCfg.PayRMBNum,

                    money = orderCfg.m_PayRMBNum,

                    orderInfo = orderCfg.OrderInfo,

                    items = JsonMapper.ToObject<int[][]>(ctgConfig.GainItemList).ToList(),

                    buyCountLimit = ctgConfig.WeekBuyCount,

@@ -209,7 +209,7 @@
                vipModel.TryGetOrderInfo(ctgConfig.RecordID, out orderCfg);

                m_MonthRechargeDict[ctgConfig.RecordID] = new DayGift()

                {

                    money = orderCfg.PayRMBNum,

                    money = orderCfg.m_PayRMBNum,

                    orderInfo = orderCfg.OrderInfo,

                    items = JsonMapper.ToObject<int[][]>(ctgConfig.GainItemList).ToList(),

                    buyCountLimit = ctgConfig.MonthBuyCount,


 System/Vip/LimitedTimePackageItemBehaviour.cs

@@ -66,7 +66,7 @@
                    {
                        var recharge = reward.gifts[index];
                        //根据各地区不同，rmb单位为分需转换为 单位为元带两位小数点
                        var showNum = UIHelper.GetMoneyFormat(reward.gifts[index].rmb);
                        var showNum = UIHelper.GetMoneyFormat(reward.gifts[index].rmb *0.01f);
                        m_MoneyClose.text = Language.Get("ArtFontMoney", showNum);
                        m_MoneyOpen.text = Language.Get("ArtFontMoney", showNum);
                        DisplayRedpoint();

 System/Vip/LimitedTimePackageWin.cs

@@ -130,14 +130,8 @@
                    if (gift.gifts.Length > 0 && _index < gift.gifts.Length)

                    {

                        string str = string.Empty;

                        float rmb = gift.gifts[_index].rmb;

                        if (PlayerDatas.Instance.baseData.IsActive90Off)

                        {

                            OrderInfoConfig orderInfo = null;

                            vipModel.TryGetOrderInfoByOrderInfo(gift.gifts[_index].OrderInfo, out orderInfo);

                            rmb = orderInfo.PayRMBNum;

                        }

                        var curMoneyStr = UIHelper.GetMoneyFormat(rmb);



                        var curMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmb * 0.01f);

                        var orgMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmbOriginal);

                        str = Language.Get("TimeLimitGoods", curMoneyStr);

                        m_Text_PackageName.text = str;

@@ -168,7 +162,7 @@
                                {

                                    m_Buy_Btn.interactable = false;

                                    time = 0;

                                    vipModel.OpenFreePlat(str, rmb, gift.gifts[_index].OrderInfo);

                                    vipModel.OpenFreePlat(str, gift.gifts[_index].rmb, gift.gifts[_index].OrderInfo);

                                    return;

                                }




 System/Vip/VipModel.cs

@@ -982,7 +982,7 @@
                                    {

                                        WindowCenter.Instance.Open<GotoChargeWin>(true);

                                    }

                                    ynmbxxjUtil.Instance.FreePlatformPay(rechargeConfig.Title, config.PayRMBNum, config.OrderInfo);

                                    ynmbxxjUtil.Instance.FreePlatformPay(rechargeConfig.Title, config.m_PayRMBNum, config.OrderInfo);



                                    RechargeTimeLismit[config.OrderInfo] = DateTime.Now;

                                }

@@ -1001,7 +1001,7 @@
            {

                WindowCenter.Instance.Open<GotoChargeWin>(true);

            }

            ynmbxxjUtil.Instance.FreePlatformPay(rechargeConfig == null ? string.Empty : rechargeConfig.Title, config.PayRMBNum, config.OrderInfo);

            ynmbxxjUtil.Instance.FreePlatformPay(rechargeConfig == null ? string.Empty : rechargeConfig.Title, config.m_PayRMBNum, config.OrderInfo);

        }



        Dictionary<string, DateTime> RechargeTimeLismit = new Dictionary<string, DateTime>();


 Utility/UIHelper.cs

@@ -856,12 +856,12 @@
    //货币单位的显示，海外显示逗号, 国内不加逗号

    public static string GetMoneyFormat(double money)

    {

        //if (money == (int)money)

        //{

        //    return money.ToString("N0");

        //}

        //return money.ToString("N2");

        return money.ToString();

        if (money == (int)money)

        {

            return money.ToString("F0");

        }

        return money.ToString("F2").TrimEnd('0').TrimEnd('.');

        //return money.ToString();

    }



    //仅用于显示 仙玉和灵石的特殊处理，存在负数情况，如GM惩罚扣除货币