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

client_Wu Xijin

2018-08-22 42e8bf4cf1ed3f5e249b7ae50e3cefca487652fc

 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -139,14 +139,14 @@
        StageManager.Instance.onStageLoadFinish += onStageLoadFinish;

        NPCInteractProcessor.s_NpcInteractEvent += NpcInterac;

        FaBaoNPCIdList.Clear();

        string strFabao = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("FaBaoNPCID").Numerical1;

        string strFabao = Config.Instance.Get<FuncConfigConfig>("FaBaoNPCID").Numerical1;

        string[] strFabaoNpcID = ConfigParse.GetMultipleStr(strFabao);//解析出数组|



        for (int i = 0; i < strFabaoNpcID.Length; i++)

        {

            FaBaoNPCIdList.Add(int.Parse(strFabaoNpcID[i]));

        }

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

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

        BossDelayTimeint = float.Parse(BossDelayTime);

    }



@@ -203,7 +203,7 @@
    {

        try

        {

            var pytaskM = ConfigManager.Instance.GetTemplate<PyTaskConfig>(MissionID);

            var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);

            if (pytaskM == null)

            {

                return;

@@ -264,7 +264,7 @@
        }

        catch (Exception ex)

        {

            DesignDebug.Log(ex);

            DebugEx.Log(ex);

        }



    }

@@ -304,7 +304,7 @@
        {

            return;

        }

        var config = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(taskID);

        var config = Config.Instance.Get<StoryMissionsConfig>(taskID);

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

        var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;

        if (config != null)

@@ -369,10 +369,10 @@


    void AddMission(int MissionID, int MissionState, int DiscriptionIndex)//添加任务

    {

        var config = ConfigManager.Instance.GetTemplate<PyTaskConfig>(MissionID);

        var config = Config.Instance.Get<PyTaskConfig>(MissionID);

        if (config == null)

        {

            DesignDebug.LogError(MissionID + "表格中不存在此任务ID");

            DebugEx.LogError(MissionID + "表格中不存在此任务ID");

            return;

        }



@@ -723,7 +723,7 @@


    void TaskChanges(int MissionID, int MissionState, int DiscriptionIndex)//存在的任务的修改

    {

        var pytaskM = ConfigManager.Instance.GetTemplate<PyTaskConfig>(MissionID);

        var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);

        if (pytaskM == null)

            return;

        allMissionDict[MissionID].Time = DateTime.Now;

@@ -1171,7 +1171,7 @@
        }

        catch (Exception ex)

        {

            DesignDebug.Log(ex);

            DebugEx.Log(ex);

        }

    }



@@ -1293,14 +1293,14 @@
            {

                // GetNowTaskID = _taskID;

                string _strTest = allMissionDict[_taskID].InforList;

                string strTask = TaskAllocation.Instance.GetTaskInfo(ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_strTest).show_writing, _taskID);

                string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);

                HrefAnalysis.Inst.ExcuteHrefEvent(strTask);

                DropItemManager.StopMissionPickup = false;

            }

        }

        catch (Exception ex)

        {

            DesignDebug.Log(ex);

            DebugEx.Log(ex);

        }



    }

@@ -1408,12 +1408,12 @@
    private bool IsDungeon()//判断是否在副本中

    {

        var mapId = PlayerDatas.Instance.baseData.MapID;

        var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);

        var mapConfig = Config.Instance.Get<MapConfig>(mapId);

        return mapConfig != null && mapConfig.MapFBType != 0;

    }

    public bool IsGather(int npdId)//是否能采集NPC

    {

        var taskListConfig = ConfigManager.Instance.GetTemplate<TaskListConfig>(currentMission);

        var taskListConfig = Config.Instance.Get<TaskListConfig>(currentMission);

        if (taskListConfig != null)

        {

            int[] collectNPCList = taskListConfig.CollectNPC;

@@ -1466,7 +1466,7 @@
        {

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

            var point = mapModel.GetRecommendHangPoint();

            var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(point);

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

            MapTransferUtility.Instance.MoveToNPC(config.NPCID);



        }