diff --git a/hwe/join_post.php b/hwe/join_post.php index b1d365f8..94f673f3 100644 --- a/hwe/join_post.php +++ b/hwe/join_post.php @@ -275,6 +275,9 @@ foreach(array_keys(General::RANK_COLUMN) as $rankColumn){ ]; } $db->insert('rank_data', $rank_data); +$db->insert('betting', [ + 'general_id'=>$generalID, +]); $cityname = CityConst::byID($city)->name; $me = [ diff --git a/hwe/sammo/Command/Nation/che_허보.php b/hwe/sammo/Command/Nation/che_허보.php index ae49a405..5ea9653a 100644 --- a/hwe/sammo/Command/Nation/che_허보.php +++ b/hwe/sammo/Command/Nation/che_허보.php @@ -32,7 +32,7 @@ class che_허보 extends Command\NationCommand{ protected function argTest():bool{ if($this->arg === null){ - return null; + return false; } if(!key_exists('destCityID', $this->arg)){ return false; diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index 13d19365..a5cdbc6c 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -551,6 +551,7 @@ class General implements iAction{ $db->delete('general', 'no=%i', $generalID); $db->delete('general_turn', 'general_id=%i', $generalID); $db->delete('rank_data', 'general_id=%i', $generalID); + $db->delete('betting', 'general_id=%i', $generalID); $this->updatedVar = []; $db->update('nation', [ diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php index 8bf9f257..39a27c96 100644 --- a/hwe/sammo/ResetHelper.php +++ b/hwe/sammo/ResetHelper.php @@ -261,6 +261,26 @@ class ResetHelper{ 'tournament'=>0, ]; + $db->insert('betting', [ + 'general_id'=>0, + 'bet0'=>0, + 'bet1'=>0, + 'bet2'=>0, + 'bet3'=>0, + 'bet4'=>0, + 'bet5'=>0, + 'bet6'=>0, + 'bet7'=>0, + 'bet8'=>0, + 'bet9'=>0, + 'bet10'=>0, + 'bet11'=>0, + 'bet12'=>0, + 'bet13'=>0, + 'bet14'=>0, + 'bet15'=>0, + ]); + foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){ $db->insert('general', [ 'owner'=>$admin['no'], @@ -295,6 +315,9 @@ class ResetHelper{ ]; } $db->insert('rank_data', $rank_data); + $db->insert('betting', [ + 'general_id'=>$generalID, + ]); } foreach($env as $key=>$value){ diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php index 6c8a2b3b..3459a60d 100644 --- a/hwe/sammo/Scenario/NPC.php +++ b/hwe/sammo/Scenario/NPC.php @@ -368,6 +368,9 @@ class NPC{ ]; } $db->insert('rank_data', $rank_data); + $db->insert('betting', [ + 'general_id'=>$this->generalID, + ]); return true; //생성되었다. } diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index b45a5f40..350ef241 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -601,22 +601,22 @@ ENGINE=Aria; CREATE TABLE IF NOT EXISTS `betting` ( `general_id` INT(11) NOT NULL, - `bet0` INT(11) NOT NULL, - `bet1` INT(11) NOT NULL, - `bet2` INT(11) NOT NULL, - `bet3` INT(11) NOT NULL, - `bet4` INT(11) NOT NULL, - `bet5` INT(11) NOT NULL, - `bet6` INT(11) NOT NULL, - `bet7` INT(11) NOT NULL, - `bet8` INT(11) NOT NULL, - `bet9` INT(11) NOT NULL, - `bet10` INT(11) NOT NULL, - `bet11` INT(11) NOT NULL, - `bet12` INT(11) NOT NULL, - `bet13` INT(11) NOT NULL, - `bet14` INT(11) NOT NULL, - `bet15` INT(11) NOT NULL, + `bet0` INT(11) NOT NULL DEFAULT 0, + `bet1` INT(11) NOT NULL DEFAULT 0, + `bet2` INT(11) NOT NULL DEFAULT 0, + `bet3` INT(11) NOT NULL DEFAULT 0, + `bet4` INT(11) NOT NULL DEFAULT 0, + `bet5` INT(11) NOT NULL DEFAULT 0, + `bet6` INT(11) NOT NULL DEFAULT 0, + `bet7` INT(11) NOT NULL DEFAULT 0, + `bet8` INT(11) NOT NULL DEFAULT 0, + `bet9` INT(11) NOT NULL DEFAULT 0, + `bet10` INT(11) NOT NULL DEFAULT 0, + `bet11` INT(11) NOT NULL DEFAULT 0, + `bet12` INT(11) NOT NULL DEFAULT 0, + `bet13` INT(11) NOT NULL DEFAULT 0, + `bet14` INT(11) NOT NULL DEFAULT 0, + `bet15` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`general_id`) ) ENGINE=Aria;