Merge remote-tracking branch 'origin/master' into LuaOrgan

client_Lhy

2019-07-04 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5

 System/MainInterfacePanel/LowSettingTip.cs

@@ -88,6 +88,10 @@
            {

                WindowCenter.Instance.Open<SkillWin>();

            }

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

            {

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

            }

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

            {

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