Merge branch 'g38_ui' into devel

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>

hwe/ts/processing/General/che_군량매매.vue

@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" />
+  <TopBackBar :title="commandName" />
   <div class="bg0">
     <div>
       자신의 군량을 사거나 팝니다.<br />

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 />

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 />

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)를 다른 병종

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 />

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 />

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 />

hwe/ts/processing/General/che_헌납.vue

@@ -1,5 +1,5 @@
 <template>
-  <TopBackBar :title="commandName" type="chief" />
+  <TopBackBar :title="commandName" />
   <div class="bg0">
     <div>
       자신의 자금이나 군량을 국가 재산으로 헌납합니다.

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">

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">

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">

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">

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">

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">

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),

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,

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),