Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -264,7 +264,7 @@
            if (inDungeon)

            {

                m_FunctionForecastTip.gameObject.SetActive(false);

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

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

                {

                    WindowCenter.Instance.Close<FunctionForecastWin>();

                }

@@ -292,7 +292,7 @@
            }

            else

            {

                var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

                var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



                if (isNeutralMap)

                {

@@ -384,7 +384,7 @@
            PlayerTaskDatas.CompletionOfTaskEvent -= CompletionOfTaskEvent;

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;

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

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

            {

                WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();

            }

@@ -529,7 +529,7 @@
                }

            }

            var inDungeon = IsDungeon();

            var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



            if (_areaType == MapArea.E_Type.Boss && !_enter)

            {

@@ -566,7 +566,7 @@
             && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun

             && onMainModel.MoveBool)

            {

                if (!WindowCenter.Instance.CheckOpen("PathfindingIconWin"))

                if (!WindowCenter.Instance.IsOpen("PathfindingIconWin"))

                {

                    WindowCenter.Instance.Open<PathfindingIconWin>(true);

                }

@@ -574,7 +574,7 @@
            else

            {

                onMainModel.MoveBool = false;

                if (WindowCenter.Instance.CheckOpen("PathfindingIconWin"))

                if (WindowCenter.Instance.IsOpen("PathfindingIconWin"))

                {

                    WindowCenter.Instance.CloseImmediately<PathfindingIconWin>();

                }

@@ -582,9 +582,9 @@


            if (runeTowerModel.newPassFloor > 0 && !IsDungeon())

            {

                if (!WindowCenter.Instance.CheckOpen("NewBieWin") && !WindowCenter.Instance.CheckOpen("TreasureNewGotWin"))

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))

                {

                    if (!WindowCenter.Instance.CheckOpen("RuneNewGotWin"))

                    if (!WindowCenter.Instance.IsOpen("RuneNewGotWin"))

                    {

                        WindowCenter.Instance.Open<RuneNewGotWin>();

                    }

@@ -673,7 +673,7 @@
            var inDungeon = IsDungeon();



            bool IsBossBool = PlayerDatas.Instance.hero == null ? false : MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域

            var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



            if (!recordPositionBool)

            {

@@ -739,7 +739,7 @@
                }

                LeftImage.SetActive(false);

                RightImg.SetActive(true);

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

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

                {

                    WindowCenter.Instance.Close<FunctionForecastWin>();

                }

@@ -761,7 +761,7 @@
        {

            var inDungeon = IsDungeon();

            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);

            var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



            if (recordPositionBool)//显示功能入口

            {

@@ -1022,7 +1022,7 @@


        void CheckChatTipOpen()

        {

            bool _chatWinOpen = WindowCenter.Instance.CheckOpen<ChatWin>();

            bool _chatWinOpen = WindowCenter.Instance.IsOpen<ChatWin>();

            m_ChatTip.gameObject.SetActive(!_chatWinOpen);

            if (!_chatWinOpen)

            {