From f9602be1bacf44452856f4ede40864966d19f2d1 Mon Sep 17 00:00:00 2001
From: happyhappyhappy-arch
 <39981845+happyhappyhappy-arch@users.noreply.github.com>
Date: Thu, 5 Jun 2025 15:36:17 +0800
Subject: [PATCH 1/5] Add ssl support (#4840)

* Add: add ssl authentication

* Fix: unify the format for ssl config

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
---
 config/deploy.template-AidLux-cn.yaml |  8 ++++++++
 config/deploy.template-AidLux.yaml    |  8 ++++++++
 config/deploy.template-cn.yaml        |  8 ++++++++
 config/deploy.template-docker-cn.yaml |  8 ++++++++
 config/deploy.template-docker.yaml    |  8 ++++++++
 config/deploy.template-linux-cn.yaml  |  8 ++++++++
 config/deploy.template-linux.yaml     |  8 ++++++++
 config/deploy.template.yaml           |  8 ++++++++
 deploy/config.py                      |  2 ++
 gui.py                                | 20 +++++++++++++++++++-
 10 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/config/deploy.template-AidLux-cn.yaml b/config/deploy.template-AidLux-cn.yaml
index 5e400d27a..50e6bd7c3 100644
--- a/config/deploy.template-AidLux-cn.yaml
+++ b/config/deploy.template-AidLux-cn.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template-AidLux.yaml b/config/deploy.template-AidLux.yaml
index 0b515705f..cb2c1bde3 100644
--- a/config/deploy.template-AidLux.yaml
+++ b/config/deploy.template-AidLux.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template-cn.yaml b/config/deploy.template-cn.yaml
index 9c031ecbd..4e75328ba 100644
--- a/config/deploy.template-cn.yaml
+++ b/config/deploy.template-cn.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template-docker-cn.yaml b/config/deploy.template-docker-cn.yaml
index 302c2a19e..dde3fb12c 100644
--- a/config/deploy.template-docker-cn.yaml
+++ b/config/deploy.template-docker-cn.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template-docker.yaml b/config/deploy.template-docker.yaml
index 7d8288ed2..8b5990d96 100644
--- a/config/deploy.template-docker.yaml
+++ b/config/deploy.template-docker.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template-linux-cn.yaml b/config/deploy.template-linux-cn.yaml
index eb32dee35..285a00dba 100644
--- a/config/deploy.template-linux-cn.yaml
+++ b/config/deploy.template-linux-cn.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template-linux.yaml b/config/deploy.template-linux.yaml
index c1656b478..ed0729146 100644
--- a/config/deploy.template-linux.yaml
+++ b/config/deploy.template-linux.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/config/deploy.template.yaml b/config/deploy.template.yaml
index 22d0e938a..8b725e90f 100644
--- a/config/deploy.template.yaml
+++ b/config/deploy.template.yaml
@@ -157,3 +157,11 @@ Deploy:
     # '["alas"]' specified "alas" config
     # '["alas","alas2"]' specified "alas" "alas2" configs
     Run: null
+    # SSL support
+    # Only effective when both parameters below are set
+    # --ssl-key. Path to SSL key file
+    # [Default] null (no SSL)
+    WebuiSSLKey: null
+    # --ssl-cert. Path to SSL cert file
+    # [Default] null (no SSL)
+    WebuiSSLCert: null
diff --git a/deploy/config.py b/deploy/config.py
index 03bf4c1b5..e63128169 100644
--- a/deploy/config.py
+++ b/deploy/config.py
@@ -54,6 +54,8 @@ class ConfigModel:
     # Webui
     WebuiHost: str = "0.0.0.0"
     WebuiPort: int = 22267
+    WebuiSSLKey: Optional[str] = None
+    WebuiSSLCert: Optional[str] = None
     Language: str = "en-US"
     Theme: str = "default"
     DpiScaling: bool = True
diff --git a/gui.py b/gui.py
index 97b5f3cf4..ffed55044 100644
--- a/gui.py
+++ b/gui.py
@@ -40,6 +40,12 @@ def func(ev: threading.Event):
     parser.add_argument(
         "--electron", action="store_true", help="Runs by electron client."
     )
+    parser.add_argument(
+        "--ssl-key", dest="ssl_key", type=str, help="SSL key file path for HTTPS support"
+    )
+    parser.add_argument(
+        "--ssl-cert", type=str, help="SSL certificate file path for HTTPS support"
+    )
     parser.add_argument(
         "--run",
         nargs="+",
@@ -50,11 +56,15 @@ def func(ev: threading.Event):
 
     host = args.host or State.deploy_config.WebuiHost or "0.0.0.0"
     port = args.port or int(State.deploy_config.WebuiPort) or 22267
+    ssl_key = args.ssl_key or State.deploy_config.WebuiSSLKey
+    ssl_cert = args.ssl_cert or State.deploy_config.WebuiSSLCert
+    ssl = ssl_key is not None and ssl_cert is not None
     State.electron = args.electron
 
     logger.hr("Launcher config")
     logger.attr("Host", host)
     logger.attr("Port", port)
+    logger.attr("SSL", ssl)
     logger.attr("Electron", args.electron)
     logger.attr("Reload", ev is not None)
 
@@ -64,7 +74,15 @@ def func(ev: threading.Event):
         from module.logger import console_hdlr
         logger.removeHandler(console_hdlr)
 
-    uvicorn.run("module.webui.app:app", host=host, port=port, factory=True)
+    if ssl_cert is None and ssl_key is not None:
+        logger.error("SSL key provided without certificate. Please provide both SSL key and certificate.")
+    elif ssl_key is None and ssl_cert is not None:
+        logger.error("SSL certificate provided without key. Please provide both SSL key and certificate.")
+
+    if ssl:
+        uvicorn.run("module.webui.app:app", host=host, port=port, factory=True, ssl_keyfile=ssl_key, ssl_certfile=ssl_cert)
+    else:
+        uvicorn.run("module.webui.app:app", host=host, port=port, factory=True)
 
 
 if __name__ == "__main__":

From d7d729e198bb3e4dcdfc9791d0e547a872b6085e Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:20:45 +0800
Subject: [PATCH 2/5] Fix: handle empty rows from "ldconsole.exe list2" (#4846)

---
 module/device/method/ldopengl.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/module/device/method/ldopengl.py b/module/device/method/ldopengl.py
index a7a71bd2a..81f2a4a25 100644
--- a/module/device/method/ldopengl.py
+++ b/module/device/method/ldopengl.py
@@ -2,7 +2,6 @@ import ctypes
 import os
 import subprocess
 import time
-import typing as t
 from dataclasses import dataclass
 from functools import wraps
 
@@ -102,17 +101,31 @@ class LDConsole:
             logger.warning(f'TimeoutExpired when calling {cmd}, stdout={stdout}, stderr={stderr}')
         return stdout
 
-    def list2(self) -> t.List[DataLDPlayerInfo]:
+    def list2(self):
         """
         > ldconsole.exe list2
         0,雷电模拟器,28053900,42935798,1,59776,36816,1280,720,240
         1,雷电模拟器-1,0,0,0,-1,-1,1280,720,240
+
+        Returns:
+            list[DataLDPlayerInfo]:
         """
         out = []
         data = self.subprocess_run(['list2'])
         for row in data.strip().split(b'\n'):
-            info = row.strip().split(b',')
-            info = DataLDPlayerInfo(*info)
+            row = row.strip()
+            if not row:
+                continue
+            info = row.split(b',')
+            # check parts
+            if len(info) != 10:
+                logger.warning(f'ldplayer info does not have 10 parts: "{row}"')
+                continue
+            # build info
+            try:
+                info = DataLDPlayerInfo(*info)
+            except Exception as e:
+                logger.warning(f'Failed to build ldplayer info from "{row}", {e}')
             out.append(info)
         return out
 

From 2247d72bf74ab731342c578b03d38d1f4d6d327e Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Fri, 6 Jun 2025 01:18:31 +0800
Subject: [PATCH 3/5] ix: Handle TACTICAL_CHECK without black-blurred
 background (#4861)

---
 module/tactical/tactical_class.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/tactical/tactical_class.py b/module/tactical/tactical_class.py
index 84b60ab54..062db8988 100644
--- a/module/tactical/tactical_class.py
+++ b/module/tactical/tactical_class.py
@@ -434,7 +434,10 @@ class RewardTacticalClass(Dock):
                 continue
 
             # Get finish time
-            if self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
+            # sometimes you have TACTICAL_CHECK without black-blurred background
+            # TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears
+            if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \
+                    and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
                 self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 if book_empty:
                     self.device.click(BACK_ARROW)

From 938d98a2430e70a5b05318609c06eb0df30a3e62 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Fri, 6 Jun 2025 01:39:18 +0800
Subject: [PATCH 4/5] Fix: handle insufficient fund in guild operation

---
 .../cn/guild/GUILD_OPERATION_FUND_CHECK.png   | Bin 0 -> 8275 bytes
 module/guild/assets.py                        |   1 +
 module/guild/operations.py                    |  35 +++++++++++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png

diff --git a/assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png b/assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c5b0bad50e6e4b2b4f517e706feb8930d889bdb
GIT binary patch
literal 8275
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

literal 0
HcmV?d00001

diff --git a/module/guild/assets.py b/module/guild/assets.py
index 14c304dd2..4133f4e5d 100644
--- a/module/guild/assets.py
+++ b/module/guild/assets.py
@@ -27,6 +27,7 @@ GUILD_OPERATIONS_JOIN = Button(area={'cn': (939, 539, 1121, 579), 'en': (968, 54
 GUILD_OPERATIONS_MONTHLY_COUNT = Button(area={'cn': (1237, 500, 1278, 522), 'en': (1237, 500, 1278, 522), 'jp': (1237, 500, 1278, 522), 'tw': (1237, 500, 1278, 522)}, color={'cn': (74, 63, 77), 'en': (74, 63, 77), 'jp': (74, 63, 77), 'tw': (74, 63, 77)}, button={'cn': (1237, 500, 1278, 522), 'en': (1237, 500, 1278, 522), 'jp': (1237, 500, 1278, 522), 'tw': (1237, 500, 1278, 522)}, file={'cn': './assets/cn/guild/GUILD_OPERATIONS_MONTHLY_COUNT.png', 'en': './assets/en/guild/GUILD_OPERATIONS_MONTHLY_COUNT.png', 'jp': './assets/jp/guild/GUILD_OPERATIONS_MONTHLY_COUNT.png', 'tw': './assets/tw/guild/GUILD_OPERATIONS_MONTHLY_COUNT.png'})
 GUILD_OPERATIONS_NEW = Button(area={'cn': (960, 542, 1036, 576), 'en': (961, 547, 1062, 572), 'jp': (1049, 544, 1116, 573), 'tw': (960, 542, 1036, 576)}, color={'cn': (107, 117, 214), 'en': (102, 112, 202), 'jp': (106, 116, 212), 'tw': (107, 117, 214)}, button={'cn': (960, 542, 1036, 576), 'en': (961, 547, 1062, 572), 'jp': (1049, 544, 1116, 573), 'tw': (960, 542, 1036, 576)}, file={'cn': './assets/cn/guild/GUILD_OPERATIONS_NEW.png', 'en': './assets/en/guild/GUILD_OPERATIONS_NEW.png', 'jp': './assets/jp/guild/GUILD_OPERATIONS_NEW.png', 'tw': './assets/cn/guild/GUILD_OPERATIONS_NEW.png'})
 GUILD_OPERATIONS_SOLOMON = Button(area={'cn': (1125, 156, 1248, 181), 'en': (1118, 153, 1239, 170), 'jp': (1155, 151, 1259, 179), 'tw': (1125, 156, 1248, 181)}, color={'cn': (101, 102, 107), 'en': (107, 108, 112), 'jp': (87, 90, 95), 'tw': (101, 102, 107)}, button={'cn': (1125, 153, 1280, 535), 'en': (1116, 124, 1266, 554), 'jp': (1124, 152, 1280, 515), 'tw': (1125, 153, 1280, 535)}, file={'cn': './assets/cn/guild/GUILD_OPERATIONS_SOLOMON.png', 'en': './assets/en/guild/GUILD_OPERATIONS_SOLOMON.png', 'jp': './assets/jp/guild/GUILD_OPERATIONS_SOLOMON.png', 'tw': './assets/cn/guild/GUILD_OPERATIONS_SOLOMON.png'})
+GUILD_OPERATION_FUND_CHECK = Button(area={'cn': (1064, 481, 1265, 521), 'en': (1064, 481, 1265, 521), 'jp': (1064, 481, 1265, 521), 'tw': (1064, 481, 1265, 521)}, color={'cn': (64, 59, 75), 'en': (64, 59, 75), 'jp': (64, 59, 75), 'tw': (64, 59, 75)}, button={'cn': (1064, 481, 1265, 521), 'en': (1064, 481, 1265, 521), 'jp': (1064, 481, 1265, 521), 'tw': (1064, 481, 1265, 521)}, file={'cn': './assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png', 'en': './assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png', 'jp': './assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png', 'tw': './assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png'})
 GUILD_RED_DOT = Button(area={'cn': (1250, 665, 1273, 688), 'en': (1250, 665, 1273, 688), 'jp': (1253, 666, 1270, 684), 'tw': (1250, 665, 1273, 688)}, color={'cn': (134, 86, 88), 'en': (134, 86, 88), 'jp': (174, 103, 100), 'tw': (134, 86, 88)}, button={'cn': (1250, 665, 1273, 688), 'en': (1250, 665, 1273, 688), 'jp': (1253, 666, 1270, 684), 'tw': (1250, 665, 1273, 688)}, file={'cn': './assets/cn/guild/GUILD_RED_DOT.png', 'en': './assets/en/guild/GUILD_RED_DOT.png', 'jp': './assets/jp/guild/GUILD_RED_DOT.png', 'tw': './assets/tw/guild/GUILD_RED_DOT.png'})
 GUILD_REPORT_AVAILABLE = Button(area={'cn': (117, 607, 435, 713), 'en': (117, 607, 435, 713), 'jp': (117, 607, 435, 713), 'tw': (117, 607, 435, 713)}, color={'cn': (75, 66, 72), 'en': (75, 66, 72), 'jp': (75, 66, 72), 'tw': (75, 66, 72)}, button={'cn': (117, 607, 435, 713), 'en': (117, 607, 435, 713), 'jp': (117, 607, 435, 713), 'tw': (117, 607, 435, 713)}, file={'cn': './assets/cn/guild/GUILD_REPORT_AVAILABLE.png', 'en': './assets/en/guild/GUILD_REPORT_AVAILABLE.png', 'jp': './assets/jp/guild/GUILD_REPORT_AVAILABLE.png', 'tw': './assets/tw/guild/GUILD_REPORT_AVAILABLE.png'})
 GUILD_REPORT_CLAIM = Button(area={'cn': (739, 595, 1078, 637), 'en': (850, 601, 966, 631), 'jp': (739, 596, 1078, 637), 'tw': (850, 601, 966, 631)}, color={'cn': (85, 118, 217), 'en': (123, 148, 225), 'jp': (82, 115, 208), 'tw': (123, 148, 225)}, button={'cn': (739, 595, 1078, 637), 'en': (850, 601, 966, 631), 'jp': (739, 596, 1078, 637), 'tw': (850, 601, 966, 631)}, file={'cn': './assets/cn/guild/GUILD_REPORT_CLAIM.png', 'en': './assets/en/guild/GUILD_REPORT_CLAIM.png', 'jp': './assets/jp/guild/GUILD_REPORT_CLAIM.png', 'tw': './assets/tw/guild/GUILD_REPORT_CLAIM.png'})
diff --git a/module/guild/operations.py b/module/guild/operations.py
index b5ab5043e..250c57534 100644
--- a/module/guild/operations.py
+++ b/module/guild/operations.py
@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from module.base.button import ButtonGrid
 from module.base.timer import Timer
 from module.base.utils import *
@@ -19,6 +17,10 @@ class GuildOperations(GuildBase):
         """
         Ensure guild operation is loaded
         After entering guild operation, background loaded first, then dispatch/boss
+
+        Returns:
+            bool: True if success to enter operation
+                False if fund insufficient
         """
         logger.attr('Guild master/official', self.config.GuildOperation_SelectNewOperation)
         confirm_timer = Timer(1.5, count=3).start()
@@ -39,6 +41,8 @@ class GuildOperations(GuildBase):
                     'probably because guild operation has been started by another guild officer already')
                 raise GameBugError('Unable to start/join guild operation')
 
+            if self._guild_operation_fund_insufficient():
+                return False
             if self._handle_guild_operations_start():
                 confirm_timer.reset()
                 continue
@@ -73,7 +77,7 @@ class GuildOperations(GuildBase):
             # End
             if self.appear(GUILD_BOSS_ENTER) or self.appear(GUILD_OPERATIONS_ACTIVE_CHECK, offset=(20, 20)):
                 if not self.info_bar_count() and confirm_timer.reached():
-                    break
+                    return True
 
     def _handle_guild_operations_start(self):
         """
@@ -111,6 +115,21 @@ class GuildOperations(GuildBase):
 
         return False
 
+    def _guild_operation_fund_insufficient(self):
+        """
+        Returns:
+            bool: True if insufficient
+
+        Pages:
+            in: GUILD_OPERATIONS_NEW
+        """
+        if not self.appear(GUILD_OPERATIONS_NEW, offset=(20, 20)):
+            return False
+        if self.image_color_count(GUILD_OPERATION_FUND_CHECK, color=(255, 93, 91), threshold=180, count=30):
+            logger.warning('Insufficient guild fund to start new operation')
+            return True
+        return False
+
     def _guild_operations_get_mode(self):
         """
         Returns:
@@ -133,7 +152,10 @@ class GuildOperations(GuildBase):
             logger.info('Mode: Operations Active, may proceed to scan and dispatch fleets')
             return 1
         elif self.appear(GUILD_BOSS_ENTER):
-            logger.info('Mode: Guild Raid Boss')
+            logger.info('Mode: Guild Raid Boss (GUILD_BOSS_ENTER)')
+            return 2
+        elif self.appear(GUILD_OPERATIONS_NEW, offset=(20, 20)):
+            logger.info('Mode: Guild Raid Boss (GUILD_OPERATIONS_NEW)')
             return 2
         else:
             logger.warning('Operations interface is unrecognized')
@@ -517,7 +539,10 @@ class GuildOperations(GuildBase):
     def guild_operations(self):
         logger.hr('Guild operations', level=1)
         self.guild_side_navbar_ensure(bottom=1)
-        self._guild_operations_ensure()
+        entered = self._guild_operations_ensure()
+        if not entered:
+            logger.info(f'Guild operation run success: {entered}')
+            return False
         # Determine the mode of operations, currently 3 are available
         operations_mode = self._guild_operations_get_mode()
 

From 3b65dfe6f0130bf350aa528ee987caf2a3503802 Mon Sep 17 00:00:00 2001
From: guoh064 <50830808+guoh064@users.noreply.github.com>
Date: Sun, 1 Jun 2025 18:34:20 +0900
Subject: [PATCH 5/5] Add: check manjuu loading in os_mission_overview_accept

---
 assets/cn/handler/MANJUU_AREA.png     | Bin 0 -> 2997 bytes
 assets/cn/handler/TEMPLATE_MANJUU.png | Bin 0 -> 600 bytes
 module/handler/assets.py              |   2 ++
 module/handler/info_handler.py        |  39 ++++++++++++++++++++++++++
 module/os_handler/mission.py          |   6 +++-
 5 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 assets/cn/handler/MANJUU_AREA.png
 create mode 100644 assets/cn/handler/TEMPLATE_MANJUU.png

diff --git a/assets/cn/handler/MANJUU_AREA.png b/assets/cn/handler/MANJUU_AREA.png
new file mode 100644
index 0000000000000000000000000000000000000000..93e657c733eb492087fd805145284b0b5c8d9c60
GIT binary patch
literal 2997
zcmeAS@N?(olHy`uVBq!ia0y~yU<ERnE^sgbDF=BkMg|7%8c!F;kcwMxuWuA&P~c(S
z*z&jB%-z*1%TMay)cqixqhK@yMnhl#LZD%>FT;T;M>zfzm)yF__#jFR=mrM{W(I}^
z1~wp*kq1aHNdO5J10cbX03-ws011T#V7^AMh|z+knSd5-_Tkoo(}`HM;P(}p7GeSd
zp#{Mr5O!dN;7}x53(>(n8g_I@s=!Pz3PwX<Gz3ONU@(V3TyA6_i$lb{zWE?mdb;|#
JtaD0e0sxWwTX+Bf

literal 0
HcmV?d00001

diff --git a/assets/cn/handler/TEMPLATE_MANJUU.png b/assets/cn/handler/TEMPLATE_MANJUU.png
new file mode 100644
index 0000000000000000000000000000000000000000..4430bab41dce0cd20c0a3ad6fbd9dc1c51bee4e9
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq000>P000mO0ssI2Y=lGn0006XNkl<ZILnPw
zOK%e~5T3EUkC089C_+)CA}S#vUPZYhxbWlP1izp+Bo3Sai8~jl1YAI+AXN21+R%_q
zvWb#(cWn>eUGfesqmkvu`18y+pOIQ`VPZ5jM>x+27|mT0GXbb4v6>-c>5P^@nTMFt
zS~C+PMfNaT3=0~+pFeuM{puxLWG|jPeY3S?5VPeHtX|tc`nvPu)5i<3I*rE8`|WTz
zoWe3yq)rNrYlXtLL&<?c<Aj<JGB*iiPKscl^O241!CAvkC_`lbdb1yNm+ntr;l&j*
zM(uz|FL0k)&hxksmTk{sWEE(wV#Y<*7CYzKZq6!rq%<j0l+i@isZJk4X|ko&-0}YR
z_1ibH?htZwuA-1+91goO8d|v(H(wNh^;3Th%TN)6`YCdrVj)7S2f+Zw`P%|GK&6yY
zD%-z)syH&!gQEs#tW?ZjE|)HO>u7RN8vITsF)^kATnj?=cNs}obtk-7;$-*p@wYEd
zq#~*7N*AtI?>$^gxJ#Ngr`3{|jIn}YoCw+A+7l{O9PfR2cjZpC;MaOd0L0Bb#gVx#
z7;!lOXL5u!R<>YJa7Mx(ZEA?Sp~D?n+wX(USU5asZOX_ZE1}e~z!J-~y72R;ys=Ta
zS?$Im=o`gRt=adk-f~P*NqIE-Q;4&Fd#TA(p3wAzgV)av1E}7AaBcH$lFpp;{vRvt
m2~Fg-fF&-jaXQ96FYXTvQUYHu^99@h0000<MNUMnLSTYPr4#%B

literal 0
HcmV?d00001

diff --git a/module/handler/assets.py b/module/handler/assets.py
index a83f1a022..d69a67efd 100644
--- a/module/handler/assets.py
+++ b/module/handler/assets.py
@@ -53,6 +53,7 @@ LOGIN_GAME_UPDATE = Button(area={'cn': (700, 471, 873, 529), 'en': (726, 474, 85
 LOGIN_RETURN_INFO = Button(area={'cn': (960, 123, 1158, 333), 'en': (960, 123, 1158, 333), 'jp': (960, 123, 1158, 333), 'tw': (960, 123, 1158, 333)}, color={'cn': (170, 185, 166), 'en': (170, 185, 166), 'jp': (170, 185, 166), 'tw': (170, 185, 166)}, button={'cn': (960, 123, 1158, 333), 'en': (960, 123, 1158, 333), 'jp': (960, 123, 1158, 333), 'tw': (960, 123, 1158, 333)}, file={'cn': './assets/cn/handler/LOGIN_RETURN_INFO.png', 'en': './assets/en/handler/LOGIN_RETURN_INFO.png', 'jp': './assets/jp/handler/LOGIN_RETURN_INFO.png', 'tw': './assets/tw/handler/LOGIN_RETURN_INFO.png'})
 LOGIN_RETURN_SIGN = Button(area={'cn': (1, 7, 104, 47), 'en': (1, 7, 118, 39), 'jp': (1, 7, 104, 47), 'tw': (1, 7, 104, 47)}, color={'cn': (158, 214, 229), 'en': (176, 223, 236), 'jp': (158, 214, 229), 'tw': (158, 214, 229)}, button={'cn': (1, 7, 104, 47), 'en': (1, 7, 118, 39), 'jp': (1, 7, 104, 47), 'tw': (1, 7, 104, 47)}, file={'cn': './assets/cn/handler/LOGIN_RETURN_SIGN.png', 'en': './assets/en/handler/LOGIN_RETURN_SIGN.png', 'jp': './assets/jp/handler/LOGIN_RETURN_SIGN.png', 'tw': './assets/tw/handler/LOGIN_RETURN_SIGN.png'})
 MAINTENANCE_ANNOUNCE = Button(area={'cn': (923, 141, 990, 186), 'en': (923, 141, 990, 186), 'jp': (923, 141, 990, 186), 'tw': (923, 141, 990, 186)}, color={'cn': (207, 95, 91), 'en': (207, 95, 91), 'jp': (207, 95, 91), 'tw': (207, 95, 91)}, button={'cn': (923, 141, 990, 186), 'en': (923, 141, 990, 186), 'jp': (923, 141, 990, 186), 'tw': (923, 141, 990, 186)}, file={'cn': './assets/cn/handler/MAINTENANCE_ANNOUNCE.png', 'en': './assets/en/handler/MAINTENANCE_ANNOUNCE.png', 'jp': './assets/jp/handler/MAINTENANCE_ANNOUNCE.png', 'tw': './assets/tw/handler/MAINTENANCE_ANNOUNCE.png'})
+MANJUU_AREA = Button(area={'cn': (520, 240, 760, 400), 'en': (520, 240, 760, 400), 'jp': (520, 240, 760, 400), 'tw': (520, 240, 760, 400)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (520, 240, 760, 400), 'en': (520, 240, 760, 400), 'jp': (520, 240, 760, 400), 'tw': (520, 240, 760, 400)}, file={'cn': './assets/cn/handler/MANJUU_AREA.png', 'en': './assets/cn/handler/MANJUU_AREA.png', 'jp': './assets/cn/handler/MANJUU_AREA.png', 'tw': './assets/cn/handler/MANJUU_AREA.png'})
 MAP_AIR_RAID = Button(area={'cn': (350, 447, 1280, 472), 'en': (350, 447, 1280, 472), 'jp': (350, 447, 1280, 472), 'tw': (350, 447, 1280, 472)}, color={'cn': (154, 43, 46), 'en': (154, 43, 46), 'jp': (154, 43, 46), 'tw': (154, 43, 46)}, button={'cn': (350, 447, 1280, 472), 'en': (350, 447, 1280, 472), 'jp': (350, 447, 1280, 472), 'tw': (350, 447, 1280, 472)}, file={'cn': './assets/cn/handler/MAP_AIR_RAID.png', 'en': './assets/en/handler/MAP_AIR_RAID.png', 'jp': './assets/jp/handler/MAP_AIR_RAID.png', 'tw': './assets/tw/handler/MAP_AIR_RAID.png'})
 MAP_AMBUSH = Button(area={'cn': (261, 433, 1280, 449), 'en': (261, 433, 1280, 449), 'jp': (261, 433, 1280, 449), 'tw': (261, 433, 1280, 449)}, color={'cn': (161, 41, 43), 'en': (161, 41, 43), 'jp': (161, 41, 43), 'tw': (161, 41, 43)}, button={'cn': (261, 433, 1280, 449), 'en': (261, 433, 1280, 449), 'jp': (261, 433, 1280, 449), 'tw': (261, 433, 1280, 449)}, file={'cn': './assets/cn/handler/MAP_AMBUSH.png', 'en': './assets/en/handler/MAP_AMBUSH.png', 'jp': './assets/jp/handler/MAP_AMBUSH.png', 'tw': './assets/tw/handler/MAP_AMBUSH.png'})
 MAP_AMBUSH_ATTACK = Button(area={'cn': (804, 457, 876, 488), 'en': (791, 463, 888, 485), 'jp': (804, 457, 876, 488), 'tw': (804, 455, 876, 486)}, color={'cn': (139, 168, 210), 'en': (164, 187, 221), 'jp': (150, 175, 212), 'tw': (149, 175, 213)}, button={'cn': (755, 446, 925, 501), 'en': (753, 443, 927, 503), 'jp': (757, 447, 925, 501), 'tw': (762, 443, 927, 499)}, file={'cn': './assets/cn/handler/MAP_AMBUSH_ATTACK.png', 'en': './assets/en/handler/MAP_AMBUSH_ATTACK.png', 'jp': './assets/jp/handler/MAP_AMBUSH_ATTACK.png', 'tw': './assets/tw/handler/MAP_AMBUSH_ATTACK.png'})
@@ -89,6 +90,7 @@ SUBMARINE_MOVE_CONFIRM = Button(area={'cn': (1103, 646, 1218, 674), 'en': (1094,
 SUBMARINE_MOVE_ENTER = Button(area={'cn': (1109, 511, 1169, 571), 'en': (1109, 511, 1169, 571), 'jp': (1109, 511, 1169, 571), 'tw': (1109, 511, 1169, 571)}, color={'cn': (106, 107, 114), 'en': (106, 107, 114), 'jp': (106, 107, 114), 'tw': (106, 107, 114)}, button={'cn': (1109, 511, 1169, 571), 'en': (1109, 511, 1169, 571), 'jp': (1109, 511, 1169, 571), 'tw': (1109, 511, 1169, 571)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_ENTER.png', 'en': './assets/en/handler/SUBMARINE_MOVE_ENTER.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_ENTER.png', 'tw': './assets/tw/handler/SUBMARINE_MOVE_ENTER.png'})
 SUBMARINE_VIEW_OFF = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, color={'cn': (156, 156, 158), 'en': (156, 156, 158), 'jp': (156, 156, 158), 'tw': (156, 156, 158)}, button={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, file={'cn': './assets/cn/handler/SUBMARINE_VIEW_OFF.png', 'en': './assets/en/handler/SUBMARINE_VIEW_OFF.png', 'jp': './assets/jp/handler/SUBMARINE_VIEW_OFF.png', 'tw': './assets/tw/handler/SUBMARINE_VIEW_OFF.png'})
 SUBMARINE_VIEW_ON = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, color={'cn': (177, 178, 179), 'en': (177, 178, 179), 'jp': (177, 178, 179), 'tw': (177, 178, 179)}, button={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, file={'cn': './assets/cn/handler/SUBMARINE_VIEW_ON.png', 'en': './assets/en/handler/SUBMARINE_VIEW_ON.png', 'jp': './assets/jp/handler/SUBMARINE_VIEW_ON.png', 'tw': './assets/tw/handler/SUBMARINE_VIEW_ON.png'})
+TEMPLATE_MANJUU = Template(file={'cn': './assets/cn/handler/TEMPLATE_MANJUU.png', 'en': './assets/cn/handler/TEMPLATE_MANJUU.png', 'jp': './assets/cn/handler/TEMPLATE_MANJUU.png', 'tw': './assets/cn/handler/TEMPLATE_MANJUU.png'})
 USER_AGREEMENT_CONFIRM = Button(area={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, color={'cn': (151, 216, 243), 'en': (151, 216, 243), 'jp': (151, 216, 243), 'tw': (151, 216, 243)}, button={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, file={'cn': './assets/cn/handler/USER_AGREEMENT_CONFIRM.png', 'en': './assets/en/handler/USER_AGREEMENT_CONFIRM.png', 'jp': './assets/jp/handler/USER_AGREEMENT_CONFIRM.png', 'tw': './assets/tw/handler/USER_AGREEMENT_CONFIRM.png'})
 USE_DATA_KEY = Button(area={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (627, 300, 743, 321), 'tw': (688, 316, 782, 338)}, color={'cn': (165, 154, 99), 'en': (170, 160, 94), 'jp': (127, 128, 116), 'tw': (159, 150, 97)}, button={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (627, 300, 743, 321), 'tw': (688, 316, 782, 338)}, file={'cn': './assets/cn/handler/USE_DATA_KEY.png', 'en': './assets/en/handler/USE_DATA_KEY.png', 'jp': './assets/jp/handler/USE_DATA_KEY.png', 'tw': './assets/tw/handler/USE_DATA_KEY.png'})
 USE_DATA_KEY_NOTIFIED = Button(area={'cn': (770, 434, 793, 456), 'en': (820, 440, 837, 456), 'jp': (686, 430, 709, 456), 'tw': (782, 440, 799, 456)}, color={'cn': (41, 44, 49), 'en': (33, 40, 41), 'jp': (33, 44, 49), 'tw': (34, 40, 48)}, button={'cn': (770, 434, 793, 456), 'en': (820, 440, 837, 456), 'jp': (686, 430, 709, 456), 'tw': (782, 440, 799, 456)}, file={'cn': './assets/cn/handler/USE_DATA_KEY_NOTIFIED.png', 'en': './assets/en/handler/USE_DATA_KEY_NOTIFIED.png', 'jp': './assets/jp/handler/USE_DATA_KEY_NOTIFIED.png', 'tw': './assets/tw/handler/USE_DATA_KEY_NOTIFIED.png'})
diff --git a/module/handler/info_handler.py b/module/handler/info_handler.py
index 379b118e0..b5ab2b2d8 100644
--- a/module/handler/info_handler.py
+++ b/module/handler/info_handler.py
@@ -510,3 +510,42 @@ class InfoHandler(ModuleBase):
             return True
 
         return False
+
+    """
+    Manjuu loading
+    """
+    def manjuu_count(self):
+        """
+        detect manjuu count by template matching
+        Returns:
+            int: Number of manjuu
+        """
+        image = self.image_crop(MANJUU_AREA, copy=False)
+        # Default 0.85 will not work for manjuu, because the face will be stretched
+        # and shrinked, so the template will not match.
+        # Use 0.8 to match the deformed face.
+        buttons = TEMPLATE_MANJUU.match_multi(image, similarity=0.8, name='INFO_MANJUU')
+        return len(buttons)
+
+    def wait_until_manjuu_disappear(self):
+        """
+        Wait until manjuu loading disappear.
+        """
+        while 1:
+            self.device.screenshot()
+            if not self.manjuu_count():
+                break
+    
+    def handle_manjuu(self):
+        """
+        Handle manjuu loading.
+        Returns:
+            bool: If handled
+        """
+        count = self.manjuu_count()
+        if count > 2:
+            logger.info(f'Manjuu count: {count}, waiting for manjuu to disappear')
+            self.wait_until_manjuu_disappear()
+            return True
+        else:
+            return False
\ No newline at end of file
diff --git a/module/os_handler/mission.py b/module/os_handler/mission.py
index 35faceb43..3b911d27c 100644
--- a/module/os_handler/mission.py
+++ b/module/os_handler/mission.py
@@ -189,7 +189,8 @@ class MissionHandler(GlobeOperation, ZoneManager):
         self.os_map_goto_globe(unpin=False)
         # is_in_globe
         self.ui_click(MISSION_OVERVIEW_ENTER, check_button=MISSION_OVERVIEW_CHECK,
-                      offset=(200, 20), retry_wait=3, skip_first_screenshot=True)
+                      offset=(200, 20), retry_wait=3, additional=self.handle_manjuu,
+                      skip_first_screenshot=True)
 
         # MISSION_OVERVIEW_CHECK
         confirm_timer = Timer(1, count=3).start()
@@ -201,6 +202,9 @@ class MissionHandler(GlobeOperation, ZoneManager):
             else:
                 self.device.screenshot()
 
+            if self.handle_manjuu():
+                confirm_timer.reset()
+                continue
             if self.info_bar_count():
                 logger.info('Unable to accept missions, because reached the maximum number of missions')
                 success = False