diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php index d920ba43..527f8eba 100644 --- a/hwe/b_myBossInfo.php +++ b/hwe/b_myBossInfo.php @@ -44,9 +44,8 @@ if($meLevel == 0) { = 5) { $btn = "submit"; } +if($meLevel >= 5) { $btn = "button"; } else { $btn = "hidden"; } $query = "select name,level,picture,imgsvr,belong from general where nation='{$nation['nation']}' and level>={$lv} order by level desc"; @@ -181,7 +180,7 @@ for($i=12; $i >= $lv; $i-=2) { if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) { echo " - "; $query = "select no,npc,name,level,leadership,strength,intel,killturn from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -193,17 +192,18 @@ if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) { continue; } echo " - "; + "; } echo " - "; + "; } $query = "select name,city from general where nation='{$me['nation']}' and level=12"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); +$levelText = getLevelText(11, $nation['level']); echo " @@ -214,14 +214,14 @@ echo " ".getLevelText(12, $nation['level'])." {$general['name']} 【".CityConst::byID($general['city'])->name."】 - ".getLevelText(11, $nation['level'])." + {$levelText} "; if($meLevel >= 5 && $nation['l11set'] == 0) { echo " - + "; $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' order by npc,binary(name)"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gencount = MYDB_num_rows($result); @@ -229,18 +229,17 @@ if($meLevel >= 5 && $nation['l11set'] == 0) { for($i=0; $i < $gencount; $i++) { $general = MYDB_fetch_array($result); if($general['level'] == 11) { - echo ""; + echo ""; } elseif($general['level'] > 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } echo " - - "; + "; } else { $query = "select name,city from general where nation='{$me['nation']}' and level='11'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -265,15 +264,17 @@ $queries[5] = "select no,name,level,city from general where nation='{$me['natio for($i=10; $i >= $lv; $i--) { if($i % 2 == 0) { echo ""; } + $levelText = getLevelText($i, $nation['level']); echo " - ".getLevelText($i, $nation['level'])." + {$levelText} "; + if($meLevel >= 5 && $nation["l{$i}set"] == 0) { echo " - + "; $query = $queries[$i]; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -282,18 +283,17 @@ for($i=10; $i >= $lv; $i--) { for($k=0; $k < $gencount; $k++) { $general = MYDB_fetch_array($result); if($general['level'] == $i) { - echo ""; + echo ""; } elseif($general['level'] > 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } echo " - - "; + "; } else { $query = "select name,city from general where nation='{$me['nation']}' and level={$i}"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -338,12 +338,13 @@ endif; = 5) { + $levelText = getLevelText(4, $nation['level']); echo " 도 시 관 직 임 명 - 태 수 임 명 + {$levelText} 임명 - "; $query = "select city,name,region from city where nation='{$nation['nation']}' and officer4set=0 order by region,level desc,binary(name)"; // 도시 이름 목록 @@ -362,14 +363,14 @@ if($meLevel >= 5) { $region = $city['region']; } - echo ""; + echo ""; } echo ""; echo " - + "; $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and strength>='".GameConst::$chiefStatMin."' order by npc,binary(name)"; @@ -378,24 +379,24 @@ if($meLevel >= 5) { for($i=0; $i < $count; $i++) { $general = MYDB_fetch_array($result); if($general['level'] == 4) { - echo ""; + echo ""; } elseif($general['level'] > 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } echo " - - + - - - 군 사 임 명 + "; + $levelText = getLevelText(3, $nation['level']); + echo " + {$levelText} 임명 - "; $query = "select city,name,region from city where nation='{$nation['nation']}' and officer3set=0 order by region,level desc,binary(name)"; // 도시 이름 목록 @@ -414,14 +415,14 @@ if($meLevel >= 5) { $region = $city['region']; } - echo ""; + echo ""; } echo ""; echo " - + "; $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$chiefStatMin."' order by npc,binary(name)"; @@ -430,24 +431,24 @@ if($meLevel >= 5) { for($i=0; $i < $count; $i++) { $general = MYDB_fetch_array($result); if($general['level'] == 3) { - echo ""; + echo ""; } elseif($general['level'] > 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } echo " - - + - - - 종 사 임 명 + "; + $levelText = getLevelText(2, $nation['level']); + echo " + {$levelText} 임명 - "; $query = "select city,name,region from city where nation='{$nation['nation']}' and officer2set=0 order by region, level desc,binary(name)"; // 도시 이름 목록 @@ -466,14 +467,14 @@ if($meLevel >= 5) { $region = $city['region']; } - echo ""; + echo ""; } echo ""; echo " - + "; $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' order by npc,binary(name)"; @@ -482,18 +483,17 @@ if($meLevel >= 5) { for($i=0; $i < $count; $i++) { $general = MYDB_fetch_array($result); if($general['level'] == 2) { - echo ""; + echo ""; } elseif($general['level'] > 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } echo " - - + 빨간색은 현재 임명중인 장수, 노란색은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다. diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php index ae6c17fc..b802a513 100644 --- a/hwe/j_myBossInfo.php +++ b/hwe/j_myBossInfo.php @@ -3,9 +3,9 @@ namespace sammo; include "lib.php"; include "func.php"; -// $btn, $level, $genlist, $outlist +// $action, $level, $genlist, $outlist -$btn = Util::getReq('btn'); +$action = Util::getReq('action'); $level = Util::getReq('level', 'int'); $destGeneralID = Util::getReq('destGeneralID', 'int'); $destCityID = Util::getReq('destCityID', 'int'); @@ -30,7 +30,7 @@ if($myLevel < 5){ ]); } -if($btn === '추방' && $destGeneralID==0){ +if($action === '추방' && $destGeneralID==0){ Json::die([ 'result'=>false, 'reason'=>'장수가 지정되지 않았습니다.' @@ -333,7 +333,7 @@ function do추방(General $general, int $myLevel):?string{ -if($btn == "임명") { +if($action == "임명") { if(2 <= $level && $level <= 4){ if(!$destCityID){ Json::die([ @@ -374,7 +374,7 @@ if($btn == "임명") { ]); } -if($btn == "추방") { +if($action == "추방") { $result = do추방($general, $myLevel); if($result !== null){ Json::die([ diff --git a/hwe/js/bossInfo.js b/hwe/js/bossInfo.js index 391eb590..80f83fd7 100644 --- a/hwe/js/bossInfo.js +++ b/hwe/js/bossInfo.js @@ -77,5 +77,125 @@ $(function(){ changePermission(false, $('#selectAuditor').select2('data')); return false; + }); + + $('#btn_kick').click(function(){ + var $kickSelect = $('#genlist_kick option:selected'); + var generalID = $kickSelect.val(); + if(!$generalID){ + alert('장수를 선택해주세요'); + return false; + } + var generalName = $kickSelect.data('name'); + if(!confirm('{0}를 추방하시겠습니까?'.format(generalName))){ + return false; + } + $.post({ + url:'j_myBossInfo.php', + dataType:'json', + data:{ + action:'추방', + destGeneralID:generalID + }, + }).then(function(data){ + if(!data){ + alert('추방하지 못했습니다.'); + return false; + } + if(!data.result){ + alert('추방하지 못했습니다. : '+data.reason); + return false; + } + alert('{0}를 추방했습니다.'.format(generalName)); + location.reload(); + }, errUnknown); + return false; + }); + + $('.btn_appoint').click(function(){ + var $btn = $(this); + var level = $btn.data('level'); + var cityID = 0; + var cityName = '_'; + var $generalSelect = $('.genlist_{0} option:selected'.format(level)); + var $citySelect = $('.citylist_{0} option:selected'.format(level)); + var levelText = $btn.data('level-text'); + + var generalID = $generalSelect.val(); + var generalName = $generalSelect.data('name'); + var generalLevel = $generalSelect.data('level'); + + + if(level >= 5){ + if(generalID == 0){ + if(!confirm('{0}직을 비우시겠습니까?'.format(levelText))){ + return false; + } + } + else if(generalLevel >= 5){ + if(!confirm('이미 수뇌인 {0}를 {1}직에 임명하시겠습니까?'.format(generalName, levelText))){ + return false; + } + } + else{ + if(!confirm('{0}를 {1}직에 임명하시겠습니까?'.format(generalName, levelText))){ + return false; + } + } + } + else{ + cityID = $citySelect.val(); + if(!cityID){ + alert('도시를 선택해주세요'); + return false; + } + cityName = $citySelect.find('option:selected .name_field').text(); + + if(generalID == 0){ + if(!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, levelText))){ + return false; + } + } + else if(generalLevel >= 5){ + if(!confirm('수뇌인 {0}를 {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, levelText))){ + return false; + } + } + else{ + if(!confirm('{0}를 {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, levelText))){ + return false; + } + } + } + + $.post({ + url:'j_myBossInfo.php', + dataType:'json', + data:{ + action:'임명', + destGeneralID:generalID, + destCityID:cityID, + level:level + }, + }).then(function(data){ + if(!data){ + alert('임명하지 못했습니다.'); + return false; + } + if(!data.result){ + alert('임명하지 못했습니다. : '+data.reason); + return false; + } + + if(destGeneralID){ + alert('{0}를 임명했습니다.'.format(generalName)); + } + else{ + alert('관직을 비웠습니다.'); + } + + location.reload(); + }, errUnknown); + }) }) \ No newline at end of file