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

client_linchunjie

2018-08-27 4c0d9dcb998c6645dbb30be778e9d6f93458ac03

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -238,7 +238,7 @@
        }



        protected override void OnAfterOpen()

        {       
        {

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

            if (onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool))

            {

@@ -286,7 +286,7 @@
                }

            }

            else

            {             
            {

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



                if (isNeutralMap)

@@ -448,7 +448,7 @@


        private void OnEnterOrExitArea(MapArea.E_Type _areaType, bool _enter)

        {

           // DesignDebug.LogError(_areaType + ".." + _enter);

            // DesignDebug.LogError(_areaType + ".." + _enter);

            if (PlayerDatas.Instance.baseData.MapID == 10040 && _areaType != MapArea.E_Type.Boss && _enter)

            {

                if (Buffmodel.PkType != onMainModel.AreaState)

@@ -653,7 +653,7 @@
            if (!recordPositionBool)

            {

                if (inDungeon || IsBossBool || isNeutralMap)

                {                   
                {

                    if (IsCopyOfThePanel != null)

                    {

                        IsCopyOfThePanel(false);

@@ -664,12 +664,12 @@
                    }

                    CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);

                    m_ContainerBossList.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);

                    m_BossBriefInfos.Unfold(false);                  
                    m_BossBriefInfos.Unfold(false);

                }

                if (!IsBossBool)

                {

                    if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon)

                    {                    
                    {

                        if (IsCopyOfThePanel != null)

                        {

                            IsCopyOfThePanel(true);

@@ -814,6 +814,17 @@
            recordPositionBool = !recordPositionBool;

        }



        // 前期战斗用强制设置任务位置逻辑

        public void ForceShowTaskPanel()

        {

            if (onMainModel.IsBossAreaTask)

            {

                onMainModel.IsBossAreaTask = false;

            }

            m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            TaskSwithBool = !TaskSwithBool;

        }



        void ArticleExperience()//关于经验条

        {

            int NowLv = (int)PlayerDatas.Instance.baseData.LV;