Przeglądaj źródła

Merge branch 'dev' into master

llBai 1 miesiąc temu
rodzic
commit
7ce0bb4d97

+ 1 - 1
tasks/ActivityShikigami/assets.py

@@ -69,7 +69,7 @@ class ActivityShikigamiAssets:
 	# description 
 	# description 
 	I_PASS_3 = RuleImage(roi_front=(1178,620,71,61), roi_back=(1149,606,111,92), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_3.png")
 	I_PASS_3 = RuleImage(roi_front=(1178,620,71,61), roi_back=(1149,606,111,92), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_3.png")
 	# description 
 	# description 
-	I_PASS_4 = RuleImage(roi_front=(482,499,58,54), roi_back=(448,439,126,137), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_4.png")
+	I_PASS_4 = RuleImage(roi_front=(482,499,58,54), roi_back=(346,431,575,146), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_4.png")
 	# 第一个 
 	# 第一个 
 	I_PASS_5 = RuleImage(roi_front=(421,286,65,48), roi_back=(419,287,69,51), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_5.png")
 	I_PASS_5 = RuleImage(roi_front=(421,286,65,48), roi_back=(419,287,69,51), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_5.png")
 	# 印记 
 	# 印记 

+ 1 - 1
tasks/ActivityShikigami/fire/image.json

@@ -30,7 +30,7 @@
     "itemName": "pass_4",
     "itemName": "pass_4",
     "imageName": "fire_pass_4.png",
     "imageName": "fire_pass_4.png",
     "roiFront": "482,499,58,54",
     "roiFront": "482,499,58,54",
-    "roiBack": "448,439,126,137",
+    "roiBack": "346,431,575,146",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"

+ 8 - 0
tasks/ActivityShikigami/script_task.py

@@ -190,11 +190,14 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
         # self.ui_clicks([self.I_TO_BATTLE_MAIN_2],
         # self.ui_clicks([self.I_TO_BATTLE_MAIN_2],
         #                stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         #                stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         #
         #
+        center_click_cnt = 0
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
 
 
             if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_PASS_4):
             if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_PASS_4):
                 break
                 break
+            if self.appear(self.I_CHECK_BATTLE_MAIN):
+                break
             if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
             if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
                 continue
                 continue
             if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=0.5):
             if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=0.5):
@@ -207,6 +210,10 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
                 continue
                 continue
             if self.appear_then_click(self.I_PASS_2, interval=1.5):
             if self.appear_then_click(self.I_PASS_2, interval=1.5):
                 continue
                 continue
+            center = RuleClick(roi_front=(630,360,10,10), roi_back=(630,360,10,10), name="random_all")
+            if center_click_cnt <= 5 and self.click(center, interval=3.5):
+                center_click_cnt += 1
+                continue
         logger.info('Enter occupation reward screen')  # 进入到占领奖励
         logger.info('Enter occupation reward screen')  # 进入到占领奖励
         index = 0
         index = 0
         clicks = [self.I_PASS_5, self.I_PASS_6, self.I_PASS_7, self.I_PASS_8, self.I_PASS_9]
         clicks = [self.I_PASS_5, self.I_PASS_6, self.I_PASS_7, self.I_PASS_8, self.I_PASS_9]
@@ -355,6 +362,7 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
         # 运行战斗
         # 运行战斗
         strategies, options = self.loadout_from_config(self.get_general_battle_conf())
         strategies, options = self.loadout_from_config(self.get_general_battle_conf())
         # strategies['success'] = 'activity'
         # strategies['success'] = 'activity'
+        options['completion'].check_imgs = [self.I_CHECK_BATTLE_MAIN]
         self.loadout_show((strategies, options))
         self.loadout_show((strategies, options))
         self.state_show()
         self.state_show()
         with battle_wait_strategy(**strategies), battle_wait_options(**options):
         with battle_wait_strategy(**strategies), battle_wait_options(**options):

+ 13 - 13
tasks/BondlingFairyland/general_invite.py

@@ -74,7 +74,7 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                 logger.warning('Timeout, now is no room')
                 logger.warning('Timeout, now is no room')
                 return False
                 return False
 
 
-            if self.appear(self.I_INVITE_ENSURE) or self.appear(self.I_GI_CANCEL):
+            if self.appear(self.I_INVITE_ENSURE) or self.appear(self.I_UI_CANCEL):
                 logger.warning('Invite page is still open, close it before checking room status')
                 logger.warning('Invite page is still open, close it before checking room status')
                 self.close_invite_page()
                 self.close_invite_page()
                 continue
                 continue
@@ -114,9 +114,9 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         closed = False
         closed = False
         while not timer.reached():
         while not timer.reached():
             self.screenshot()
             self.screenshot()
-            if not self.appear(self.I_INVITE_ENSURE) and not self.appear(self.I_GI_CANCEL):
+            if not self.appear(self.I_INVITE_ENSURE) and not self.appear(self.I_UI_CANCEL):
                 return closed
                 return closed
-            if self.appear_then_click(self.I_GI_CANCEL, interval=0.8):
+            if self.appear_then_click(self.I_UI_CANCEL, interval=0.8):
                 closed = True
                 closed = True
                 continue
                 continue
             if self.appear_then_click(self.I_INVITE_ENSURE, interval=0.8):
             if self.appear_then_click(self.I_INVITE_ENSURE, interval=0.8):
@@ -174,13 +174,13 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.is_in_room() and \
             if not self.is_in_room() and \
-                    not self.appear_then_click(self.I_GI_SURE, interval=0.8) and \
+                    not self.appear_then_click(self.I_UI_CONFIRM, interval=0.8) and \
                     not self.appear(self.I_BACK_YELLOW):
                     not self.appear(self.I_BACK_YELLOW):
                 break
                 break
-            if self.appear_then_click(self.I_GI_SURE, interval=0.5):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
                 continue
                 continue
-            if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
-                self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
+            if not self.appear(self.I_UI_CONFIRM) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
+                self.wait_until_appear(self.I_UI_CONFIRM, wait_time=0.8)
                 continue
                 continue
         return True
         return True
 
 
@@ -461,25 +461,25 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         :param default_invite:
         :param default_invite:
         :return:
         :return:
         """
         """
-        if not self.appear(self.I_GI_SURE, interval=1.5):
+        if not self.appear(self.I_UI_CONFIRM, interval=1.5):
             return False
             return False
 
 
         if default_invite:
         if default_invite:
             # 有可能是挑战失败的
             # 有可能是挑战失败的
-            if self.appear(self.I_I_DEFAULT) or self.appear(self.I_I_NO_DEFAULT):
+            if self.appear(self.I_UI_CHECK) or self.appear(self.I_UI_UNCHECK):
                 logger.info('Click default invite')
                 logger.info('Click default invite')
                 while 1:
                 while 1:
                     self.screenshot()
                     self.screenshot()
-                    if self.appear(self.I_I_DEFAULT):
+                    if self.appear(self.I_UI_CHECK):
                         break
                         break
-                    if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+                    if self.appear_then_click(self.I_UI_UNCHECK, interval=1):
                         continue
                         continue
         # 点击确认
         # 点击确认
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if not self.appear(self.I_GI_SURE):
+            if not self.appear(self.I_UI_CONFIRM):
                 break
                 break
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
 
 
         return True
         return True

+ 3 - 3
tasks/BondlingFairyland/script_task.py

@@ -350,7 +350,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             for i in range(3):
             for i in range(3):
                 if self.appear_then_click(self.I_BUY_PLUS, interval=1):
                 if self.appear_then_click(self.I_BUY_PLUS, interval=1):
                     sleep(0.5)
                     sleep(0.5)
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_STONE_SURE, interval=2):
             if self.appear_then_click(self.I_STONE_SURE, interval=2):
                 continue
                 continue
@@ -769,9 +769,9 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             if self.appear(GeneralBattleAssets.I_EXIT):
             if self.appear(GeneralBattleAssets.I_EXIT):
                 logger.info("已经在战斗场景中")
                 logger.info("已经在战斗场景中")
                 return False
                 return False
-            if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+            if self.appear_then_click(self.I_UI_UNCHECK, interval=1):
                 continue
                 continue
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
                 continue
                 continue

+ 2 - 0
tasks/Component/GeneralBattle/assets.py

@@ -250,6 +250,8 @@ class GeneralBattleAssets:
 	C_END_3_6 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_3_6")
 	C_END_3_6 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_3_6")
 	# 其实贪吃鬼这个点了也是没事儿 
 	# 其实贪吃鬼这个点了也是没事儿 
 	C_END_GREED = RuleClick(roi_front=(138,16,512,93), roi_back=(138,16,512,93), name="end_greed")
 	C_END_GREED = RuleClick(roi_front=(138,16,512,93), roi_back=(138,16,512,93), name="end_greed")
+	# 中间的一堆奖励直接忽略。上面的end_1_1到end_3_6会容易UI变化失效 
+	C_END_MASTER = RuleClick(roi_front=(251,145,811,530), roi_back=(248,143,815,535), name="end_master")
 
 
 
 
 	# Click Rule Assets
 	# Click Rule Assets

+ 30 - 19
tasks/Component/GeneralBattle/battle_wait.py

@@ -141,14 +141,6 @@ class OptionSetupDefault:
     excludes: list | None = None
     excludes: list | None = None
 
 
 
 
-@dataclass
-class OptionCompletionDefault:
-    # 这里是为了, 确认结束战斗后退回到 “fire” 的界面
-    check_imgs: list[RuleImage] = None
-    # 兜底:check_imgs 都检测不到时,间隔点击的排除位
-    excludes: list[str] = field(default_factory=list)
-
-
 @dataclass
 @dataclass
 class OptionInterruptDefault:
 class OptionInterruptDefault:
     pass
     pass
@@ -170,6 +162,18 @@ class OptionSuccessDefault:
     ])
     ])
 
 
 
 
+@dataclass
+class OptionCompletionDefault:
+    # 这里是为了, 确认结束战斗后退回到 “fire” 的界面
+    check_imgs: list[RuleImage] | None = None
+    # 兜底:check_imgs 都检测不到时,间隔点击的排除位
+    excludes: list[str] = field(default_factory=lambda:
+    [
+        'C_END_MESSAGE_RIGHT_TOP', 'C_END_BUFF_AREA_1',
+        'C_END_BUFF_AREA_2', 'C_END_SOUL_RECORD', 'C_END_SOUL_DETAILS',
+        'C_END_MASTER',
+    ])
+
 @dataclass
 @dataclass
 class OptionFailureDefault:
 class OptionFailureDefault:
     pass
     pass
@@ -367,8 +371,9 @@ class PerBattleSetup:
 @dataclass
 @dataclass
 class PerBattleCompletion:
 class PerBattleCompletion:
     click_stage_2: RuleClickExclude | None = None
     click_stage_2: RuleClickExclude | None = None
-    # 兜底点击节拍器:进入 completion 起算,满 8s 才首次点击,之后每 8s 一次
+    # 兜底点击节拍器:进入 completion 起算,满 3s 才首次点击,之后每 3s 一次
     fallback_timer: Timer | None = None
     fallback_timer: Timer | None = None
+    fallback_cnt: int = 0
 
 
 
 
 @dataclass
 @dataclass
@@ -948,8 +953,8 @@ def randomclick_gate(func: Callable) -> Callable:
     @wraps(func)
     @wraps(func)
     def wrapper(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def wrapper(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
         options = pub.options.get('randomclick')
         options = pub.options.get('randomclick')
-        state_battle = pri.per_battle
-        state_task = pri.per_task
+        state_battle: PerBattleRandomclick = pri.per_battle
+        state_task: PerTaskRandomclick = pri.per_task
         if not isinstance(options, OptionRandomclickDefault):
         if not isinstance(options, OptionRandomclickDefault):
             raise TypeError(f"randomclick options must be OptionRandomclickDefault, got {type(options)!r}")
             raise TypeError(f"randomclick options must be OptionRandomclickDefault, got {type(options)!r}")
         if not isinstance(state_battle, PerBattleRandomclick):
         if not isinstance(state_battle, PerBattleRandomclick):
@@ -1109,8 +1114,8 @@ class BattleWait(BaseTask, GeneralBattleAssets):
 
 
     def _bw_completion_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_completion_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
         logger.info('Battle completion process')
         logger.info('Battle completion process')
-        state = pri.per_battle
-        options = pri.options
+        state: PerBattleCompletion = pri.per_battle
+        options: OptionCompletionDefault = pri.options
         if not isinstance(state, PerBattleCompletion) or not isinstance(options, OptionCompletionDefault):
         if not isinstance(state, PerBattleCompletion) or not isinstance(options, OptionCompletionDefault):
             raise
             raise
         if options.check_imgs is None:
         if options.check_imgs is None:
@@ -1125,9 +1130,13 @@ class BattleWait(BaseTask, GeneralBattleAssets):
             pub.per_task.count += 1
             pub.per_task.count += 1
             # self.current_count += 1  # 兼容旧的计数
             # self.current_count += 1  # 兼容旧的计数
             return HookSignal.DONE
             return HookSignal.DONE
-        # check_imgs 全没出现 → 兜底点击回退界面:进入 completion 满 8s 才首次点击,之后每 8s 一次
+        # check_imgs 全没出现 → 兜底点击回退界面:进入 completion 满 3s 才首次点击,之后每 3s 一次
         if state.fallback_timer is None:
         if state.fallback_timer is None:
-            state.fallback_timer = Timer(8).start()
+            state.fallback_timer = Timer(3).start()
+        if state.fallback_cnt >= 5:
+            pub.per_task.count += 1
+            logger.info('Fallback timer expired')
+            return HookSignal.DONE
         if not isinstance(state.fallback_timer, Timer):
         if not isinstance(state.fallback_timer, Timer):
             raise
             raise
         if not state.fallback_timer.reached():
         if not state.fallback_timer.reached():
@@ -1135,8 +1144,10 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         state.fallback_timer.reset()
         state.fallback_timer.reset()
         if state.click_stage_2 is None:
         if state.click_stage_2 is None:
             state.click_stage_2 = PerBattleSuccess.reward_exclude_click(self, options.excludes, name='completion_exclude_click')
             state.click_stage_2 = PerBattleSuccess.reward_exclude_click(self, options.excludes, name='completion_exclude_click')
-        x, y = state.click_stage_2.coord()
-        self.device.click(x=x, y=y, control_name='completion_exclude_click')
+        if self.click(state.click_stage_2, interval=1.5):
+            state.fallback_cnt += 1
+        # x, y = state.click_stage_2.coord()
+        # self.device.click(x=x, y=y, control_name='completion_exclude_click')
         return HookSignal.CONTINUE
         return HookSignal.CONTINUE
 
 
     def _bw_interrupt_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_interrupt_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
@@ -1144,8 +1155,8 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         return HookSignal.CONTINUE
         return HookSignal.CONTINUE
 
 
     def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
-        state = pri.per_battle
-        options = pri.options
+        state: PerBattleSuccess = pri.per_battle
+        options: OptionSuccessDefault = pri.options
         if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
         if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
             raise
             raise
         if state.click_stage_1 is None:
         if state.click_stage_1 is None:

+ 6 - 0
tasks/Component/GeneralBattle/gw/click2.json

@@ -112,5 +112,11 @@
     "roiFront": "138,16,512,93",
     "roiFront": "138,16,512,93",
     "roiBack": "138,16,512,93",
     "roiBack": "138,16,512,93",
     "description": "其实贪吃鬼这个点了也是没事儿"
     "description": "其实贪吃鬼这个点了也是没事儿"
+  },
+  {
+    "itemName": "end_master",
+    "roiFront": "251,145,811,530",
+    "roiBack": "248,143,815,535",
+    "description": "中间的一堆奖励直接忽略。上面的end_1_1到end_3_6会容易UI变化失效"
   }
   }
 ]
 ]

+ 0 - 8
tasks/Component/GeneralInvite/assets.py

@@ -79,14 +79,6 @@ class GeneralInviteAssets:
 	I_I_ACCEPT = RuleImage(roi_front=(113,225,63,72), roi_back=(113,225,63,280), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept.png")
 	I_I_ACCEPT = RuleImage(roi_front=(113,225,63,72), roi_back=(113,225,63,280), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept.png")
 	# 队员默认接受邀请 
 	# 队员默认接受邀请 
 	I_I_ACCEPT_DEFAULT = RuleImage(roi_front=(205,223,61,68), roi_back=(205,223,61,297), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept_default.png")
 	I_I_ACCEPT_DEFAULT = RuleImage(roi_front=(205,223,61,68), roi_back=(205,223,61,297), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept_default.png")
-	# 不勾选 默认邀请 
-	I_I_NO_DEFAULT = RuleImage(roi_front=(542,343,36,35), roi_back=(542,343,36,35), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_no_default.png")
-	# 勾选 默认邀请 
-	I_I_DEFAULT = RuleImage(roi_front=(541,342,41,39), roi_back=(541,342,41,39), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_default.png")
-	# description 
-	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_cancel.png")
-	# 队长邀请 确定 
-	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
 	# 所有的组队界面都有加成 
 	# 所有的组队界面都有加成 
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
 	# 三人御魂组队左上角的协站队伍 
 	# 三人御魂组队左上角的协站队伍 

+ 21 - 22
tasks/Component/GeneralInvite/general_invite.py

@@ -183,16 +183,16 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.is_in_room() and \
             if not self.is_in_room() and \
-                    not self.appear_then_click(self.I_GI_SURE, interval=0.8) and \
+                    not self.appear_then_click(self.I_UI_CONFIRM, interval=0.8) and \
                     not self.appear(self.I_BACK_YELLOW):
                     not self.appear(self.I_BACK_YELLOW):
                 break
                 break
-            if self.appear_then_click(self.I_GI_SURE, interval=0.5):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
                 continue
                 continue
-            if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
-                self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
+            if not self.appear(self.I_UI_CONFIRM) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
+                self.wait_until_appear(self.I_UI_CONFIRM, wait_time=0.8)
                 continue
                 continue
-            if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW_SEA, interval=0.8):
-                self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
+            if not self.appear(self.I_UI_CONFIRM) and self.appear_then_click(self.I_BACK_YELLOW_SEA, interval=0.8):
+                self.wait_until_appear(self.I_UI_CONFIRM, wait_time=0.8)
                 continue
                 continue
         return True
         return True
 
 
@@ -498,33 +498,33 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         # 判断是否进入界面
         # 判断是否进入界面
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_GI_SURE):
+            if self.appear(self.I_UI_CONFIRM):
                 break
                 break
         # 如果勾选了默认邀请
         # 如果勾选了默认邀请
         if default_invite:
         if default_invite:
             logger.info('Click default invite')
             logger.info('Click default invite')
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
-                if self.appear(self.I_I_DEFAULT):
+                if self.appear(self.I_UI_CHECK):
                     break
                     break
-                if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+                if self.appear_then_click(self.I_UI_UNCHECK, interval=1):
                     continue
                     continue
         else:
         else:
             logger.info('Click no default invite')
             logger.info('Click no default invite')
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
-                if self.appear(self.I_I_NO_DEFAULT):
+                if self.appear(self.I_UI_UNCHECK):
                     break
                     break
-                if self.appear_then_click(self.I_I_DEFAULT, interval=1):
+                if self.appear_then_click(self.I_UI_CHECK, interval=1):
                     continue
                     continue
 
 
         # 点击确认
         # 点击确认
         logger.info('Click invite ensure')
         logger.info('Click invite ensure')
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if not self.appear(self.I_GI_SURE):
+            if not self.appear(self.I_UI_CONFIRM):
                 break
                 break
-            if self.appear_then_click(self.I_GI_SURE):
+            if self.appear_then_click(self.I_UI_CONFIRM):
                 continue
                 continue
 
 
     def check_and_invite(self, default_invite: bool=True) -> bool:
     def check_and_invite(self, default_invite: bool=True) -> bool:
@@ -533,26 +533,25 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         :param default_invite:
         :param default_invite:
         :return:
         :return:
         """
         """
-        if not self.appear(self.I_GI_SURE):
+        if not self.appear(self.I_UI_CONFIRM):
             return False
             return False
 
 
         if default_invite:
         if default_invite:
             # 有可能是挑战失败的
             # 有可能是挑战失败的
-            if self.appear(self.I_I_DEFAULT) or self.appear(self.I_I_NO_DEFAULT):
+            if self.appear(self.I_UI_CHECK) or self.appear(self.I_UI_UNCHECK):
                 logger.info('Click default invite')
                 logger.info('Click default invite')
                 while 1:
                 while 1:
                     self.screenshot()
                     self.screenshot()
-                    if self.appear(self.I_I_DEFAULT):
+                    if self.appear(self.I_UI_CHECK):
                         break
                         break
-                    if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
-                        sleep(0.8)
+                    if self.appear_then_click(self.I_UI_UNCHECK, interval=1):
                         continue
                         continue
         # 点击确认
         # 点击确认
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if not self.appear(self.I_GI_SURE):
+            if not self.appear(self.I_UI_CONFIRM):
                 break
                 break
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
 
 
         return True
         return True
@@ -573,9 +572,9 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             # https://github.com/runhey/OnmyojiAutoScript/issues/230
             # https://github.com/runhey/OnmyojiAutoScript/issues/230
             if self.appear(GeneralBattleAssets.I_EXIT):
             if self.appear(GeneralBattleAssets.I_EXIT):
                 return False
                 return False
-            if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+            if self.appear_then_click(self.I_UI_UNCHECK, interval=1):
                 continue
                 continue
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
                 continue
                 continue

BIN
tasks/Component/GeneralInvite/gi/gi_cancel.png


BIN
tasks/Component/GeneralInvite/gi/gi_default_invite.png


BIN
tasks/Component/GeneralInvite/gi/gi_default_no.png


BIN
tasks/Component/GeneralInvite/gi/gi_gi_sure.png


BIN
tasks/Component/GeneralInvite/gi/gi_i_default.png


BIN
tasks/Component/GeneralInvite/gi/gi_i_no_default.png


+ 0 - 36
tasks/Component/GeneralInvite/gi/image.json

@@ -305,42 +305,6 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "队员默认接受邀请"
     "description": "队员默认接受邀请"
   },
   },
-  {
-    "itemName": "i_no_default",
-    "imageName": "gi_i_no_default.png",
-    "roiFront": "542,343,36,35",
-    "roiBack": "542,343,36,35",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "不勾选 默认邀请"
-  },
-  {
-    "itemName": "i_default",
-    "imageName": "gi_i_default.png",
-    "roiFront": "541,342,41,39",
-    "roiBack": "541,342,41,39",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "勾选 默认邀请"
-  },
-  {
-    "itemName": "gi_cancel",
-    "imageName": "gi_cancel.png",
-    "roiFront": "438,407,171,55",
-    "roiBack": "438,407,171,55",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "gi_sure",
-    "imageName": "gi_gi_sure.png",
-    "roiFront": "670,402,175,60",
-    "roiBack": "670,402,175,60",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "队长邀请 确定"
-  },
   {
   {
     "itemName": "gi_buff",
     "itemName": "gi_buff",
     "imageName": "gi_gi_buff.png",
     "imageName": "gi_gi_buff.png",

+ 2 - 0
tasks/Duel/assets.py

@@ -60,6 +60,8 @@ class DuelAssets:
 	I_DUEL_HONOR = RuleImage(roi_front=(211,636,20,20), roi_back=(200,601,130,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_honor.png")
 	I_DUEL_HONOR = RuleImage(roi_front=(211,636,20,20), roi_back=(200,601,130,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_honor.png")
 	# 队伍试用 
 	# 队伍试用 
 	I_D_TRY = RuleImage(roi_front=(667,356,111,30), roi_back=(667,356,111,30), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_try.png")
 	I_D_TRY = RuleImage(roi_front=(667,356,111,30), roi_back=(667,356,111,30), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_try.png")
+	# 斗技胜利MVP分享页右下分享按钮 
+	I_D_VICTORY_SHARE = RuleImage(roi_front=(1100,580,90,120), roi_back=(1080,560,130,160), threshold=0.8, method="Masked template matching", file="./tasks/Duel/duel/duel_d_victory_share.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

BIN
tasks/Duel/duel/duel_d_victory_share.png


BIN
tasks/Duel/duel/duel_d_victory_share_mask.png


+ 9 - 0
tasks/Duel/duel/image.json

@@ -187,5 +187,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "队伍试用"
     "description": "队伍试用"
+  },
+  {
+    "itemName": "d_victory_share",
+    "imageName": "duel_d_victory_share.png",
+    "roiFront": "1100,580,90,120",
+    "roiBack": "1080,560,130,160",
+    "method": "Masked template matching",
+    "threshold": 0.8,
+    "description": "斗技胜利MVP分享页右下分享按钮"
   }
   }
 ]
 ]

+ 2 - 1
tasks/Duel/script_task.py

@@ -303,7 +303,8 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, DuelAssets, SwitchOnmyoji):
             self.appear(self.I_D_CHECK_BAN)
             self.appear(self.I_D_CHECK_BAN)
 
 
     def is_battle_win(self) -> bool:
     def is_battle_win(self) -> bool:
-        return self.appear(self.I_WIN) or self.appear(self.I_D_VICTORY)
+        return self.appear(self.I_WIN) or self.appear(self.I_D_VICTORY) or \
+            self.appear(self.I_D_VICTORY_SHARE)
 
 
     def is_battle_lose(self) -> bool:
     def is_battle_lose(self) -> bool:
         return self.appear(self.I_FALSE) or self.appear(self.I_D_FAIL)
         return self.appear(self.I_FALSE) or self.appear(self.I_D_FAIL)

+ 1 - 1
tasks/EternitySea/script_task.py

@@ -165,7 +165,7 @@ class ScriptTask(
             self.screenshot()
             self.screenshot()
             if self.match_page_once(page_soul_zones):
             if self.match_page_once(page_soul_zones):
                 return
                 return
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_BACK_YELLOW, interval=1):
             if self.appear_then_click(self.I_BACK_YELLOW, interval=1):
                 continue
                 continue

+ 1 - 0
tasks/GameUi/navigator.py

@@ -50,6 +50,7 @@ class GameUi(BaseTask, GameUiAssets):
         GlobalGameAssets.I_UI_BACK_YELLOW,
         GlobalGameAssets.I_UI_BACK_YELLOW,
         SixRealmsAssets.I_EXIT_SIXREALMS,
         SixRealmsAssets.I_EXIT_SIXREALMS,
         GlobalGameAssets.I_UI_BACK_BLUE,
         GlobalGameAssets.I_UI_BACK_BLUE,
+        GlobalGameAssets.I_UI_BACK_CIRCLE,
     ]
     ]
 
 
     def __init__(self, config, device):
     def __init__(self, config, device):

+ 6 - 0
tasks/MemoryScrolls/assets.py

@@ -27,6 +27,12 @@ class MemoryScrollsAssets:
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
 	# 双绘卷之二 
 	# 双绘卷之二 
 	C_MS_DOUBLE_SCROLLS_2 = RuleClick(roi_front=(714,128,464,397), roi_back=(714,128,464,397), name="ms_double_scrolls_2")
 	C_MS_DOUBLE_SCROLLS_2 = RuleClick(roi_front=(714,128,464,397), roi_back=(714,128,464,397), name="ms_double_scrolls_2")
+	# 小绘卷最大按钮 
+	C_MS_MAX_S = RuleClick(roi_front=(1106,116,36,36), roi_back=(1106,116,36,36), name="ms_max_s")
+	# 中绘卷最大按钮 
+	C_MS_MAX_M = RuleClick(roi_front=(1106,258,36,36), roi_back=(1106,258,36,36), name="ms_max_m")
+	# 大绘卷最大按钮 
+	C_MS_MAX_L = RuleClick(roi_front=(1106,398,36,36), roi_back=(1106,398,36,36), name="ms_max_l")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 18 - 0
tasks/MemoryScrolls/ms/click.json

@@ -46,5 +46,23 @@
     "roiFront": "714,128,464,397",
     "roiFront": "714,128,464,397",
     "roiBack": "714,128,464,397",
     "roiBack": "714,128,464,397",
     "description": "双绘卷之二"
     "description": "双绘卷之二"
+  },
+  {
+    "itemName": "ms_max_s",
+    "roiFront": "1106,116,36,36",
+    "roiBack": "1106,116,36,36",
+    "description": "小绘卷最大按钮"
+  },
+  {
+    "itemName": "ms_max_m",
+    "roiFront": "1106,258,36,36",
+    "roiBack": "1106,258,36,36",
+    "description": "中绘卷最大按钮"
+  },
+  {
+    "itemName": "ms_max_l",
+    "roiFront": "1106,398,36,36",
+    "roiBack": "1106,398,36,36",
+    "description": "大绘卷最大按钮"
   }
   }
 ]
 ]

+ 14 - 6
tasks/MemoryScrolls/script_task.py

@@ -131,25 +131,33 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
     def contribute_memoryscrolls(self):
     def contribute_memoryscrolls(self):
         """
         """
         捐献碎片
         捐献碎片
+        最多捐献 10 轮,避免素材识别异常时无限循环(一轮捐一次,剩余碎片留到下次运行)
         :return: None
         :return: None
         """
         """
-        while 1:
+        max_rounds = 10
+        for i in range(1, max_rounds + 1):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_MS_ZERO_S) and self.appear(self.I_MS_ZERO_M) and self.appear(self.I_MS_ZERO_L):
             if self.appear(self.I_MS_ZERO_S) and self.appear(self.I_MS_ZERO_M) and self.appear(self.I_MS_ZERO_L):
                 logger.info('Memory Scrolls contribution is already completed')
                 logger.info('Memory Scrolls contribution is already completed')
                 return
                 return
-            self.swipe(self.S_MS_SWIPE_S, interval=1)
-            self.swipe(self.S_MS_SWIPE_M, interval=1)
-            self.swipe(self.S_MS_SWIPE_L, interval=1)
+            # 用每行的“最大”按钮代替滑动:小/中/大各点两次,等价于把数量条拉满
+            for max_button in (self.C_MS_MAX_S, self.C_MS_MAX_M, self.C_MS_MAX_L):
+                for _ in range(2):
+                    self.click(max_button)
+                    sleep(0.3)
             if self.appear_then_click(self.I_MS_CONTRIBUTE, interval=3):
             if self.appear_then_click(self.I_MS_CONTRIBUTE, interval=3):
-                logger.info('Contributed Memory Scrolls')
+                logger.info(f'Contributed Memory Scrolls ({i}/{max_rounds})')
                 # 等待捐献动画结束
                 # 等待捐献动画结束
-                while 1:
+                for _ in range(max_rounds):
                     self.screenshot()
                     self.screenshot()
                     if self.wait_until_appear(self.I_MS_CONTRIBUTED, wait_time=5):
                     if self.wait_until_appear(self.I_MS_CONTRIBUTED, wait_time=5):
                         self.click(self.C_MS_CONTRIBUTED, interval=1)
                         self.click(self.C_MS_CONTRIBUTED, interval=1)
                     else:
                     else:
                         break
                         break
+                else:
+                    logger.warning('Wait for MS_MS_CONTRIBUTED too many times')
+        logger.warning(f'Memory Scrolls contribution reached the round limit ({max_rounds}), '
+                       f'give up this run to avoid getting stuck')