diff --git a/hwe/func_command.php b/hwe/func_command.php index 349bfed9..871219ee 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -570,7 +570,7 @@ function processCommand($no) { case 17: process_17($general); break; //소집해제 case 21: process_21($general); break; //이동 - //case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인 + case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인 case 25: process_25($general); break; //임관 case 26: process_26($general); break; //집합 case 28: process_28($general); break; //귀환 diff --git a/hwe/j_basic_info.php b/hwe/j_basic_info.php index 60a799c1..3d597164 100644 --- a/hwe/j_basic_info.php +++ b/hwe/j_basic_info.php @@ -19,5 +19,6 @@ if(!$generalInfo){ $result['generalID'] = $generalInfo['no']; $result['myNationID'] = $generalInfo['nation']; $result['isChief'] = ($generalInfo['level'] == 12); +$result['generalLevel'] = $generalInfo['level']; Json::die($result); \ No newline at end of file diff --git a/hwe/js/msg.js b/hwe/js/msg.js index 93bd0c00..a059f661 100644 --- a/hwe/js/msg.js +++ b/hwe/js/msg.js @@ -216,7 +216,8 @@ function refreshMailboxList(obj){ generalList = {}; - //TODO:수뇌인 경우 각국에 대해 외교 국메를 넣을 수 있어야함. + + $.each(obj.nation, function(){ var nation = this; @@ -284,6 +285,25 @@ function refreshMailboxList(obj){ $favorite.append($lastContact); //TODO:운영자를 추가하는 코드도 넣을 것. + if(myGeneralLevel >= 5){ + $.each(obj.nation, function(){ + var nation = this; + //console.log(nation); + var $nation = $(''.format(nation.mailbox,nation.name)); + $nation.css('color', nation.color); + + if(isBrightColor(nation.color)){ + $nation.css('background-color', 'black'); + } + else{ + $nation.css('background-color', 'white'); + } + $favorite.append($nation); + }); + + } + + $mailboxList.prepend($favorite); if(!oldSelected){ @@ -307,6 +327,7 @@ function registerGlobal(basicInfo){ }; myGeneralID = basicInfo.generalID; isChief = basicInfo.isChief; + myGeneralLevel = basicInfo.generalLevel; } function activateMessageForm(){