diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 009fdd3a..218386f6 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -528,7 +528,7 @@ function checkWander(RandUtil $rng) $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); - $admin = $gameStor->getValues(['year', 'month']); + $admin = $gameStor->getValues(['year', 'month', 'init_year', 'init_month']); $wanderers = $db->queryFirstColumn('SELECT general.`no` FROM general LEFT JOIN nation ON general.nation = nation.nation WHERE nation.`level` = 0 AND general.`officer_level` = 12'); diff --git a/hwe/install.php b/hwe/install.php index 96b785f8..12cf1ef5 100644 --- a/hwe/install.php +++ b/hwe/install.php @@ -32,6 +32,7 @@ if ($session->userGrade < 5 && !$allowReset) { + diff --git a/hwe/recent_map.php b/hwe/recent_map.php index 8497e026..3dfa9e3a 100644 --- a/hwe/recent_map.php +++ b/hwe/recent_map.php @@ -27,6 +27,7 @@ include "func.php"; + diff --git a/hwe/ts/components/GeneralBasicCard.vue b/hwe/ts/components/GeneralBasicCard.vue index 78a4a2d7..9d6fea45 100644 --- a/hwe/ts/components/GeneralBasicCard.vue +++ b/hwe/ts/components/GeneralBasicCard.vue @@ -27,7 +27,7 @@
- {{ general.leadership }} + {{ calcInjury("leadership", general) }} +{{ general.lbonus }}
@@ -40,7 +40,7 @@
- {{ general.strength }} + {{ calcInjury("strength", general) }}
@@ -51,7 +51,7 @@
- {{ general.intel }} + {{ calcInjury("intel", general) }}
@@ -60,18 +60,24 @@
명마
-
{{ horse.name }}
+
{{ horse.name }}
+
{{ horse.name }}
+
무기
-
{{ weapon.name }}
+
{{ weapon.name }}
+
{{ weapon.name }}
+
서적
-
{{ book.name }}
+
{{ book.name }}
+
{{ book.name }}
자금
{{ general.gold.toLocaleString() }}
군량
{{ general.rice.toLocaleString() }}
도구
-
{{ item.name }}
+
{{ item.name }}
+
{{ item.name }}
병종
-
{{ crewtype.name }}
+
{{ crewtype.name }}
+
{{ crewtype.name }}
병사
{{ general.crew.toLocaleString() }}
성격
-
{{ personal.name }}
+
{{ personal.name }}
+
{{ personal.name }}
훈련
@@ -95,8 +103,11 @@
{{ general.atmos }}
특기
- {{ specialDomestic.name }} / - {{ specialWar.name }} + {{ specialDomestic.name }} {{ specialDomestic.name }} + / + {{ specialWar.name }} {{ specialWar.name }}
Lv
@@ -148,7 +159,7 @@