Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-20 052bb69a8b50948052165847ea44312b8d4f6607

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -120,20 +120,33 @@
            m_ImgSelected.SetActive(true);



            taskmodel.GetNowTaskID = Task_ID;



            if (mainModel.TaskId_Skill1.Contains(Task_ID))

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

            {

                int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品

                if (itemNumber >= mainModel.ItemNumber)

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

                {

                    taskmodel.CompletionOfTask(Task_ID);

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                    WindowCenter.Instance.Open<WingTaskJumpWin>();

                    return;

                }

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

                if (BackpackDic == null)

                {

                    WindowCenter.Instance.Open<WingTaskJumpWin>();

                    return;

                }

                else

                {

                    StateDetermination();

                    ContentText.ExcuteHref();

                    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))

@@ -141,8 +154,17 @@
                case -5:

                case 0:

                    StateDetermination();

                    ContentText.ExcuteHref();

                    OpenPanel(Task_ID);

                    if (mainModel.TaskId_Skill.Contains(Task_ID))

                    {

                        mainModel.TaskSkillID = Task_ID;

                        WindowCenter.Instance.Open<SkillTaskWin>();

                    }

                    else

                    {

                        ContentText.ExcuteHref();

                        OpenPanel(Task_ID);

                    }

                   
                    break;

                case 1:



@@ -203,6 +225,8 @@
            }

        }







        private void StateDetermination()//状态判定

        {

            DropItemManager.StopMissionPickup = true;//主动停止拾取物品

@@ -236,6 +260,7 @@


        private void OnClickDeliveryButton()//传送符

        {

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

            mainModel.FlyShoseTaskID = Task_ID;

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

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

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

                    if (NeedMoney >= 1)

                    {





                        m_ContentText.ExcuteHref(1);

                    }

                    else

@@ -273,20 +300,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);

@@ -318,33 +345,16 @@
                m_TitleText.text = "<color=#ec4bf6>" + TaskTitle(TaskID) + "</color>";

            }

            string str = taskmodel.allMissionDict[TaskID].InforList;

            var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);

            if (mainModel.TaskId_Skill1.Contains(TaskID))//特殊任务

            var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);        
            if (taskinfo != null)

            {

                int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品

                string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);

                string Str_B = Language.Get("PassiveSkillTask2");

                if (itemNumber >= mainModel.ItemNumber)

                {

                    m_ContentText.text = Str_B;

                }

                else

                {

                    m_ContentText.text = Str_A;

                }

                m_ContentText.text = taskinfo.show_writing;

            }

            else

            {

                if (taskinfo != null)

                {

                    m_ContentText.text = taskinfo.show_writing;

                }

                else

                {

                    DebugEx.LogError("任务表格PyTaskInfo配置缺失");

                    return;

                }

            }          
                DebugEx.LogError("任务表格PyTaskInfo配置缺失");

                return;

            }

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

            if (isOPenTransferButton && !IsKaJiBool)

            {

@@ -354,9 +364,7 @@
            {

                m_DeliveryButton.gameObject.SetActive(false);

            }



            m_ContentText.raycastTarget = false;



            if (taskmodel._DicTaskInformation.ContainsKey(TaskID))

            {

                Dictionary<string, string> SkillDic = new Dictionary<string, string>();