Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-06-13 e90a6df3377a013921d4956180230b21e97d4a2a

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Alchemy/AlchemyModel.cs

@@ -110,8 +110,9 @@
                CheckRedpoint();

            }



            if (m_AlchemyDrugs.Contains(itemId))

            if (AttrFruitConfig.Has(itemId))

            {

                CheckRedpoint();

                RefreshUseDrugRedpoint();

            }

        }

@@ -550,6 +551,7 @@
                alchemyDrugUseRefresh();

            }



            CheckRedpoint();

            RefreshUseDrugRedpoint();

        }



@@ -667,10 +669,13 @@
                    else

                    {

                        var drugConfig = AttrFruitConfig.Get(config.AlchemItemID);

                        if (packModel.GetItemTotalUsedTimes(config.AlchemItemID)

                            >= drugConfig.basicUseLimit)

                        if (drugConfig != null)

                        {

                            continue;

                            if (packModel.GetItemTotalUsedTimes(config.AlchemItemID)

                               >= drugConfig.basicUseLimit)

                            {

                                continue;

                            }

                        }

                    }




 System/FindPrecious/BossHomeVipLackWin.cs

@@ -14,8 +14,13 @@


    public class BossHomeVipLackWin : Window

    {

        [SerializeField] Text m_Remind;

        [SerializeField] Text m_VipLevel;

        [SerializeField] Button m_ViewVip;

        [SerializeField] Button m_Close;



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

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



        #region Built-in

        protected override void BindController()

@@ -30,6 +35,7 @@


        protected override void OnPreOpen()

        {

            Display();

        }



        protected override void OnAfterOpen()

@@ -45,6 +51,16 @@
        }

        #endregion



        void Display()

        {

            var floor = model.selectedFloor;

            var vipLevel = model.GetFloorVipRequirement(model.selectedFloor);

            var requireMoney = vipModel.GetVipPreExp(vipLevel);



            m_Remind.text = Language.Get("W_BossHomeVip4", requireMoney, vipLevel, Language.Get("Num_CHS_8_" + floor));

            m_VipLevel.text = vipLevel.ToString();

        }



        private void ViewVip()

        {

            if (VersionConfig.Get().isBanShu)


 System/WindowJump/WindowJumpMgr.cs

@@ -596,6 +596,11 @@
                ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = int.Parse(_tagWinSearchModel.SelectActive) + 1;

                SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.MonthInvest:

            case JumpUIType.WeekInvest:

                ModelCenter.Instance.GetModel<MonthWeekInvestModel>().jumpType = int.Parse(_tagWinSearchModel.SelectActive);

                SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.BestXB:

            case JumpUIType.RuneXB:

            case JumpUIType.XBStore:

@@ -1691,6 +1696,8 @@
    AlchemyFairy = 321,

    RolePromote = 322,

    UseFairyDrug = 323,

    MonthInvest = 324,

    WeekInvest = 325,



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面