Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 System/MainInterfacePanel/HighSettingTip.cs

@@ -290,6 +290,15 @@
            {

                _model.currentCategory = TreasureCategory.Human;

            }

            else if (_model.GetTreasureUnlockShow(TreasureCategory.Demon) != 0)

            {

                _model.currentCategory = TreasureCategory.Demon;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

                == RedPointState.Simple)

            {

                _model.currentCategory = TreasureCategory.Human;

            }

            WindowCenter.Instance.Open<TreasureSelectWin>();

        }