1930【1.0.15】【主干】功能预告跳转八卦炉激活，功能预告界面未关闭

client_linchunjie

2018-09-14 a0ede150686a218c92b901b1f20aef12a9913890

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -121,7 +121,7 @@


            taskmodel.GetNowTaskID = Task_ID;



            if (mainModel.TaskId_Skill1.Contains(Task_ID))

            if (mainModel.TaskId_Skill1.Contains(Task_ID))//特殊支线任务解锁被动技能的

            {

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

@@ -145,6 +145,35 @@
                {

                    WindowCenter.Instance.Open<HoistingWin>();

                }

                return;

            }

            if (mainModel.WingTask == Task_ID && ((int)taskmodel.GetTaskStatus(Task_ID) == 0 || (int)taskmodel.GetTaskStatus(Task_ID) == -5))//关于特殊翅膀任务

            {

                if (playerPack.GetSinglePackModel(PackType.rptItem) == null)

                {

                    WindowCenter.Instance.Open<WingTaskJumpWin>();

                    return;

                }

                Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.rptItem).GetPackModelIndexDict();

                if (BackpackDic == null)

                {

                    WindowCenter.Instance.Open<WingTaskJumpWin>();

                    return;

                }

                else

                {

                    int job = PlayerDatas.Instance.baseData.Job;

                    foreach (var key in BackpackDic.Keys)

                    {

                        ItemModel ItemM = BackpackDic[key];

                        if (ItemM.chinItemModel.Type == 111 && ItemM.chinItemModel.ExpireTime == 0 && ItemM.chinItemModel.JobLimit / 100 == job)

                        {

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.KnapSackFunc1Type2);//跳到背包

                            return;

                        }

                    }

                }

                WindowCenter.Instance.Open<WingTaskJumpWin>();

                return;

            }

            switch ((int)taskmodel.GetTaskStatus(Task_ID))

@@ -214,7 +243,7 @@
            }

        }



        




        private void StateDetermination()//状态判定

        {

@@ -249,6 +278,25 @@


        private void OnClickDeliveryButton()//传送符

        {

            //--------------特殊任务的传送逻辑

            if (mainModel.TaskId_Skill1.Contains(Task_ID))

            {

                var mapModel = ModelCenter.Instance.GetModel<MapModel>();

                var point = mapModel.GetRecommendHangPoint();

                var config = Config.Instance.Get<MapEventPointConfig>(point);



                var flyBootOwn = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralConfig.Instance.flyBootItemId);

                var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;

                if (isVipFreeTransfer || flyBootOwn > 0)

                {

                    MapTransferUtility.Instance.MissionFlyTo(config.MapID, config.NPCID);

                }

                else

                {

                    MapTransferUtility.Instance.MoveToNPC(config.NPCID);

                }

                return;

            }

            mainModel.FlyShoseTaskID = Task_ID;

            string _FlyID = Config.Instance.Get<FuncConfigConfig>("TransportPay").Numerical1;

            int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, int.Parse(_FlyID));//获取飞鞋的数量

@@ -269,6 +317,8 @@
                    int NeedMoney = (int)UIHelper.GetMoneyCnt(1) + (int)UIHelper.GetMoneyCnt(2);

                    if (NeedMoney >= 1)

                    {





                        m_ContentText.ExcuteHref(1);

                    }

                    else

@@ -286,20 +336,20 @@
            }



        }







        public void FlyingShoes_Task(int TaskID)

        {

            Task_ID = TaskID;

            TypeAssignment();

            if (TaskID == taskmodel.GetNowTaskID)

            for (int i = 0; i < m_parent.childCount; i++)

            {

                m_ImgSelected.SetActive(true);

                for (int i = 0; i < m_parent.childCount; i++)

                int taskID1 = m_parent.GetChild(i).GetComponent<TaskType>().TaskID;

                m_parent.GetChild(i).GetComponent<FlyingShoesTask>().ImgSelected.SetActive(false);

                if (taskID1 == taskmodel.GetNowTaskID)

                {

                    int taskID1 = m_parent.GetChild(i).GetComponent<TaskType>().TaskID;

                    if (TaskID != taskID1)

                    {

                        m_parent.GetChild(i).GetComponent<FlyingShoesTask>().ImgSelected.SetActive(false);

                    }

                    m_parent.GetChild(i).GetComponent<FlyingShoesTask>().ImgSelected.SetActive(true);

                }

            }

            m_DeliveryButton.gameObject.SetActive(true);

@@ -363,7 +413,7 @@
                {

                    string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);

                    m_ContentText.text = Str_C;

                }          
                }

            }

            else

            {

@@ -376,7 +426,7 @@
                    DebugEx.LogError("任务表格PyTaskInfo配置缺失");

                    return;

                }

            }          
            }

            bool isOPenTransferButton = HrefAnalysis.Inst.ContainsKey(taskinfo.show_writing, "flynpc");

            if (isOPenTransferButton && !IsKaJiBool)

            {

@@ -386,7 +436,18 @@
            {

                m_DeliveryButton.gameObject.SetActive(false);

            }



            //----------------特殊采集魔团任务的传送云处理 
            if (mainModel.TaskId_Skill1.Contains(TaskID))//特殊任务

            {

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

                    m_DeliveryButton.gameObject.SetActive(true);

                }

                else

                {

                    m_DeliveryButton.gameObject.SetActive(false);

                }

            }

            m_ContentText.raycastTarget = false;



            if (taskmodel._DicTaskInformation.ContainsKey(TaskID))