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

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -186,12 +186,12 @@ namespace GFGGame
                     {
                         if (time > setTime)
                         {
-                            for (int j = i; i < taskIdArr.Length - 1; i++)
+                            for (int j = i; j < taskIdArr.Length - 1; j++)
                             {
                                 taskIdArr[j] = taskIdArr[j + 1];
                             }
                             Array.Resize(ref taskIdArr, taskIdArr.Length - 1);
-                            break;
+                            continue;
                         }
                     }
                 }
@@ -199,12 +199,12 @@ namespace GFGGame
                 {
                     if (time < setTime)
                     {
-                        for (int j = i; i < taskIdArr.Length - 1; i++)
+                        for (int j = i; j < taskIdArr.Length - 1; j++)
                         {
                             taskIdArr[j] = taskIdArr[j + 1];
                         }
                         Array.Resize(ref taskIdArr, taskIdArr.Length - 1);
-                        break;
+                        continue;
                     }
                 }
             }