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

client_Hale

2018-09-20 56091a5a2b3df0681996731982f812003daf85e9

 System/MainInterfacePanel/PlayerMainDate.cs

@@ -115,12 +115,11 @@
    public bool IsEmperor = false;



    //---------关于任务需要的数据

    public List<int> TaskId_Skill = new List<int>();

    public List<int> TaskId_Skill1 = new List<int>();

    public int ItemID = 0;

    public int UnitPrice = 0;

    public int ItemNumber = 0;

    public int TaskLv = 0;//任务等级

    public List<int> TaskId_Skill = new List<int>();//任务ID

    public List<int> SkillIndex = new List<int>();//技能槽索引

    public List<int> NeedFairyJade = new List<int>();//所需解锁仙玉

    public int Skill_Index = 0;

    public int TaskSkillID = 0;

    //-----关于支线翅膀任务的特殊逻辑

    public int WingTask = 0;



@@ -169,7 +168,8 @@
    private void GetPassiveSkillTask()//获取任务数据

    {

        TaskId_Skill.Clear();

        TaskId_Skill1.Clear();

        SkillIndex.Clear();

        NeedFairyJade.Clear();

        var PassiveSkillTaskconfig = Config.Instance.Get<FuncConfigConfig>("PassiveSkillTask");

        int[] TaskId_SkillInt = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical1);

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

@@ -179,18 +179,13 @@
        int[] TaskId_SkillInt1 = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical2);

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

        {

            TaskId_Skill1.Add(TaskId_SkillInt1[i]);

            SkillIndex.Add(TaskId_SkillInt1[i]);

        }

        int[] PassiveSkillTask = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical3);

        string str4 =PassiveSkillTaskconfig.Numerical4;

        TaskLv = int.Parse(str4);

        if (PassiveSkillTask.Length >= 3)

        int[] TaskId_SkillInt2 = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical3);

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

        {

            ItemID = PassiveSkillTask[0];

            UnitPrice = PassiveSkillTask[1];

            ItemNumber = PassiveSkillTask[2];

           
        }     
            NeedFairyJade.Add(TaskId_SkillInt2[i]);

        }  
    }