사령부 공백이어도 사령턴은 보임
This commit is contained in:
@@ -70,6 +70,13 @@ foreach(
|
|||||||
$nationTurnBrief = [];
|
$nationTurnBrief = [];
|
||||||
foreach($nationTurnList as $officer_level=>$turnBrief){
|
foreach($nationTurnList as $officer_level=>$turnBrief){
|
||||||
if(!key_exists($officer_level, $generals)){
|
if(!key_exists($officer_level, $generals)){
|
||||||
|
$nationTurnBrief[$officer_level] = [
|
||||||
|
'name'=>null,
|
||||||
|
'turnTime'=>null,
|
||||||
|
'officerLevelText'=>getOfficerLevelText($officer_level, $nationLevel),
|
||||||
|
'npcType'=>null,
|
||||||
|
'turn'=>$turnBrief
|
||||||
|
];
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$general = $generals[$officer_level];
|
$general = $generals[$officer_level];
|
||||||
|
|||||||
+21
-1
@@ -65,18 +65,35 @@ function reloadTable(){
|
|||||||
filledChiefList[chiefIdx] = true;
|
filledChiefList[chiefIdx] = true;
|
||||||
|
|
||||||
var plateObj = chiefTableObj[chiefIdx];
|
var plateObj = chiefTableObj[chiefIdx];
|
||||||
|
if(chiefInfo.name){
|
||||||
var $name = $('<span>{0}</span>'.format(chiefInfo.name));
|
var $name = $('<span>{0}</span>'.format(chiefInfo.name));
|
||||||
var nameColor = getNpcColor(chiefInfo.npcType);
|
var nameColor = getNpcColor(chiefInfo.npcType);
|
||||||
if(nameColor){
|
if(nameColor){
|
||||||
$name.css('color',nameColor);
|
$name.css('color',nameColor);
|
||||||
}
|
}
|
||||||
plateObj.officerLevelText.text(chiefInfo.officerLevelText);
|
|
||||||
plateObj.name.html($name);
|
plateObj.name.html($name);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
plateObj.name.html('');
|
||||||
|
}
|
||||||
|
|
||||||
|
plateObj.officerLevelText.text(chiefInfo.officerLevelText);
|
||||||
|
|
||||||
|
if(chiefInfo.turnTime){
|
||||||
var turnTimeObj = moment(chiefInfo.turnTime);
|
var turnTimeObj = moment(chiefInfo.turnTime);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
var turnTimeObj = null;
|
||||||
|
}
|
||||||
var turnList = plateObj.turn;
|
var turnList = plateObj.turn;
|
||||||
$.each(chiefInfo.turn, function(turnIdx, turnText){
|
$.each(chiefInfo.turn, function(turnIdx, turnText){
|
||||||
|
if(turnTimeObj){
|
||||||
turnList[turnIdx].turnTime.text(turnTimeObj.format('HH:mm'));
|
turnList[turnIdx].turnTime.text(turnTimeObj.format('HH:mm'));
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
turnList[turnIdx].turnTime.text('');
|
||||||
|
}
|
||||||
|
|
||||||
turnList[turnIdx].turnText.html(turnText).css('font-size', '13px');
|
turnList[turnIdx].turnText.html(turnText).css('font-size', '13px');
|
||||||
var oWidth = turnList[turnIdx].turnPad.innerWidth();
|
var oWidth = turnList[turnIdx].turnPad.innerWidth();
|
||||||
var iWidth = turnList[turnIdx].turnText.outerWidth();
|
var iWidth = turnList[turnIdx].turnText.outerWidth();
|
||||||
@@ -84,7 +101,10 @@ function reloadTable(){
|
|||||||
var newFontSize = 13 * oWidth / iWidth * 0.9;
|
var newFontSize = 13 * oWidth / iWidth * 0.9;
|
||||||
turnList[turnIdx].turnText.css('font-size', '{0}px'.format(newFontSize));
|
turnList[turnIdx].turnText.css('font-size', '{0}px'.format(newFontSize));
|
||||||
}
|
}
|
||||||
|
if(turnTimeObj){
|
||||||
turnTimeObj = turnTimeObj.add(turnTerm, 'minute');
|
turnTimeObj = turnTimeObj.add(turnTerm, 'minute');
|
||||||
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user