From a573969897b762cd7dc409ae93c5922e819ec69f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 18 Mar 2018 00:44:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=84=A0=ED=83=9D=20?=
 =?UTF-8?q?=EC=B0=BD=EC=97=90=EC=84=9C=20'=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EB=90=9C=20=EA=B2=BD=EC=9A=B0'=20=EC=A0=95=EC=83=81=20?=
 =?UTF-8?q?=EC=9E=91=EB=8F=99=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0=20-=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=EB=A1=9C=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20?=
 =?UTF-8?q?=ED=8B=80=EC=96=B4=EC=A0=B8=EC=84=9C=20=EB=82=98=EC=98=A4?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EB=8F=84=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i_entrance/Action.js        | 12 ++++++------
 i_entrance/Style.css        |  8 ++++----
 i_entrance/entrance.php     |  2 +-
 twe/j_server_basic_info.php |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/i_entrance/Action.js b/i_entrance/Action.js
index e44097f2..5b1ff846 100644
--- a/i_entrance/Action.js
+++ b/i_entrance/Action.js
@@ -21,7 +21,7 @@ var serverFullTemplate = "\
 
 var serverCreateAndSelectTemplate = "\
 <td colspan='2' class='not_registered'>- 미 등 록 -</td>\
-<td class='server_list_btn'>\
+<td class='ignore_border'>\
 <a href='<%serverPath%>/select_npc.php'><button class='general_select with_skin'>장수선택</button></a>\
 <a href='<%serverPath%>/join.php'><button class='general_create with_skin'>장수생성</button></a>\
 </td>\
@@ -29,15 +29,15 @@ var serverCreateAndSelectTemplate = "\
 
 var serverCreateTemplate = "\
 <td colspan='2' class='not_registered'>- 미 등 록 -</div>\
-<td class='server_list_btn'>\
+<td class='ignore_border'>\
 <a href='<%serverPath%>/join.php'><button class='general_create with_skin'>장수생성</button></a>\
 </td>\
 ";
 
 var serverLoginTemplate = "\
-<td><%picture%></td>\
+<td style='background:url(<%picture%>);background-size: 64px 64px;'></td>\
 <td><%name%></td>\
-<td class='server_list_btn'>\
+<td class='ignore_border'>\
 <a href='<%serverPath%>/'><button class='general_login with_skin'>입장</button></a>\
 </td>\
 ";
@@ -113,8 +113,8 @@ function Entrance_drawServerList(serverInfos){
                 TemplateEngine(serverTextInfo, game)
             );
 
-            if(game.me){
-                var me = game.me;
+            if(result.me){
+                var me = result.me;
                 me.serverPath = serverPath;
                 $serverHtml.append(
                     TemplateEngine(serverLoginTemplate, me)
diff --git a/i_entrance/Style.css b/i_entrance/Style.css
index b6e78b05..65bb8c13 100644
--- a/i_entrance/Style.css
+++ b/i_entrance/Style.css
@@ -19,22 +19,22 @@
 }
 
 #server_list tr{
-    height:64px;
+    height:66px;
 }
 
 #server_list .server_create_and_select .general_create,
 #server_list .server_create_and_select .general_select {
-    width: 120px; height: 32px;
+    width: 120px; height: 33px;
     float: left;
 }
 
 #server_list .general_create,
 #server_list .general_login {
-    width: 120px; height: 64px;
+    width: 120px; height: 66px;
     float: left;
 }
 
-.server_list_btn{
+.ignore_border{
     border:0;
     margin:0;
     padding:0;
diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php
index e586d7b5..06069f24 100644
--- a/i_entrance/entrance.php
+++ b/i_entrance/entrance.php
@@ -66,7 +66,7 @@ if($member['GRADE'] >= 6) {
     <colgroup>
         <col style="width:100px;" />
         <col style="width:400px;" />
-        <col style="width:64px;" />
+        <col style="width:66px;" />
         <col/>
         <col style="width:120px;" />
     </colgroup>
diff --git a/twe/j_server_basic_info.php b/twe/j_server_basic_info.php
index 04f56668..b6485b8d 100644
--- a/twe/j_server_basic_info.php
+++ b/twe/j_server_basic_info.php
@@ -75,14 +75,14 @@ $me = [
 ];
 
 if($generalID){
-    $general = queryFirstRow('SELECT name, picture, imgsvr from general where no=%i', $generalID);
+    $general = $db->queryFirstRow('SELECT name, picture, imgsvr from general where no=%i', $generalID);
     if($general){
         $me['name'] = $general['name'];
 
-        if($me['imgsvr'] == 0) {
-            $me['picture'] = IMAGE.W.$me['PICTURE'];
+        if($general['imgsvr'] == 0) {
+            $me['picture'] = '../../image/'.$general['picture'];
         } else {
-            $me['picture'] = '../d_pic/'.$me['PICTURE'];
+            $me['picture'] = '../d_pic/'.$general['picture'];
         }
     }
 }