From 8defcd29a475f29d264fe1fb341edcc71372fcc2 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 30 Jul 2022 10:31:31 +0900 Subject: [PATCH 01/15] =?UTF-8?q?fix:=20=EC=9D=B8=EC=9E=90=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/API/Nation/GetGeneralLog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/sammo/API/Nation/GetGeneralLog.php b/hwe/sammo/API/Nation/GetGeneralLog.php index 7b1aa603..96aa2893 100644 --- a/hwe/sammo/API/Nation/GetGeneralLog.php +++ b/hwe/sammo/API/Nation/GetGeneralLog.php @@ -81,7 +81,7 @@ class GetGeneralLog extends \sammo\BaseAPI if ( $reqType === self::GENERAL_ACTION && $testGeneralNPCType < 2 && - $generalID !== $me['generalID'] && + $generalID !== $me['no'] && $permission < 2 ) { return '권한이 부족합니다. 유저 장수의 개인 기록은 수뇌만 열람 가능합니다.'; From f8448fbb51b918cecb87e449a25afb5fc6c0e651 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 30 Jul 2022 10:34:40 +0900 Subject: [PATCH 02/15] =?UTF-8?q?fix:=20=EC=9E=90=EB=8F=99=20=ED=95=B4?= =?UTF-8?q?=EC=82=B0=EC=97=90=20=ED=95=84=EC=9A=94=ED=95=9C=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=A0=9C=EA=B3=B5=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_gamerule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'); From e0410807737e90acc455bc99670c57287e269de7 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 30 Jul 2022 12:15:07 +0900 Subject: [PATCH 03/15] =?UTF-8?q?fix:=20=EC=9C=A0=EC=82=B0=20=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=EA=B0=80=200=EC=9D=B4=EC=96=B4=EB=8F=84=20?= =?UTF-8?q?=EB=8F=99=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/InheritancePointManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/sammo/InheritancePointManager.php b/hwe/sammo/InheritancePointManager.php index 6c36fcdf..407df345 100644 --- a/hwe/sammo/InheritancePointManager.php +++ b/hwe/sammo/InheritancePointManager.php @@ -121,7 +121,7 @@ class InheritancePointManager $gameStor = KVStorage::getStorage(DB::db(), 'game_env'); if ($storeType === true || ($gameStor->isunited != 0 && !$forceCalc)) { $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}"); - [$value, $aux] = $inheritStor->getValue($key); + [$value, $aux] = $inheritStor->getValue($key) ?? [0, null]; return $value; } From 5ce899ee6e92dbd115afd3b6d943d58d3b78e044 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 30 Jul 2022 14:25:23 +0900 Subject: [PATCH 04/15] =?UTF-8?q?fix:=20=EC=9E=A5=EC=88=98=20=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=EC=97=90=20=EB=B6=80=EC=83=81=EC=8A=A4=ED=83=AF=20?= =?UTF-8?q?=EB=AF=B8=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/components/GeneralBasicCard.vue | 8 +++++--- hwe/ts/components/GeneralLiteCard.vue | 8 +++++--- hwe/ts/utilGame/calcInjury.ts | 6 ++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 hwe/ts/utilGame/calcInjury.ts diff --git a/hwe/ts/components/GeneralBasicCard.vue b/hwe/ts/components/GeneralBasicCard.vue index 78a4a2d7..ece1e410 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) }}
@@ -163,6 +163,8 @@ import { parseTime } from "@/util/parseTime"; import { clamp } from "lodash"; import { formatCityName } from "@/utilGame/formatCityName"; import { isValidObjKey } from "@/utilGame/isValidObjKey"; +import { calcInjury } from "@/utilGame/calcInjury"; + const imagePath = window.pathConfig.gameImage; const gameConstStore = unwrap(inject>("gameConstStore")); const props = defineProps<{ diff --git a/hwe/ts/components/GeneralLiteCard.vue b/hwe/ts/components/GeneralLiteCard.vue index 71919d4f..28af6775 100644 --- a/hwe/ts/components/GeneralLiteCard.vue +++ b/hwe/ts/components/GeneralLiteCard.vue @@ -23,7 +23,7 @@
- {{ general.leadership }} + {{ calcInjury('leadership', general) }} +{{ general.lbonus }}
@@ -33,7 +33,7 @@
- {{ general.strength }} + {{ calcInjury('strength', general) }}
@@ -41,7 +41,7 @@
- {{ general.intel }} + {{ calcInjury('intel', general) }}
@@ -91,6 +91,8 @@ import { unwrap } from "@/util/unwrap"; import type { GameConstStore } from "@/GameConstStore"; import { formatGeneralTypeCall } from "@/utilGame/formatGeneralTypeCall"; import { formatConnectScore } from "@/utilGame/formatConnectScore"; +import { calcInjury } from "@/utilGame/calcInjury"; + const gameConstStore = unwrap(inject>("gameConstStore")); const props = defineProps<{ general: GeneralListItemP0; diff --git a/hwe/ts/utilGame/calcInjury.ts b/hwe/ts/utilGame/calcInjury.ts new file mode 100644 index 00000000..e3f5c29c --- /dev/null +++ b/hwe/ts/utilGame/calcInjury.ts @@ -0,0 +1,6 @@ +import type { GeneralListItemP0 } from "@/defs/API/Nation"; + +export function calcInjury(statKey: 'leadership'|'strength'|'intel', general: GeneralListItemP0){ + const baseStat = general[statKey]; + return Math.round(baseStat * (100 -general.injury) / 100); +} \ No newline at end of file From 2e2ff1b150dad710ba173db85805fef42fbaf395 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 30 Jul 2022 19:34:34 +0900 Subject: [PATCH 05/15] =?UTF-8?q?feat:=20=EA=B0=90=EC=B0=B0=EB=B6=80?= =?UTF-8?q?=EC=97=90=EC=84=9C=20'=EC=9D=B4=EC=A0=84',=20'=EB=8B=A4?= =?UTF-8?q?=EC=9D=8C'=20=EB=B2=84=ED=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/PageBattleCenter.vue | 43 ++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue index 32dd4131..7bc3f473 100644 --- a/hwe/ts/PageBattleCenter.vue +++ b/hwe/ts/PageBattleCenter.vue @@ -3,7 +3,10 @@
-
+
+ ◀ 이전 +
+
-
+
+
+ 다음 ▶ +
@@ -67,7 +73,7 @@ declare const queryValues: { }; From 48f4dbec50fe352ba7b85071d1431d1509d828bf Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sun, 31 Jul 2022 22:34:33 +0900 Subject: [PATCH 15/15] =?UTF-8?q?misc:=20=EB=B6=80=EB=8C=80=ED=8E=B8?= =?UTF-8?q?=EC=84=B1=201000px=20=EB=B2=84=ED=8A=BC=EC=9D=98=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=EB=A5=BC=20=EB=AA=85=ED=99=95=ED=9E=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/PageTroop.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hwe/ts/PageTroop.vue b/hwe/ts/PageTroop.vue index 6f67f849..01ea1488 100644 --- a/hwe/ts/PageTroop.vue +++ b/hwe/ts/PageTroop.vue @@ -104,7 +104,7 @@
-
+
@@ -646,11 +646,20 @@ async function kickTroopMember(troop: TroopInfo) { .filler { grid-column: 1/2; grid-row: 3/4; + display: grid; + align-content: center; + justify-content: right; + + .dummy::after { + content: "└"; + padding-right: 1.5ch; + } } .troopAction { grid-column: 2/7; grid-row: 3/4; + border-left: transparent; .actionButtons { display: grid; grid-template-columns: 110px 110px 110px;