Răsfoiți Sursa

Merge remote-tracking branch 'origin/dev' into dev

ryland 1 an în urmă
părinte
comite
284060caf0

+ 1 - 1
tasks/Component/SwitchAccount/switch_account_config.py

@@ -16,7 +16,7 @@ class AccountInfo(BaseModel):
     svr: str = Field(default="", description="svr_help")
     svr: str = Field(default="", description="svr_help")
     account: str = Field(default="", description="account_help")
     account: str = Field(default="", description="account_help")
     # 为防止ocr出错 暂定格式 字符串以#分割
     # 为防止ocr出错 暂定格式 字符串以#分割
-    accountAlias: str = Field(default="", description="")
+    accountAlias: str = Field(default="", description="account_alias_help")
     appleOrAndroid: bool = Field(default=True, description="apple_or_android_help")
     appleOrAndroid: bool = Field(default=True, description="apple_or_android_help")
     # 上一次执行成功的时间 ,防止出错时重复登录浪费时间
     # 上一次执行成功的时间 ,防止出错时重复登录浪费时间
     last_complete_time: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"), description="last_complete_time_help")
     last_complete_time: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"), description="last_complete_time_help")

+ 2 - 0
tasks/DailyTrifles/assets.py

@@ -25,6 +25,8 @@ class DailyTriflesAssets:
 	I_CLICK_BLESS = RuleImage(roi_front=(617,442,92,39), roi_back=(617,442,92,39), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/Screenshots_click_bless.png")
 	I_CLICK_BLESS = RuleImage(roi_front=(617,442,92,39), roi_back=(617,442,92,39), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/Screenshots_click_bless.png")
 	# 吉闻页 
 	# 吉闻页 
 	I_LUCK_TITLE = RuleImage(roi_front=(600,52,131,67), roi_back=(600,52,131,67), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/Screenshots_luck_title.png")
 	I_LUCK_TITLE = RuleImage(roi_front=(600,52,131,67), roi_back=(600,52,131,67), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/Screenshots_luck_title.png")
+	# 好友羁绊提升弹窗 
+	I_FRIENDSHIP_UP = RuleImage(roi_front=(1147,80,27,28), roi_back=(1147,80,27,28), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/friendship_up.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

BIN
tasks/DailyTrifles/love/friendship_up.png


+ 9 - 0
tasks/DailyTrifles/love/image.json

@@ -61,5 +61,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "吉闻页"
     "description": "吉闻页"
+  },
+  {
+    "itemName": "friendship_up",
+    "imageName": "friendship_up.png",
+    "roiFront": "1147,80,27,28",
+    "roiBack": "1147,80,27,28",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "好友羁绊提升弹窗"
   }
   }
 ]
 ]

+ 4 - 0
tasks/DailyTrifles/script_task.py

@@ -50,6 +50,8 @@ class ScriptTask(GameUi, Summon, DailyTriflesAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_LUCK_TITLE):
             if self.appear(self.I_LUCK_TITLE):
                 break
                 break
+            if self.appear_then_click(self.I_FRIENDSHIP_UP, interval=1):
+                continue
             if self.appear_then_click(self.I_LUCK_MSG, interval=1):
             if self.appear_then_click(self.I_LUCK_MSG, interval=1):
                 continue
                 continue
         logger.info('Start luck msg')
         logger.info('Start luck msg')
@@ -78,6 +80,8 @@ class ScriptTask(GameUi, Summon, DailyTriflesAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_L_LOVE):
             if self.appear(self.I_L_LOVE):
                 break
                 break
+            if self.appear_then_click(self.I_FRIENDSHIP_UP, interval=1):
+                continue
             if self.appear_then_click(self.I_L_FRIENDS, interval=1):
             if self.appear_then_click(self.I_L_FRIENDS, interval=1):
                 continue
                 continue
         logger.info('Start friend love')
         logger.info('Start friend love')

+ 4 - 3
tasks/EternitySea/script_task.py

@@ -256,9 +256,10 @@ class ScriptTask(
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_FORM_TEAM, interval=1):
             if self.appear(self.I_FORM_TEAM, interval=1):
                 return True
                 return True
-            if self.appear_then_click(self.I_ETERNITY_SEA):
-                #有可能点击到录像
-                self.appear_then_click(self.I_BACK_BOTTOM, interval=1)
+            if self.appear_then_click(self.I_ETERNITY_SEA, interval=1):
+                continue
+            #有可能点击到录像
+            if self.appear_then_click(self.I_BACK_BOTTOM, interval=1):
                 continue
                 continue
 
 
     def _navigate_to_soul_zones(self) -> None:
     def _navigate_to_soul_zones(self) -> None:

+ 1 - 3
tasks/FindJade/README.md

@@ -1,6 +1,3 @@
-详细配置文件见config/findjade/find_jade.json
-
-
 ### **注意事项:**
 ### **注意事项:**
 
 
 1. 可以配置多个被邀请对象,但每次只会按从前到后的顺序邀请一个.
 1. 可以配置多个被邀请对象,但每次只会按从前到后的顺序邀请一个.
@@ -12,3 +9,4 @@
 ### **运行中可能出现的问题:**
 ### **运行中可能出现的问题:**
 1. 小号存在打不过的情况,导致邀请完成后,无法完成任务,需手动搞一下 
 1. 小号存在打不过的情况,导致邀请完成后,无法完成任务,需手动搞一下 
 2. 由于本人电脑配置一般(16GB内存,5个模拟器满载),所以部分延时写的挺长,可以根据情况酌情调整
 2. 由于本人电脑配置一般(16GB内存,5个模拟器满载),所以部分延时写的挺长,可以根据情况酌情调整
+

+ 3 - 2
tasks/FindJade/config.py

@@ -17,8 +17,9 @@ class InviteHistoryItem(BaseModel):
 
 
 class InviteInfo(BaseModel):
 class InviteInfo(BaseModel):
     # 被邀请人员昵称
     # 被邀请人员昵称
-    name: str = Field(default="")
-    default_invite_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.JadeAndFood)
+    name: str = Field(default="", description='name_help')
+    default_invite_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.JadeAndFood,
+                                                                  description='default_invite_type_help')
 
 
     # 协作任务类型   上次邀请时间
     # 协作任务类型   上次邀请时间
     invite_history_1: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),
     invite_history_1: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),

+ 2 - 0
tasks/GameUi/assets.py

@@ -170,6 +170,8 @@ class GameUiAssets:
 	I_BACK_DAILY = RuleImage(roi_front=(33,13,39,50), roi_back=(33,13,39,50), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_daily.png")
 	I_BACK_DAILY = RuleImage(roi_front=(33,13,39,50), roi_back=(33,13,39,50), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_daily.png")
 	# description 
 	# description 
 	I_NEW = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/image_name.png")
 	I_NEW = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/image_name.png")
+	# 下载拓展包弹窗
+	I_DLC_CLOSE = RuleImage(roi_front=(916,147,24,25), roi_back=(916,147,24,25), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/store_dlc_close.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 1 - 1
tasks/GameUi/page.py

@@ -143,7 +143,7 @@ page_daily.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_DAILY, destination=page_daily)
 page_main.link(button=G.I_MAIN_GOTO_DAILY, destination=page_daily)
 # 商店 mall
 # 商店 mall
 page_mall = Page(G.I_CHECK_MALL)
 page_mall = Page(G.I_CHECK_MALL)
-page_mall.additional = [G.I_AD_CLOSE_RED, G.I_BACK_Y]
+page_mall.additional = [G.I_AD_CLOSE_RED, G.I_BACK_Y, G.I_DLC_CLOSE]
 page_mall.link(button=G.I_BACK_BLUE, destination=page_main)
 page_mall.link(button=G.I_BACK_BLUE, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 # 阴阳寮 guild
 # 阴阳寮 guild

+ 9 - 0
tasks/GameUi/page/page_img_3.json

@@ -187,5 +187,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "dlc_close",
+    "imageName": "store_dlc_close.png",
+    "roiFront": "916,147,24,25",
+    "roiBack": "916,147,24,25",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "下载拓展包弹窗"
   }
   }
 ]
 ]

BIN
tasks/GameUi/page/store_dlc_close.png


+ 4 - 0
tasks/WantedQuests/assets.py

@@ -86,10 +86,14 @@ class WantedQuestsAssets:
 	I_WQ_INVITE_CANCEL = RuleImage(roi_front=(230,540,132,60), roi_back=(230,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_cancel.png")
 	I_WQ_INVITE_CANCEL = RuleImage(roi_front=(230,540,132,60), roi_back=(230,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_cancel.png")
 	# 邀请好友被选中标记 
 	# 邀请好友被选中标记 
 	I_WQ_INVITE_SELECTED = RuleImage(roi_front=(370,180,32,32), roi_back=(370,180,370,355), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_selected.png")
 	I_WQ_INVITE_SELECTED = RuleImage(roi_front=(370,180,32,32), roi_back=(370,180,370,355), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_selected.png")
+	# 邀请好友被选中标记 
+	I_WQ_INVITE_FRIEND_LIST_APPEAR = RuleImage(roi_front=(370,180,32,32), roi_back=(370,180,370,355), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_friend_list_appear.png")
 	# 邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	# 邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	I_WQ_INVITE_SAME_SVR = RuleImage(roi_front=(170,90,60,35), roi_back=(170,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_same_svr.png")
 	I_WQ_INVITE_SAME_SVR = RuleImage(roi_front=(170,90,60,35), roi_back=(170,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_same_svr.png")
 	# 邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	# 邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	I_WQ_INVITE_DIFF_SVR = RuleImage(roi_front=(280,90,60,35), roi_back=(280,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_diff_svr.png")
 	I_WQ_INVITE_DIFF_SVR = RuleImage(roi_front=(280,90,60,35), roi_back=(280,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_diff_svr.png")
+	# 邀请跨服好友,已选中状态,高亮状态 
+	I_WQ_INVITE_DIFF_SVR_HIGHLIGHT = RuleImage(roi_front=(260,70,120,90), roi_back=(260,70,120,90), threshold=0.9, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_diff_svr_highlight.png")
 	# 从左到右第一个协作任务的类型 
 	# 从左到右第一个协作任务的类型 
 	I_WQ_COOPERATION_TYPE_GOLD_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_gold.png")
 	I_WQ_COOPERATION_TYPE_GOLD_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_gold.png")
 	# 从左到右第一个协作任务的类型 
 	# 从左到右第一个协作任务的类型 

+ 18 - 0
tasks/WantedQuests/invite/image.json

@@ -98,6 +98,15 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "邀请好友被选中标记"
     "description": "邀请好友被选中标记"
   },
   },
+  {
+    "itemName": "wq_invite_friend_list_appear",
+    "imageName": "wq_invite_friend_list_appear.png",
+    "roiFront": "370,180,32,32",
+    "roiBack": "370,180,370,355",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "好友列表已加载标志"
+  },
   {
   {
     "itemName": "wq_invite_same_svr",
     "itemName": "wq_invite_same_svr",
     "imageName": "wq_invite_same_svr.png",
     "imageName": "wq_invite_same_svr.png",
@@ -116,6 +125,15 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息"
     "description": "邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息"
   },
   },
+  {
+    "itemName": "wq_invite_diff_svr_highlight",
+    "imageName": "wq_invite_diff_svr_highlight.png",
+    "roiFront": "260,70,120,90",
+    "roiBack": "260,70,120,90",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "邀请跨服好友,已选中状态,高亮状态"
+  },
   {
   {
     "itemName": "wq_cooperation_type_gold_1",
     "itemName": "wq_cooperation_type_gold_1",
     "imageName": "wq_cooperation_type_gold.png",
     "imageName": "wq_cooperation_type_gold.png",

BIN
tasks/WantedQuests/invite/wq_invite_diff_svr_highlight.png


BIN
tasks/WantedQuests/invite/wq_invite_friend_list_appear.png


+ 58 - 10
tasks/WantedQuests/script_task.py

@@ -1,12 +1,15 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+import copy
 import re
 import re
 from datetime import timedelta, time, datetime
 from datetime import timedelta, time, datetime
 from time import sleep
 from time import sleep
 from typing import List
 from typing import List
 
 
+import cv2
 from cached_property import cached_property
 from cached_property import cached_property
+from markdown_it.rules_inline import image
 
 
 from module.atom.image import RuleImage
 from module.atom.image import RuleImage
 from module.base.timer import Timer
 from module.base.timer import Timer
@@ -232,7 +235,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
             # 防止点击后界面来不及刷新
             # 防止点击后界面来不及刷新
             sleep(1.5)
             sleep(1.5)
         # 关闭单个任务的追踪界面
         # 关闭单个任务的追踪界面
-        self.ui_click(self.C_WQ_TRACE_ONE_CLOSE, stop=self.I_WQ_TRACE_ONE_CHECK_OPENED, interval=1.5)
+        self.ui_click_until_smt_disappear(self.C_WQ_TRACE_ONE_CLOSE, stop=self.I_WQ_TRACE_ONE_CHECK_OPENED, interval=1.5)
 
 
     def execute_mission(self, ocr, num_want: int, num_challenge: int):
     def execute_mission(self, ocr, num_want: int, num_challenge: int):
         """
         """
@@ -461,8 +464,6 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         @return:
         @return:
         """
         """
         self.ui_click(btn, self.I_WQ_INVITE_ENSURE, interval=2.5)
         self.ui_click(btn, self.I_WQ_INVITE_ENSURE, interval=2.5)
-        # 等待好友列表加载
-        sleep(1.5)
 
 
         # 选人
         # 选人
         self.O_WQ_INVITE_COLUMN_1.keyword = name
         self.O_WQ_INVITE_COLUMN_1.keyword = name
@@ -470,21 +471,27 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
 
 
         find = False
         find = False
         for i in range(2):
         for i in range(2):
+            self.wait_until_appear(self.I_WQ_INVITE_FRIEND_LIST_APPEAR, wait_time=4)
             self.screenshot()
             self.screenshot()
             in_col_1 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_1)
             in_col_1 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_1)
             in_col_2 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_2)
             in_col_2 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_2)
             find = in_col_2 or in_col_1
             find = in_col_2 or in_col_1
             if find:
             if find:
-                sleep(4)
+                self.wait_until_appear(self.I_WQ_INVITE_SELECTED, wait_time=2)
                 self.screenshot()
                 self.screenshot()
                 if self.appear(self.I_WQ_INVITE_SELECTED):
                 if self.appear(self.I_WQ_INVITE_SELECTED):
                     logger.info("friend found and selected")
                     logger.info("friend found and selected")
                     break
                     break
                 # TODO OCR识别到文字 但是没有选中 尝试重新选择  (选择好友时,弹出协作邀请导致选择好友失败)
                 # TODO OCR识别到文字 但是没有选中 尝试重新选择  (选择好友时,弹出协作邀请导致选择好友失败)
-            # 在当前服务器没找到,切换服务器  30s 防止短时间连续点击
-            self.click(self.I_WQ_INVITE_DIFF_SVR, interval=30)
-            # NOTE 跨服好友刷新缓慢,切换标签页难以检测,姑且用延时.非常卡的模拟器可能出问题
-            sleep(4)
+            # 检测跨服好友按钮是否高亮
+            while 1:
+                self.screenshot()
+                if not self.appear_highlight(self.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT):
+                    self.click(self.I_WQ_INVITE_DIFF_SVR)
+                    continue
+                break
+            # 等待好友列表加载
+            self.wait_until_appear(self.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT, wait_time=4)
         # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
         # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
         if not find:
         if not find:
             self.screenshot()
             self.screenshot()
@@ -525,6 +532,39 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         logger.info(f"get cooperation size {len(retList)}")
         logger.info(f"get cooperation size {len(retList)}")
         return retList
         return retList
 
 
+    # 使用平均亮度检测是否一致
+    def appear_highlight(self, rule_image: RuleImage):
+        def compute_region_brightness(img, top_left, width, height):
+            """
+            计算目标区域的平均亮度 (灰度图的平均值)
+            :param img: 目标图像
+            :param top_left: 匹配区域的左上角坐标
+            :param width: 模板宽度
+            :param height: 模板高度
+            :return: 区域亮度均值
+            """
+            # 裁剪出匹配区域
+            region = img[top_left[1]:top_left[1] + height, top_left[0]:top_left[0] + width]
+            # 转为灰度图
+            gray_region = cv2.cvtColor(region, cv2.COLOR_BGR2GRAY)
+            # 计算灰度均值
+            return gray_region.mean()
+
+        src = rule_image.corp(self.device.image)
+        template = rule_image.image
+        result = cv2.matchTemplate(src, template, cv2.TM_CCOEFF_NORMED)
+        _, max_val, _, max_loc = cv2.minMaxLoc(result)
+
+        brightness_src = compute_region_brightness(src, max_loc, template.shape[1], template.shape[0])
+        brightness_template = compute_region_brightness(template, (0, 0), template.shape[1], template.shape[0])
+
+        if max_val > rule_image.threshold and (brightness_src >= brightness_template * rule_image.threshold) and (
+                brightness_src <= brightness_template * (2 - rule_image.threshold)):
+            rule_image.roi_front[0] = max_loc[0] + rule_image.roi_back[0]
+            rule_image.roi_front[1] = max_loc[1] + rule_image.roi_back[1]
+            return True
+        return False
+
     @cached_property
     @cached_property
     def special_main(self) -> bool:
     def special_main(self) -> bool:
         # 特殊的庭院需要点一下,左边然后才能找到图标
         # 特殊的庭院需要点一下,左边然后才能找到图标
@@ -561,6 +601,14 @@ if __name__ == '__main__':
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
-    t.screenshot()
+    img = cv2.imread(r"E:\highlight.png")
+    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    t.device.image = img
+    appear = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
+
+    img = cv2.imread(r"E:\normal.png")
+    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    t.device.image = img
+    appear_normal = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
 
 
-    t.run()
+    print(appear)

+ 23 - 4
tasks/base_task.py

@@ -519,8 +519,11 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param time_delta: 下次运行日期为几天后,默认为第二天
         :param time_delta: 下次运行日期为几天后,默认为第二天
         :return:
         :return:
         """
         """
-        target_time = (datetime.now() + timedelta(days=time_delta)).replace(hour=custom_time.hour, minute=custom_time.minute, second=custom_time.second)
+        target_time = (datetime.now() + timedelta(days=time_delta)).replace(hour=custom_time.hour,
+                                                                            minute=custom_time.minute,
+                                                                            second=custom_time.second)
         self.set_next_run(task, target=target_time)
         self.set_next_run(task, target=target_time)
+
     #  ---------------------------------------------------------------------------------------------------------------
     #  ---------------------------------------------------------------------------------------------------------------
     #
     #
     #  ---------------------------------------------------------------------------------------------------------------
     #  ---------------------------------------------------------------------------------------------------------------
@@ -533,7 +536,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             self.screenshot()
             self.screenshot()
         return self.appear_then_click(self.I_UI_REWARD, action=self.C_UI_REWARD, interval=0.4, threshold=0.6)
         return self.appear_then_click(self.I_UI_REWARD, action=self.C_UI_REWARD, interval=0.4, threshold=0.6)
 
 
-    def ui_get_reward(self, click_image: RuleImage or RuleOcr or RuleClick, click_interval: float=1):
+    def ui_get_reward(self, click_image: RuleImage or RuleOcr or RuleClick, click_interval: float = 1):
         """
         """
         传进来一个点击图片 或是 一个ocr, 会点击这个图片,然后等待‘获得奖励’,
         传进来一个点击图片 或是 一个ocr, 会点击这个图片,然后等待‘获得奖励’,
         最后当获得奖励消失后 退出
         最后当获得奖励消失后 退出
@@ -573,7 +576,6 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 if self.click(click_image, interval=click_interval):
                 if self.click(click_image, interval=click_interval):
                     continue
                     continue
 
 
-
         return True
         return True
 
 
     def ui_click(self, click, stop, interval=1):
     def ui_click(self, click, stop, interval=1):
@@ -595,7 +597,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
             elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
                 continue
                 continue
 
 
-    def ui_click_until_disappear(self, click, interval: float =1):
+    def ui_click_until_disappear(self, click, interval: float = 1):
         """
         """
         点击一个按钮直到消失
         点击一个按钮直到消失
         :param interval:
         :param interval:
@@ -609,4 +611,21 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             elif self.appear_then_click(click, interval=interval):
             elif self.appear_then_click(click, interval=interval):
                 continue
                 continue
 
 
+    def ui_click_until_smt_disappear(self, click, stop, interval: float = 1):
+        """
+        点击一个按钮/区域/文字直到stop消失
 
 
+        """
+        while 1:
+            self.screenshot()
+            if not self.appear(stop):
+                break
+            if isinstance(click, RuleImage) or isinstance(click, RuleGif):
+                self.appear_then_click(click, interval=interval)
+                continue
+            if isinstance(click, RuleClick):
+                self.click(click, interval)
+                continue
+            if isinstance(click, RuleOcr):
+                self.click(click)
+                continue