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

client_Hale

2019-04-09 d95b46254cd889d49d5f7987ec80e48073a75280

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -44,13 +44,14 @@
        [SerializeField] Button _SwitchShowBtn;//切换按钮

        [SerializeField] Button m_TaskSwithButton;//关于功能预告     

        [SerializeField] Transform m_EffectTask;//任务完成特效播放位置

        [SerializeField] Transform CopyOfThePanel;      
        [SerializeField] Transform CopyOfThePanel;

        [SerializeField] GameObject m_TaskAndTeamTip;

        [SerializeField] GameObject m_MailObj;//邮件显隐

        [SerializeField] ClickScreenOtherSpace _MarkRay;//便捷切换按钮            



        [SerializeField] MainPositionTween m_MainPositionTween;

        [SerializeField] MainButtonMisc m_MainButtonMisc;



        #region

        private bool TaskSwithBool = true;

        private float ExpValueFloat = 0;

@@ -64,37 +65,30 @@
        public static event Action<bool> IsCopyOfThePanel;

        public static event Action IsOpenMaininterface;



        RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }

        MountModel horsemodel { get { return ModelCenter.Instance.GetModel<MountModel>(); } }

        PlayerMainDate onMainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }

        TaskModel onPlayerTask { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }

        BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }

        PKModel pKModel { get { return ModelCenter.Instance.GetModel<PKModel>(); } }

        RuneTowerModel runeTowerModel { get { return ModelCenter.Instance.GetModel<RuneTowerModel>(); } }

        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }

        DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }

        IceCrystalVeinModel iceCrystalVeinModel { get { return ModelCenter.Instance.GetModel<IceCrystalVeinModel>(); } }

        JadeDynastyTowerModel jadeDynastyTowerModel { get { return ModelCenter.Instance.GetModel<JadeDynastyTowerModel>(); } }

        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }



        #region Built-in

        private bool IsUpdateBool = true;

        protected override void BindController()

        {

            var inst = BossShowModel.Instance;

            m_MapSwitchingBehaviour.InitAwake();

            recordPositionBool = true;

            TaskSwithBool = true;

            m_MainPositionTween.SetTaskPos(true);

            m_MailObj.SetActive(true);       
            m_MailObj.SetActive(true);

            ListBossMapId.Clear();

            string strBoss = FuncConfigConfig.Get("TaskRetract").Numerical1;

            string[] bossList = ConfigParse.GetMultipleStr(strBoss);//解析出数组|

            for (int i = 0; i < bossList.Length; i++)

            {

                ListBossMapId.Add(int.Parse(bossList[i]));

            }         
            }

        }



        protected override void AddListeners()

@@ -142,13 +136,12 @@
            NewBieCenter.Instance.guideCompletedEvent += OnGuideCompleted;

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterEvent;

            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterEvent;

            //TaskModel.CompletionOfTaskEvent += CompletionOfTaskEvent;

            NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;

            fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;

            GlobalTimeEvent.Instance.secondEvent += secondEvent;

            IsCrossServerOneVsOne();

            ProcessCrossServerOneVsOne();

        }

     


        protected override void OnActived()

        {

            m_MainButtonMisc.OnActived();

@@ -161,12 +154,14 @@
            var inDungeon = IsDungeon();

            var judge1 = onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool && !m_MainPositionTween.IsTaskAndPanelShow);

            var judge2 = mapId != PlayerDatas.Instance.baseData.MapID;



            if (judge1)

            {

                TaskSwithButton();

                onMainModel.IsBossAreaTask = false;

                onMainModel.IsDead = false;

            }



            if (m_AnimationFadeOut.GetIsFadeIn())

            {

                _MarkRay.gameObject.SetActive(true);

@@ -225,7 +220,7 @@
                else if (!isNeutralMap && !IsBossBool)

                {

                    SetTipPanelOrBossList(true, false);

                }            
                }

            }

            mapId = PlayerDatas.Instance.baseData.MapID;

            m_HighSettingTip.AfterOpen();

@@ -260,7 +255,6 @@
            NewBieCenter.Instance.guideCompletedEvent -= OnGuideCompleted;

            WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterEvent;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterEvent;

            //TaskModel.CompletionOfTaskEvent -= CompletionOfTaskEvent;

            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;

            GlobalTimeEvent.Instance.secondEvent -= secondEvent;

            fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;

@@ -289,16 +283,12 @@
                EffectMgr.Instance.PlayUIEffect(1100, 1100, m_EffectTask, false);

            }

        }

     


        protected override void OnAfterClose()

        {



        }

        #endregion

        //private void CompletionOfTaskEvent(int obj)

        //{

        //    EffectMgr.Instance.PlayUIEffect(1100, 1100, m_EffectTask, false);

        //}



        private void secondEvent()

        {

@@ -339,7 +329,6 @@


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

        {

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

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

            {

                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState);

@@ -376,6 +365,7 @@
                    SwitchShowButton();

                }

            }



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

            {

                if (onMainModel.IsBossAreaTask)

@@ -384,9 +374,9 @@
                    onMainModel.IsBossAreaTask = false;

                }

            }



            var inDungeon = IsDungeon();

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



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

            {

                if (!m_MainPositionTween.IsSetCopyOfThePanelShow && !inDungeon && !isNeutralMap)

@@ -398,11 +388,11 @@


        private void AtkTypeChange()//骑宠争夺是否切换状态

        {

            int mapID = PlayerDatas.Instance.baseData.MapID;

            var mapID = PlayerDatas.Instance.baseData.MapID;

            var config = MapConfig.Get(mapID);

            int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();

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

            int Line = 0;

            var atkInt = pKModel.GetArea(config.AtkType);

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

            var Line = 0;

            fairyGrabBossModel.TryGetFairyGrabBossLine(out Line);

            if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line == PlayerDatas.Instance.baseData.FBID)

            {

@@ -410,6 +400,7 @@
                onMainModel.AreaState = Buffmodel.PkType;

                return;

            }



            if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line != PlayerDatas.Instance.baseData.FBID)//逍遥城普通Boss区域处理

            {



@@ -417,9 +408,10 @@
                onMainModel.AreaState = Buffmodel.PkType;

                return;

            }



            if (!onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//前四只Boss和活动Boss特殊处理

            {

                if (IsBossBool && atkInt.Length > 1 && Buffmodel.PkType != 5)

                if (IsBossBool && atkInt.Count > 1 && Buffmodel.PkType != 5)

                {

                    onMainModel.AreaState = Buffmodel.PkType;

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);

@@ -439,30 +431,30 @@
                }

            }

        }

             


        public void MarkRayButton()

        {

            if (NewBieCenter.Instance.inGuiding)

            {

                return;

            }

            var _treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();

            if (_treasureModel.treasureStageUpShow || _treasureModel.newGotShowing)



            if (treasureModel.treasureStageUpShow || treasureModel.newGotShowing)

            {

                return;

            }

            var inDungeon = IsDungeon();



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

            var inDungeon = IsDungeon();

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

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



            if (!recordPositionBool)

            {

                if (inDungeon || IsBossBool || isNeutralMap)

                if (inDungeon || inBossArea || isNeutralMap)

                {

                    SetTipPanelOrBossList(false, true);

                }

                if (!IsBossBool)

                if (!inBossArea)

                {

                    if (!m_MainPositionTween.IsSetCopyOfThePanelShow && !inDungeon)

                    {

@@ -478,7 +470,6 @@


        void DownButton(GameObject go)

        {

           
            _ExpRate.gameObject.SetActive(true);

        }



@@ -513,13 +504,10 @@
            var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var judge1 = inDungeon || IsBossBool || isNeutralMap;

            var judge2 = !IsBossBool && !m_MainPositionTween.IsSetCopyOfThePanelShow && !inDungeon;



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

            {

                if (judge1)

                {

                    SetTipPanelOrBossList(true, true);

                }

                if (judge2)

                if (judge1 || judge2)

                {

                    SetTipPanelOrBossList(true, true);

                }

@@ -620,10 +608,10 @@


            if (_tCDBPlayerRefresh == PlayerDataType.ExAttr5)//判断是否再跨服

            {

                IsCrossServerOneVsOne();

                ProcessCrossServerOneVsOne();

            }

        }

     




        private bool IsDungeon()

        {

@@ -745,7 +733,7 @@
            AtkTypeChange();

        }



        private void IsCrossServerOneVsOne()

        private void ProcessCrossServerOneVsOne()

        {

            if (CrossServerUtility.IsCrossServerOneVsOne())//是否再跨服副本中

            {