Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/StoryMissions.cs

@@ -87,7 +87,7 @@


    private void OnClickDeliveryButton()//传送符

    {

        string _FlyID = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TransportPay").Numerical1;

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

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

        if (ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0)

        {

@@ -110,10 +110,10 @@
    {

        if (MainlineTaskType == null)

        {

            MainlineTaskType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MainlineTaskType").Numerical1.Split('|');//主线

            SideQuestsType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SideQuestsType").Numerical1.Split('|');//支线

            BountyMissionsType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BountyMissionsType").Numerical1.Split('|');//赏金

            FairyAuMissionType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("FairyAuMissionType").Numerical1.Split('|');//仙盟

            MainlineTaskType = Config.Instance.Get<FuncConfigConfig>("MainlineTaskType").Numerical1.Split('|');//主线

            SideQuestsType = Config.Instance.Get<FuncConfigConfig>("SideQuestsType").Numerical1.Split('|');//支线

            BountyMissionsType = Config.Instance.Get<FuncConfigConfig>("BountyMissionsType").Numerical1.Split('|');//赏金

            FairyAuMissionType = Config.Instance.Get<FuncConfigConfig>("FairyAuMissionType").Numerical1.Split('|');//仙盟

        }



        _AllMissionDict = taskmodel.allMissionDict;

@@ -133,7 +133,7 @@
        m_GuidanceShowImage.SetActive(false);

       

        string str = _AllMissionDict[TaskID].InforList;

        var taskinfo = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);

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

        m_ContentText.raycastTarget = false;

        if (_DicTaskInforma.ContainsKey(TaskID))

        {

@@ -153,7 +153,7 @@
        }

        if (taskmodel.BountyDic.ContainsKey(TaskID) || taskmodel.FairyAuDic.ContainsKey(TaskID))

        {

            var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);

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

            if (config != null)

            {

                string strRichA = TaskAllocation.Instance.GetTaskInfo(config.show_writing, TaskID);

@@ -171,7 +171,7 @@


    private string TaskTitle(int taskID)

    {

        var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_AllMissionDict[taskID].InforList);

        var config = Config.Instance.Get<TASKINFOConfig>(_AllMissionDict[taskID].InforList);

        if (config == null)

        {

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