Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/Strengthening/EquipSuit/PlayerSuitModel.cs

@@ -111,6 +111,13 @@
            CheckTypeBtnRedPointCondition();

        }



        #region 处理跳转数据

        public void SetJumpModel(int suitType)

        {

            EquipSuitTips.E_SuitType = (SuitType)suitType;

        }

        #endregion



        private void RefreshFuncOpenState(int funcId)

        {

            if (funcId != (int)FuncOpenEnum.Suit)

@@ -1005,7 +1012,7 @@
        }

        #endregion





        #region 成就前往数据

        public SuitType jumpToSuitType { get; private set;}

        public int jumpToGroupType { get; private set; }  //1.防具 2.仙器

        public int jumpToEquipPlace { get; private set; }

@@ -1027,6 +1034,7 @@
            jumpToGroupType = 0;

            jumpToEquipPlace = 0;

        }

        #endregion



        public int GetMakerEquipPlace()

        {