버그 수정, 커맨드 사이즈 자동 반영

hwe/b_chiefcenter.php

@@ -49,7 +49,7 @@ var maxChiefTurn = <?=GameConst::$maxChiefTurn?>;
 <?php   foreach(range(1, GameConst::$maxChiefTurn) as $turnIdx): ?>
         ><div class='chiefTurnBox turn<?=$turnIdx?>'
             ><div class='chiefTurnTime'>&nbsp;</div
-            ><div class='chiefTurnText'>&nbsp;</div
+            ><div class='chiefTurnPad'><span class='chiefTurnText'>&nbsp;</span></div
         ></div
 <?php   endforeach; ?>
     ></div
@@ -89,7 +89,7 @@ var maxChiefTurn = <?=GameConst::$maxChiefTurn?>;
 <?php   foreach(range(1, GameConst::$maxChiefTurn) as $turnIdx): ?>
         ><div class='chiefTurnBox turn<?=$turnIdx?>'
             ><div class='chiefTurnTime'>&nbsp;</div
-            ><div class='chiefTurnText'>&nbsp;</div
+            ><div class='chiefTurnPad'><span class='chiefTurnText'>&nbsp;</span></div
         ></div
 <?php   endforeach; ?>
     ></div

hwe/css/chiefCenter.css

@@ -38,6 +38,7 @@
     flex-grow: 1;
     display:flex;
     flex-flow: row;
+    max-height:22px;
 }
 
 .chiefTurnBox .turnHeader{
@@ -69,10 +70,11 @@
     line-height:21px;
 }
 
-.chiefTurnText{
+.chiefTurnPad{
     border-top:solid 0.67px #888888;
     table-layout: fixed;
     width:192px;
     line-height:21px;
     flex-grow: 1;
+    white-space:nowrap;
 }

hwe/css/main.css

@@ -86,3 +86,15 @@ color:white;
 #sidebar button{
     /*width:100px;*/
 }
+
+.turn_pad{
+    white-space:nowrap;
+    font-weight:lighter;
+    max-width: 162px;
+    width: 162px;
+
+}
+
+.turn_pad .turn_text{
+    display:inline-block;
+}

hwe/index.php

@@ -255,7 +255,7 @@ else if($session->userGrade == 4){
                             ><td width="24" class='idx_pad center bg0'><?=$turnIdx+1?></td
                             ><td height='24' class='month_pad center bg1' style='min-width:70px;white-space:nowrap;overflow:hidden;'></td
                             ><td width='42' class='time_pad center' style='background-color:black;white-space:nowrap;overflow:hidden;'></td
-                            ><td width='165' class='turn_pad center bg2' style='white-space:nowrap;overflow:hidden;font-weight:lighter'></td
+                            ><td width='165' class='turn_pad center bg2'><span class='turn_text'></span></td
                         ></tr>
 <?php endfor; ?>
                     </tbody>

hwe/js/chiefCenter.js

@@ -20,8 +20,9 @@ function genChiefTableObj(){
         for(var turnIdx=0;turnIdx<maxChiefTurn;turnIdx++){
             var $turn = $plate.find('.turn{0}'.format(turnIdx+1));
             var $turnTime = $turn.find('.chiefTurnTime');
+            var $turnPad = $turn.find('.chiefTurnPad');
             var $turnText = $turn.find('.chiefTurnText');
-            turn.push({turnTime:$turnTime,turnText:$turnText});
+            turn.push({turnTime:$turnTime,turnPad:$turnPad,turnText:$turnText});
         }
         objTable[chiefIdx] = {
             levelText: $levelText,
@@ -76,7 +77,13 @@ function reloadTable(){
             var turnList = plateObj.turn;
             $.each(chiefInfo.turn, function(turnIdx, turnText){
                 turnList[turnIdx].turnTime.text(turnTimeObj.format('hh:mm'));
-                turnList[turnIdx].turnText.text(turnText);
+                turnList[turnIdx].turnText.text(turnText).css('font-size', '13px');
+                var oWidth = turnList[turnIdx].turnPad.innerWidth();
+                var iWidth = turnList[turnIdx].turnText.outerWidth();
+                if(iWidth > 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');
             });
         });

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();
 });

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();

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{