diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php
index 2febd89e..994d8de4 100644
--- a/hwe/b_chiefcenter.php
+++ b/hwe/b_chiefcenter.php
@@ -49,7 +49,7 @@ var maxChiefTurn = =GameConst::$maxChiefTurn?>;
>
>;
>
>userGrade == 4){
>=$turnIdx+1?> | | | | |
diff --git a/hwe/js/chiefCenter.js b/hwe/js/chiefCenter.js
index f5ab4cce..43d1a710 100644
--- a/hwe/js/chiefCenter.js
+++ b/hwe/js/chiefCenter.js
@@ -20,8 +20,9 @@ function genChiefTableObj(){
for(var turnIdx=0;turnIdx oWidth * 0.95){
+ var newFontSize = 13 * oWidth / iWidth * 0.9;
+ turnList[turnIdx].turnText.css('font-size', '{0}px'.format(newFontSize));
+ }
turnTimeObj = turnTimeObj.add(turnTerm, 'minute');
});
});
diff --git a/hwe/js/main.js b/hwe/js/main.js
index 83a1a475..e5956340 100644
--- a/hwe/js/main.js
+++ b/hwe/js/main.js
@@ -35,7 +35,17 @@ function reloadCommandList(){
$tr.find('.time_pad').text(nextTurnTime.format('HH:mm'));
$tr.find('.month_pad').text('{0}年 {1}月'.format(year, month));
- $tr.find('.turn_pad').text(turnInfo.brief);
+ var $turn_pad = $tr.find('.turn_pad');
+ var $turn_text = $turn_pad.find('.turn_text');
+ $turn_text.text(turnInfo.brief).css('font-size','13px');
+
+ var oWidth = $turn_pad.innerWidth();
+ var iWidth = $turn_text.outerWidth();
+ if(iWidth > oWidth * 0.95){
+ var newFontSize = 13 * oWidth / iWidth * 0.9;
+ $turn_text.css('font-size', '{0}px'.format(newFontSize));
+ }
+
nextTurnTime.add(data.turnTerm, 'minutes');
month+=1;
if(month >= 13){
@@ -44,6 +54,8 @@ function reloadCommandList(){
}
});
console.log(data);
+
+
});
}
@@ -138,7 +150,6 @@ $('#reserveTurn').click(function(){
return false;
})
-
setInterval(myclock, 500);
reloadCommandList();
});
\ No newline at end of file
diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php
index 8a0b2496..beaa3af7 100644
--- a/hwe/sammo/Command/General/che_화계.php
+++ b/hwe/sammo/Command/General/che_화계.php
@@ -163,6 +163,12 @@ class che_화계 extends Command\GeneralCommand{
return 0;
}
+ public function getBrief():string{
+ $commandName = $this->getName();
+ $destCityName = CityConst::byID($this->arg['destCityID'])->name;
+ return "【{$destCityName}】에 {$commandName}실행";
+ }
+
public function getFailString():string{
$commandName = $this->getName();
$failReason = $this->testRunnable();
diff --git a/hwe/sammo/Constraint/NotNeutralDestCity.php b/hwe/sammo/Constraint/NotNeutralDestCity.php
index fad4b1e9..2125c254 100644
--- a/hwe/sammo/Constraint/NotNeutralDestCity.php
+++ b/hwe/sammo/Constraint/NotNeutralDestCity.php
@@ -2,7 +2,7 @@
namespace sammo\Constraint;
-class NotBeNeutral extends Constraint{
+class NotNeutralDestCity extends Constraint{
const REQ_VALUES = Constraint::REQ_DEST_CITY;
public function checkInputValues(bool $throwExeception=true):bool{