외교메시지 수신 기준 변경중

hwe/css/msg.css

@@ -60,7 +60,7 @@
 }
 
 .diplomacy_message{
-    max-height:667px;
+    height:667px;
 }
 
 .national_message{

hwe/index.php

@@ -317,12 +317,14 @@ else if($session->userGrade == 4){
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
         </section>
     </div><div style="right:0;" class="board_side bg0">
-        <section class="diplomacy_message">
-        </section>
         <div class="board_header bg0">국가 메시지(최고99자)</div>
         <section class="national_message">
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="national">이전 메시지 불러오기</button>
         </section>
+        <div class="board_header bg0">외교 메시지(최고99자)</div>
+        <section class="diplomacy_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="diplomacy">이전 메시지 불러오기</button>
+        </section>
  </div></div>
 <div style="clear:left;"><?=allButton()?><?=banner()?></div>
 </div>

hwe/j_basic_info.php

@@ -11,14 +11,18 @@ $result = [
 $session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();
 
-$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level` from `general` where `owner`=%i', $userID);
+$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, penalty, permission from `general` where `owner`=%i', $userID);
 if(!$generalInfo){
     Json::die($result);
 }
 
+$permission = checkSecretPermission($generalInfo);
+
+
 $result['generalID'] = $generalInfo['no'];
 $result['myNationID'] = $generalInfo['nation'];
 $result['isChief'] = ($generalInfo['level'] == 12);
 $result['generalLevel'] = $generalInfo['level'];
+$result['permission'] = $permission;
 
 Json::die($result);

hwe/js/msg.js

@@ -181,11 +181,6 @@ function redrawMsg(deferred, addFront){
                 return true;
             }
 
-            if(msgType == 'diplomacy'){
-                //외교는 항상 새로 그린다
-                $msgBoard.empty();
-            }
-
 
             var needRefreshLastContact = (msgType == 'private');
 
@@ -217,7 +212,7 @@ function redrawMsg(deferred, addFront){
 
                 msg.defaultIcon = pathConfig.sharedIcon+'/default.jpg';
                 if(msgType == 'diplomacy'){
-                    msg.allowButton = myGeneralLevel>4;
+                    msg.allowButton = permissionLevel>=4;
                 }
                 else{
                     msg.allowButton = true;
@@ -465,6 +460,7 @@ function registerGlobal(basicInfo){
     window.myGeneralID = basicInfo.generalID;
     window.isChief = basicInfo.isChief;
     window.myGeneralLevel = basicInfo.generalLevel;
+    window.permissionLevel = basicInfo.permissionLevel;
 }
 
 function activateMessageForm(){