Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -203,7 +203,7 @@
                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//御剑山庄boss区域特殊处理（可切换状态）

                {

                    WindowCenter.Instance.Open<CombatModeWin>();

                    if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

                    if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                    {

                        WindowCenter.Instance.Close<FunctionForecastWin>();

                    }

@@ -218,7 +218,7 @@
                }



                WindowCenter.Instance.Open<CombatModeWin>();

                if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

                if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                {

                    WindowCenter.Instance.Close<FunctionForecastWin>();

                }