From 86305087f789abb0087abfd18a02e6e17dead331 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 8 Jun 2024 17:52:13 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"=EC=9E=A5=EC=88=98=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9E=A5=EC=88=98=EB=AA=85=EC=97=90=20?= =?UTF-8?q?=EB=A7=88=EC=9A=B0=EC=8A=A4=EB=A5=BC=20=EC=98=AC=EB=A6=AC?= =?UTF-8?q?=EB=A9=B4=20=EB=B3=B8=EB=8B=89=20=EA=B3=B5=EA=B0=9C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a3d7ef30dd43bc2766dd9c4210a8ef946cac8a39. --- hwe/a_genList.php | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/hwe/a_genList.php b/hwe/a_genList.php index b605228c..68c6bcbf 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -32,8 +32,10 @@ if ($type <= 0 || $type > 15) { } $ownerNameList = []; -foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) { - $ownerNameList[$ownerID] = $ownerName; +if ($gameStor->isunited) { + foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) { + $ownerNameList[$ownerID] = $ownerName; + } } ?> @@ -52,15 +54,6 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID - @@ -175,11 +168,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID $name = formatName($general['name'], $general['npc']); if (key_exists($general['owner'], $ownerNameList)) { - if ($gameStor->isunited) { - $name = $name . '
(' . $ownerNameList[$general['owner']] . ')'; - } else { - $name = $name . '
(' . $ownerNameList[$general['owner']] . ')'; - } + $name = $name . '
(' . $ownerNameList[$general['owner']] . ')'; } $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1); @@ -196,7 +185,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID data-npc-type='{$general['npc']}' > - $name + $name {$general['age']}세 " . displayCharInfo($general['personal']) . " " . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "