merge: validate invader resume watchdog fix

hwe/sammo/Event/Action/InvaderEnding.php

@@ -2,6 +2,7 @@
 namespace sammo\Event\Action;
 
 use sammo\ActionLogger;
+use sammo\AutoResetProgress;
 use sammo\CityConst;
 use sammo\DB;
 use sammo\KVStorage;
@@ -61,6 +62,7 @@ class InvaderEnding extends \sammo\Event\Action{
             $logger->pushGlobalHistoryLog("<L><b>【이벤트】</b></>백성은 언젠가 영웅이 나타나길 기다립니다.");
         }
         $gameStor->setValue('isunited', 3);
+        AutoResetProgress::record($gameStor);
         $logger->flush();
 
         $gameStor->refreshLimit = $gameStor->refreshLimit * 100;
@@ -71,4 +73,4 @@ class InvaderEnding extends \sammo\Event\Action{
         return [__CLASS__, 'Deleted'];
     }
 
-}
+}

hwe/sammo/Event/Action/RaiseInvader.php

@@ -4,6 +4,7 @@ namespace sammo\Event\Action;
 
 use Ds\Set;
 use sammo\ActionLogger;
+use sammo\AutoResetProgress;
 use sammo\CityConst;
 use sammo\DB;
 use sammo\Json;
@@ -119,6 +120,7 @@ class RaiseInvader extends \sammo\Event\Action
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $gameStor->setValue('isunited', 1);
+        AutoResetProgress::record($gameStor);
 
         $turnterm = $gameStor->turnterm;
         $generalCnt = $db->queryFirstField('SELECT count(*) FROM general');