v0.10.1까지 merge

This commit is contained in:
2019-04-07 23:35:54 +09:00
46 changed files with 482 additions and 228 deletions
+4 -1
View File
@@ -165,6 +165,8 @@ class ResetHelper{
'locktime'=>TimeUtil::now(true)
]);
$prevWinner = $db->queryFirstField('SELECT l12name FROM emperior ORDER BY `no` DESC LIMIT 1');
CityConst::build();
$cityPositions = [];
foreach(CityConst::all() as $city){
@@ -235,7 +237,8 @@ class ResetHelper{
'npcmode'=>$npcmode,
'extended_general'=>$extend,
'fiction'=>$fiction,
'tnmt_trig'=>$tournament_trig
'tnmt_trig'=>$tournament_trig,
'prev_winner'=>$prevWinner
];
foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){