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

GameClient/Assets/Game/HotUpdate/ServerProxy/TaskSProxy.cs

@@ -101,7 +101,8 @@ namespace GFGGame
                     Progress = response.NextTask.Progress
                 };
                 TaskDataManager.Instance.UpdateTaskInfo(response.NextTask.Id, taskInfo);
-                TaskDataManager.Instance.RemoveTaskInfo(response.Id);
+                if(response.NextTask.Id != response.Id)
+                    TaskDataManager.Instance.RemoveTaskInfo(response.Id);
             }
             else
                 TaskDataManager.Instance.UpdateTaskState(response.Id, response.Status);