From 6678e87cbf895dd117b6b70c76e43e7132496d8f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 23 Dec 2021 03:16:24 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=90=98=EB=8F=8C=EC=95=84=EA=B0=80?=
 =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=EC=B9=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/processing/General/che_건국.vue        |  2 +-
 hwe/ts/processing/General/che_군량매매.vue    |  2 +-
 hwe/ts/processing/General/che_등용.vue        |  2 +-
 hwe/ts/processing/General/che_선양.vue        |  2 +-
 hwe/ts/processing/General/che_숙련전환.vue    |  2 +-
 hwe/ts/processing/General/che_임관.vue        |  2 +-
 hwe/ts/processing/General/che_장비매매.vue    |  2 +-
 .../processing/General/che_장수대상임관.vue   |  2 +-
 hwe/ts/processing/General/che_헌납.vue        |  2 +-
 hwe/ts/processing/Nation/che_국기변경.vue     |  2 +-
 hwe/ts/processing/Nation/che_국호변경.vue     |  2 +-
 hwe/ts/processing/Nation/che_물자원조.vue     |  2 +-
 hwe/ts/processing/Nation/che_발령.vue         |  2 +-
 hwe/ts/processing/Nation/che_불가침제의.vue   |  2 +-
 hwe/ts/processing/Nation/che_피장파장.vue     |  2 +-
 hwe/ts/processing/ProcessCity.vue             |  7 ++++--
 hwe/ts/processing/ProcessGeneralAmount.vue    |  6 +++--
 hwe/ts/processing/ProcessNation.vue           | 22 +++++++++++++++----
 18 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/hwe/ts/processing/General/che_건국.vue b/hwe/ts/processing/General/che_건국.vue
index c9876386..ecd172ad 100644
--- a/hwe/ts/processing/General/che_건국.vue
+++ b/hwe/ts/processing/General/che_건국.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" />
+  <TopBackBar :title="commandName" />
   <div class="bg0" v-if="!available건국">더 이상 건국은 불가능합니다.</div>
   <div class="bg0" v-else>
     <div>현재 도시에서 나라를 세웁니다. 중, 소도시에서만 가능합니다.</div>
diff --git a/hwe/ts/processing/General/che_군량매매.vue b/hwe/ts/processing/General/che_군량매매.vue
index 5a1a56be..da17fa6f 100644
--- a/hwe/ts/processing/General/che_군량매매.vue
+++ b/hwe/ts/processing/General/che_군량매매.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" />
+  <TopBackBar :title="commandName" />
   <div class="bg0">
     <div>
       자신의 군량을 사거나 팝니다.<br />
diff --git a/hwe/ts/processing/General/che_등용.vue b/hwe/ts/processing/General/che_등용.vue
index b805ff20..db1bb3e5 100644
--- a/hwe/ts/processing/General/che_등용.vue
+++ b/hwe/ts/processing/General/che_등용.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" v-model:searchable="searchable" />
   <div class="bg0">
     <div>
       재야나 타국의 장수를 등용합니다.<br />
diff --git a/hwe/ts/processing/General/che_선양.vue b/hwe/ts/processing/General/che_선양.vue
index c1e0658b..7b2e8d72 100644
--- a/hwe/ts/processing/General/che_선양.vue
+++ b/hwe/ts/processing/General/che_선양.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" v-model:searchable="searchable" />
   <div class="bg0">
     <div v-if="commandName == '등용'">
       재야나 타국의 장수를 등용합니다.<br />
diff --git a/hwe/ts/processing/General/che_숙련전환.vue b/hwe/ts/processing/General/che_숙련전환.vue
index a69b38e2..ffff65cc 100644
--- a/hwe/ts/processing/General/che_숙련전환.vue
+++ b/hwe/ts/processing/General/che_숙련전환.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" />
+  <TopBackBar :title="commandName" />
   <div class="bg0">
     <div>
       본인의 특정 병종 숙련을 40% 줄이고, 줄어든 숙련 중 9/10(90%p)를 다른 병종
diff --git a/hwe/ts/processing/General/che_임관.vue b/hwe/ts/processing/General/che_임관.vue
index 2bba9f7b..aa3087c2 100644
--- a/hwe/ts/processing/General/che_임관.vue
+++ b/hwe/ts/processing/General/che_임관.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" v-model:searchable="searchable" />
   <div class="bg0">
     <div>
       국가에 임관합니다.<br />
diff --git a/hwe/ts/processing/General/che_장비매매.vue b/hwe/ts/processing/General/che_장비매매.vue
index d46a0f24..330282b5 100644
--- a/hwe/ts/processing/General/che_장비매매.vue
+++ b/hwe/ts/processing/General/che_장비매매.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" v-model:searchable="searchable" />
   <div class="bg0">
     <div>
       장비를 구입하거나 매각합니다.<br />
diff --git a/hwe/ts/processing/General/che_장수대상임관.vue b/hwe/ts/processing/General/che_장수대상임관.vue
index 9285fd0a..70d0113e 100644
--- a/hwe/ts/processing/General/che_장수대상임관.vue
+++ b/hwe/ts/processing/General/che_장수대상임관.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" v-model:searchable="searchable" />
   <div class="bg0">
     <div>
       장수를 따라 임관합니다.<br />
diff --git a/hwe/ts/processing/General/che_헌납.vue b/hwe/ts/processing/General/che_헌납.vue
index 6191c61f..65b90f6b 100644
--- a/hwe/ts/processing/General/che_헌납.vue
+++ b/hwe/ts/processing/General/che_헌납.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" />
+  <TopBackBar :title="commandName" />
   <div class="bg0">
     <div>
       자신의 자금이나 군량을 국가 재산으로 헌납합니다.
diff --git a/hwe/ts/processing/Nation/che_국기변경.vue b/hwe/ts/processing/Nation/che_국기변경.vue
index c0fdf098..897ee4b7 100644
--- a/hwe/ts/processing/Nation/che_국기변경.vue
+++ b/hwe/ts/processing/Nation/che_국기변경.vue
@@ -14,7 +14,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" type="chief" />
 </template>
 
 <script lang="ts">
diff --git a/hwe/ts/processing/Nation/che_국호변경.vue b/hwe/ts/processing/Nation/che_국호변경.vue
index bdb8b2e2..89a5478f 100644
--- a/hwe/ts/processing/Nation/che_국호변경.vue
+++ b/hwe/ts/processing/Nation/che_국호변경.vue
@@ -14,7 +14,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" type="chief" />
 </template>
 
 <script lang="ts">
diff --git a/hwe/ts/processing/Nation/che_물자원조.vue b/hwe/ts/processing/Nation/che_물자원조.vue
index 207970f7..bc33e2cf 100644
--- a/hwe/ts/processing/Nation/che_물자원조.vue
+++ b/hwe/ts/processing/Nation/che_물자원조.vue
@@ -65,7 +65,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" type="chief" />
 </template>
 
 <script lang="ts">
diff --git a/hwe/ts/processing/Nation/che_발령.vue b/hwe/ts/processing/Nation/che_발령.vue
index e2b81a4e..99515cb9 100644
--- a/hwe/ts/processing/Nation/che_발령.vue
+++ b/hwe/ts/processing/Nation/che_발령.vue
@@ -36,7 +36,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" type="chief" />
 </template>
 
 <script lang="ts">
diff --git a/hwe/ts/processing/Nation/che_불가침제의.vue b/hwe/ts/processing/Nation/che_불가침제의.vue
index 39a9614b..23c15234 100644
--- a/hwe/ts/processing/Nation/che_불가침제의.vue
+++ b/hwe/ts/processing/Nation/che_불가침제의.vue
@@ -47,7 +47,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" type="chief" />
 </template>
 
 <script lang="ts">
diff --git a/hwe/ts/processing/Nation/che_피장파장.vue b/hwe/ts/processing/Nation/che_피장파장.vue
index 348a5b52..1d398f17 100644
--- a/hwe/ts/processing/Nation/che_피장파장.vue
+++ b/hwe/ts/processing/Nation/che_피장파장.vue
@@ -36,7 +36,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" type="chief" />
 </template>
 
 <script lang="ts">
diff --git a/hwe/ts/processing/ProcessCity.vue b/hwe/ts/processing/ProcessCity.vue
index fa1f4acc..2b86938c 100644
--- a/hwe/ts/processing/ProcessCity.vue
+++ b/hwe/ts/processing/ProcessCity.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" :type="procEntryMode" v-model:searchable="searchable" />
   <div class="bg0">
     <MapLegacyTemplate
       :isDetailMap="false"
@@ -77,7 +77,7 @@
       @selected="selected"
     />
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" :type="procEntryMode" />
 </template>
 
 <script lang="ts">
@@ -100,6 +100,8 @@ declare const procRes: {
   distanceList: Record<number, number[]>;
   cities: [number, string][];
 };
+declare const entryInfo: ['General'|'Nation', unknown];
+
 export default defineComponent({
   components: {
     MapLegacyTemplate,
@@ -141,6 +143,7 @@ export default defineComponent({
     }
 
     return {
+      procEntryMode: entryInfo[0] == 'Nation'?'chief':'normal',
       searchable: getProcSearchable(),
       mapTheme: ref(mapTheme),
       citiesMap: ref(citiesMap),
diff --git a/hwe/ts/processing/ProcessGeneralAmount.vue b/hwe/ts/processing/ProcessGeneralAmount.vue
index bc34a90e..1c0c6b5a 100644
--- a/hwe/ts/processing/ProcessGeneralAmount.vue
+++ b/hwe/ts/processing/ProcessGeneralAmount.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar :title="commandName" :type="procEntryMode" v-model:searchable="searchable" />
   <div class="bg0">
     <div v-if="commandName == '몰수'">
       장수의 자금이나 군량을 몰수합니다.<br />
@@ -43,7 +43,7 @@
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" :type="procEntryMode" />
 </template>
 
 <script lang="ts">
@@ -63,6 +63,7 @@ import {
 } from "./processingRes";
 import { getNpcColor } from "@/common_legacy";
 declare const commandName: string;
+declare const entryInfo: ['General'|'Nation', unknown];
 
 declare const procRes: {
   distanceList: Record<number, number[]>;
@@ -124,6 +125,7 @@ export default defineComponent({
     }
 
     return {
+      procEntryMode: entryInfo[0] == 'Nation'?'chief':'normal',
       searchable: getProcSearchable(),
       amount,
       isGold,
diff --git a/hwe/ts/processing/ProcessNation.vue b/hwe/ts/processing/ProcessNation.vue
index 9c31cc52..4e569aaf 100644
--- a/hwe/ts/processing/ProcessNation.vue
+++ b/hwe/ts/processing/ProcessNation.vue
@@ -1,5 +1,9 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" v-model:searchable="searchable" />
+  <TopBackBar
+    :title="commandName"
+    :type="procEntryMode"
+    v-model:searchable="searchable"
+  />
   <div class="bg0">
     <MapLegacyTemplate
       :isDetailMap="false"
@@ -54,14 +58,18 @@
     <div class="row">
       <div class="col-6 col-md-3">
         국가 :
-        <SelectNation :nations="nationList" v-model="selectedNationID" :searchable="searchable" />
+        <SelectNation
+          :nations="nationList"
+          v-model="selectedNationID"
+          :searchable="searchable"
+        />
       </div>
       <div class="col-4 col-md-2 d-grid">
         <b-button @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
   </div>
-  <BottomBar :title="commandName" />
+  <BottomBar :title="commandName" :type="procEntryMode" />
 </template>
 
 <script lang="ts">
@@ -74,9 +82,14 @@ import { unwrap } from "@/util/unwrap";
 import { Args } from "@/processing/args";
 import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
-import { getProcSearchable, procNationItem, procNationList } from "./processingRes";
+import {
+  getProcSearchable,
+  procNationItem,
+  procNationList,
+} from "./processingRes";
 declare const mapTheme: string;
 declare const commandName: string;
+declare const entryInfo: ['General'|'Nation', unknown];
 
 declare const procRes: {
   nationList: procNationList;
@@ -121,6 +134,7 @@ export default defineComponent({
     }
 
     return {
+      procEntryMode: entryInfo[0] == "Nation" ? "chief" : "normal",
       searchable: getProcSearchable(),
       startYear: procRes.startYear,
       mapTheme: ref(mapTheme),