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

client_Hale

2018-08-23 35578d649a7aa913c6914d6c97e6dbc80e9c9ca0

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -123,19 +123,27 @@


            if (mainModel.TaskId_Skill1.Contains(Task_ID))

            {

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

                if (itemNumber >= mainModel.ItemNumber)

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

                {

                    taskmodel.CompletionOfTask(Task_ID);

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);



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

                    if (itemNumber >= mainModel.ItemNumber)

                    {

                        taskmodel.CompletionOfTask(Task_ID);

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                    }

                    else

                    {

                        StateDetermination();

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

                        var point = mapModel.GetRecommendHangPoint();

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

                        MapTransferUtility.Instance.MoveToNPC(config.NPCID);

                    }

                }

                else

                {

                    StateDetermination();

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

                    var point = mapModel.GetRecommendHangPoint();

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

                    MapTransferUtility.Instance.MoveToNPC(config.NPCID);

                    WindowCenter.Instance.Open<HoistingWin>();

                }

                return;

            }

@@ -338,17 +346,24 @@
            var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);

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

            {

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

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

                if (itemNumber >= mainModel.ItemNumber)

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

                {

                    m_ContentText.text = Str_B;

                    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;

                    }

                }

                else

                {

                    m_ContentText.text = Str_A;

                }

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

                    m_ContentText.text = Str_C;

                }          
            }

            else

            {