Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/Strengthening/EquipSuitTips.cs

@@ -138,6 +138,8 @@
        }

        else

        {

            if(!WindowJumpMgr.Instance.IsJumpState)

            {

            E_SuitType = SuitType.LowSuit;

            bool isSwitch = true;

            foreach(var red in SuitModel.suitCellRedPointDict.Values)

@@ -153,6 +155,7 @@
                E_SuitType = SuitType.HighSuit;

            }

        }

        }

        equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType);

        CreateEquipSuitCell();

        StartCoroutine(SetOffestPos());