Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 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>();

                }