From 8253526f239fc622a46bb8f12279cf5f4813dc30 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 7 Sep 2018 02:03:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=9E=90=20=EC=B0=AC?=
 =?UTF-8?q?=EC=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_currentCity.php | 7 ++++---
 hwe/func.php          | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index a261fe27..7236d3eb 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -11,6 +11,7 @@ extractMissingPostToGlobals();
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
+$userGrade = Session::getUserGrade();
 
 $db = DB::db();
 $connect=$db->get();
@@ -168,7 +169,7 @@ echo "
 unset($city);
 
 // 첩보된 도시까지만 허용
-if($valid == 0 && $session->userGrade < 5) {
+if($valid == 0 && $userGrade < 5) {
     $citylist = $me['city'];
 }
 
@@ -239,7 +240,7 @@ for($j=0; $j < $gencount; $j++) {
     }
     $leadershipBonusText = formatLeadershipBonus($leadershipBonus);
 
-    if($ourGeneral){
+    if($ourGeneral || $userGrade == 6){
         $defenceMode = $general['mode'];
         $defenceModeText = formatDefenceMode($defenceMode);
         $crewType = $general['crewtype'];
@@ -274,7 +275,7 @@ for($j=0; $j < $gencount; $j++) {
     }
     
     $generalsFormat[] = [
-        'ourGeneral'=>$ourGeneral,
+        'ourGeneral'=>($ourGeneral || $userGrade == 6),
         'isNPC'=>$isNPC,
         'wounded'=>$wounded,
         'name'=>$name,
diff --git a/hwe/func.php b/hwe/func.php
index b6d48532..2e3ab3a6 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1245,6 +1245,7 @@ function increaseRefresh($type="", $cnt=1) {
     $session = Session::getInstance();
     $userID = $session->userID;
     $generalID = $session->generalID;
+    $userGrade = $session->userGrade;
 
     $date = date('Y-m-d H:i:s');
 
@@ -1252,7 +1253,7 @@ function increaseRefresh($type="", $cnt=1) {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $gameStor->refresh = $gameStor->refresh+$cnt; //TODO: +로 증가하는 값은 별도로 분리
 
-    if($generalID) {
+    if($generalID && $userGrade < 6) {
         $db->update('general', [
             'lastrefresh'=>$date,
             'con'=>$db->sqleval('con + %i', $cnt),