Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -131,9 +131,9 @@ namespace GFGGame
                     return 1;
                 else {
                     if (TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State) > 0)
-                        return -1;
-                    else if (TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State) < 0)
                         return 1;
+                    else if (TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State) < 0)
+                        return -1;
                     else {
                         if (a.id > b.id)
                             return 1;