10343 英文版本1折后的充值界面表现

hch

2024-12-10 0bd288a8c79c9966e4114b93dc8aad268d64a6f9

10343 英文版本1折后的充值界面表现

# Conflicts:
#	Core/GameEngine/Model/Config/OrderInfoConfig.cs
#	LogicProject/System/Buy1Free5/Buy1Free5Cell.cs
#	LogicProject/System/MergeServerActivity/MergeServerLimitedTimePackageItemBehaviour.cs
#	LogicProject/System/OpenServerActivity/InvestWin.cs
#	LogicProject/System/Recharge/FuncSysPrivilegeWin.cs
#	LogicProject/System/Recharge/NewGuyGiftWin.cs
#	LogicProject/System/Recharge/OnlineRechargeWin.cs
#	MiniGame/PushCoin/SuperPushWin.cs
#	System/CustomizedGift/CustomizedGiftCell.cs
#	System/ExclusiveBenefit/ExclusiveBenefitWin.cs
#	System/HolidayWishes/HolidayLimitedTimePackageItemBehaviour.cs
#	System/LoopAct/FairyAffinity/FairyAffinityRechargeGiftActCell.cs
#	System/RankAction/RechargeGiftAct31Cell.cs
#	System/RankAction/RechargeGiftActCell.cs
#	System/Vip/FirstRechargeWin.cs
#	System/Vip/LimitedTimePackageItemBehaviour.cs
#	System/Vip/RechargeBoxWin.cs
#	System/Vip/SuperUPGiftCell.cs
#	System/Vip/SupremeRechargeWin.cs
#	System/Vip/VipInvest/ForeverCardWin.cs
#	System/Vip/VipInvest/MonthWeekInvestWin.cs
#	System/Welfare/CZBMCell.cs
#	System/Welfare/SuccessBattlePassWin.cs
#	System/ZhanLingH/ZhanLingHBuyWin.cs

 Core/GameEngine/Model/Config/CTGConfig.cs

@@ -28,9 +28,25 @@
    public readonly int[][] SelectItemInfo;

    public readonly string Icon;

    public readonly int PayType;

    public readonly int Percentage;

    public readonly int m_Percentage;



    public CTGConfig()

    //特殊处理 原价和1折的变化

    public int Percentage

    {

        get

        {

            if (PlayerDatas.Instance.baseData.IsActive90Off)

            {

                return m_Percentage*10;

            }

            else

            {

                return m_Percentage;

            }

        }

    }



    public CTGConfig()

    {

    }



@@ -70,7 +86,7 @@


            int.TryParse(tables[14],out PayType); 



            int.TryParse(tables[15],out Percentage); 
            int.TryParse(tables[15],out m_Percentage); 
        }

        catch (Exception ex)

        {


 LogicProject/System/MergeServerActivity/MergeServerLimitedTimePackageWin.cs

@@ -27,7 +27,7 @@

    Transform countObj;
    Text countText;
    public int CDTIME = 5;
    public int CDTIME = 1;
    private float time = 0;
    #region Built-in
    MergeServerLimitedTimePackageModel limitedTimePackageItemModel = MergeServerLimitedTimePackageModel.Instance;
@@ -141,7 +141,15 @@
                if (gift.gifts.Length > 0 && _index < gift.gifts.Length)
                {
                    string str = string.Empty;
                    var curMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmb);
                    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 orgMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmbOriginal);
                    str = Language.Get("TimeLimitGoods", curMoneyStr);
                    m_Text_PackageName.text = str;
@@ -172,7 +180,7 @@
                            {
                                m_Buy_Btn.interactable = false;
                                time = 0;
                                vipModel.OpenFreePlat(str, gift.gifts[_index].rmb, gift.gifts[_index].OrderInfo);
                                vipModel.OpenFreePlat(str, rmb, gift.gifts[_index].OrderInfo);
                                return;
                            }


 LogicProject/System/Recharge/CelestialStarTowerWin.cs

@@ -14,6 +14,9 @@
    ButtonEx btnClose;

    ButtonEx btnBuy;

    ImageEx imgBuy;

    TextEx orgPrice;





    VipModel vipModel { get { return ModelCenter.Instance.GetModelEx<VipModel>(); } }

    protected override void BindController()

    {

@@ -23,6 +26,10 @@
        btnClose = proxy.GetWidgtEx<ButtonEx>("btnClose");

        btnBuy = proxy.GetWidgtEx<ButtonEx>("btnBuy");

        imgBuy = proxy.GetWidgtEx<ImageEx>("imgBuy");



        var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

        if (obj != null)

            orgPrice = obj as TextEx;

    }



    protected override void AddListeners()

@@ -50,6 +57,12 @@
        OrderInfoConfig orderCfg;

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

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

        if (orgPrice != null)

        {

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

            orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

        }



        txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(CelestialStarTowerModel.Instance.ctgIdDict[3]).Percentage);

    }




 LogicProject/System/Recharge/DailySpecialsWin.cs

@@ -24,6 +24,9 @@
    public ImageEx imgAllBuy;

    public List<List<ItemCell>> showLineList = new List<List<ItemCell>>();



    TextEx orgAllPrice;

    public List<TextEx> orgPriceList = new List<TextEx>();



    VipModel vipModel { get { return ModelCenter.Instance.GetModelEx<VipModel>(); } }

    protected override void BindController()

    {

@@ -41,6 +44,17 @@
            txtHaveList.Add(proxy.GetWidgtEx<TextEx>("txtHave" + i));

            imgBuyList.Add(proxy.GetWidgtEx<ImageEx>("imgBuy" + i));

            imgHaveList.Add(proxy.GetWidgtEx<ImageEx>("imgHave" + i));



            if (i == 0)

            {

                orgPriceList.Add(null);

            }

            else

            {

                var obj1 = btnBuyList[i].FindComponent("TextEx", "Txt_orgPrice");

                if (obj1 != null)

                    orgPriceList.Add(obj1 as TextEx);

            }

        }



        for (int i = 0, count = 0; i < 4; i++)

@@ -53,6 +67,10 @@
            }

            showLineList.Add(showItemImgList);

        }



        var obj = btnAllBuy.FindComponent("TextEx", "Txt_orgPrice");

        if (obj != null)

            orgAllPrice = obj as TextEx;

    }



    protected override void AddListeners()

@@ -128,6 +146,12 @@
        vipModel.TryGetOrderInfo(DailySpecialsModel.Instance.packRechargeIdList[0], out orderCfg);

        txtAllBuy.text = Language.Get("PriceBuy", orderCfg.PayRMBNum) + Language.Get("ItemOverdue102", 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)

        {

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

            orgAllPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

        }





        //分支礼包相关

        for (int i = 0; i < 4; i++)

@@ -154,6 +178,11 @@
                vipModel.TryGetOrderInfo(ctgID, out orderCfg);

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

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

                if (orgPriceList[i] != null)

                {

                    orgPriceList[i].SetActiveIL(PlayerDatas.Instance.baseData.IsActive90Off);

                    orgPriceList[i].text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

                }

            }



            btnBuyList[i].SetListener(() =>


 LogicProject/System/Recharge/GuBaoTotalStarsWin.cs

@@ -14,6 +14,8 @@
    ButtonEx btnClose;

    ButtonEx btnBuy;

    ImageEx imgBuy;

    TextEx orgPrice;



    VipModel vipModel { get { return ModelCenter.Instance.GetModelEx<VipModel>(); } }

    protected override void BindController()

    {

@@ -23,6 +25,10 @@
        btnClose = proxy.GetWidgtEx<ButtonEx>("btnClose");

        btnBuy = proxy.GetWidgtEx<ButtonEx>("btnBuy");

        imgBuy = proxy.GetWidgtEx<ImageEx>("imgBuy");



        var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

        if (obj != null)

            orgPrice = obj as TextEx;

    }



    protected override void AddListeners()

@@ -51,6 +57,11 @@
        OrderInfoConfig orderCfg;

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

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

        if (orgPrice != null)

        {

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

            orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

        }

        txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(GuBaoTotalStarsModel.Instance.ctgIdDict[4]).Percentage);

    }




 LogicProject/System/Recharge/ILSupremeRechargeWin.cs

File was deleted

 LogicProject/System/Recharge/ILSupremeRechargeWin.cs.meta

File was deleted

 LogicProject/System/Recharge/LimitedTimeLuxuryGiftWin.cs

@@ -17,6 +17,7 @@
    ButtonEx btnBuyNow;

    ImageEx imgBuyNow;

    ImageEx imgTimeOutNow;

    TextEx orgPrice;



    VipModel vipModel { get { return ModelCenter.Instance.GetModelEx<VipModel>(); } }



@@ -33,6 +34,10 @@
        btnBuyNow = proxy.GetWidgtEx<ButtonEx>("btnBuyNow");

        imgBuyNow = proxy.GetWidgtEx<ImageEx>("imgBuyNow");

        imgTimeOutNow = proxy.GetWidgtEx<ImageEx>("imgTimeOutNow");



        var obj = btnBuyNow.FindComponent("TextEx", "Txt_orgPrice");

        if (obj != null)

            orgPrice = obj as TextEx;

    }



    protected override void AddListeners()

@@ -173,6 +178,12 @@
        OrderInfoConfig orderCfg;

        vipModel.TryGetOrderInfo(showCtgID, out orderCfg);

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

        if (orgPrice != null)

        {

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

            orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

        }



        txtGiftName.text = CTGConfig.Get(showCtgID).Title;

        txtProfitNumber.text = ILLimitedTimeLuxuryGiftConfig.Get(showLuxuryGiftID).ProfitRatio[showGiftGearIndex].ToString();

    }


 LogicProject/System/Recharge/LvZhanlingWin.cs

@@ -15,6 +15,8 @@
    ButtonEx btnClose;

    ButtonEx btnBuy;

    ImageEx imgBuy;

    TextEx orgPrice;



    VipModel vipModel { get { return ModelCenter.Instance.GetModelEx<VipModel>(); } }

    protected override void BindController()

    {

@@ -24,6 +26,9 @@
        btnClose = proxy.GetWidgtEx<ButtonEx>("btnClose");

        btnBuy = proxy.GetWidgtEx<ButtonEx>("btnBuy");

        imgBuy = proxy.GetWidgtEx<ImageEx>("imgBuy");

        var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

        if (obj != null)

            orgPrice = obj as TextEx;

    }



    protected override void AddListeners()

@@ -52,6 +57,11 @@
        OrderInfoConfig orderCfg;

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

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

        if (orgPrice != null)

        {

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

            orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

        }

        txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(LvZhanlingModel.Instance.ctgIdDict[1]).Percentage);

    }




 LogicProject/System/Recharge/RealmLVZhanlingWin.cs

@@ -14,6 +14,8 @@
    ButtonEx btnClose;

    ButtonEx btnBuy;

    ImageEx imgBuy;

    TextEx orgPrice;



    VipModel vipModel { get { return ModelCenter.Instance.GetModelEx<VipModel>(); } }

    protected override void BindController()

    {

@@ -23,6 +25,10 @@
        btnClose = proxy.GetWidgtEx<ButtonEx>("btnClose");

        btnBuy = proxy.GetWidgtEx<ButtonEx>("btnBuy");

        imgBuy = proxy.GetWidgtEx<ImageEx>("imgBuy");



        var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

        if (obj != null)

            orgPrice = obj as TextEx;

    }



    protected override void AddListeners()

@@ -51,6 +57,13 @@
        OrderInfoConfig orderCfg;

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

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



        if (orgPrice != null)

        {

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

            orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

        }



        txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(RealmLVZhanlingModel.Instance.ctgIdDict[2]).Percentage);

    }




 LogicProject/System/TongTianLing/TTLBattlePassWin.cs

@@ -28,6 +28,7 @@
    ScrollerController missionScroller;
    Image activeBPImg;
    Button buyTTL;
    TextEx orgPrice;
    Button allAwardGet;
    ScrollerController bpScroller;
    Transform ttlbpcell;
@@ -59,7 +60,11 @@
        allAwardGet = proxy.GetWidgtEx<Button>("allget");
        bpScroller = proxy.GetWidgtEx<ScrollerController>("bpScroller");
        ttlbpcell = proxy.GetWidgtEx<Transform>("ttlbpcell");
        scoreLimit = proxy.GetWidgtEx<Text>("scoreLimit");
        scoreLimit = proxy.GetWidgtEx<Text>("scoreLimit");



        var obj = buyTTL.FindComponent("TextEx", "Txt_orgPrice");
        if (obj != null)
            orgPrice = obj as TextEx;
    }

    protected override void AddListeners()
@@ -277,7 +282,13 @@
        { 

            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", orderConfig.PayRMBNum);



            if (orgPrice != null)
            {

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

                orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderConfig.m_PayRMBNum));

            }
        }


        var ttlFix = ttlbpcell.GetILBehaviour<TTLBattlePassCell>();

 System/BlessedLand/BlessedLandCornucopiaWin.cs

@@ -17,15 +17,19 @@
        [SerializeField] TextEx txtSchedule;

        [SerializeField] TextEx txtRebate;

        [SerializeField] ItemCell itemCell;



        TextEx orgPrice;

        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }

        BlessedLandModel blessedLandModel { get { return ModelCenter.Instance.GetModel<BlessedLandModel>(); } }



        protected override void AddListeners()

        protected override void BindController()

        {



            var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

            if (obj != null)

                orgPrice = obj as TextEx;

        }



        protected override void BindController()

        protected override void AddListeners()

        {

            btnClose.SetListener(() =>

            {

@@ -72,6 +76,12 @@
                OrderInfoConfig orderCfg;

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

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



                if (orgPrice != null)

                {

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

                    orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

                }

            }



            int percent = blessedLandModel.TreasureProgress[blessedLandModel.cornucopiaIndex];


 System/HolidayWishes/HolidayLimitedTimePackageWin.cs

@@ -26,7 +26,7 @@
        [SerializeField] Text m_Money1;//原价
        [SerializeField] Text m_Money2;//现价
        [SerializeField] Text m_Text_ActivityTimeTo;//活动时间
        public int CDTIME = 5;
        public int CDTIME = 1;
        private float time = 0;
        #region Built-in
        HolidayLimitedTimePackageModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<HolidayLimitedTimePackageModel>(); } }
@@ -132,8 +132,15 @@
                {
                    if (gift.gifts.Length > 0 && _index < gift.gifts.Length)
                    {
                        string str = string.Empty;
                        var curMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmb);
                        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 orgMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmbOriginal);
                        str = Language.Get("HolidayTimeLimitGoods", curMoneyStr);
                        m_Text_PackageName.text = str;
@@ -164,7 +171,7 @@
                                {
                                    m_Buy_Btn.interactable = false;
                                    time = 0;
                                    vipModel.OpenFreePlat(str, gift.gifts[_index].rmb, gift.gifts[_index].OrderInfo);
                                    vipModel.OpenFreePlat(str, rmb, gift.gifts[_index].OrderInfo);
                                    return;
                                }


 System/LoopAct/FairyAffinity/FairyAffinityLoginActWin.cs

@@ -15,6 +15,9 @@
        [SerializeField] ButtonEx btnBuy;

        [SerializeField] ImageEx imgBuy;
        [SerializeField] ScrollerController m_Controller;



        TextEx orgPrice;



        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
        FairyAffinityLoginActModel model { get { return ModelCenter.Instance.GetModel<FairyAffinityLoginActModel>(); } }

        FairyAffinityZhanLingModel fairyAffinityZhanLingModel { get { return ModelCenter.Instance.GetModel<FairyAffinityZhanLingModel>(); } }

@@ -23,6 +26,9 @@


        protected override void BindController()
        {

            var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

            if (obj != null)

                orgPrice = obj as TextEx;

        }

        protected override void AddListeners()
@@ -97,6 +103,12 @@
            OrderInfoConfig orderCfg;

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

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

            if (orgPrice != null)
            {

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

                orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

            }


            txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(holiday.awardExCTGID).Percentage);

            txtBuyValue.text = model.buyValue.ToString();

        }

 System/LoopAct/FairyAffinity/FairyAffinityMissionActWin.cs

@@ -20,7 +20,10 @@
        [SerializeField] TextEx txtProfitRatio;

        [SerializeField] TextEx txtBuyValue;

        [SerializeField] ButtonEx btnBuy;

        [SerializeField] ImageEx imgBuy;
        [SerializeField] ImageEx imgBuy;



        TextEx orgPrice;

        FairyAffinityMissionActModel model { get { return ModelCenter.Instance.GetModel<FairyAffinityMissionActModel>(); } }
        FairyAffinityZhanLingModel fairyAffinityZhanLingModel { get { return ModelCenter.Instance.GetModel<FairyAffinityZhanLingModel>(); } }

        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }

@@ -29,6 +32,9 @@


        protected override void BindController()
        {

            var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

            if (obj != null)

                orgPrice = obj as TextEx;

        }

        protected override void AddListeners()
@@ -96,6 +102,13 @@
            OrderInfoConfig orderCfg;

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

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



            if (orgPrice != null)
            {

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

                orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

            }



            txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(fairyAffinityZhanLingModel.ctgIdDict[fairyAffinityZhanLingModel.ZhanLingType]).Percentage);

            txtBuyValue.text = fairyAffinityZhanLingModel.buyValue.ToString();




 System/LoopAct/FairyAffinity/FairyAffinityZhanLingWin.cs

@@ -13,6 +13,7 @@
        [SerializeField] TextEx txtBuyValue;

        [SerializeField] ButtonEx btnBuy;

        [SerializeField] ImageEx imgBuy;

        TextEx orgPrice;

        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }

        FairyAffinityZhanLingModel model { get { return ModelCenter.Instance.GetModel<FairyAffinityZhanLingModel>(); } }



@@ -28,6 +29,9 @@


        protected override void BindController()

        {

            var obj = btnBuy.FindComponent("TextEx", "Txt_orgPrice");

            if (obj != null)

                orgPrice = obj as TextEx;

        }



        protected override void OnPreOpen()

@@ -42,6 +46,11 @@
            OrderInfoConfig orderCfg;

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

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

            if (orgPrice != null)

            {

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

                orgPrice.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderCfg.m_PayRMBNum));

            }

            txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(model.ctgIdDict[model.ZhanLingType]).Percentage);

            txtBuyValue.text = model.buyValue.ToString();

        }


 System/Vip/DayGoods.cs

@@ -87,7 +87,7 @@
            int.TryParse(goods.orderInfo, out moneyType);

            m_MustBuy.SetActive(goods.money == 0);
            var onSaleImg = m_Buy.FindComponent("Image", "ImageEx") as Image;
            var onSaleImg = m_Buy.FindComponent("Image", "saleImage") as Image;
            onSaleImg?.SetActive(false);
            if (goods.money == 0)

            {

@@ -100,7 +100,7 @@
            else

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

            m_Buy.SetListener(() => {

 System/Vip/DayPackageModel.cs

@@ -57,8 +57,6 @@


    public int weekBuyType = 0;

    public int monthBuyType = 0;

    public int[] weekStoreList;

    public int[] monthStoreList;

    public List<int> weekStoreListSort = new List<int>();   //显示顺序

    public List<int> monthStoreListSort = new List<int>();

@@ -68,6 +66,7 @@
    public event Action onDayGoodsUpdate;
    public override void Init()
    {
        PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefreshEvent;
        OpenServerActivityCenter.Instance.Register(23, this);
        ParseConfig();
    }
@@ -119,6 +118,7 @@

    public override void UnInit()
    {
        PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefreshEvent;
    }
    public void OnPlayerLoginOk()
    {
@@ -143,13 +143,41 @@

    }



    void OnPlayerDataRefreshEvent(PlayerDataType type)

    {

        if (type == PlayerDataType.LV2)

        {

            //一折之后需要刷新变化

            ParseConfig();



            if (PlayerDatas.Instance.baseData.IsActive90Off)

            { 
                foreach (var item in m_RechargeDict)

                {

                    OrderInfoConfig orderInfo = null;

                    vipModel.TryGetOrderInfoByOrderInfo(item.Value.orderInfo, out orderInfo);

                    if (orderInfo != null)

                    {

                        item.Value.money = orderInfo.PayRMBNum;

                    }

                    item.Value.onSalePer = item.Value.onSalePer * 10;

                }

            }

        }

    }



    void ParseConfig()

    {

        // 礼包数据包含了价格 购买数量等动态信息 切换账号和打折时刷新

        weekStoreListSort.Clear();

        monthStoreListSort.Clear();

        m_MonthRechargeDict.Clear();

        m_WeekRechargeDict.Clear();





        var config = FuncConfigConfig.Get("BuyPackage");
        weekStoreList = JsonMapper.ToObject<int[]>(config.Numerical1);
        monthStoreList = JsonMapper.ToObject<int[]>(config.Numerical2);
        var weekStoreList = JsonMapper.ToObject<int[]>(config.Numerical1);
        var monthStoreList = JsonMapper.ToObject<int[]>(config.Numerical2);
        weekBuyType = int.Parse(config.Numerical3);
        monthBuyType = int.Parse(config.Numerical4);



@@ -187,6 +215,7 @@
            {

                OrderInfoConfig orderCfg;

                vipModel.TryGetOrderInfo(ctgConfig.RecordID, out orderCfg);



                m_WeekRechargeDict[ctgConfig.RecordID] = new DayGift()

                {

                    money = (int)(orderCfg.PayRMBNum),

@@ -243,6 +272,8 @@

    public void DayGoodsInfo(HAA25_tagMCDailyGiftbagInfo pack)
    {
        ParseConfig();

        recordIDs = new List<int>();
        foreach (var goods in pack.GiftbagInfo)
        {
@@ -266,7 +297,7 @@
                orderInfo = goods.OrderInfo,
                items = tmpItems,
                buyCountLimit = (int)goods.BuyCountLimit,
                onSalePer = goods.Discount,
                onSalePer = PlayerDatas.Instance.baseData.IsActive90Off ? goods.Discount * 10 : goods.Discount,
            };

            

 System/Vip/LimitedTimePackageWin.cs

@@ -26,7 +26,7 @@
        [SerializeField] Text m_Money1;//原价

        [SerializeField] Text m_Money2;//现价

        [SerializeField] Text m_Text_ActivityTimeTo;//活动时间

        public int CDTIME = 5;

        public int CDTIME = 1;

        private float time = 0;

        #region Built-in

        LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }

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

                    {

                        string str = string.Empty;

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

                        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 orgMoneyStr = UIHelper.GetMoneyFormat(gift.gifts[_index].rmbOriginal);

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

                        m_Text_PackageName.text = str;

@@ -161,7 +168,7 @@
                                {

                                    m_Buy_Btn.interactable = false;

                                    time = 0;

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

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

                                    return;

                                }




 System/Vip/RechargeBehaviour.cs

@@ -143,7 +143,7 @@
                    model.ShowRechargeBox(chargeId);

                    return;

                }

                model.CTGEx(chargeId, multi);

                model.CTG(chargeId);

            }

        }

    }


 System/Vip/VipModel.cs

@@ -891,35 +891,7 @@
            }

        }



        //港台版本比较特殊同一个CTGID 有多个OrderInfo

        //暂且只用到首充多倍的编号区分，实际充值到账为同一效果

        //充值获得对应倍数的充值编号进行充值

        public void CTGEx(int _id, int multi = 1)

        {

            List<OrderInfoConfig> orderInfos = null;

            if (TryGetOrderInfoList(_id, out orderInfos))

            {

                if (orderInfos.Count != 1 && MultiOrderInfoDict.ContainsKey(multi))

                {

                    foreach (var orderInfo in orderInfos)

                    {

                        if (MultiOrderInfoDict[multi].Contains(orderInfo.OrderInfo))

                        {

                            CTG(orderInfo);

                            return;

                        }

                    }

#if UNITY_EDITOR

                    //漏配情况下

                    CTG(orderInfos[0]);

#endif

                }

                else

                {

                    CTG(orderInfos[0]);

                }

            }

        }

        
        public void CTG(OrderInfoConfig config)

        {

            if (config == null)


 Utility/OperationLogCollect.cs

@@ -169,7 +169,8 @@
            contentPrefix = StringUtility.Contact(contentPrefix, "os_version:", DeviceUtility.GetDeviceOSLevel(), ";");



            tables["Title"] = "system";

            tables["Content"] = _content.Substring(0, Math.Min(500, _content.Length));

            _content.Replace("0000", "");

            tables["Content"] = _content.Substring(0, Math.Min(800, _content.Length));

            tables["ClientInfo"] = contentPrefix;



            HttpRequest.Instance.RequestHttpGet(StringUtility.Contact(bugReportUrl, HttpRequest.HashtablaToString(tables)), HttpRequest.defaultHttpContentType);