Merge branch 'master' into SubWindow

client_Wu Xijin

2019-04-29 469866975156c12945f65f0d6f7e6d57ec4f782f

 System/MainInterfacePanel/LowSettingTip.cs

@@ -86,11 +86,11 @@
            var talentModel = ModelCenter.Instance.GetModel<TalentModel>();

            if (skillModel.passSkillRedpoint.state == RedPointState.Simple)

            {

                WindowCenter.Instance.Open<SkillWin>(false, 1);

                WindowCenter.Instance.Open<SkillWin>(false, 2);

            }

            else if (treasureSkillModel.redpoint.state == RedPointState.Simple)

            {

                WindowCenter.Instance.Open<SkillWin>(false, 2);

                WindowCenter.Instance.Open<SkillWin>(false, 1);

            }

            else if (talentModel.talentRedpoint.state == RedPointState.Simple)

            {