diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php
index 2d7ea874..7d5ec491 100644
--- a/hwe/a_emperior.php
+++ b/hwe/a_emperior.php
@@ -98,11 +98,21 @@ foreach($emperiors as $emperior){
=$emperior['l12name']?> |
승 상 |
=$emperior['l11name']?> |
- 위 장 군 |
+ 표 기 장 군 |
=$emperior['l10name']?> |
사 공 |
=$emperior['l9name']?> |
+
+ | 거 기 장 군 |
+ =$emperior['l8name']?> |
+ 태 위 |
+ =$emperior['l7name']?> |
+ 위 장 군 |
+ =$emperior['l6name']?> |
+ 사 도 |
+ =$emperior['l5name']?> |
+
diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php
index b0f8cb23..633f7632 100644
--- a/hwe/a_hallOfFame.php
+++ b/hwe/a_hallOfFame.php
@@ -5,26 +5,36 @@ include "lib.php";
include "func.php";
$session = Session::getInstance()->setReadOnly();
+$seasonIdx = Util::getReq('seasonIdx', 'int', UniqueConst::$seasonIdx);
$scenarioIdx = Util::getReq('scenarioIdx', 'int', null);
$db = DB::db();
increaseRefresh("명예의전당", 1);
-$scenarioList= [];
-foreach($db->query('SELECT scenario_name as name, count(scenario) as cnt, scenario from ng_games group by scenario order by scenario asc') as $scenarioInfo){
- $scenarioList[$scenarioInfo['scenario']] = $scenarioInfo;
-}
+$scenarioList = (function(){
+ $db = DB::db();
+ $scenarioList= [];
+ foreach($db->query('SELECT season, scenario_name as name, count(scenario) as cnt, scenario from ng_games group by season, scenario order by season desc, scenario asc') as $scenarioInfo){
+ $seasonIdx = $scenarioInfo['season'];
+ $scenarioIdx = $scenarioInfo['scenario'];
+ if(!key_exists($seasonIdx, $scenarioList)){
+ $scenarioList[$seasonIdx] = [];
+ }
+ $scenarioList[$seasonIdx][$scenarioIdx] = $scenarioInfo;
+ }
+ return $scenarioList;
+})();
if($scenarioIdx !== null || key_exists($scenarioIdx, $scenarioList)){
- $searchScenarioName = $scenarioList[$scenarioIdx]['name'];
- $searchFilter = $db->sqleval('scenario = %i', $scenarioIdx);
+ $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
+ $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
}
else{
$searchScenarioName = '* 모두 *';
- $searchFilter = $db->sqleval(true);
+ $searchFilter = $db->sqleval('season = %i', $seasonIdx);
}
?>
@@ -53,12 +63,19 @@ else{
명 예 의 전 당 =closeButton()?> |
시나리오 검색 :
diff --git a/hwe/d_setting/UniqueConst.orig.php b/hwe/d_setting/UniqueConst.orig.php
index 29dd6dbe..6627a649 100644
--- a/hwe/d_setting/UniqueConst.orig.php
+++ b/hwe/d_setting/UniqueConst.orig.php
@@ -4,6 +4,7 @@ namespace sammo;
class UniqueConst{
public static $serverID = '_tK_serverID_';
public static $serverName = '_tK_serverName_';
+ public static $seasonIdx = '_tK_seasonIdx_';
private function __construct(){}
diff --git a/hwe/func.php b/hwe/func.php
index 440a7a10..fc8ec6d2 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -654,7 +654,24 @@ function generalInfo($no) {
$lbonus = "";
}
- $troopName = getTroopName($general['troop'])??'-';
+ if($general['troop'] == 0){
+ $troopInfo = '-';
+ }
+ else{
+ $troopCity = $db->queryFirstField('SELECT city FROM general WHERE no=%i', $general['troop']);
+ $troopTurn = $db->queryFirstField('SELECT `action` FROM general_turn WHERE general_id = %i AND turn_idx = 0', $general['troop']);
+ $troopInfo = $db->queryFirstField('SELECT name FROM troop WHERE troop_leader = %i', $general['troop']);
+
+ $troopInfo = $troop['name'];
+
+ if($troopTurn == 'che_집합'){
+ $troopInfo = "{$troopInfo}";
+ }
+ else if($troopCity != $general['city']){
+ $troopCityName = CityConst::byID($troopCity)->name;
+ $troopInfo = "{$troopInfo}({$troopCityName})";
+ }
+ }
$level = getLevel($general['level'], $nation['level']);
if($general['level'] == 2) {
@@ -796,7 +813,7 @@ function generalInfo($no) {
|
| 부대 |
- {$troopName} |
+ {$troopInfo} |
벌점 |
".getConnect($general['connect'])." {$general['connect']}({$general['con']}) |
@@ -1473,6 +1490,7 @@ function CheckHall($no) {
$db->insertIgnore('ng_hall', [
'server_id'=>UniqueConst::$serverID,
+ 'season'=>UniqueConst::$seasonIdx,
'scenario'=>$scenarioIdx,
'general_no'=>$no,
'type'=>$idx,
diff --git a/hwe/func_template.php b/hwe/func_template.php
index 3306dfaf..a31de307 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -43,7 +43,7 @@ foreach(range(1, GameConst::$maxChiefTurn - 1) as $turnIdx){
$turnText = join("\n", $turnList);
return "
-