Merge branch 'dev' into storage_jp

2026-03-12 05:08:19 +08:00 · 2022-12-20 10:05:42 +08:00
parent 1be4cbd8a0 b358a84628
commit 941da49fc2
102 changed files with 474 additions and 261 deletions
--- a/assets/en/equipment/EQUIP_CONFIRM.BUTTON.png
+++ b/assets/en/equipment/EQUIP_CONFIRM.BUTTON.png
--- a/assets/en/equipment/EQUIP_CONFIRM.png
+++ b/assets/en/equipment/EQUIP_CONFIRM.png
--- a/assets/en/os/FLEET_1.png
+++ b/assets/en/os/FLEET_1.png
--- a/assets/en/os/FLEET_2.png
+++ b/assets/en/os/FLEET_2.png
--- a/assets/en/os/FLEET_3.png
+++ b/assets/en/os/FLEET_3.png
--- a/assets/en/os/FLEET_4.png
+++ b/assets/en/os/FLEET_4.png
--- a/assets/en/os_handler/AUTO_SEARCH_OS_MAP_OPTION_OFF.png
+++ b/assets/en/os_handler/AUTO_SEARCH_OS_MAP_OPTION_OFF.png
--- a/assets/en/os_handler/AUTO_SEARCH_OS_MAP_OPTION_ON.png
+++ b/assets/en/os_handler/AUTO_SEARCH_OS_MAP_OPTION_ON.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_DEVICE_CHECK.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_DEVICE_CHECK.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_DEVICE_CONTINUE.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_DEVICE_CONTINUE.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_DEVICE_STOP.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_DEVICE_STOP.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.BUTTON.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.BUTTON.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_MERCHANT_CONTINUE.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_MERCHANT_CONTINUE.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_MERCHANT_STOP.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_MERCHANT_STOP.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_POPUP_CHECK.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_POPUP_CHECK.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_SCROLL_AREA.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_SCROLL_AREA.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_SUBMIT_CHECK.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_SUBMIT_CHECK.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_SUBMIT_OFF.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_SUBMIT_OFF.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_SUBMIT_ON.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_SUBMIT_ON.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_TAB_SECURED.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_TAB_SECURED.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_ZONEMODE_RANDOM.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_ZONEMODE_RANDOM.png
--- a/assets/en/os_handler/STRATEGIC_SEARCH_ZONEMODE_REPEAT.png
+++ b/assets/en/os_handler/STRATEGIC_SEARCH_ZONEMODE_REPEAT.png
--- a/assets/gui/css/alas.css
+++ b/assets/gui/css/alas.css
@@ -312,6 +312,7 @@ pre.rich-traceback-code {
 }

 #pywebio-scope-group__info>p {
+    font-size: .80rem !important;
    font-weight: 400;
 }

--- a/assets/jp/os_handler/ACTION_POINT_REMAIN_OS.png
+++ b/assets/jp/os_handler/ACTION_POINT_REMAIN_OS.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_DEVICE_CHECK.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_DEVICE_CHECK.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_DEVICE_CONTINUE.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_DEVICE_CONTINUE.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_DEVICE_STOP.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_DEVICE_STOP.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_MERCHANT_CONTINUE.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_MERCHANT_CONTINUE.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_MERCHANT_STOP.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_MERCHANT_STOP.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_POPUP_CHECK.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_POPUP_CHECK.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_SCROLL_AREA.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_SCROLL_AREA.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_SUBMIT_CHECK.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_SUBMIT_CHECK.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_SUBMIT_OFF.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_SUBMIT_OFF.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_SUBMIT_ON.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_SUBMIT_ON.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_TAB_SECURED.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_TAB_SECURED.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_ZONEMODE_RANDOM.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_ZONEMODE_RANDOM.png
--- a/assets/jp/os_handler/STRATEGIC_SEARCH_ZONEMODE_REPEAT.png
+++ b/assets/jp/os_handler/STRATEGIC_SEARCH_ZONEMODE_REPEAT.png
--- a/assets/shop/voucher/LoggerUnlockT1.png
+++ b/assets/shop/voucher/LoggerUnlockT1.png
--- a/assets/shop/voucher/LoggerUnlockT2.png
+++ b/assets/shop/voucher/LoggerUnlockT2.png
--- a/assets/tw/freebies/MAIL_COLLECT.png
+++ b/assets/tw/freebies/MAIL_COLLECT.png
--- a/assets/tw/freebies/MAIL_COLLECTED.png
+++ b/assets/tw/freebies/MAIL_COLLECTED.png
--- a/assets/tw/freebies/MAIL_DELETE.png
+++ b/assets/tw/freebies/MAIL_DELETE.png
--- a/assets/tw/os_handler/EXCHANGE_CHECK.png
+++ b/assets/tw/os_handler/EXCHANGE_CHECK.png
--- a/assets/tw/os_handler/EXCHANGE_ENTER.png
+++ b/assets/tw/os_handler/EXCHANGE_ENTER.png
--- a/assets/tw/os_handler/STRATEGIC_SEARCH_DEVICE_CHECK.png
+++ b/assets/tw/os_handler/STRATEGIC_SEARCH_DEVICE_CHECK.png
--- a/assets/tw/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.png
+++ b/assets/tw/os_handler/STRATEGIC_SEARCH_MAP_OPTION_OFF.png
--- a/assets/tw/os_handler/STRATEGIC_SEARCH_POPUP_CHECK.png
+++ b/assets/tw/os_handler/STRATEGIC_SEARCH_POPUP_CHECK.png
--- a/assets/tw/os_handler/STRATEGIC_SEARCH_SUBMIT_CHECK.png
+++ b/assets/tw/os_handler/STRATEGIC_SEARCH_SUBMIT_CHECK.png
--- a/assets/tw/os_handler/STRATEGIC_SEARCH_TAB_SECURED.png
+++ b/assets/tw/os_handler/STRATEGIC_SEARCH_TAB_SECURED.png