season merge

hwe/sammo/ResetHelper.php

@@ -96,7 +96,7 @@ class ResetHelper{
             $servRoot.'/d_setting/UniqueConst.php',[
                 'serverID'=>$serverID,
                 'serverName'=>AppConf::getList()[$prefix]->getKorName(),
-                'seasonIdx'=>$seasonIdx
+                'seasonIdx'=>$seasonIdx,
             ], true
         );
 
@@ -235,6 +235,7 @@ class ResetHelper{
             'init_year'=> $year,
             'init_month'=>$month,
             'map_theme' => $scenarioObj->getMapTheme(),
+            'season'=>$seasonIdx,
             'msg'=>'공지사항',//TODO:공지사항
             'maxgeneral'=>GameConst::$defaultMaxGeneral,
             'maxnation'=>GameConst::$defaultMaxNation,
@@ -256,6 +257,7 @@ class ResetHelper{
             'tnmt_trig'=>$tournament_trig,
             'prev_winner'=>$prevWinner,
             'tournament'=>0,
+            'server_cnt'=>$db->queryFirstField('SELECT count(*) FROM ng_games')
         ];
 
         foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){