devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-04-27 02:18:42 +09:00
parent e0036ca32b
commit f90ac9dea4
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+1 -1
View File
@@ -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()){
hwe/j_myBossInfo.php
+6 -1
View File
@@ -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([
hwe/js/bossInfo.js
+1 -1
View File
@@ -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;
}
hwe/sammo/Command/General/che_집합.php
+1 -1
View File
@@ -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
hwe/templates/allButton.php
+1 -1
View File
@@ -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>