Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 System/MainInterfacePanel/TaskListTip.cs

@@ -390,6 +390,19 @@
        {

            MissionDetailDates xPack = taskmodel.allMissionDict[x];

            MissionDetailDates yPack = taskmodel.allMissionDict[y];

            bool IsMainTaskx = xPack.Type == 0;

            bool IsMainTasky = yPack.Type == 0;

            if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//优先主线

            {

                return -IsMainTaskx.CompareTo(IsMainTasky);

            }

            bool IsStateTaskx = xPack.MissionState == 2;

            bool IsStateTasky = yPack.MissionState == 2;

            if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//优先可领取

            {

                return -IsStateTaskx.CompareTo(IsStateTasky);

            }



            var _index0 = ListSort.IndexOf(xPack.Type);

            var _index1 = ListSort.IndexOf(yPack.Type);

            if (_index0.CompareTo(_index1) != 0)

@@ -407,6 +420,18 @@
        {

            MissionDetailDates xPack = taskmodel.allMissionDict[x];

            MissionDetailDates yPack = taskmodel.allMissionDict[y];

            bool IsMainTaskx = xPack.Type == 0;

            bool IsMainTasky = yPack.Type == 0;

            if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//优先主线

            {

                return -IsMainTaskx.CompareTo(IsMainTasky);

            }

            bool IsStateTaskx = xPack.MissionState == 2;

            bool IsStateTasky = yPack.MissionState == 2;

            if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//优先可领取

            {

                return -IsStateTaskx.CompareTo(IsStateTasky);

            }

            var _index0 = ListSort1.IndexOf(xPack.Type);

            var _index1 = ListSort1.IndexOf(yPack.Type);

            if (_index0.CompareTo(_index1) != 0)