From f90ac9dea43fd0ca70b4859d11bce3f32c5e2bfe Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 27 Apr 2020 02:18:42 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php                           | 2 +-
 hwe/j_myBossInfo.php                   | 7 ++++++-
 hwe/js/bossInfo.js                     | 2 +-
 hwe/sammo/Command/General/che_집합.php | 2 +-
 hwe/templates/allButton.php            | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 89fbff13..f40f1acd 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -541,7 +541,7 @@ function generalInfo(General $generalObj) {
         $troopTurn = $db->queryFirstField('SELECT `brief` FROM general_turn WHERE general_id = %i AND turn_idx = 0', $generalObj->getVar('troop'));
         $troopInfo = $db->queryFirstField('SELECT name FROM troop WHERE troop_leader = %i', $generalObj->getVar('troop'));
     
-        if($troopTurn == '집합'){
+        if($troopTurn !== '집합'){
             $troopInfo = "<strike style='color:gray;'>{$troopInfo}</strike>";
         }
         else if($troopCity != $generalObj->getCityID()){
diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php
index e500f8cc..28d20ecf 100644
--- a/hwe/j_myBossInfo.php
+++ b/hwe/j_myBossInfo.php
@@ -40,7 +40,12 @@ if($destGeneralID==0){
     $general = new DummyGeneral(true);
 }
 else{
-    $general = General::createGeneralObjFromDB($destGeneralID, ['name', 'leadership', 'strength', 'intel', 'gold','rice','troop','officer_level','npc','picture','imgsvr','permission','penalty','belong'], 1);
+    $general = General::createGeneralObjFromDB($destGeneralID, [
+        'name', 'leadership', 'strength', 'intel', 'gold','rice',
+        'troop','officer_level','npc','picture','imgsvr',
+        'permission','penalty','belong', 'crewtype',
+        'experience', 'dedication'
+    ], 1);
 
     if($general instanceof DummyGeneral){
         Json::die([
diff --git a/hwe/js/bossInfo.js b/hwe/js/bossInfo.js
index d793301d..9e781847 100644
--- a/hwe/js/bossInfo.js
+++ b/hwe/js/bossInfo.js
@@ -82,7 +82,7 @@ $(function(){
     $('#btn_kick').click(function(){
         var $kickSelect = $('#genlist_kick option:selected');
         var generalID = $kickSelect.val();
-        if(!$generalID){
+        if(!generalID){
             alert('장수를 선택해주세요');
             return false;
         }
diff --git a/hwe/sammo/Command/General/che_집합.php b/hwe/sammo/Command/General/che_집합.php
index f0e5d74d..6f72dac7 100644
--- a/hwe/sammo/Command/General/che_집합.php
+++ b/hwe/sammo/Command/General/che_집합.php
@@ -86,7 +86,7 @@ class che_집합 extends Command\GeneralCommand{
 
         $logger->pushGeneralActionLog("<G><b>{$cityName}</b></>에서 집합을 실시했습니다. <1>$date</>");
 
-        $generalList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND troop=%i AND no!=%i', $general->getNationID(), $troopID, $general->getID());
+        $generalList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city!=%i AND troop=%i AND no!=%i', $general->getNationID(), $cityID, $troopID, $general->getID());
         if($generalList){
             $db->update('general', [
                 'city'=>$cityID
diff --git a/hwe/templates/allButton.php b/hwe/templates/allButton.php
index f112516c..15e38ac3 100644
--- a/hwe/templates/allButton.php
+++ b/hwe/templates/allButton.php
@@ -16,7 +16,7 @@
         <a href="/bbs/history2" target="_blank"><button type="button" class="toolbarButton">개인 열전</button></a>
         <a href="/bbs/history3" target="_blank"><button type="button" class="toolbarButton">국가 열전</button></a>
         <a href="/bbs/patch" target="_blank"><button type="button" class="toolbarButton">패치 내역</button></a>
-        <a href="battle_simulator" target="_blank"><button type="button" class="toolbarButton">전투 시뮬레이터</button></a>
+        <a href="battle_simulator.php" target="_blank"><button type="button" class="toolbarButton">전투 시뮬레이터</button></a>
         <a href="<?=$site?>" target="_blank"><button type="button" class="toolbarButton"><?=$call?></button></a>
     </div>
 </div>