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

webpack: dynamic js build on update

Browse Source
This commit is contained in:
Hide_D
2021-08-25 03:35:51 +09:00
parent 90c696776c
commit 3961ff5185
107 changed files with 288 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -33,6 +33,9 @@ d_pic/*.png
d_pic/*.webp
d_pic/uploaded_image
*/dist_js/*
*/dist_css/*
d_setting/*.php
*/d_setting/*.php
*/d_setting/templates/*.php
hwe/a_bestGeneral.php
+15 -16
View File
@@ -30,8 +30,8 @@ $templates = new \League\Plates\Engine(__DIR__.'/templates');
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printCSS('css/hallOfFame.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
</head>
<body>
@@ -73,7 +73,7 @@ $types = [
}
$v['nationName'] = '???';
$v['pictureFullPath'] = GetImageURL(0)."/default.jpg";
$v['name'] = '???';
$v['name'] = '???';
$v['ownerName'] = null;
$v['bgColor'] = GameConst::$basecolor4;
$v['fgColor'] = newColor($v['bgColor']);
@@ -122,9 +122,9 @@ $types = [
$v['value'] = 0;
}
else{
$v['value'] = $v['ttw']/max(1, $totalCnt);
$v['value'] = $v['ttw']/max(1, $totalCnt);
}
return $v;
return $v;
}],
["통 솔 전 승 률", "percent", function($v){
$totalCnt = $v['tlw']+$v['tld']+$v['tll'];
@@ -134,7 +134,7 @@ $types = [
else{
$v['value'] = $v['tlw']/max(1, $totalCnt);
}
return $v;
return $v;
}],
["일 기 토 승 률", "percent", function($v){
$totalCnt = $v['tsw']+$v['tsd']+$v['tsl'];
@@ -154,7 +154,7 @@ $types = [
else{
$v['value'] = $v['tiw']/max(1, $totalCnt);
}
return $v;
}],
["베 팅 투 자 액", "int", function($v){$v['value'] = $v['betgold']; return $v; }],
@@ -173,17 +173,17 @@ $types = [
$generals = [];
foreach($db->query(
"SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
"SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
experience, dedication,
dex1, dex2, dex3, dex4, dex5,
horse, weapon, book, item
dex1, dex2, dex3, dex4, dex5,
horse, weapon, book, item
FROM general WHERE %l", $btn == "NPC 보기"?"npc>=2":"npc<2") as $general
){
$generalID = $general['no'];
$general['bgColor'] = $nationColor[$general['nation']]??GameConst::$basecolor4;
$general['fgColor'] = newColor($general['bgColor']);
$general['nationName'] = $nationName[$general['nation']];
if(key_exists('picture', $general)){
$imageTemp = GetImageURL($general['imgsvr']);
$general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
@@ -264,7 +264,7 @@ foreach($generals as $general){
else{
$itemOwners[$itemClassName] = [$general];
}
}
}
@@ -279,7 +279,7 @@ foreach(GameConst::$allItems as $itemType=>$itemList){
continue;
}
$itemClass = buildItemClass($itemClassName);
if($itemClass->isBuyable()){
continue;
}
@@ -287,7 +287,7 @@ foreach(GameConst::$allItems as $itemType=>$itemList){
$info = $itemClass->getInfo();
$name = $itemClass->getName();
if($info){
$name = $templates->render('tooltip', [
'text'=>$name,
@@ -322,7 +322,7 @@ foreach(GameConst::$allItems as $itemType=>$itemList){
$itemRanker[] = $card;
}
}
echo $templates->render('hallOfFrame', [
'typeName'=>$itemNameType,
'generals'=>$itemRanker
@@ -336,4 +336,3 @@ foreach(GameConst::$allItems as $itemType=>$itemList){
</table>
</body>
</html>
hwe/a_emperior.php
+4 -4
View File
@@ -17,8 +17,8 @@ increaseRefresh("왕조일람", 1);
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 왕조일람</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
@@ -70,9 +70,9 @@ foreach($emperiors as $emperior){
<tr>
<td bgcolor=skyblue align=center colspan=8>
<font size=5><?=$emperior['phase']?></font>
<a href="a_emperior_detail.php?select=<?=$emperior['no']?>"><button type='button'>자세히</button></a>
<?php if($emperior['server_id']): ?>
<a href="a_history.php?serverID=<?=$emperior['server_id']?>"><button type='button'>역사 보기</button></a>
<?php endif ?>
hwe/a_genList.php
+5 -5
View File
@@ -47,8 +47,8 @@ if($gameStor->isunited){
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
</head>
@@ -148,7 +148,7 @@ foreach($generalList as $general){
$intel = "{$general['intel']}";
}
if ($general['npc'] >= 2) {
$name = "<font color=cyan>{$general['name']}</font>";
@@ -166,8 +166,8 @@ foreach($generalList as $general){
$imageTemp = GetImageURL($general['imgsvr']);
echo "
<tr data-general-id='{$general['no']}'
data-general-wounded='{$general['injury']}'
<tr data-general-id='{$general['no']}'
data-general-wounded='{$general['injury']}'
data-general-leadership='{$general['leadership']}'
data-general-leadership-bonus='{$lbonus}'
data-general-strength='{$general['strength']}'
hwe/a_hallOfFame.php
+7 -8
View File
@@ -51,8 +51,8 @@ else{
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printCSS('css/hallOfFame.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
<?=WebUtil::printJs('js/hallOfFame.js')?>
</head>
@@ -63,14 +63,14 @@ else{
<tr><td>
시나리오 검색 : <select id="by_scenario" name="by_scenario">
<?php foreach($scenarioList as $iterSeasonIdx=>$subScenarioList): ?>
<option
data-season="<?=$iterSeasonIdx?>"
value=""
<option
data-season="<?=$iterSeasonIdx?>"
value=""
<?=($iterSeasonIdx == $seasonIdx && $scenarioIdx === null)?"selected='selected'":''?>
>* 시즌 : <?=$iterSeasonIdx?> 종합 *</option>
<?php foreach($subScenarioList as $info): ?>
<option
data-season="<?=$iterSeasonIdx?>"
data-season="<?=$iterSeasonIdx?>"
value="<?=$info['scenario']?>"
<?=($iterSeasonIdx == $seasonIdx && $info['scenario']===$scenarioIdx)?"selected='selected'":''?>
><?=$info['name']?>(<?=$info['cnt']?>회)</option>
@@ -135,7 +135,7 @@ foreach($types as $typeName=>[$typeDescribe, $typeValue]) {
$general['bgColor'] = $general['color'];
}
}
if(!key_exists('fgColor', $general)){
$general['fgColor'] = newColor($general['bgColor']);
}
@@ -174,4 +174,3 @@ foreach($types as $typeName=>[$typeDescribe, $typeValue]) {
</table>
</body>
</html>
hwe/a_history.php
+3 -3
View File
@@ -100,10 +100,10 @@ $nations = Json::decode($history['nations']);
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 연감</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS("js/map/theme_{$mapTheme}.js")?>
<?=WebUtil::printJS('js/map.js')?>
<?=WebUtil::printJS('dist_js/map.js')?>
<?=WebUtil::printJS('js/history.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
hwe/a_kingdomList.php
+4 -4
View File
@@ -26,8 +26,8 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 세력일람</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('js/ext.kingdoms.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
@@ -48,7 +48,7 @@ $nations[0] = getNationStaticInfo(0);
foreach($db->query('SELECT npc,name,city,nation,officer_level,penalty,permission FROM general ORDER BY dedication DESC') as $general){
$nationID = $general['nation'];
if(!key_exists('generals', $nations[$nationID])){
$nations[$nationID]['generals'] = [];
}
@@ -177,7 +177,7 @@ echo"
<td colspan=5> 장수 일람 : ";
foreach($nations[0]['generals'] as $general) {
$generalText = getColoredName($general['name'], $general['npc']);
echo "{$generalText}, ";
echo "{$generalText}, ";
}
echo"
</td>
hwe/a_npcList.php
+2 -2
View File
@@ -27,8 +27,8 @@ $sel[$type] = "selected";
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 빙의일람</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
hwe/a_status.php
+3 -4
View File
@@ -28,10 +28,10 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 세력도</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('d_shared/base_map.js')?>
<?=WebUtil::printJS('js/map.js')?>
<?=WebUtil::printJS('dist_js/map.js')?>
<script>
window.serverNick = '<?=DB::prefix()?>';
window.serverID = '<?=UniqueConst::$serverID?>';
@@ -79,4 +79,3 @@ $(function(){
</body>
</html>
hwe/a_traffic.php
+4 -4
View File
@@ -53,8 +53,8 @@ if ($admin['maxonline'] < $curonline) {
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
@@ -111,7 +111,7 @@ foreach($refresh as $i=>$value){
<?php else:?>
<div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'><span><?=$value?></span></div>
<?php endif;?>
</td>
</tr>
<?php
@@ -146,7 +146,7 @@ foreach($online as $i=>$value){
<?php else:?>
<div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'><span><?=$value?></span></div>
<?php endif;?>
</td>
</tr>
<?php
hwe/a_vote.php
+7 -7
View File
@@ -29,8 +29,8 @@ $vote = $admin['vote']?:['-'];
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
@@ -238,8 +238,8 @@ if ($admin['voteopen'] >= 1 || $isVoteAdmin) {
else{
$totalPer += $per;
}
// if($per < 5) { $vote['cnt'] = "&nbsp;"; }
?>
<?php if($per == 0): ?>
@@ -303,7 +303,7 @@ if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
foreach($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i=>$nation){
$memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']);
$voteCount = $nationVoteCount[$nation['nation']] ?? 0;
if($memCount == 0){
@@ -312,7 +312,7 @@ if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
else{
$percentage = round($voteCount / $memCount * 100, 1);
}
echo "
<tr>
@@ -336,7 +336,7 @@ if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
else{
$totalPer += $per;
}
// if($per < 5) { $vote['cnt'] = "&nbsp;"; }
?>
<?php if($per == 0): ?>
hwe/b_auction.php
+2 -2
View File
@@ -50,8 +50,8 @@ if ($msg2 == "") {
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
hwe/b_battleCenter.php
+6 -6
View File
@@ -87,10 +87,10 @@ else if($reqArgType===1){
$generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
}
else if($reqArgType===2){
$generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, value as %b
FROM general LEFT JOIN rank_data
ON general.no = rank_data.general_id
WHERE rank_data.type = %s AND general.nation = %i',
$generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, value as %b
FROM general LEFT JOIN rank_data
ON general.no = rank_data.general_id
WHERE rank_data.type = %s AND general.nation = %i',
$reqQueryType, $reqQueryType, $nationID
);
}
@@ -121,8 +121,8 @@ $showGeneral = General::createGeneralObjFromDB($gen);
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
hwe/b_betting.php
+2 -2
View File
@@ -64,8 +64,8 @@ if($str3){
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 베팅장</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/betting.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/betting.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
hwe/b_chiefcenter.php
+3 -4
View File
@@ -16,10 +16,10 @@ $generalObj = General::createGeneralObjFromDB($session->generalID);
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 사령부</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
<?=WebUtil::printJS('js/chiefCenter.js')?>
<?=WebUtil::printJS('dist_js/chiefCenter.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
@@ -107,4 +107,3 @@ var maxChiefTurn = <?=GameConst::$maxChiefTurn?>;
</div>
</body>
</html>
hwe/b_currentCity.php
+7 -8
View File
@@ -30,8 +30,8 @@ $templates = new \League\Plates\Engine('templates');
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
<?=WebUtil::printJS('js/currentCity.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
@@ -229,7 +229,7 @@ $generalTurnList = [];
if($generals){
foreach($db->queryAllLists(
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
array_column($generals, 'no')
) as [$generalID, $turnIdx, $brief]
){
@@ -268,7 +268,7 @@ foreach($generals as $general){
$isNPC = $general['npc']>1;
$wounded = $general['injury'];
$name = $general['name'];
$nameText = formatName($name, $general['npc']);
@@ -325,7 +325,7 @@ foreach($generals as $general){
else{
$turnText = '';
}
$generalsFormat[] = [
'ourGeneral'=>$ourGeneral,
'iconPath'=>GetImageURL($general['imgsvr']).'/'.$general['picture'],
@@ -407,7 +407,7 @@ foreach($generalsFormat as $general){
}
$chkDef = false;
if($minTrain >= 80){
$crew80 += $general['crew'];
$gen80 += 1;
@@ -424,7 +424,7 @@ foreach($generalsFormat as $general){
$chkDef = true;
}
}
@@ -520,4 +520,3 @@ foreach($generalsFormat as $general){
</table>
</body>
</html>
hwe/b_dipcenter.php
+5 -5
View File
@@ -59,8 +59,8 @@ var nationMsg = <?=Json::encode($nationStor->notice??'')?>;
var scoutmsg = <?=Json::encode($nationStor->scout_msg??'')?>;
</script>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/summernote/summernote-bs4.min.js')?>
<?=WebUtil::printJS('../e_lib/summernote/lang/summernote-ko-KR.js')?>
<?=WebUtil::printJS('../e_lib/summernote/plugin/image-sammo/summernote-image-flip.js')?>
@@ -115,14 +115,14 @@ foreach($nationsList as $staticNation):
0 => "<font color=red>교 전</font>",
1 => "<font color=magenta>선포중</font>",
2 => "통 상",
7 => "<font color=green>불가침</font>",
7 => "<font color=green>불가침</font>",
][$diplomacyState['state']];
if($diplomacyState['term']){
$dipEndMonth = $admin['month'] + $diplomacyState['term'] - 1;
$dipEndYear = $admin['year'] + intdiv($dipEndMonth, 12);
$dipEndMonth = $dipEndMonth % 12 + 1;
$dipTermText = $diplomacyState['term'].'개월';
$dipEndDateText = "{$dipEndYear}年 {$dipEndMonth}月";
}
@@ -204,7 +204,7 @@ if ($budgetricediff > 0) {
<div class='edit_form viewer'></div>
</div>
</div>
</div></td></tr>
<tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
<tr>
hwe/b_diplomacy.php
+10 -10
View File
@@ -31,8 +31,8 @@ foreach($db->queryAllLists('SELECT nation, count(city) FROM city WHERE nation !=
$realConflict = [];
foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as [
$cityID,
$cityName,
$cityID,
$cityName,
$rawConflict
])
{
@@ -62,7 +62,7 @@ foreach($db->queryAllLists('SELECT me, you, state FROM diplomacy') as [$me, $you
if(!key_exists($me, $diplomacyList)){
$diplomacyList[$me] = [];
}
$diplomacyList[$me][$you] = $state;
}
@@ -91,10 +91,10 @@ $neutralStateCharMap = [
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 중원 정보</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('d_shared/base_map.js')?>
<?=WebUtil::printJS('js/map.js')?>
<?=WebUtil::printJS('dist_js/map.js')?>
<script>
window.serverNick = '<?=DB::prefix()?>';
window.serverID = '<?=UniqueConst::$serverID?>';
@@ -162,9 +162,9 @@ else{
<table class='tb_layout bg0' style='width:100%;'>
<?php foreach($conflict as $item): ?>
<tr>
<td
<td
width=130
align=right
align=right
style='color:<?=newColor($item['color'])?>;background-color:<?=$item['color']?>;'
><?=$item['name']?>&nbsp;</td>
<td width=48 align=right><?=(float)$item['percent']?> %&nbsp;</td>
@@ -174,14 +174,14 @@ else{
</tr>
<?php endforeach; ?>
</table>
</td>
</tr>
<?php endforeach; ?>
<tr><td colspan=2 height=5 id=bg1></td></tr>
</table>
<?php endif; ?>
<?php endif; ?>
<br>
<table align=center width=1000 class='tb_layout bg0'>
hwe/b_genList.php
+4 -4
View File
@@ -57,8 +57,8 @@ $templates = new \League\Plates\Engine('templates');
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
</head>
<body>
@@ -105,7 +105,7 @@ $generals = $db->query(
$generalTurnList = [];
foreach($db->queryAllLists(
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
array_column($generals, 'no')
) as [$generalID, $turnIdx, $brief]
){
@@ -157,7 +157,7 @@ foreach ($generals as &$general) {
$general['modeText'] = formatDefenceTrain($general['defence_train']);
$general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name??'-';
if ($general['npc'] < 2) {
$turntext = [];
foreach($generalTurnList[$general['no']] as $turnRawIdx=>$turn){
hwe/b_inheritPoint.php
+7 -7
View File
@@ -43,16 +43,16 @@ foreach(array_keys(General::INHERITANCE_KEY) as $key){
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?= WebUtil::preloadCSS('css/inheritPoint.css') ?>
<?= WebUtil::preloadJS('js/inheritPoint.js') ?>
<?= WebUtil::preloadCSS('dist_css/inheritPoint.css') ?>
<?= WebUtil::preloadJS('dist_js/inheritPoint.js') ?>
<?= WebUtil::printCSS('../e_lib/bootstrap.min.css') ?>
<?= WebUtil::printCSS('../d_shared/common.css') ?>
<?= WebUtil::printCSS('../css/config.css') ?>
<?= WebUtil::printCSS('css/common.css') ?>
<?= WebUtil::printCSS('css/inheritPoint.css') ?>
<?= WebUtil::printCSS('dist_css/inheritPoint.css') ?>
<?= WebUtil::printJS('../d_shared/common_path.js') ?>
<?= WebUtil::printJS('js/vendors.js') ?>
<?= WebUtil::printJS('js/common.js') ?>
<?= WebUtil::printJS('dist_js/vendors.js') ?>
<?= WebUtil::printJS('dist_js/common.js') ?>
<script>
var items = <?=Json::encode($items)?>;
var helpText = <?=Json::encode($pointHelpText)?>;
@@ -127,8 +127,8 @@ foreach(array_keys(General::INHERITANCE_KEY) as $key){
</div>
</div>
<div id="app"></div>
<?= WebUtil::printJS('js/inheritPoint.js') ?>
<?= WebUtil::printJS('dist_js/inheritPoint.js') ?>
</body>
</html>
hwe/b_myBossInfo.php
+12 -12
View File
@@ -34,10 +34,10 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 인사부</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
<?=WebUtil::printJS('js/bossInfo.js')?>
<?=WebUtil::printJS('dist_js/bossInfo.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
@@ -48,7 +48,7 @@ var chiefStatMin = <?=GameConst::$chiefStatMin?>;
var myLevel = <?=$meLevel?>;
</script>
<?php
<?php
$ambassadors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nationID);
$auditors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nationID);
@@ -112,8 +112,8 @@ $level = Util::convertArrayToDict(
);
$tigers = $db->query('SELECT value, name
FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
$tigers = $db->query('SELECT value, name
FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
WHERE rank_data.nation_id = %i AND rank_data.type = "killnum" AND value > 0 ORDER BY value DESC LIMIT 5',
$nationID
);// 오호장군
@@ -122,9 +122,9 @@ $tigerstr = join(', ', array_map(function($arr){
return "{$arr['name']}【{$number}】";
}, $tigers));
$eagles = $db->query('SELECT value, name
FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
WHERE rank_data.nation_id = %i AND rank_data.type = "firenum" AND value > 0 ORDER BY value DESC LIMIT 7',
$eagles = $db->query('SELECT value, name
FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
WHERE rank_data.nation_id = %i AND rank_data.type = "firenum" AND value > 0 ORDER BY value DESC LIMIT 7',
$nationID
);// 건안칠자
$eaglestr = join(', ', array_map(function($arr){
@@ -240,7 +240,7 @@ if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
if(key_exists(11, $level)){
echo "{$level[11]['name']} 【".CityConst::byID($level[11]['city'])->name."】";
}
}
echo "
</td>
@@ -255,7 +255,7 @@ for($i=10; $i >= $lv; $i--) {
<td width=398>
";
if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $i)) {
echo "
<select id='genlist_{$i}' size=1 style=color:white;background-color:black;>
@@ -503,7 +503,7 @@ foreach($db->query('SELECT city,name,level,region,officer_set from city where na
<td width=78 align=right style='color:<?=$textColor?>;background-color:<?=$nationColor?>;font-size:1.2em;'><?=$city['name']?>&nbsp;&nbsp;</td>
<?php foreach(Util::range(4, 1, -1) as $officerLevel): ?>
<?php if(key_exists($officerLevel, $cityOfficerList)):
<?php if(key_exists($officerLevel, $cityOfficerList)):
$officer = $cityOfficerList[$officerLevel];
?>
<td style="color:<?=isOfficerSet($city['officer_set'], $officerLevel)?'orange':'white'?>;"><?=$officer['name']?>(<?=$officer['belong']?>년) 【<?=CityConst::byID($officer['city'])->name?>】</td>
hwe/b_myCityInfo.php
+4 -5
View File
@@ -40,8 +40,8 @@ $sel = [$type => "selected"];
<?=WebUtil::printCSS('../e_lib/jquery-ui.min.css')?>
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/jquery-ui.min.js')?>
<?=WebUtil::printJS('js/ext.expand_city.js')?>
@@ -129,10 +129,10 @@ foreach($cityList as $city){
];
$cityOfficerList = $officerList[$cityID]??[];
foreach($cityOfficerList as $cityOfficer){
foreach($cityOfficerList as $cityOfficer){
$officerName[$cityOfficer['officer_level']] = getColoredName($cityOfficer['name'], $cityOfficer['npc']);
}
if ($type == 10 && $city['region'] != $region) {
echo "<br>";
$region = $city['region'];
@@ -209,4 +209,3 @@ foreach($cityList as $city){
</body>
<div id="helper_genlist" style="display:none;"></div>
</html>
hwe/b_myGenInfo.php
+2 -3
View File
@@ -48,8 +48,8 @@ if($gameStor->isunited){
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
</head>
@@ -183,4 +183,3 @@ foreach($generalList as $general){
</body>
</html>
hwe/b_myKingdomInfo.php
+2 -3
View File
@@ -28,8 +28,8 @@ if($nationID == 0) {
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 세력정보</title>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
@@ -158,4 +158,3 @@ if ($budgetricediff > 0) {
</body>
</html>
hwe/b_myPage.php
+3 -4
View File
@@ -52,9 +52,9 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn')??1;
var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
</script>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('js/myPage.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('dist_js/myPage.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
@@ -162,4 +162,3 @@ var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
</table>
</body>
</html>
hwe/b_npc_control.php
+3 -3
View File
@@ -128,10 +128,10 @@ $zeroPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['optio
'내정워프': '도시에서 더이상 내정을 수행할 수 없는 경우,<br>일정확률로 내정이 부족한 다른 도시로 이동합니다.',
};
</script>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?= WebUtil::printJS('../e_lib/jquery_toast/toast.js') ?>
<?= WebUtil::printJS('../e_lib/Sortable.min.js') ?>
<?= WebUtil::printJS('../e_lib/jquery-sortable.js') ?>
hwe/b_processing.php
+3 -3
View File
@@ -76,11 +76,11 @@ $cssList = $commandObj->getCSSFiles();
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
<?=WebUtil::printJS('d_shared/base_map.js')?>
<?=WebUtil::printJS('js/processing.js')?>
<?=WebUtil::printJS('dist_js/processing.js')?>
<script>
window.serverNick = '<?=DB::prefix()?>';
window.serverID = '<?=UniqueConst::$serverID?>';
hwe/b_troop.php
+8 -9
View File
@@ -44,7 +44,7 @@ if($troops){
$generalTurnList = [];
foreach($db->queryAllLists(
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
array_column($troopLeaders, 'no')
) as [$generalID, $turnIdx, $brief]
){
@@ -53,10 +53,10 @@ if($troops){
}
$generalTurnList[$generalID][$turnIdx] = $brief;
}
foreach($troopLeaders as $troopLeader){
$imageTemp = GetImageURL($troopLeader['imgsvr']);
$troopLeader['pictureFullPath'] = "$imageTemp/{$troopLeader['picture']}";
$troopLeader['cityText'] = CityConst::byID($troopLeader['city'])->name;
@@ -85,14 +85,14 @@ uasort($troops, function($lhs, $rhs){
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 부대편성</title>
<?=WebUtil::preloadJS('js/troop.js')?>
<?=WebUtil::preloadJS('dist_js/troop.js')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printCSS('css/troop.css')?>
<?=WebUtil::printCSS('dist_css/troop.css')?>
<script>
</script>
@@ -209,7 +209,6 @@ foreach ($troops as $troopNo=>$troop) {
<tr><td><?=banner()?> </td></tr>
</table>
</div>
<?=WebUtil::printJS('js/troop.js')?>
<?=WebUtil::printJS('dist_js/troop.js')?>
</body>
</html>
hwe/battle_simulator.php
+2 -2
View File
@@ -50,13 +50,13 @@ else{
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printCSS('css/battle_simulator.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<script>
var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
var city = <?=Json::encode($city)?>;
var nation = <?=Json::encode($nation)?>;
</script>
<?=WebUtil::printJS('js/battle_simulator.js')?>
<?=WebUtil::printJS('dist_js/battle_simulator.js')?>
</head>
<body>
<div id="container">
hwe/css/inheritPoint.css
-3
View File
@@ -1,3 +0,0 @@
#inheritance_list{display:flex;flex-wrap:wrap}.inherit_padding{width:33%;padding:10px 2px}.inherit_item{width:33%;padding:10px 2px}.col-form-label{text-align:right;padding-right:2ch}.inherit_value{text-align:right}
/*# sourceMappingURL=inheritPoint.css.map*/
hwe/css/inheritPoint.css.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"../css/inheritPoint.css","mappings":"AAAA,kBACI,aACA,eAGJ,iBACI,UACA,iBAGJ,cACI,UACA,iBAGJ,gBACI,iBACA,kBAGJ,eACI,iB","sources":["webpack://hidche_lib/./hwe/scss/inheritPoint.scss"],"sourcesContent":["#inheritance_list{\n display: flex;\n flex-wrap: wrap;\n}\n\n.inherit_padding{\n width: 33%;\n padding: 10px 2px;\n}\n\n.inherit_item{\n width: 33%;\n padding: 10px 2px;\n}\n\n.col-form-label{\n text-align:right;\n padding-right:2ch;\n}\n\n.inherit_value{\n text-align: right;\n}"],"names":[],"sourceRoot":""}
hwe/css/troop.css
-3
View File
@@ -1,3 +0,0 @@
#troop_list .cityText{display:none}#troop_list .diffCity .cityText{display:inline}#troop_list .diffCity{color:red}#troop_list .leader{color:#90ee90}#troop_list .leader::before{content:"*"}#troop_list .leader::after{content:"*"}
/*# sourceMappingURL=troop.css.map*/
hwe/css/troop.css.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"../css/troop.css","mappings":"AAEA,sBACI,aAGJ,gCACI,eAGJ,sBACI,UAGJ,oBACI,cAGJ,4BACI,YAGJ,2BACI,Y","sources":["webpack://hidche_lib/./hwe/scss/troop.scss"],"sourcesContent":["@charset \"UTF-8\";\n\n#troop_list .cityText{\n display:none;\n}\n\n#troop_list .diffCity .cityText{\n display:inline;\n}\n\n#troop_list .diffCity {\n color:red;\n}\n\n#troop_list .leader{\n color:lightgreen;\n}\n\n#troop_list .leader::before{\n content:'*';\n}\n\n#troop_list .leader::after{\n content:'*';\n}"],"names":[],"sourceRoot":""}
hwe/index.php
+5 -5
View File
@@ -98,15 +98,15 @@ $serverCnt = $gameStor->server_cnt;
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
<?=WebUtil::printJS('../e_lib/moment.min.js')?>
<?=WebUtil::printJS('../e_lib/linkify/linkify.min.js')?>
<?=WebUtil::printJS('../e_lib/linkify/linkify-string.min.js')?>
<?=WebUtil::printJS('js/main.js')?>
<?=WebUtil::printJS('d_shared/base_map.js')?>
<?=WebUtil::printJS('js/map.js')?>
<?=WebUtil::printJS('dist_js/map.js')?>
<?=WebUtil::printJS('js/msg.js')?>
<script>
window.serverNick = '<?=DB::prefix()?>';
@@ -294,7 +294,7 @@ else if($session->userGrade == 4){
style='background-color:<?=GameConst::$basecolor2?>;color:white;width:70px;font-size:13px;margin-left:1ch;margin-right:2ch;'
><input type=button value='▼미루기' id='pushTurn'
style='background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px;'
><input type=button value='▲당기기' id='pullTurn'
><input type=button value='▲당기기' id='pullTurn'
style='background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px;'
></td>
</tr>
@@ -305,7 +305,7 @@ else if($session->userGrade == 4){
style='background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px;'
><input type=button value='갱 신' id='refreshPage'
style='background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px;'
><input type=button value='로비로' onclick="location.replace('../')"
><input type=button value='로비로' onclick="location.replace('../')"
style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px;
>
</td>
hwe/install.php
+2 -2
View File
@@ -29,8 +29,8 @@ if($session->userGrade < 5 && !$allowReset){
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/install.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/install.js')?>
<?=WebUtil::printCSS('css/normalize.css')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('css/install.css')?>
hwe/install_db.php
+6 -6
View File
@@ -22,8 +22,8 @@ if($session->userGrade == 5){
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/install_db.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/install_db.js')?>
<?=WebUtil::printCSS('css/normalize.css')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('css/install.css')?>
@@ -37,7 +37,7 @@ if($session->userGrade == 5){
<div class="card" id="db_form_card">
<h3 class="card-header">
설치(DB 설정)
</h3>
</h3>
<div class="card-body">
<form id="db_form" method="post" action="#">
<?php if(class_exists('\\sammo\\DB')): ?>
@@ -51,7 +51,7 @@ if($session->userGrade == 5){
<label class="btn btn-secondary active">
<input type="radio" name="full_reset" value="0" checked>N
</label>
</div>
</div>
</div>
@@ -71,7 +71,7 @@ if($session->userGrade == 5){
<input type="text" class="form-control" name="db_port" id="db_port" placeholder="접속 포트" value="3306" />
</div>
</div>
<div class="form-group row">
<label for="db_id" class="col-sm-3 col-form-label">DB계정</label>
<div class="col-sm-9">
@@ -80,7 +80,7 @@ if($session->userGrade == 5){
</div>
</div>
<div class="form-group row">
<label for="db_pw" class="col-sm-3 col-form-label">DB비밀번호</label>
<div class="col-sm-9">
hwe/join.php
+2 -2
View File
@@ -57,8 +57,8 @@ echo Json::encode((object)$charInfoText);
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
<?=WebUtil::printJS('../d_shared/common_path.js')?>
<?=WebUtil::printJS('js/vendors.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printJS('dist_js/vendors.js')?>
<?=WebUtil::printJS('dist_js/common.js')?>
<?=WebUtil::printJS('js/join.js')?>
</head>
hwe/js/battle_simulator.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/battle_simulator.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/betting.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/betting.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/board.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/board.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/bossInfo.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/bossInfo.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/chiefCenter.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/chiefCenter.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/colorSelect.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/colorSelect.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/common.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/common.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/defaultSelectCityByMap.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/defaultSelectCityByMap.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/defaultSelectNationByMap.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/defaultSelectNationByMap.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/inheritPoint.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/inheritPoint.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/install.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/install.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/install_db.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/install_db.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/map.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/map.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/myPage.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/myPage.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/processing.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/processing.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/recent_map.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/recent_map.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/recruitCrewForm.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/recruitCrewForm.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/select_npc.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/select_npc.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/troop.js
-2
View File
File diff suppressed because one or more lines are too long
hwe/js/troop.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/js/vendors.js
-3
View File
File diff suppressed because one or more lines are too long
hwe/js/vendors.js.LICENSE.txt
-55
View File
@@ -1,55 +0,0 @@
/*!
* Bootstrap v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
/*!
* Sizzle CSS Selector Engine v2.3.6
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2021-02-16
*/
/*!
* jQuery JavaScript Library v3.6.0
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2021-03-02T17:08Z
*/
/**!
* @fileOverview Kickass library to create and place poppers near their reference elements.
* @version 1.16.1
* @license
* Copyright (c) 2016 Federico Zivolo and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
hwe/js/vendors.js.map
-1
View File
File diff suppressed because one or more lines are too long
hwe/recent_map.php
+2 -2
View File
@@ -18,9 +18,9 @@ include "func.php";
<script>
var serverNick = '<?= $runningServer['korName'] ?>';
</script>
<?= WebUtil::printJS('js/vendors.js') ?>
<?= WebUtil::printJS('dist_js/vendors.js') ?>
<?= WebUtil::printJS('d_shared/base_map.js') ?>
<?= WebUtil::printJS('js/recent_map.js') ?>
<?= WebUtil::printJS('dist_js/recent_map.js') ?>
<?= WebUtil::printCSS('../d_shared/common.css') ?>
<?= WebUtil::printCSS('../e_lib/bootstrap.min.css') ?>
hwe/sammo/Command/General/che_강행.php
+1 -1
View File
@@ -169,7 +169,7 @@ class che_강행 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/General/che_건국.php
+4 -4
View File
@@ -199,7 +199,7 @@ class che_건국 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/colorSelect.js'
'dist_js/colorSelect.js'
];
}
@@ -216,14 +216,14 @@ class che_건국 extends Command\GeneralCommand
foreach(GetNationColors() as $color){
$colorUsed[$color] = 0;
}
foreach(getAllNationStaticInfo() as $nation){
if($nation['level'] <= 0){
continue;
}
$colorUsed[$nation['color']]++;
}
$colorUsedCnt = 0;
foreach($colorUsed as $color=>$used){
if($used){
@@ -231,7 +231,7 @@ class che_건국 extends Command\GeneralCommand
}
$colorUsedCnt += 1;
}
//색깔이 다 쓰였으면 그냥 모두 허용
if($colorUsedCnt === count($colorUsed)){
foreach(array_keys($colorUsed) as $color){
hwe/sammo/Command/General/che_이동.php
+1 -1
View File
@@ -177,7 +177,7 @@ class che_이동 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/General/che_징병.php
+1 -1
View File
@@ -234,7 +234,7 @@ class che_징병 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/recruitCrewForm.js'
'dist_js/recruitCrewForm.js'
];
}
hwe/sammo/Command/General/che_첩보.php
+1 -1
View File
@@ -225,7 +225,7 @@ class che_첩보 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/General/che_출병.php
+3 -3
View File
@@ -60,7 +60,7 @@ class che_출병 extends Command\GeneralCommand
ConstraintHelper::ReqGeneralRice($reqRice),
];
}
protected function initWithArg()
@@ -199,7 +199,7 @@ class che_출병 extends Command\GeneralCommand
else{
$logger->pushGeneralActionLog("가까운 경로에 적군 도시가 없습니다. <G><b>{$defenderCityName}</b></>{$josaRo} 이동합니다. <1>$date</>");
}
$this->alternative = new che_이동($general, $this->env, ['destCityID' => $defenderCityID]);
return false;
}
@@ -239,7 +239,7 @@ class che_출병 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/General/che_화계.php
+3 -3
View File
@@ -106,7 +106,7 @@ class che_화계 extends Command\GeneralCommand
$general = $this->generalObj;
$this->setCity();
[$reqGold, $reqRice] = $this->getCost();
@@ -118,7 +118,7 @@ class che_화계 extends Command\GeneralCommand
ConstraintHelper::ReqGeneralRice($reqRice),
];
}
protected function initWithArg()
@@ -335,7 +335,7 @@ class che_화계 extends Command\GeneralCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/Nation/che_국기변경.php
+2 -2
View File
@@ -82,7 +82,7 @@ class che_국기변경 extends Command\NationCommand
public function getCost(): array
{
return [0, 0];
}
@@ -154,7 +154,7 @@ class che_국기변경 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/colorSelect.js'
'dist_js/colorSelect.js'
];
}
hwe/sammo/Command/Nation/che_국호변경.php
+3 -3
View File
@@ -81,7 +81,7 @@ class che_국호변경 extends Command\NationCommand
public function getCost(): array
{
return [0, 0];
}
@@ -129,7 +129,7 @@ class che_국호변경 extends Command\NationCommand
return false;
}
$josaRo = JosaUtil::pick($newNationName, '로');
$general->addExperience(5 * ($this->getPreReqTurn() + 1));
@@ -160,7 +160,7 @@ class che_국호변경 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/colorSelect.js'
'dist_js/colorSelect.js'
];
}
hwe/sammo/Command/Nation/che_급습.php
+1 -1
View File
@@ -199,7 +199,7 @@ class che_급습 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
hwe/sammo/Command/Nation/che_물자원조.php
+18 -18
View File
@@ -102,7 +102,7 @@ class che_물자원조 extends Command\NationCommand{
}
$this->fullConditionConstraints=[
ConstraintHelper::ExistsDestNation(),
ConstraintHelper::ExistsDestNation(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
ConstraintHelper::SuppliedCity(),
@@ -112,11 +112,11 @@ class che_물자원조 extends Command\NationCommand{
ConstraintHelper::ReqDestNationValue('surlimit', '외교제한', '==', 0, '상대국이 외교제한중입니다.'),
];
}
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
@@ -165,33 +165,33 @@ class che_물자원조 extends Command\NationCommand{
[$goldAmount, $riceAmount] = $this->arg['amountList'];
$goldAmount = Util::valueFit(
$goldAmount,
0,
$goldAmount,
0,
$nation['gold'] - GameConst::$basegold
);
$riceAmount = Util::valueFit(
$riceAmount,
0,
$riceAmount,
0,
$nation['rice'] - GameConst::$baserice
);
$goldAmountText = number_format($goldAmount);
$riceAmountText = number_format($riceAmount);
$logger = $general->getLogger();
$year = $this->env['year'];
$month = $this->env['month'];
$josaRo = JosaUtil::pick($destNationName, '로');
$broadcastMessage = "<D><b>{$destNationName}</b></>{$josaRo} 금<C>{$goldAmountText}</> 쌀<C>{$riceAmountText}</>을 지원했습니다.";
@@ -249,11 +249,11 @@ class che_물자원조 extends Command\NationCommand{
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
public function getForm(): string
{
$currentNationLevel = getNationStaticInfo($this->generalObj->getNationID())['level'];
@@ -268,8 +268,8 @@ class che_물자원조 extends Command\NationCommand{
원조할 국가를 목록에서 선택하세요.<br>
<select class='formInput' name="destNationID" id="destNationID" size='1' style='color:white;background-color:black;'>
<?php foreach(getAllNationStaticInfo() as $nation): ?>
<option
value='<?=$nation['nation']?>'
<option
value='<?=$nation['nation']?>'
style='color:<?=$nation['color']?>;'
>【<?=$nation['name']?> 】</option>
<?php endforeach; ?>
@@ -278,12 +278,12 @@ class che_물자원조 extends Command\NationCommand{
<?php foreach(Util::range($currentNationLevel+1) as $nationLevel): ?>
<option value='<?=$nationLevel*GameConst::$coefAidAmount?>'><?=$nationLevel*GameConst::$coefAidAmount?></option>
<?php endforeach; ?>
</select>
</select>
병량 <select class='formInput amountList' name="amountList[]" size='1' style='color:white;background-color:black;'>
<?php foreach(Util::range($currentNationLevel+1) as $nationLevel): ?>
<option value='<?=$nationLevel*GameConst::$coefAidAmount?>'><?=$nationLevel*GameConst::$coefAidAmount?></option>
<?php endforeach; ?>
</select>
</select>
<input type=button id="commonSubmit" value="<?=$this->getName()?>"><br>
<br>
<?php
hwe/sammo/Command/Nation/che_발령.php
+9 -9
View File
@@ -51,10 +51,10 @@ class che_발령 extends Command\NationCommand{
$this->setCity();
$this->setNation();
$this->minConditionConstraints=[
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::SuppliedCity(),
];
@@ -63,7 +63,7 @@ class che_발령 extends Command\NationCommand{
protected function initWithArg()
{
$this->setDestCity($this->arg['destCityID']);
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, 1);
$this->setDestGeneral($destGeneral);
@@ -76,7 +76,7 @@ class che_발령 extends Command\NationCommand{
$this->fullConditionConstraints=[
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ExistsDestGeneral(),
@@ -95,11 +95,11 @@ class che_발령 extends Command\NationCommand{
$destGeneralName = $this->destGeneralObj->getName();
return "{$failReason} <Y>{$destGeneralName}</> {$commandName} 실패.";
}
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
@@ -134,7 +134,7 @@ class che_발령 extends Command\NationCommand{
$destGeneral = $this->destGeneralObj;
$destGeneralName = $destGeneral->getName();
$logger = $general->getLogger();
$destGeneral->setVar('city', $destCityID);
@@ -156,11 +156,11 @@ class che_발령 extends Command\NationCommand{
return true;
}
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/Nation/che_백성동원.php
+6 -6
View File
@@ -48,7 +48,7 @@ class che_백성동원 extends Command\NationCommand{
$this->setCity();
$this->setNation(['strategic_cmd_limit']);
$this->minConditionConstraints=[
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
@@ -76,18 +76,18 @@ class che_백성동원 extends Command\NationCommand{
return "{$name}/{$reqTurn}턴(재사용 대기 $postReqTurn)";
}
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
public function getPostReqTurn():int{
$genCount = Util::valueFit($this->nation['gennum'], GameConst::$initialNationGenLimit);
$nextTerm = Util::round(sqrt($genCount*4)*10);
$nextTerm = Util::round(sqrt($genCount*4)*10);
$nextTerm = $this->generalObj->onCalcStrategic($this->getName(), 'delay', $nextTerm);
return $nextTerm;
@@ -144,7 +144,7 @@ class che_백성동원 extends Command\NationCommand{
], 'city=%i', $destCityID);
$josaYiNation = JosaUtil::pick($nationName, '이');
$logger->pushGeneralHistoryLog('<M>백성동원</>을 발동');
$logger->pushNationalHistoryLog("<L><b>【전략】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>에 <M>백성동원</>을 하였습니다.");
@@ -162,7 +162,7 @@ class che_백성동원 extends Command\NationCommand{
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/Nation/che_불가침제의.php
+3 -3
View File
@@ -74,7 +74,7 @@ class che_불가침제의 extends Command\NationCommand
{
$general = $this->generalObj;
$this->setCity();
$this->setNation();
@@ -94,7 +94,7 @@ class che_불가침제의 extends Command\NationCommand
$month = $this->arg['month'];
$env = $this->env;
$relYear = $env['year'] - $env['startyear'];
$currentMonth = $env['year'] * 12 + $env['month'] - 1;
$reqMonth = $year * 12 + $month - 1;
@@ -226,7 +226,7 @@ class che_불가침제의 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
hwe/sammo/Command/Nation/che_불가침파기제의.php
+10 -10
View File
@@ -55,11 +55,11 @@ class che_불가침파기제의 extends Command\NationCommand{
$this->setCity();
$this->setNation();
$this->minConditionConstraints=[
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::SuppliedCity(),
];
@@ -71,7 +71,7 @@ class che_불가침파기제의 extends Command\NationCommand{
$this->fullConditionConstraints=[
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ExistsDestNation(),
@@ -86,7 +86,7 @@ class che_불가침파기제의 extends Command\NationCommand{
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
@@ -129,7 +129,7 @@ class che_불가침파기제의 extends Command\NationCommand{
// 상대에게 발송
$src = new MessageTarget(
$general->getID(),
$general->getID(),
$general->getName(),
$nationID,
$nationName,
@@ -173,7 +173,7 @@ class che_불가침파기제의 extends Command\NationCommand{
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
@@ -204,7 +204,7 @@ class che_불가침파기제의 extends Command\NationCommand{
$nationList[] = $destNation;
}
ob_start();
ob_start();
?>
<?=\sammo\getMapHtml()?><br>
불가침중인 국가에 조약 파기를 제의합니다.<br>
@@ -213,12 +213,12 @@ class che_불가침파기제의 extends Command\NationCommand{
<br>
<select class='formInput' name="destNationID" id="destNationID" size='1' style='color:white;background-color:black;'>
<?php foreach($nationList as $nation): ?>
<option
value='<?=$nation['nation']?>'
<option
value='<?=$nation['nation']?>'
style='color:<?=$nation['color']?>;<?=$nation['cssBgColor']?>'
>【<?=$nation['name']?> 】</option>
<?php endforeach; ?>
</select>에게
</select>에게
<input type=button id="commonSubmit" value="<?=$this->getName()?>">
<?php
return ob_get_clean();
hwe/sammo/Command/Nation/che_선전포고.php
+1 -1
View File
@@ -195,7 +195,7 @@ class che_선전포고 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
hwe/sammo/Command/Nation/che_수몰.php
+8 -8
View File
@@ -50,7 +50,7 @@ class che_수몰 extends Command\NationCommand{
$this->setCity();
$this->setNation(['strategic_cmd_limit']);
$this->minConditionConstraints=[
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
@@ -62,7 +62,7 @@ class che_수몰 extends Command\NationCommand{
{
$this->setDestCity($this->arg['destCityID']);
$this->setDestNation($this->destCity['nation']);
$this->fullConditionConstraints=[
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
@@ -80,18 +80,18 @@ class che_수몰 extends Command\NationCommand{
return "{$name}/{$reqTurn}턴(재사용 대기 $postReqTurn)";
}
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 2;
}
public function getPostReqTurn():int{
$genCount = Util::valueFit($this->nation['gennum'], GameConst::$initialNationGenLimit);
$nextTerm = Util::round(sqrt($genCount*4)*10);
$nextTerm = Util::round(sqrt($genCount*4)*10);
$nextTerm = $this->generalObj->onCalcStrategic($this->getName(), 'delay', $nextTerm);
return $nextTerm;
@@ -125,7 +125,7 @@ class che_수몰 extends Command\NationCommand{
$destNationID = $destCity['nation'];
$destNationName = getNationStaticInfo($destNationID)['name'];
$nationID = $general->getNationID();
$nationName = $this->nation['name'];
@@ -166,7 +166,7 @@ class che_수몰 extends Command\NationCommand{
'def' => $db->sqleval('def * 0.2'),
'wall' => $db->sqleval('wall * 0.2'),
], 'city=%i', $destCityID);
$josaYiNation = JosaUtil::pick($nationName, '이');
$logger->pushGeneralHistoryLog("<G><b>{$destCityName}</b></>에 <M>수몰</>을 발동");
@@ -185,7 +185,7 @@ class che_수몰 extends Command\NationCommand{
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/Nation/che_이호경식.php
+1 -1
View File
@@ -202,7 +202,7 @@ class che_이호경식 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
hwe/sammo/Command/Nation/che_종전제의.php
+10 -10
View File
@@ -55,10 +55,10 @@ class che_종전제의 extends Command\NationCommand{
$this->setCity();
$this->setNation();
$this->minConditionConstraints=[
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::SuppliedCity(),
];
@@ -70,7 +70,7 @@ class che_종전제의 extends Command\NationCommand{
$this->fullConditionConstraints=[
ConstraintHelper::BeChief(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::NotBeNeutral(),
ConstraintHelper::OccupiedCity(),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ExistsDestNation(),
@@ -84,7 +84,7 @@ class che_종전제의 extends Command\NationCommand{
public function getCost():array{
return [0, 0];
}
public function getPreReqTurn():int{
return 0;
}
@@ -127,7 +127,7 @@ class che_종전제의 extends Command\NationCommand{
// 상대에게 발송
$src = new MessageTarget(
$general->getID(),
$general->getID(),
$general->getName(),
$nationID,
$nationName,
@@ -171,7 +171,7 @@ class che_종전제의 extends Command\NationCommand{
public function getJSFiles(): array
{
return [
'js/defaultSelectNationByMap.js'
'dist_js/defaultSelectNationByMap.js'
];
}
@@ -202,7 +202,7 @@ class che_종전제의 extends Command\NationCommand{
$nationList[] = $destNation;
}
ob_start();
ob_start();
?>
<?=\sammo\getMapHtml()?><br>
전쟁중인 국가에 종전을 제의합니다.<br>
@@ -211,12 +211,12 @@ class che_종전제의 extends Command\NationCommand{
<br>
<select class='formInput' name="destNationID" id="destNationID" size='1' style='color:white;background-color:black;'>
<?php foreach($nationList as $nation): ?>
<option
value='<?=$nation['nation']?>'
<option
value='<?=$nation['nation']?>'
style='color:<?=$nation['color']?>;<?=$nation['cssBgColor']?>'
>【<?=$nation['name']?> 】</option>
<?php endforeach; ?>
</select>에게
</select>에게
<input type=button id="commonSubmit" value="<?=$this->getName()?>">
<?php
return ob_get_clean();
hwe/sammo/Command/Nation/che_천도.php
+2 -2
View File
@@ -134,7 +134,7 @@ class che_천도 extends Command\NationCommand
$general = $this->getGeneral();
$nationID = $general->getNationID();
$nationStor = \sammo\KVStorage::getStorage(DB::db(), $nationID, 'nation_env');
$nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
if ($lastTurn->getCommand() != $commandName || $lastTurn->getArg() !== $this->arg) {
@@ -232,7 +232,7 @@ class che_천도 extends Command\NationCommand
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}
hwe/sammo/Command/Nation/che_초토화.php
+6 -6
View File
@@ -51,7 +51,7 @@ class che_초토화 extends Command\NationCommand{
$this->setCity();
$this->setNation(['surlimit', 'gold', 'rice', 'capital']);
$this->minConditionConstraints=[
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
@@ -63,7 +63,7 @@ class che_초토화 extends Command\NationCommand{
protected function initWithArg()
{
$this->setDestCity($this->arg['destCityID']);
$this->fullConditionConstraints=[
ConstraintHelper::OccupiedCity(),
ConstraintHelper::OccupiedDestCity(),
@@ -77,7 +77,7 @@ class che_초토화 extends Command\NationCommand{
], ),
];
}
public function getCost():array{
return [0, 0];
}
@@ -145,7 +145,7 @@ class che_초토화 extends Command\NationCommand{
$josaUl = JosaUtil::pick($destCityName, '을');
$logger = $general->getLogger();
$general->addExperience(-$general->getVar('experience') * 0.1, false);
$general->addExperience(5 * ($this->getPreReqTurn() + 1));
@@ -183,7 +183,7 @@ class che_초토화 extends Command\NationCommand{
\sammo\refreshNationStaticInfo();
\sammo\SetNationFront($nationID);
$logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>{$josaUl} 초토화했습니다. <1>$date</>");
$logger->pushGeneralHistoryLog("<G><b>{$destCityName}</b></>{$josaUl} <M>초토화</> 명령");
$logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>{$josaUl} <M>초토화</> 명령");
@@ -198,7 +198,7 @@ class che_초토화 extends Command\NationCommand{
public function getJSFiles(): array
{
return [
'js/defaultSelectCityByMap.js'
'dist_js/defaultSelectCityByMap.js'
];
}

Some files were not shown because too many files have changed in this diff Show More