0312 首充倒计时，仙界秘境购买经验药水界面

hch

2019-10-14 af15f2297af8da6462229977b9404f28fe249902

0312 首充倒计时，仙界秘境购买经验药水界面

 System/Dungeon/DungeonLiquidCell.cs

@@ -21,6 +21,7 @@
    [SerializeField] Button m_ItemBtn;

    [SerializeField] Text m_BtnTxt;

    [SerializeField] Transform m_ContainerUse;

    [SerializeField] Text m_ItemTime;



    DungeonLiquidModel m_Model;

    DungeonLiquidModel model

@@ -79,6 +80,8 @@
                    m_ContainerUp.transform.localPosition = m_ContainerUp.transform.localPosition.SetY(0);

                    SkillConfig skillCfg = SkillConfig.Get(cfg.AddSkill1);

                    m_ExpUpper.text = Language.Get("FairyLand_Func24", skillCfg.EffectValue11 / 100);

                    m_ItemTime.text = Language.Get("BuyExpShow_" + itemModel.itemId);



                    var _buffId = 0;

                    m_UpperIcon.gameObject.SetActive(true);

                    if (UseLiquid(out _buffId))

@@ -116,10 +119,10 @@
                m_ItemBG.SetItemBackGround(cfg.ItemColor);

                m_ItemCount.gameObject.SetActive(false);

                m_MoneyIcon.SetIconWithMoneyType(storeModel.MoneyType);

                m_ContainerUp.transform.localPosition = m_ContainerUp.transform.localPosition.SetY(25);

                m_ContainerUp.transform.localPosition = m_ContainerUp.transform.localPosition.SetY(8);

                SkillConfig skillCfg = SkillConfig.Get(cfg.AddSkill1);

                m_ExpUpper.text = Language.Get("FairyLand_Func24", skillCfg.EffectValue11 / 100);



                m_ItemTime.text = Language.Get("BuyExpShow_" + storeModel.ItemID);

                m_ContainerUp.gameObject.SetActive(true);

                var _buffId = 0;

                m_UpperIcon.gameObject.SetActive(true);


 System/Dungeon/DungeonLiquidModel.cs

@@ -28,14 +28,14 @@
        {

            FuncConfigConfig funcConfig = FuncConfigConfig.Get("BuyExpLiquidCondition");

            liquidItems.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical3));

            liquidItems.Sort(Compare);

            //liquidItems.Sort(Compare);

            var _moneyTypes = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2);

            var _moneyTypeList = new List<int>(_moneyTypes);

            var _shopTypes = new List<int>(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1));

            _moneyTypeList.Sort((int x, int y) =>

            {

                return -x.CompareTo(y);

            });

            //_moneyTypeList.Sort((int x, int y) =>

            //{

            //    return -x.CompareTo(y);

            //});

            for (int i = 0; i < liquidItems.Count; i++)

            {

                Dictionary<int, StoreConfig> _dict;


 System/Vip/FirstTimeRechargeModel.cs

@@ -191,12 +191,6 @@
                TryOutEvent(IsTryOut);

            }

        }

        private bool IsDungeon()

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = MapConfig.Get(mapId);

            return mapConfig != null && mapConfig.MapFBType != 0;

        }



        public bool IsShowTime()

        {

@@ -207,6 +201,18 @@


            return false;

        }



        public bool IsDungeon()

        {

            var isDungeon = MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID);

            if (ClientDungeonStageUtility.isClientDungeon)

            {

                isDungeon = true;

            }

            return isDungeon;

        }







        private void secondEvent()

        {

@@ -220,7 +226,7 @@
                    int Residue = CumulativeTime - second;

                    if (!WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                    {

                        if (!IsShowOnce && Residue / 60 > 0)

                        if (!IsShowOnce && Residue > 0 && !IsDungeon())

                            WindowCenter.Instance.Open<FirstTimeRechargeWin>();

                    }