3335 任务多状态修改

client_linchunjie

2019-03-26 2512f04ca5804cf13bdc158df74baa88499378f8

3335 任务多状态修改

 System/MainInterfacePanel/TaskModel.cs

@@ -352,14 +352,15 @@
        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)
        {
            return;
        }
        }



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


        var state = GetQuestState(taskID);
        var config = StoryMissionsConfig.GetConfig(taskID, state);
        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
        if (config != null)
        var state = 0;

        if (TryGetCustomTaskState(taskID, out state))

        {

            if (NPCid == config.NpcID)

            var config = StoryMissionsConfig.GetConfig(taskID, state);

            if (config != null && NPCid == config.NpcID)

            {

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

                     && !WindowCenter.Instance.ExistAnyFullScreenOrMaskWin())

@@ -369,44 +370,21 @@
                    WindowCenter.Instance.Open<DialogueDuidanceWin>();

                }

                return;

            }
            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain)
            {
                WindowCenter.Instance.Close<MainInterfaceWin>();
                WindowCenter.Instance.Open<TaskBoxBGMWin>();
                return;
            }
            else
            {
                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))
                {
                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
                    {
                        RequestGetTaskAward("OK");
                    }
                }
            }
        }
        else
        {
            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain)
            {
                WindowCenter.Instance.Close<MainInterfaceWin>();
                WindowCenter.Instance.Open<TaskBoxBGMWin>();
                return;
            }
            else
            {
                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))
                {
                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
                    {
                        RequestGetTaskAward("OK");
                    }
                }
            }
        }

            }

        }

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

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<TaskBoxBGMWin>();

            return;

        }

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

        {

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

            {

                RequestGetTaskAward("OK");

            }

        }

    }


@@ -420,6 +398,21 @@

    }

    public bool TryGetCustomTaskState(int taskId, out int state)

    {

        state = 0;

        if (ReplaceDic.ContainsKey(taskId))

        {

            var keyValue = ReplaceDic[taskId];

            if (keyValue.ContainsKey("state"))

            {

                state = keyValue["state"];

                return true;

            }

        }

        return false;

    }

    void AddMission(int MissionID, int MissionState, int DiscriptionIndex)//添加任务
    {
        var config = PyTaskConfig.Get(MissionID);