diff --git a/hwe/index.php b/hwe/index.php
index be5f5c2e..273c4150 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -114,10 +114,10 @@ if (!$otherTextInfo) {
$lastVoteID = $gameStor->lastVote;
$lastVote = null;
-if($lastVoteID){
+if ($lastVoteID) {
$voteStor = KVStorage::getStorage($db, 'vote');
$lastVote = VoteInfo::fromArray($voteStor->getValue("vote_{$lastVoteID}"));
- if($lastVote->endDate && $lastVote->endDate < TimeUtil::now()){
+ if ($lastVote->endDate && $lastVote->endDate < TimeUtil::now()) {
$lastVote = null;
}
}
@@ -282,7 +282,21 @@ if($lastVoteID){
@@ -382,7 +396,18 @@ if($lastVoteID){
국가 메뉴
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index 8b1a0759..3e9bc9ea 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -65,7 +65,7 @@ body {
}
#navbarNationItems {
- columns: 2;
+ columns: 3;
}
#navbarQuickItems {
@@ -320,7 +320,7 @@ body {
font-weight: bold;
font-size: 14px;
}
-
+
.toolbarButton2 {
@extend .btn;
@extend .btn-sammo-base2;
diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php
index 12f163e4..2fc26597 100644
--- a/hwe/templates/commandButton.php
+++ b/hwe/templates/commandButton.php
@@ -16,5 +16,12 @@
=$btnBegin??''?>'>감 찰 부=$btnEnd??''?>
=$btnBegin??''?>유산 관리=$btnEnd??''?>
=$btnBegin??''?>내 정보&설정=$btnEnd??''?>
-=$btnBegin??''?>거 래 장=$btnEnd??''?>
+=$splitBtnBegin??''?>
+ =$splitMainBegin??''?>경 매 장=$splitMainEnd??''?>
+ =$splitZoneSign??''?>
+ =$splitZoneBegin??''?>
+ =$splitSubBtnBegin??''?>'>금/쌀 경매장=$splitSubBtnEnd??''?>
+ =$splitSubBtnBegin??''?>'>유니크 경매장=$splitSubBtnEnd??''?>
+ =$splitZoneEnd??''?>
+=$splitBtnEnd??''?>
=$btnBegin??''?>베 팅 장=$btnEnd??''?>
\ No newline at end of file
diff --git a/hwe/ts/PageAuction.vue b/hwe/ts/PageAuction.vue
index b0dc4b07..f48b12fc 100644
--- a/hwe/ts/PageAuction.vue
+++ b/hwe/ts/PageAuction.vue
@@ -22,9 +22,16 @@ import TopBackBar from "@/components/TopBackBar.vue";
import BottomBar from "./components/BottomBar.vue";
import AuctionResource from "@/components/AuctionResource.vue";
import AuctionUniqueItem from "@/components/AuctionUniqueItem.vue";
-import { ref } from "vue";
+import { toRef } from "vue";
-const isResAuction = ref(true);
+const props = defineProps({
+ isResAuction: {
+ type: Boolean,
+ default: true,
+ },
+});
+
+const isResAuction = toRef(props, 'isResAuction');
function tryReload() {
console.log('갱신');
diff --git a/hwe/ts/v_auction.ts b/hwe/ts/v_auction.ts
index a17a0102..072d67d1 100644
--- a/hwe/ts/v_auction.ts
+++ b/hwe/ts/v_auction.ts
@@ -6,9 +6,18 @@ import { auto500px } from "./util/auto500px";
import { insertCustomCSS } from "./util/customCSS";
import { htmlReady } from "./util/htmlReady";
+declare const staticValues: {
+ serverID: string,
+ turnterm: number,
+ serverNick: string,
+ isResAuction: boolean,
+};
+
auto500px();
htmlReady(() => {
insertCustomCSS();
});
-createApp(PageAuction).use(BootstrapVue3).use(BToastPlugin).mount('#app')
\ No newline at end of file
+createApp(PageAuction, {
+ isResAuction: staticValues.isResAuction,
+}).use(BootstrapVue3).use(BToastPlugin).mount('#app')
\ No newline at end of file
diff --git a/hwe/v_auction.php b/hwe/v_auction.php
index 2184eb43..66796a61 100644
--- a/hwe/v_auction.php
+++ b/hwe/v_auction.php
@@ -11,6 +11,8 @@ $userID = Session::getUserID();
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
+$isResAuction = Util::getReq('type') !== 'unique';
+
$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
?>
@@ -28,6 +30,7 @@ $me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, tur
'serverID' => UniqueConst::$serverID,
'serverNick' => DB::prefix(),
'turnterm' => $gameStor->turnterm,
+ 'isResAuction' => $isResAuction,
]
]) ?>
= WebUtil::printDist('vue', 'v_auction', true) ?>