-
【 국가방침 】
-
+
-
-
+
@@ -248,7 +257,7 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
-
+
@@ -270,19 +279,17 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
-
-
npcmode == 1) ?>
+
@@ -349,6 +356,10 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
개인
외교
+
+
+
+
diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index 334d8f67..db088fdf 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -2,42 +2,7 @@
namespace sammo;
include "lib.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
- ]);
-}
+include "func_template.php";
$session = Session::requireLogin([
'game'=>null,
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index bf2b05ae..8ca19401 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -153,6 +153,11 @@ body {
}
}
+#nation-msg-box{
+ position: relative;
+ overflow: hidden;
+}
+
@include media-breakpoint-down(md) {
.buttonPlate {
display: grid;
@@ -176,6 +181,11 @@ body {
display: block;
}
+ #nation-msg {
+ transform-origin: 0px 0px;
+ width: 1000px;
+ transform: scale(0.5);
+ }
#mapZone {
grid-column: 1 / 2;
@@ -369,28 +379,8 @@ body {
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 {
- float: left;
- color: white;
- background-color: black;
- font-size: 12px;
- width: 160px;
- height: 20px;
+ font-weight: bold;
}
.board_header {
@@ -441,6 +431,20 @@ body {
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{
box-shadow: 2px 2px darkslategrey;
@@ -508,17 +512,26 @@ body {
opacity: 0.7;
}
- .btn.active{
+ .btn.active {
opacity: 1.0;
}
- .btn:active{
+ .btn:active {
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-bottom: gray solid 1px;
}
\ No newline at end of file
diff --git a/hwe/ts/main.ts b/hwe/ts/main.ts
index d5eb4f1d..54f8a00b 100644
--- a/hwe/ts/main.ts
+++ b/hwe/ts/main.ts
@@ -11,9 +11,11 @@ import { exportWindow } from './util/exportWindow';
exportWindow($, '$');
import '../scss/main.scss';
+import { unwrap } from './util/unwrap';
+import { number } from 'vue-types';
$(function ($) {
- $('#refreshPage').click(function () {
+ $('.refreshPage').click(function () {
document.location.reload();
return false;
});
@@ -44,6 +46,10 @@ $(function ($) {
button: HTMLAnchorElement,
}[] = [];
+ let nationMsgBox!: HTMLElement;
+ let nationMsg!: HTMLElement;
+ let nationMsgHeight : number|undefined = undefined;
+
function init() {
const buttons = document.querySelectorAll
('#float-tabs a.btn');
if (!buttons) {
@@ -62,6 +68,9 @@ $(function ($) {
}
objects.push({ target, button });
}
+
+ nationMsgBox = unwrap(document.getElementById('nation-msg-box'));
+ nationMsg = unwrap(document.getElementById('nation-msg'));
}
function onScroll() {
if (!finInit && !init()) return;
@@ -93,6 +102,19 @@ $(function ($) {
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) {
if (document.readyState != 'loading') {