From 110294103f4ddf9f348200192df72a687a141ac8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 5 Mar 2019 02:23:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=9C=ED=86=B5=20=ED=9B=84=EC=97=90?=
 =?UTF-8?q?=EB=8A=94=20=EB=AA=85=EC=9E=A5=20=EC=9D=BC=EB=9E=8C=EC=97=90=20?=
 =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EB=B3=B8=EB=8B=89=EC=9D=B4=20=EB=9C=A8?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_bestGeneral.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php
index cb0073d5..0339ac27 100644
--- a/hwe/a_bestGeneral.php
+++ b/hwe/a_bestGeneral.php
@@ -49,6 +49,12 @@ increaseRefresh("명장일람", 1);
 <div style="margin:auto;width=1000px;">
 <?php
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
 
 $nationName = [0=>'재야'];
 $nationColor = [0=>'#000000'];
@@ -166,7 +172,7 @@ $generals = array_map(function($general) use($nationColor, $nationName) {
 
     return $general;
 }, $db->query(
-    "SELECT nation,no,name,name2 as owner_name, picture, imgsvr, 
+    "SELECT nation,no,name,name2 as owner_name, owner, picture, imgsvr, 
     experience, dedication, firenum, warnum, killnum, killcrew, deathcrew, 
     dex0, dex10, dex20, dex30, dex40, 
     ttw, ttd, ttl, tlw, tld, tll, tpw, tpd, tpl, tiw, tid, til,
@@ -179,7 +185,7 @@ $templates = new \League\Plates\Engine('templates');
 
 foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
     $validCnt = 0;
-    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt){
+    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt, $ownerNameList){
         $general = ($typeFunc)($general);
         $value = $general['value'];
 
@@ -193,6 +199,7 @@ foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
         else {
             $general['printValue'] = number_format($value);
         }
+        $general['owner_name'] = $ownerNameList[$general['owner']]??null;
         return $general;
     }, $generals);
 
@@ -231,6 +238,7 @@ foreach($generals as $general){
         $itemName = ($itemFunc)($itemCode);
         $general['rankName'] = $itemName;
         $general['value'] = $itemCode;
+        $general['owner_name'] = $ownerNameList[$general['owner']]??null;
         $itemTypes[$itemIdx][5][$itemCode] = $general;
     }
 }
@@ -252,6 +260,7 @@ foreach($itemTypes as [$itemNameType, $itemType, $itemFunc, $itemMinCode, $itemM
         }
 
         $general = $itemOwners[$itemCode];
+        $general['owner_name'] = $ownerNameList[$general['owner']]??null;
         $itemRanker[$itemCode] = $general;
     }