From 2da12bb71fe24b9434aec0dbd58b9622e14527cf Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 26 Jan 2022 03:01:06 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Event/Action/OpenNationBetting.php | 2 +- hwe/sammo/Event/Action/RaiseInvader.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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"]]), ]);