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-06-11 00:29:36 +09:00
parent fa2841fac6
commit 0a6496ddfb
2 changed files with 554 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/j_myBossInfo.php
+1
View File
@@ -40,6 +40,7 @@ if($action === '추방' && $destGeneralID==0){
if($destGeneralID==0){ if($destGeneralID==0){
$general = new DummyGeneral(true); $general = new DummyGeneral(true);
$general->setVar('nation', $nationID);
} }
else{ else{
$general = General::createGeneralObjFromDB($destGeneralID, [ $general = General::createGeneralObjFromDB($destGeneralID, [
hwe/js/bossInfo.js
+7 -13
View File
@@ -121,7 +121,7 @@ $(function(){
var $generalSelect = $('#genlist_{0} option:selected'.format(officerLevel)); var $generalSelect = $('#genlist_{0} option:selected'.format(officerLevel));
var $citySelect = $('#citylist_{0} option:selected'.format(officerLevel)); var $citySelect = $('#citylist_{0} option:selected'.format(officerLevel));
var generalID = $generalSelect.val(); var generalID = parseInt($generalSelect.val());
var generalName = $generalSelect.data('name'); var generalName = $generalSelect.data('name');
var generalOfficerLevel = $generalSelect.data('officer_level'); var generalOfficerLevel = $generalSelect.data('officer_level');
@@ -131,19 +131,16 @@ $(function(){
if (!confirm('{0}직을 비우시겠습니까?'.format(officerLevelText))) { if (!confirm('{0}직을 비우시겠습니까?'.format(officerLevelText))) {
return false; return false;
} }
} } else if (generalOfficerLevel >= 5) {
else if(generalOfficerLevel >= 5){
if (!confirm('이미 수뇌인 {0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))) { if (!confirm('이미 수뇌인 {0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))) {
return false; return false;
} }
} } else {
else{
if (!confirm('{0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))) { if (!confirm('{0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))) {
return false; return false;
} }
} }
} } else {
else{
cityID = $citySelect.val(); cityID = $citySelect.val();
if (!cityID) { if (!cityID) {
alert('도시를 선택해주세요'); alert('도시를 선택해주세요');
@@ -155,13 +152,11 @@ $(function(){
if (!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, officerLevelText))) { if (!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, officerLevelText))) {
return false; return false;
} }
} } else if (generalOfficerLevel >= 5) {
else if(generalOfficerLevel >= 5){
if (!confirm('수뇌인 {0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))) { if (!confirm('수뇌인 {0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))) {
return false; return false;
} }
} } else {
else{
if (!confirm('{0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))) { if (!confirm('{0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))) {
return false; return false;
} }
@@ -189,8 +184,7 @@ $(function(){
if (generalID) { if (generalID) {
alert('{0}을(를) 임명했습니다.'.format(generalName)); alert('{0}을(를) 임명했습니다.'.format(generalName));
} } else {
else{
alert('관직을 비웠습니다.'); alert('관직을 비웠습니다.');
} }