명전에서 장수의 본닉이 뜨도록
This commit is contained in:
+11
-1
@@ -92,12 +92,22 @@ $types = [
|
|||||||
|
|
||||||
$templates = new \League\Plates\Engine('templates');
|
$templates = new \League\Plates\Engine('templates');
|
||||||
|
|
||||||
|
$ownerNameList = [];
|
||||||
|
foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
|
||||||
|
$ownerNameList[$ownerID] = $ownerName;
|
||||||
|
}
|
||||||
|
|
||||||
foreach($types as $idx=>[$typeName, $typeValue]) {
|
foreach($types as $idx=>[$typeName, $typeValue]) {
|
||||||
$hallResult = $db->query('SELECT * FROM ng_hall WHERE `type`=%i AND %? ORDER BY `value` DESC LIMIT 10', $idx, $searchFilter);
|
$hallResult = $db->query('SELECT * FROM ng_hall WHERE `type`=%i AND %? ORDER BY `value` DESC LIMIT 10', $idx, $searchFilter);
|
||||||
|
|
||||||
$hallResult = array_map(function($general)use($typeValue){
|
$hallResult = array_map(function($general)use($typeValue, $ownerNameList){
|
||||||
$aux = Json::decode($general['aux']);
|
$aux = Json::decode($general['aux']);
|
||||||
$general += $aux;
|
$general += $aux;
|
||||||
|
|
||||||
|
if(key_exists($general['owner'], $ownerNameList)){
|
||||||
|
$general['owner_name'] = $ownerNameList[$general['owner']];
|
||||||
|
}
|
||||||
|
|
||||||
if(!key_exists('bgColor', $general)){
|
if(!key_exists('bgColor', $general)){
|
||||||
if(!key_exists('color', $general)){
|
if(!key_exists('color', $general)){
|
||||||
$general['bgColor'] = GameConst::$basecolor4;
|
$general['bgColor'] = GameConst::$basecolor4;
|
||||||
|
|||||||
+6
-1
@@ -2151,6 +2151,11 @@ function CheckHall($no) {
|
|||||||
|
|
||||||
[$scenarioIdx, $scenarioName, $startTime] = $gameStor->getValuesAsArray(['scenario', 'scenario_text', 'starttime']);
|
[$scenarioIdx, $scenarioName, $startTime] = $gameStor->getValuesAsArray(['scenario', 'scenario_text', 'starttime']);
|
||||||
|
|
||||||
|
$ownerName = $general['name2'];
|
||||||
|
if($general['owner']){
|
||||||
|
$ownerName = RootDB::db()->queryFirstField('SELECT name FROM member WHERE no = %i', $general['owner']);
|
||||||
|
}
|
||||||
|
|
||||||
foreach($types as $idx=>$typeName) {
|
foreach($types as $idx=>$typeName) {
|
||||||
|
|
||||||
|
|
||||||
@@ -2180,7 +2185,7 @@ function CheckHall($no) {
|
|||||||
'imgsvr'=>$general['imgsvr'],
|
'imgsvr'=>$general['imgsvr'],
|
||||||
'startTime'=>$startTime,
|
'startTime'=>$startTime,
|
||||||
'unitedTime'=>$unitedDate,
|
'unitedTime'=>$unitedDate,
|
||||||
'owner_name'=>$general['name2'],
|
'owner_name'=>$ownerName,
|
||||||
'serverID'=>UniqueConst::$serverID,
|
'serverID'=>UniqueConst::$serverID,
|
||||||
'serverIdx'=>$serverCnt,
|
'serverIdx'=>$serverCnt,
|
||||||
'serverName'=>UniqueConst::$serverName,
|
'serverName'=>UniqueConst::$serverName,
|
||||||
|
|||||||
Reference in New Issue
Block a user