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

feat: 500px 모드 나머지 최적화

Browse Source
This commit is contained in:
Hide_D
2021-12-03 02:07:34 +09:00
parent 5b026e3c5c
commit cf631491e8
6 changed files with 183 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_template.php
+35
View File
@@ -250,3 +250,38 @@ function getInvitationList(array $nationList)
'nationList' => $nationList 'nationList' => $nationList
]); ]);
} }
function getAutorunInfo($autorunOption){
$templates = new \League\Plates\Engine(__DIR__.'/templates');
$auto_info = [];
foreach($autorunOption['options'] as $auto_option => $value){
assert($value);
switch($auto_option){
case 'develop': $auto_info['내정'] = '내정'; break;
case 'warp': $auto_info['순간이동'] = '순간이동'; break;
case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
case 'recruit_high': $auto_info['징병'] = '모병'; break;
case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
case 'battle': $auto_info['출병'] = '출병'; break;
case 'chief': $auto_info['사령턴'] = '사령턴'; break;
}
}
$limit = Util::toInt($autorunOption['limit_minutes']);
if($limit >= 43200){
$auto_info['제한'] = '항상 유효';
}
else if($limit % 60 == 0){
$auto_info['제한'] = ($limit/60).'시간 유효';
}
else{
$auto_info['제한'] = ($limit).'분 유효';
}
$auto_info = join(', ', array_values($auto_info));
return $templates->render('tooltip', [
'text'=>'자율행동',
'info'=>$auto_info,
'style'=>'text-decoration:underline',
'copyable_info'=>true
]);
}
hwe/func_tournament.php
+11 -11
View File
@@ -156,17 +156,17 @@ function getTournamentTime() {
function getTournament(int $tnmt) { function getTournament(int $tnmt) {
return [ return [
"<font color=magenta>경기 없음</font>", "<span style='color:magenta;'>경기 없음</span>",
"<font color=orange>참가 모집중</font>", "<span style='color:orange;'>참가 모집중</span>",
"<font color=orange>예선 진행중</font>", "<span style='color:orange;'>예선 진행중</span>",
"<font color=orange>본선 추첨중</font>", "<span style='color:orange;'>본선 추첨중</span>",
"<font color=orange>본선 진행중</font>", "<span style='color:orange;'>본선 진행중</span>",
"<font color=orange>16강 배정중</font>", "<span style='color:orange;'>16강 배정중</span>",
"<font color=orange>베팅 진행중</font>", "<span style='color:orange;'>베팅 진행중</span>",
"<font color=orange>16강 진행중</font>", "<span style='color:orange;'>16강 진행중</span>",
"<font color=orange>8강 진행중</font>", "<span style='color:orange;'>8강 진행중</span>",
"<font color=orange>4강 진행중</font>", "<span style='color:orange;'>4강 진행중</span>",
"<font color=orange>결승 진행중</font>", "<span style='color:orange;'>결승 진행중</span>",
][$tnmt]??"TOURNAMENT_TYPE_ERR_{$tnmt}"; ][$tnmt]??"TOURNAMENT_TYPE_ERR_{$tnmt}";
} }
hwe/index.php
+76 -65
View File
@@ -65,24 +65,20 @@ if ($nationID) {
$nationStor->cacheAll(); $nationStor->cacheAll();
} }
$valid = 0;
if ($gameStor->extended_general == 0) { if ($gameStor->extended_general == 0) {
$extend = "표준"; $extend = "표준";
} else { } else {
$extend = "확장"; $extend = "확장";
$valid = 1;
} }
if ($gameStor->fiction == 0) { if ($gameStor->fiction == 0) {
$fiction = "사실"; $fiction = "사실";
} else { } else {
$fiction = "가상"; $fiction = "가상";
$valid = 1;
} }
if ($gameStor->npcmode == 0) { if ($gameStor->npcmode == 0) {
$npcmode = "불가능"; $npcmode = "불가능";
} else if ($gameStor->npcmode == 1) { } else if ($gameStor->npcmode == 1) {
$npcmode = "가능"; $npcmode = "가능";
$valid = 1;
} else { } else {
$npcmode = "선택 생성"; $npcmode = "선택 생성";
} }
@@ -95,6 +91,22 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
$myNationStatic = getNationStaticInfo($generalObj->getNationID()); $myNationStatic = getNationStaticInfo($generalObj->getNationID());
$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1); $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
$autorunUser = ($gameStor->autorun_user) ?? [];
$otherTextInfo = [];
if ($gameStor->join_mode == 'onlyRandom') {
$otherTextInfo[] = '랜덤 임관 전용';
}
if ($autorunUser['limit_minutes'] ?? false) {
$otherTextInfo[] = getAutorunInfo($autorunUser);
}
if (!$otherTextInfo) {
$otherTextInfo = '표준';
} else {
$otherTextInfo = join(', ', $otherTextInfo);
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@@ -145,83 +157,80 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<div id="container" class="bg0"> <div id="container" class="bg0">
<div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div> <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div>
<div class="tb_layout row gx-0"> <div class="tb_layout row gx-0">
<div id="server_title" class="row py-1"> <div id="server_title" class="row py-2 center">
<h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3> <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3>
</div> </div>
<?php if ($valid == 1) : ?> <div class="row center gx-0">
<div class="row"> <div class="s-border-t col py-2 col-8 col-md-4" style="color:<?= $color ?>;">
<div class="col"> <?= $scenario ?>
<font color=<?= $color ?>><?= $scenario ?></font> </div>
</div> <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
<div class="col"> NPC수 : <?= $extend ?>
<font color=<?= $color ?>>NPC수 : <?= $extend ?></font> </div>
</div> <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
<div class="col"> NPC상성 : <?= $fiction ?>
<font color=<?= $color ?>>NPC상성 : <?= $fiction ?></font> </div>
</div> <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
<div class="col"> NPC선택 : <?= $npcmode ?>
<font color=<?= $color ?>>NPC선택 : <?= $npcmode ?></font> </div>
</div> <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
기타 설정: <?= $otherTextInfo ?>
</div> </div>
<?php endif; ?>
<div class="row py-1"> <div class="s-border-t col py-2 col-8 col-md-4"><?= info(2) ?></div>
<div class="col"><?= info(2) ?></div> <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
<div class="col">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div> <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
<div class="col">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div> <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
<div class="col2"></div> <div class="s-border-t py-2 col col-6 col-md-3">
</div> <div style="display:inline-block;"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
<div class="row py-1"> </div>
<div class="col"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div> <div class="s-border-t py-2 col col-6 col-md-3"><?php if ($gameStor->tournament == 0) : ?>
<div class="col"><?php if ($gameStor->tournament == 0) : ?> <span style='color:magenta'>현재 토너먼트 경기 없음</span>
<font color=magenta>현재 토너먼트 경기 없음</font>
<?php else : ?> <?php else : ?>
<marquee scrollamount=2>↑<font color=cyan><?= ↑<span style='color:cyan'><?=
([ ([
'전력전', '통솔전', '일기토', '설전', '전력전', '통솔전', '일기토', '설전',
])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?>↑</font> ])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
</marquee>
<?php endif; ?> <?php endif; ?>
</div> </div>
<div class="col"> <div class="s-border-t py-2 col col-6 col-md-3">
<?php if ($auctionCount > 0) : ?> <?php if ($auctionCount > 0) : ?>
<marquee scrollamount=2> <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
<font color=cyan><?= $auctionCount ?>건</font> 거래 진행중
</marquee>
<?php else : ?> <?php else : ?>
<font color=magenta>진행중 거래 없음</font> <span style='color:magenta'>진행중 거래 없음</span>
<?php endif; ?> <?php endif; ?>
</div> </div>
<div class="col"> <div class="s-border-t py-2 col col-6 col-md-3">
<?php <?php
$vote = $gameStor->vote ?: ['']; $vote = $gameStor->vote ?: [''];
$vote_title = Tag2Code($gameStor->vote_title ?? '-'); $vote_title = Tag2Code($gameStor->vote_title ?? '-');
?> ?>
<?php if ($vote[0] == "") : ?> <?php if ($vote[0] == "") : ?>
<font color=magenta>진행중 설문 없음</font> <span style='color:magenta'>진행중 설문 없음</span>
<?php else : ?> <?php else : ?>
<marquee scrollamount=3> <marquee scrollamount=3 style='line-height:1.5em;padding:0;margin:0;'>
<font color=cyan>설문 진행중</font> : $vote_title <span style='color:cyan'>설문 진행중</span> : $vote_title
</marquee> </marquee>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
<div class="row"> <div class="row gx-0">
<div class="col">접속중인 국가: <?= $gameStor->online_nation ?></div> <div class="col s-border-t px-2 py-2">접속중인 국가: <?= $gameStor->online_nation ?></div>
</div> </div>
<div class="row"> <div class="row gx-0">
<div class="col">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div> <div class="col s-border-t px-2 py-2">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div>
</div> </div>
<div class="row"> <div class="row gx-0">
<div class="col" id="nation-msg-position"> <div class="col s-border-t py-2" id="nation-msg-position">
<div>【 국가방침 】</div> <div class="px-2">【 국가방침 】</div>
<div><?= nationMsg($generalObj) ?></div> <div id='nation-msg-box'><div id='nation-msg'><?= nationMsg($generalObj) ?></div></div>
</div> </div>
</div> </div>
<div class="row"> <div class="row gx-0">
<div class="col"> <div class="col s-border-t px-2 py-2">
【 접속자 】<?= onlinegen($generalObj) ?> 【 접속자 】<?= onlinegen($generalObj) ?>
</div> </div>
</div> </div>
@@ -248,7 +257,7 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div> <div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div>
<div class="view-item" id="reservedCommandList"></div> <div class="view-item" id="reservedCommandList"></div>
<div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div> <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
<div id="routeButtons" class="view-item row justify-content-center"><button type='button' class='btn btn-sammo-base2 col-2' id='refreshPage'>갱 신</button><button type='button' class='btn btn-sammo-base2 col-3' onclick="location.replace('../')">로비로</button></div> <div id="routeButtons" class="view-item row justify-content-center"><button type='button' class='btn btn-sammo-base2 col-2 refreshPage'>갱 신</button><button type='button' class='btn btn-sammo-base2 col-3' onclick="location.replace('../')">로비로</button></div>
</div> </div>
<div class="row gx-0"> <div class="row gx-0">
<div class="col-md-6" id="nation-position"><?php myNationInfo($generalObj); ?></div> <div class="col-md-6" id="nation-position"><?php myNationInfo($generalObj); ?></div>
@@ -270,19 +279,17 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div> <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
</div> </div>
</div> </div>
<div class="message_input_form bg0 gx-0">
<select id="mailbox_list" size="1">
<select name="genlist" size="1" style="color:white;background-color:black;font-size:13px">
</select>
<input type="textarea" id="msg_input" maxlength="99">
<button id="msg_submit">서신전달&amp;갱신</button><br>
내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
</div>
<div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div> <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div>
<div class="message_input_form bg0 gx-0 row">
<div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
<select id="mailbox_list" size="1" class="form-control bg-dark text-white">
</select>
</div>
<div id="msg_input-col" class="col-12 col-md-8 d-grid">
<input type="text" id="msg_input" maxlength="99" class="form-control">
</div>
<div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
</div>
<div id="message_board" class="row gx-0"> <div id="message_board" class="row gx-0">
<div class="col-md-6 board_side bg0" id='public_talk_position'> <div class="col-md-6 board_side bg0" id='public_talk_position'>
<div class="board_header bg0">전체 메시지(최고99자)</div> <div class="board_header bg0">전체 메시지(최고99자)</div>
@@ -349,6 +356,10 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<a href="#private_talk_position" class="btn btn-light">개인</a> <a href="#private_talk_position" class="btn btn-light">개인</a>
<a href="#diplomacy_talk_position" class="btn btn-light">외교</a> <a href="#diplomacy_talk_position" class="btn btn-light">외교</a>
</div> </div>
<div class="btn-group-vertical">
<button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button>
<button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button>
</div>
</div> </div>
</body> </body>
hwe/j_server_basic_info.php
+1 -36
View File
@@ -2,42 +2,7 @@
namespace sammo; namespace sammo;
include "lib.php"; include "lib.php";
include "func_template.php";
$templates = new \League\Plates\Engine(__DIR__.'/templates');
function getAutorunInfo($autorunOption){
global $templates;
$auto_info = [];
foreach($autorunOption['options'] as $auto_option => $value){
assert($value);
switch($auto_option){
case 'develop': $auto_info['내정'] = '내정'; break;
case 'warp': $auto_info['순간이동'] = '순간이동'; break;
case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
case 'recruit_high': $auto_info['징병'] = '모병'; break;
case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
case 'battle': $auto_info['출병'] = '출병'; break;
case 'chief': $auto_info['사령턴'] = '사령턴'; break;
}
}
$limit = Util::toInt($autorunOption['limit_minutes']);
if($limit >= 43200){
$auto_info['제한'] = '항상 유효';
}
else if($limit % 60 == 0){
$auto_info['제한'] = ($limit/60).'시간 유효';
}
else{
$auto_info['제한'] = ($limit).'분 유효';
}
$auto_info = join(', ', array_values($auto_info));
return $templates->render('tooltip', [
'text'=>'자율행동',
'info'=>$auto_info,
'style'=>'text-decoration:underline',
'copyable_info'=>true
]);
}
$session = Session::requireLogin([ $session = Session::requireLogin([
'game'=>null, 'game'=>null,
hwe/scss/main.scss
+37 -24
View File
@@ -153,6 +153,11 @@ body {
} }
} }
#nation-msg-box{
position: relative;
overflow: hidden;
}
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
.buttonPlate { .buttonPlate {
display: grid; display: grid;
@@ -176,6 +181,11 @@ body {
display: block; display: block;
} }
#nation-msg {
transform-origin: 0px 0px;
width: 1000px;
transform: scale(0.5);
}
#mapZone { #mapZone {
grid-column: 1 / 2; grid-column: 1 / 2;
@@ -369,28 +379,8 @@ body {
position: relative; position: relative;
} }
#msg_input {
color: white;
background-color: black;
font-size: 12px;
margin: 0 2px;
height: 20px;
border: solid 1px gray;
}
#msg_submit {
position: absolute;
right: 0;
margin-right: 2px;
}
#mailbox_list { #mailbox_list {
float: left; font-weight: bold;
color: white;
background-color: black;
font-size: 12px;
width: 160px;
height: 20px;
} }
.board_header { .board_header {
@@ -441,6 +431,20 @@ body {
font-size: 8px; font-size: 8px;
} }
@include media-breakpoint-down(md) {
#mailbox_list-col{
order: 1;
}
#msg_submit-col {
order: 2;
}
#msg_input-col{
order: 3;
}
}
/* /*
.public_message .msg_target{ .public_message .msg_target{
box-shadow: 2px 2px darkslategrey; box-shadow: 2px 2px darkslategrey;
@@ -508,17 +512,26 @@ body {
opacity: 0.7; opacity: 0.7;
} }
.btn.active{ .btn.active {
opacity: 1.0; opacity: 1.0;
} }
.btn:active{ .btn:active {
opacity: 0.7; opacity: 0.7;
} }
} }
} }
.s-border-tb{
.s-border-t {
border-top: gray solid 1px;
}
.s-border-b {
border-bottom: gray solid 1px;
}
.s-border-tb {
border-top: gray solid 1px; border-top: gray solid 1px;
border-bottom: gray solid 1px; border-bottom: gray solid 1px;
} }
hwe/ts/main.ts
+23 -1
View File
@@ -11,9 +11,11 @@ import { exportWindow } from './util/exportWindow';
exportWindow($, '$'); exportWindow($, '$');
import '../scss/main.scss'; import '../scss/main.scss';
import { unwrap } from './util/unwrap';
import { number } from 'vue-types';
$(function ($) { $(function ($) {
$('#refreshPage').click(function () { $('.refreshPage').click(function () {
document.location.reload(); document.location.reload();
return false; return false;
}); });
@@ -44,6 +46,10 @@ $(function ($) {
button: HTMLAnchorElement, button: HTMLAnchorElement,
}[] = []; }[] = [];
let nationMsgBox!: HTMLElement;
let nationMsg!: HTMLElement;
let nationMsgHeight : number|undefined = undefined;
function init() { function init() {
const buttons = document.querySelectorAll<HTMLAnchorElement>('#float-tabs a.btn'); const buttons = document.querySelectorAll<HTMLAnchorElement>('#float-tabs a.btn');
if (!buttons) { if (!buttons) {
@@ -62,6 +68,9 @@ $(function ($) {
} }
objects.push({ target, button }); objects.push({ target, button });
} }
nationMsgBox = unwrap(document.getElementById('nation-msg-box'));
nationMsg = unwrap(document.getElementById('nation-msg'));
} }
function onScroll() { function onScroll() {
if (!finInit && !init()) return; if (!finInit && !init()) return;
@@ -93,6 +102,19 @@ $(function ($) {
button.classList.add('active'); button.classList.add('active');
} }
if(nationMsgBox.offsetWidth < nationMsg.offsetWidth){
if(nationMsgHeight === undefined){
nationMsgHeight = nationMsgBox.offsetHeight;
nationMsgBox.style.height = `${nationMsgHeight / 2}px`;
}
}
else{
if(nationMsgBox.style.height){
nationMsgHeight = undefined;
nationMsgBox.style.height = '';
}
}
} }
function ready(fn: () => unknown) { function ready(fn: () => unknown) {
if (document.readyState != 'loading') { if (document.readyState != 'loading') {