국메 처리 방식을 변경. 국가간 메시지는 외교권자만 가능

This commit is contained in:
2019-04-07 22:27:14 +09:00
parent 408b1f76e4
commit 06fcc383ce
6 changed files with 38 additions and 19 deletions
+3 -3
View File
@@ -126,7 +126,7 @@ function redrawMsg(deferred, addFront){
return t;
}
lastSequence = Math.max(lastSequence, obj.sequence);
$.each(['public', 'private', 'national'], function (_, msgType) {
$.each(['public', 'private', 'national', 'diplomacy'], function (_, msgType) {
var msgList = obj[msgType];
if(msgList === undefined || msgList.length == 0){
return true;
@@ -420,7 +420,7 @@ function refreshMailboxList(obj){
$favorite.append($lastContact);
//TODO:운영자를 추가하는 코드도 넣을 것.
if(myGeneralLevel >= 5){
if(permissionLevel >= 4){
$.each(obj.nation, function(){
var nation = this;
//console.log(nation);
@@ -514,7 +514,7 @@ function activateMessageForm(){
jQuery(function($){
//tmp_template.html은 추후 msg.js에 통합될 수 있음
var getTemplate = $.get('js/templates/message.html?8',function(obj){
var getTemplate = $.get('js/templates/message.html?9',function(obj){
messageTemplate = obj;
});
+1 -1
View File
@@ -12,7 +12,7 @@
</div>
<div class="msg_body">
<div class="msg_header">
<%if(msgType != 'diplomacy' && msgType != 'diplomacy' && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
<%if(!this.option && !this.option.action && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
<button type="button" data-erase_until="<%last5min%>" class="btn btn btn-outline-warning btn-sm btn-delete-msg" style='float:right'></button>
<%}%>
<%if(msgType == 'private') {%>