Merge branch 'master' into feature

# Conflicts: # module/config/config.py # module/device/device.py # submodule/AlasFpyBridge/module/config/config.py
2025-01-09 09:57:43 +08:00 · 2024-01-07 03:58:31 +08:00 · 2024-01-07 03:58:31 +08:00 · 0c7115c5fc
commit 0c7115c5fc
parent 81326fa4cf 944190c46e
482 changed files with 4283 additions and 439 deletions
--- a/README.md
+++ b/README.md
@ -173,7 +173,8 @@ Alas 仍在活跃开发中，我们会不定期发布未来的工作在 [Issues]
 ## 联系我们 Contact Us

 - Discord: [https://discord.gg/AQN6GeJ](https://discord.gg/AQN6GeJ)
- QQ 四群：[851150687](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=GlV_kVLn8JU573fIfhbFHUezm3QUtQ9L&authKey=xff5ZAfrxMKpZ67Bqx2ljd%2BAYT18ic7a21MnizNfqOQrkQAAPxS0uIRZE6LbePUG&noverify=0&group_code=851150687)
+- QQ 五群：[332650153](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=suoTcYXMLukd982ZRMkU4mWa0BCZgzmq&authKey=9d7e%2F2%2FZvjIAI0nNi6gQfeibmtWuaeICGBN2VmTgLTodNLtDd5kpKui678Vv9rrz&noverify=0&group_code=332650153)
+- QQ 四群（已满）：[851150687](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=GlV_kVLn8JU573fIfhbFHUezm3QUtQ9L&authKey=xff5ZAfrxMKpZ67Bqx2ljd%2BAYT18ic7a21MnizNfqOQrkQAAPxS0uIRZE6LbePUG&noverify=0&group_code=851150687)
 - QQ 三群（已满）：[576458886](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Q611gtXy-y0ttnfHOQNegXjerUI2tWIy&authKey=VjW7e8fxtXTN0twcU6%2FZabZ03gKy%2FuhZETQlFDaswupHRDzVO33lsqZloKG8IfR6&noverify=0&group_code=834210833)
 - QQ 二群（已满）：[576458886](https://jq.qq.com/?_wv=1027&k=FUIOAAOm)
 - QQ 一群：[1087735381](https://jq.qq.com/?_wv=1027&k=I4NSqX7g) （有开发意向请加一群，入群需要提供你的Github用户名）
--- a/assets/cn/dorm/DORM_FEED_CHECK.png
+++ b/assets/cn/dorm/DORM_FEED_CHECK.png
--- a/assets/cn/dorm/DORM_FEED_ENTER.png
+++ b/assets/cn/dorm/DORM_FEED_ENTER.png
--- a/assets/cn/dorm/DORM_FURNITURE_BUY_ALL.png
+++ b/assets/cn/dorm/DORM_FURNITURE_BUY_ALL.png
--- a/assets/cn/dorm/DORM_FURNITURE_BUY_CONFIRM.png
+++ b/assets/cn/dorm/DORM_FURNITURE_BUY_CONFIRM.png
--- a/assets/cn/dorm/DORM_FURNITURE_BUY_SET.png
+++ b/assets/cn/dorm/DORM_FURNITURE_BUY_SET.png
--- a/assets/cn/dorm/DORM_FURNITURE_COUNTDOWN.png
+++ b/assets/cn/dorm/DORM_FURNITURE_COUNTDOWN.png
--- a/assets/cn/dorm/DORM_FURNITURE_DETAILS_ENTER.png
+++ b/assets/cn/dorm/DORM_FURNITURE_DETAILS_ENTER.png
--- a/assets/cn/dorm/DORM_FURNITURE_DETAILS_QUIT.png
+++ b/assets/cn/dorm/DORM_FURNITURE_DETAILS_QUIT.png
--- a/assets/cn/dorm/DORM_FURNITURE_SHOP_ENTER.png
+++ b/assets/cn/dorm/DORM_FURNITURE_SHOP_ENTER.png
--- a/assets/cn/dorm/DORM_FURNITURE_SHOP_FIRST.png
+++ b/assets/cn/dorm/DORM_FURNITURE_SHOP_FIRST.png
--- a/assets/cn/dorm/DORM_FURNITURE_SHOP_FIRST_SELECTED.png
+++ b/assets/cn/dorm/DORM_FURNITURE_SHOP_FIRST_SELECTED.png
--- a/assets/cn/dorm/DORM_FURNITURE_SHOP_QUIT.png
+++ b/assets/cn/dorm/DORM_FURNITURE_SHOP_QUIT.png
--- a/assets/cn/map/HARD_MODE_DETECTION.png
+++ b/assets/cn/map/HARD_MODE_DETECTION.png
--- a/assets/cn/dorm/OCR_DORM_FILL.png
+++ b/assets/cn/dorm/OCR_DORM_FILL.png
--- a/assets/cn/dorm/OCR_DORM_FURNITURE_COIN.png
+++ b/assets/cn/dorm/OCR_DORM_FURNITURE_COIN.png
--- a/assets/cn/dorm/OCR_DORM_FURNITURE_PRICE.png
+++ b/assets/cn/dorm/OCR_DORM_FURNITURE_PRICE.png
--- a/assets/cn/dorm/OCR_DORM_SLOT.png
+++ b/assets/cn/dorm/OCR_DORM_SLOT.png
--- a/assets/cn/handler/AUTO_SEARCH_SET_ALL.png
+++ b/assets/cn/handler/AUTO_SEARCH_SET_ALL.png
--- a/assets/cn/handler/AUTO_SEARCH_SET_BOSS.png
+++ b/assets/cn/handler/AUTO_SEARCH_SET_BOSS.png
--- a/assets/cn/handler/AUTO_SEARCH_SET_MOB.png
+++ b/assets/cn/handler/AUTO_SEARCH_SET_MOB.png
--- a/assets/cn/handler/AUTO_SEARCH_SET_STANDBY.png
+++ b/assets/cn/handler/AUTO_SEARCH_SET_STANDBY.png
--- a/assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO.png
+++ b/assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO.png
--- a/assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY.png
+++ b/assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY.png
--- a/assets/cn/handler/STRATEGY_OPENED.BUTTON.png
+++ b/assets/cn/handler/STRATEGY_OPENED.BUTTON.png
--- a/assets/cn/map/FLEET_1_ADVICE.png
+++ b/assets/cn/map/FLEET_1_ADVICE.png
--- a/assets/cn/map/FLEET_1_BAR.png
+++ b/assets/cn/map/FLEET_1_BAR.png
--- a/assets/cn/map/FLEET_1_CHOOSE.png
+++ b/assets/cn/map/FLEET_1_CHOOSE.png
--- a/assets/cn/map/FLEET_1_CLEAR.png
+++ b/assets/cn/map/FLEET_1_CLEAR.png
--- a/assets/cn/map/FLEET_1_HARD_SATIESFIED.png
+++ b/assets/cn/map/FLEET_1_HARD_SATIESFIED.png
--- a/assets/cn/map/FLEET_1_IN_USE.png
+++ b/assets/cn/map/FLEET_1_IN_USE.png
--- a/assets/cn/map/FLEET_2_ADVICE.png
+++ b/assets/cn/map/FLEET_2_ADVICE.png
--- a/assets/cn/map/FLEET_2_BAR.png
+++ b/assets/cn/map/FLEET_2_BAR.png
--- a/assets/cn/map/FLEET_2_CHOOSE.png
+++ b/assets/cn/map/FLEET_2_CHOOSE.png
--- a/assets/cn/map/FLEET_2_CLEAR.png
+++ b/assets/cn/map/FLEET_2_CLEAR.png
--- a/assets/cn/map/FLEET_2_HARD_SATIESFIED.png
+++ b/assets/cn/map/FLEET_2_HARD_SATIESFIED.png
--- a/assets/cn/map/FLEET_2_IN_USE.png
+++ b/assets/cn/map/FLEET_2_IN_USE.png
--- a/assets/cn/map/FLEET_PREPARATION.BUTTON.png
+++ b/assets/cn/map/FLEET_PREPARATION.BUTTON.png
--- a/assets/cn/map/FLEET_PREPARATION.png
+++ b/assets/cn/map/FLEET_PREPARATION.png
--- a/assets/cn/map/FLEET_PREPARATION_CHECK.png
+++ b/assets/cn/map/FLEET_PREPARATION_CHECK.png
--- a/assets/cn/map/SUBMARINE_ADVICE.png
+++ b/assets/cn/map/SUBMARINE_ADVICE.png
--- a/assets/cn/map/SUBMARINE_BAR.png
+++ b/assets/cn/map/SUBMARINE_BAR.png
--- a/assets/cn/map/SUBMARINE_CHOOSE.png
+++ b/assets/cn/map/SUBMARINE_CHOOSE.png
--- a/assets/cn/map/SUBMARINE_CLEAR.png
+++ b/assets/cn/map/SUBMARINE_CLEAR.png
--- a/assets/cn/map/SUBMARINE_HARD_SATIESFIED.png
+++ b/assets/cn/map/SUBMARINE_HARD_SATIESFIED.png
--- a/assets/cn/map/SUBMARINE_IN_USE.png
+++ b/assets/cn/map/SUBMARINE_IN_USE.png
--- a/assets/cn/meowfficer/MEOWFFICER_BUY_ENTER.png
+++ b/assets/cn/meowfficer/MEOWFFICER_BUY_ENTER.png
--- a/assets/cn/meowfficer/MEOWFFICER_BUY_SKIP.png
+++ b/assets/cn/meowfficer/MEOWFFICER_BUY_SKIP.png
--- a/assets/cn/meowfficer/MEOWFFICER_ENHANCE_CONFIRM.png
+++ b/assets/cn/meowfficer/MEOWFFICER_ENHANCE_CONFIRM.png
--- a/assets/cn/meowfficer/MEOWFFICER_FEED_CANCEL.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FEED_CANCEL.png
--- a/assets/cn/meowfficer/MEOWFFICER_FEED_CONFIRM.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FEED_CONFIRM.png
--- a/assets/cn/meowfficer/MEOWFFICER_FEED_ENTER.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FEED_ENTER.png
--- a/assets/cn/meowfficer/MEOWFFICER_FORT_CHECK.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FORT_CHECK.png
--- a/assets/cn/meowfficer/MEOWFFICER_FORT_CHORE.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FORT_CHORE.png
--- a/assets/cn/meowfficer/MEOWFFICER_FORT_ENTER.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FORT_ENTER.png
--- a/assets/cn/meowfficer/MEOWFFICER_FORT_RED_DOT.png
+++ b/assets/cn/meowfficer/MEOWFFICER_FORT_RED_DOT.png
--- a/assets/cn/meowfficer/MEOWFFICER_GOLD_CHECK.png
+++ b/assets/cn/meowfficer/MEOWFFICER_GOLD_CHECK.png
--- a/assets/cn/meowfficer/MEOWFFICER_TRAIN_COMPLETE.png
+++ b/assets/cn/meowfficer/MEOWFFICER_TRAIN_COMPLETE.png
--- a/assets/cn/meowfficer/MEOWFFICER_TRAIN_ENTER.png
+++ b/assets/cn/meowfficer/MEOWFFICER_TRAIN_ENTER.png
--- a/assets/cn/meowfficer/MEOWFFICER_TRAIN_EVALUATE.png
+++ b/assets/cn/meowfficer/MEOWFFICER_TRAIN_EVALUATE.png
--- a/assets/cn/meowfficer/OCR_MEOWFFICER.png
+++ b/assets/cn/meowfficer/OCR_MEOWFFICER.png
--- a/assets/cn/meowfficer/OCR_MEOWFFICER_CAPACITY.png
+++ b/assets/cn/meowfficer/OCR_MEOWFFICER_CAPACITY.png
--- a/assets/cn/meowfficer/OCR_MEOWFFICER_FEED.png
+++ b/assets/cn/meowfficer/OCR_MEOWFFICER_FEED.png
--- a/assets/cn/template/TEMPLATE_SIREN_SK_BB.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_SK_BB.gif
--- a/assets/cn/template/TEMPLATE_SIREN_SK_CA.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_SK_CA.gif
--- a/assets/cn/template/TEMPLATE_SIREN_SK_CL.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_SK_CL.gif
--- a/assets/cn/template/TEMPLATE_SIREN_SK_CV.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_SK_CV.gif
--- a/assets/cn/template/TEMPLATE_SIREN_SK_DD.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_SK_DD.gif
--- a/assets/cn/template/TEMPLATE_SIREN_Sirenboss10.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_Sirenboss10.gif
--- a/assets/cn/template/TEMPLATE_SIREN_UDFFortress2.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_UDFFortress2.gif
--- a/assets/cn/ui/DORM_CHECK.png
+++ b/assets/cn/ui/DORM_CHECK.png
--- a/assets/cn/ui/DORM_GOTO_MAIN.png
+++ b/assets/cn/ui/DORM_GOTO_MAIN.png
--- a/assets/en/dorm/DORM_FEED_CHECK.png
+++ b/assets/en/dorm/DORM_FEED_CHECK.png
--- a/assets/en/dorm/DORM_FEED_ENTER.png
+++ b/assets/en/dorm/DORM_FEED_ENTER.png
--- a/assets/en/dorm/DORM_FURNITURE_BUY_ALL.png
+++ b/assets/en/dorm/DORM_FURNITURE_BUY_ALL.png
--- a/assets/en/dorm/DORM_FURNITURE_BUY_CONFIRM.png
+++ b/assets/en/dorm/DORM_FURNITURE_BUY_CONFIRM.png
--- a/assets/en/dorm/DORM_FURNITURE_BUY_SET.png
+++ b/assets/en/dorm/DORM_FURNITURE_BUY_SET.png
--- a/assets/en/dorm/DORM_FURNITURE_COUNTDOWN.png
+++ b/assets/en/dorm/DORM_FURNITURE_COUNTDOWN.png
--- a/assets/en/dorm/DORM_FURNITURE_DETAILS_ENTER.png
+++ b/assets/en/dorm/DORM_FURNITURE_DETAILS_ENTER.png
--- a/assets/en/dorm/DORM_FURNITURE_DETAILS_QUIT.png
+++ b/assets/en/dorm/DORM_FURNITURE_DETAILS_QUIT.png
--- a/assets/en/dorm/DORM_FURNITURE_SHOP_ENTER.png
+++ b/assets/en/dorm/DORM_FURNITURE_SHOP_ENTER.png
--- a/assets/en/dorm/DORM_FURNITURE_SHOP_FIRST.png
+++ b/assets/en/dorm/DORM_FURNITURE_SHOP_FIRST.png
--- a/assets/en/dorm/DORM_FURNITURE_SHOP_FIRST_SELECTED.png
+++ b/assets/en/dorm/DORM_FURNITURE_SHOP_FIRST_SELECTED.png
--- a/assets/en/dorm/DORM_FURNITURE_SHOP_QUIT.png
+++ b/assets/en/dorm/DORM_FURNITURE_SHOP_QUIT.png
--- a/assets/jp/map/HARD_MODE_DETECTION.png
+++ b/assets/jp/map/HARD_MODE_DETECTION.png
--- a/assets/en/dorm/OCR_DORM_FILL.png
+++ b/assets/en/dorm/OCR_DORM_FILL.png
--- a/assets/en/dorm/OCR_DORM_FURNITURE_COIN.png
+++ b/assets/en/dorm/OCR_DORM_FURNITURE_COIN.png
--- a/assets/en/dorm/OCR_DORM_FURNITURE_PRICE.png
+++ b/assets/en/dorm/OCR_DORM_FURNITURE_PRICE.png
--- a/assets/en/dorm/OCR_DORM_SLOT.png
+++ b/assets/en/dorm/OCR_DORM_SLOT.png
--- a/assets/en/equipment/EQUIPMENT_OPEN.png
+++ b/assets/en/equipment/EQUIPMENT_OPEN.png
--- a/assets/en/handler/AUTO_SEARCH_SET_ALL.png
+++ b/assets/en/handler/AUTO_SEARCH_SET_ALL.png
--- a/assets/en/handler/AUTO_SEARCH_SET_BOSS.png
+++ b/assets/en/handler/AUTO_SEARCH_SET_BOSS.png
--- a/assets/en/handler/AUTO_SEARCH_SET_MOB.png
+++ b/assets/en/handler/AUTO_SEARCH_SET_MOB.png
--- a/assets/en/handler/AUTO_SEARCH_SET_STANDBY.png
+++ b/assets/en/handler/AUTO_SEARCH_SET_STANDBY.png
--- a/assets/en/handler/AUTO_SEARCH_SET_SUB_AUTO.png
+++ b/assets/en/handler/AUTO_SEARCH_SET_SUB_AUTO.png
--- a/assets/en/handler/AUTO_SEARCH_SET_SUB_STANDBY.png
+++ b/assets/en/handler/AUTO_SEARCH_SET_SUB_STANDBY.png
--- a/assets/en/handler/STRATEGY_OPENED.BUTTON.png
+++ b/assets/en/handler/STRATEGY_OPENED.BUTTON.png
--- a/assets/en/map/FLEET_1_ADVICE.png
+++ b/assets/en/map/FLEET_1_ADVICE.png
--- a/assets/en/map/FLEET_1_BAR.png
+++ b/assets/en/map/FLEET_1_BAR.png
--- a/assets/en/map/FLEET_1_CHOOSE.png
+++ b/assets/en/map/FLEET_1_CHOOSE.png
--- a/Show More
+++ b/Show More