2158【1.2.0】猫耳聊天屏蔽逻辑优化

client_linchunjie

2018-10-18 f93c57bfd57f97e78c3a00a29f302f5e8c83cdee

 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -229,6 +229,7 @@


            if (allMissionDict.ContainsKey(MissionID))

            {

                int missionState = allMissionDict[MissionID].MissionState;

                if (allMissionDict[MissionID].MissionState != MissionState && MissionState == 3 && AutomaticityBool)

                {

                    if (CompletionOfTaskEvent != null)

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

                TaskChanges(MissionID, MissionState, DiscriptionIndex);//任务的状态修改



                if (allMissionDict[MissionID].MissionState == 0 && MissionState == 1)

                if (missionState == 0 && (MissionState == 1 || MissionState==2))

                {

                    if (Event_TaskToAdd != null)//任务添加（用于存储于身上的未接取任务的特殊处理）

                    {

@@ -311,8 +312,8 @@
        {

            return;

        }

        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        if (!WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>() && IsOpenMain)

        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

        if (!WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>() && IsOpenMain)

        {

            WindowCenter.Instance.Open<DefaultDialogueBoxWin>();

            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -330,7 +331,7 @@
            return;

        }

        var config = Config.Instance.Get<StoryMissionsConfig>(taskID);

        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

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

        if (config != null)

        {

@@ -338,7 +339,7 @@
            {

                if (NPCid == config.NpcID[i])

                {

                    if (!WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>() && IsOpenMain

                    if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>() && IsOpenMain

                        && !treasureStageUpShow && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

                    {

                        WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -347,7 +348,7 @@
                    return;

                }

            }

            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<TaskBoxBGMWin>();

@@ -357,14 +358,17 @@
            {

                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))

                {

                    RequestGetTaskAward("OK");

                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)

                    {

                        RequestGetTaskAward("OK");

                    }

                }



            }

        }

        else

        {

            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<TaskBoxBGMWin>();

@@ -374,7 +378,10 @@
            {

                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))

                {

                    RequestGetTaskAward("OK");

                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)

                    {

                        RequestGetTaskAward("OK");

                    }               
                }

            }

        }

@@ -884,7 +891,7 @@
            if (_DicTaskInformation[_MissionId].ContainsKey(_DictKey))

            {

                _DicTaskInformation[_MissionId][_DictKey] = _DictValue.ToString();

                if (_DictKey == "kaji" && _DictValue == 0)

                if (_DictKey == "kaji" && (_DictValue == 0|| _DictValue == 1))//kaji:0为主线卡级变更，kaji:1为魔族卡级变更

                {

                    if (CardLevelChange != null)

                    {

@@ -1255,7 +1262,7 @@
        var _singleModel = PlayerBackModel.GetSinglePackModel(PackType.rptEquip);

        // 如果有守护, 则不拾取

        var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal);

        if (_itemModel == null || !GeneralConfig.Instance.GuardianPickUpID.Contains(_itemModel.itemId))

        if (_itemModel == null || !GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))

        {

            float _chkDistanceSqrt;

            DropItemManager.DropObject _obj = null;

@@ -1288,12 +1295,12 @@
            yield break;

        }



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

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

        {

            yield break;

        }



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

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

        {

            yield break;

        }

@@ -1454,18 +1461,18 @@


    public static bool IsOPenAutoResolve()//任务面板不开启自动挂机状态

    {

        WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>();

        WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>();

        WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>();

        WindowCenter.Instance.IsOpen<DialogueDuidanceWin>();

        bool _bool = true;

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

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

        {

            _bool = false;

        }

        else if (WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>())

        else if (WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>())

        {

            _bool = false;

        }

        else if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

        else if (WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())

        {

            _bool = false;

        }