diff --git a/hwe/sammo/Event/Action/OpenNationBetting.php b/hwe/sammo/Event/Action/OpenNationBetting.php index a333859d..d551c41d 100644 --- a/hwe/sammo/Event/Action/OpenNationBetting.php +++ b/hwe/sammo/Event/Action/OpenNationBetting.php @@ -57,7 +57,7 @@ class OpenNationBetting extends \sammo\Event\Action 'target' => 'DESTROY_NATION', 'priority' => 1000, 'condition' => Json::encode( - ["RemainNation", $this->nationCnt], + ["RemainNation", "<=", $this->nationCnt], ), 'action' => Json::encode([ ["FinishNationBetting", $bettingID], diff --git a/hwe/sammo/Event/Action/RaiseInvader.php b/hwe/sammo/Event/Action/RaiseInvader.php index 186c6174..6e48412b 100644 --- a/hwe/sammo/Event/Action/RaiseInvader.php +++ b/hwe/sammo/Event/Action/RaiseInvader.php @@ -204,12 +204,16 @@ class RaiseInvader extends \sammo\Event\Action $nationObj->postBuild($env); refreshNationStaticInfo(); $db->insert('event', [ + 'target' => 'month', + 'priority' => 1000, 'condition' => Json::encode(true), 'action' => Json::encode([["AutoDeleteInvader", $invaderNationID]]), ]); } $db->insert('event', [ + 'target' => 'month', + 'priority' => 1000, 'condition' => Json::encode(true), 'action' => Json::encode([["InvaderEnding"]]), ]);