diff --git a/hwe/css/common.css b/hwe/css/common.css
index 48f34e5a..75c75e8e 100644
--- a/hwe/css/common.css
+++ b/hwe/css/common.css
@@ -9,6 +9,7 @@ body {
color: white;
line-height: 1.3;
font-size: 14px;
+ background-position: center;
}
input {
diff --git a/hwe/sammo/Command/Nation/che_몰수.php b/hwe/sammo/Command/Nation/che_몰수.php
index 286edcea..0e58a481 100644
--- a/hwe/sammo/Command/Nation/che_몰수.php
+++ b/hwe/sammo/Command/Nation/che_몰수.php
@@ -214,6 +214,25 @@ class che_몰수 extends Command\NationCommand
return true;
}
+ public function exportJSVars(): array
+ {
+ $db = DB::db();
+ $nationID = $this->getNationID();
+ $troops = Util::convertArrayToDict($db->query('SELECT * FROM troop WHERE nation=%i', $nationID), 'troop_leader');
+ $destRawGenerals = $db->queryAllLists('SELECT no,name,officer_level,npc,gold,rice,leadership,strength,intel,city,crew,train,atmos,troop FROM general WHERE nation = %i ORDER BY npc,binary(name)', $nationID);
+ return [
+ 'procRes' => [
+ 'troops' => $troops,
+ 'generals' => $destRawGenerals,
+ 'generalsKey' => ['no', 'name', 'officerLevel', 'npc', 'gold', 'rice', 'leadership', 'strength', 'intel', 'cityID', 'crew', 'train', 'atmos', 'troopID'],
+ 'cities' => \sammo\JSOptionsForCities(),
+ 'minAmount' => 100,
+ 'maxAmount' => GameConst::$maxResourceActionAmount,
+ 'amountGuide' => GameConst::$resourceActionAmountGuide,
+ ]
+ ];
+ }
+
public function getForm(): string
{
//TODO: 암행부처럼 보여야...
diff --git a/hwe/scss/game_bg.scss b/hwe/scss/game_bg.scss
index 6f1447b9..6a59c811 100644
--- a/hwe/scss/game_bg.scss
+++ b/hwe/scss/game_bg.scss
@@ -17,6 +17,8 @@ table.tb_layout {
html,
body {
font-size: 14px;
+ background-position: center;
+ background-repeat: repeat-y;
}
.tb_layout td,
diff --git a/hwe/ts/PartialReservedCommand.vue b/hwe/ts/PartialReservedCommand.vue
index 380a3c98..2016de00 100644
--- a/hwe/ts/PartialReservedCommand.vue
+++ b/hwe/ts/PartialReservedCommand.vue
@@ -210,7 +210,7 @@ import { parseTime } from "@util/parseTime";
import { parseYearMonth } from "@util/parseYearMonth";
import { sammoAPI } from "@util/sammoAPI";
import { filter초성withAlphabet } from "@util/filter초성withAlphabet";
-
+import { automata초성All } from "@util/automata초성";
type commandItem = {
value: string;
title: string;
@@ -502,7 +502,8 @@ export default defineComponent({
const [filteredTextH, filteredTextA] = filter초성withAlphabet(
command.simpleName.replace(/\s+/g, "")
);
- command.searchText = `${command.simpleName} ${filteredTextH} ${filteredTextA}`;
+ const [filteredTextHL1, filteredTextHL2] = automata초성All(filteredTextH);
+ command.searchText = `${command.simpleName} ${filteredTextH} ${filteredTextA} ${filteredTextHL1} ${filteredTextHL2}`;
}
}
diff --git a/hwe/ts/colorSelect.ts b/hwe/ts/colorSelect.ts
deleted file mode 100644
index 31daa772..00000000
--- a/hwe/ts/colorSelect.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export function colorSelect(): void{
- function changeNationColorPlate(){
- const $this = $('#colorType');
- const $option = $this.find('option:selected');
- $this.css({
- 'background-color':$option.css('background-color'),
- 'color':$option.css('color')
- });
- }
- $('#colorType').on('change', function(){
- changeNationColorPlate();
- });
- changeNationColorPlate();
-}
\ No newline at end of file
diff --git a/hwe/ts/defaultSelectCityByMap.ts b/hwe/ts/defaultSelectCityByMap.ts
deleted file mode 100644
index a3f5078e..00000000
--- a/hwe/ts/defaultSelectCityByMap.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { reloadWorldMap } from "@/map";
-
-declare let vueReactive_destCityID: number|undefined;
-
-export function defaultSelectCityByMap(): void {
- void reloadWorldMap({
- isDetailMap: false,
- clickableAll: true,
- neutralView: true,
- useCachedMap: true,
- selectCallback: function (city) {
- if(vueReactive_destCityID === undefined){
- console.error('아직 초기화 되지 않음');
- return false;
- }
- vueReactive_destCityID = city.id;
- return false;
- }
- });
-}
diff --git a/hwe/ts/defaultSelectNationByMap.ts b/hwe/ts/defaultSelectNationByMap.ts
deleted file mode 100644
index 0a3c953a..00000000
--- a/hwe/ts/defaultSelectNationByMap.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { reloadWorldMap } from "@/map";
-
-declare let vueReactive_destNationID: number|undefined;
-
-export function defaultSelectNationByMap(): void{
- const $target = $("#destNationID");
- console.log('nation', $target);
- void reloadWorldMap({
- isDetailMap: false,
- clickableAll: true,
- neutralView: true,
- useCachedMap: true,
- selectCallback: function (city) {
- if(typeof vueReactive_destNationID === 'undefined'){
- console.error('아직 초기화 되지 않음');
- return false;
- }
- vueReactive_destNationID = city.nationID;
- return false;
- }
- });
-}
\ No newline at end of file
diff --git a/hwe/ts/processing/AmountSelect.vue b/hwe/ts/processing/AmountSelect.vue
new file mode 100644
index 00000000..8dddd7d0
--- /dev/null
+++ b/hwe/ts/processing/AmountSelect.vue
@@ -0,0 +1,100 @@
+
+
+ 몰수한것은 국가재산으로 귀속됩니다.
+