Просмотр исходного кода

feat(task): add emergency such as friend invitation

runhey 3 лет назад
Родитель
Сommit
7d054a858a

+ 15 - 1
config/template.json

@@ -34,13 +34,18 @@
   },
   "global_game": {
     "emergency": {
-      "accept_friend_invitation": true
+      "friend_invitation": "accept",
+      "invitation_detect_interval": 10,
+      "when_network_abnormal": "wait_10s",
+      "when_network_error": "restart",
+      "home_client_clear": true
     }
   },
   "area_boss": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -69,6 +74,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -78,6 +84,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -87,6 +94,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -96,6 +104,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -125,6 +134,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -134,6 +144,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -143,6 +154,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -152,6 +164,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0
@@ -161,6 +174,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval_days": 1,
       "interval_hours": 0,
       "interval_minutes": 0

+ 1 - 1
module/config/config_menu.py

@@ -15,7 +15,7 @@ class ConfigMenu:
         # 总览
         self.menu["Overview"] = []
         # 脚本设置
-        self.menu['Script'] = ['Script', 'General', 'Restart', 'GlobalGame']
+        self.menu['Script'] = ['Script', 'Restart', 'GlobalGame']
         # 刷御魂
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         # 日常的任务

BIN
module/config/i18n/zh_CN.qm


+ 14 - 0
module/config/i18n/zh_CN.ts

@@ -357,4 +357,18 @@
 	<message><source>AttackNumber</source><translation>挑战次数</translation></message>
 	<message><source>raid_mode_help</source><translation>默认为退四打九,退四打九指每次执行前都会退出四次,然后在进攻九次</translation></message>
 </context>
+<context>
+    <name>Args</name>
+	<message><source>Emergency</source><translation>突发检测</translation></message>
+	<message><source>FriendInvitation</source><translation>当出现协作邀请时</translation></message>
+	<message><source>Invitation Detect Interval</source><translation>检测间隔</translation></message>
+	<message><source>WhenNetworkAbnormal</source><translation>当网络异常时</translation></message>
+	<message><source>WhenNetworkError</source><translation>当网络出错需要重新连接服务器时</translation></message>
+	<message><source>Home Client Clear</source><translation>启用庭院客户端清空缓存</translation></message>
+	<message><source>friend_invitation_help</source><translation>默认全部接受</translation></message>
+	<message><source>invitation_detect_interval_help</source><translation>默认每隔10秒检测一次是否有协作</translation></message>
+	<message><source>when_network_abnormal_help</source><translation>默认会先等待10S</translation></message>
+	<message><source>when_network_error_help</source><translation>重启游戏</translation></message>
+	<message><source>home_client_clear_help</source><translation>有时会出现进入庭院要求清理缓存</translation></message>
+</context>
 </TS>

+ 2 - 1
module/gui/utils.py

@@ -41,4 +41,5 @@ def check_admin():
         args = ' '.join(sys.argv)
         ctypes.windll.shell32.ShellExecuteW(None, "runas", sys.executable, __file__, None, 1)
         sys.exit(0)
-    logger.log('管理员身份运行')
+    logger.log('管理员身份运行')
+

+ 16 - 0
module/ocr/models.py

@@ -9,3 +9,19 @@ class OcrModel:
 
 
 OCR_MODEL = OcrModel()
+
+
+
+if __name__ == "__main__":
+    model = OCR_MODEL.ch
+    import cv2
+    import time
+    image = cv2.imread(r"D:\ocr_test_5.png")
+
+    for i in range(10):
+        start_time = time.time()
+        result = model.detect_and_ocr(image)
+        print(result)
+        end_time = time.time()
+        print(f'耗时:{end_time-start_time}')
+

+ 16 - 1
tasks/GlobalGame/assets.py

@@ -8,5 +8,20 @@ from module.atom.list import RuleList
 # This file was automatically generated by module/dev_tools/assets_extract.py.
 # Don't modify it manually.
 class GlobalGameAssets: 
-	pass
+
+
+	# Image Rule Assets
+	# description 
+	I_ACCEPT = RuleImage(roi_front=(825,395,56,46), roi_back=(825,395,56,46), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_accept.png")
+	# description 
+	I_REJECT = RuleImage(roi_front=(825,493,53,51), roi_back=(825,493,53,51), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_reject.png")
+	# 勾玉 
+	I_JADE = RuleImage(roi_front=(661,466,43,46), roi_back=(661,466,43,46), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_jade.png")
+	# 网络异常 
+	I_NETWORK_ABNORMAL = RuleImage(roi_front=(583,330,221,67), roi_back=(583,330,221,67), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_network_abnormal.png")
+	# 已端口游戏服务器,需要重新连接,这种情况一般是断开很久了 
+	I_NETWORK_ERROR = RuleImage(roi_front=(431,253,416,208), roi_back=(431,253,416,208), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_network_error.png")
+	# 我还没有碰到这个情况没能截图 
+	I_CLIENT_CLEAR = RuleImage(roi_front=(578,369,151,72), roi_back=(578,369,151,72), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_client_clear.png")
+
 

+ 23 - 2
tasks/GlobalGame/config_emergency.py

@@ -2,9 +2,30 @@
 # @author runhey
 # github https://github.com/runhey
 from datetime import datetime, time
+from enum import Enum
 from pydantic import BaseModel, ValidationError, validator, Field
 
 
+class FriendInvitation(str, Enum):
+    ACCEPT = 'accept'
+    REJECT = 'reject'
+    ONLY_JADE = 'only_jade'  # 仅接受勾玉邀请
+
+class WhenNetworkAbnormal(str, Enum):
+    RESTART = 'restart'
+    WAIT_10S = 'wait_10s'
+
+class WhenNetworkError(str, Enum):
+    RESTART = 'restart'
+
+
+
+# 也可以是左边的邀请什么的
 class Emergency(BaseModel):
-    accept_friend_invitation: bool = Field(default=True,
-                                           description="default is true")
+    friend_invitation: FriendInvitation = Field(default=FriendInvitation.ACCEPT,description='friend_invitation_help')
+    invitation_detect_interval: int = Field(default=10, description='invitation_detect_interval_help')
+    when_network_abnormal: WhenNetworkAbnormal = Field(default=WhenNetworkAbnormal.WAIT_10S, description='when_network_abnormal_help')
+    when_network_error: WhenNetworkError = Field(default=WhenNetworkError.RESTART, description='when_network_error_help')
+    home_client_clear: bool = Field(default=True, description='home_client_clear_help')
+
+

+ 48 - 2
tasks/base_task.py

@@ -18,9 +18,14 @@ from module.logger import logger
 from module.base.timer import Timer
 from module.config.config import Config
 from module.device.device import Device
+from tasks.GlobalGame.assets import GlobalGameAssets
+from tasks.GlobalGame.config_emergency import FriendInvitation, WhenNetworkAbnormal, WhenNetworkError
 
+from module.exception import GameStuckError
 
-class BaseTask:
+
+
+class BaseTask(GlobalGameAssets):
     config: Config = None
     device: Device = None
 
@@ -38,12 +43,53 @@ class BaseTask:
 
         self.start_time = datetime.now()  # 启动的时间
 
+        self.friend_timer = None
+        if self.config.global_game.emergency.invitation_detect_interval:
+            self.interval_time = self.config.global_game.emergency.invitation_detect_interval
+            self.friend_timer = Timer(self.interval_time)
+
     def screenshot(self):
         """
         截图 引入中间函数的目的是 为了解决如协作的这类突发的事件
         :return:
         """
-        return self.device.screenshot()
+        self.device.screenshot()
+        # 判断勾协
+        if self.friend_timer and self.friend_timer.reached():
+            self.friend_timer.reset()
+            invite = self.appear(self.I_ACCEPT)
+            # 如果是全部接受
+            if invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ACCEPT:
+                # 如果是接受邀请
+                while 1:
+                    if self.appear_then_click(self.I_ACCEPT):
+                        continue
+                    if not self.appear(self.I_ACCEPT):
+                        break
+            # 如果是全部拒绝
+            elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.REJECT:
+                while 1:
+                    if self.appear_then_click(self.I_REJECT):
+                        continue
+                    if not self.appear(self.I_REJECT):
+                        break
+            # 最后一个是仅仅接受勾协
+            elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ONLY_JADE:
+                while 1:
+                    if self.appear_then_click(self.I_ACCEPT):
+                        continue
+                    if not self.appear(self.I_ACCEPT):
+                        break
+            # 判断网络异常
+            if self.appear(self.I_NETWORK_ABNORMAL):
+                raise GameStuckError
+
+            # 判断网络错误
+            if self.appear(self.I_NETWORK_ERROR):
+                raise GameStuckError
+
+        return self.device.image
+        # 返回截图
 
     def appear(self, target: RuleImage, interval: float = None, threshold: float = None):
         """