diff --git a/hwe/css/msg.css b/hwe/css/msg.css index ddb00405..d65f109b 100644 --- a/hwe/css/msg.css +++ b/hwe/css/msg.css @@ -60,7 +60,7 @@ } .diplomacy_message{ - max-height:667px; + height:667px; } .national_message{ diff --git a/hwe/index.php b/hwe/index.php index ee51383b..c4d6704c 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -312,12 +312,14 @@ else if($session->userGrade == 4){
-
-
국가 메시지(최고99자)
+
외교 메시지(최고99자)
+
+ +
diff --git a/hwe/j_basic_info.php b/hwe/j_basic_info.php index 3d597164..643a4526 100644 --- a/hwe/j_basic_info.php +++ b/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); \ No newline at end of file diff --git a/hwe/js/msg.js b/hwe/js/msg.js index 2001786d..e60e4fe1 100644 --- a/hwe/js/msg.js +++ b/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(){