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

fix(GeneralInvite): Use shared UI assets for invite confirmation #1915
- replace invite-specific checkbox, cancel, and confirm assets with GlobalGame UI assets
- remove obsolete GeneralInvite image definitions, metadata, and files
- update BondlingFairyland and EternitySea invite call sites

neptine 1 месяц назад
Родитель
Сommit
84eda193d8

+ 13 - 13
tasks/BondlingFairyland/general_invite.py

@@ -74,7 +74,7 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                 logger.warning('Timeout, now is no room')
                 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')
                 self.close_invite_page()
                 continue
@@ -114,9 +114,9 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         closed = False
         while not timer.reached():
             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
-            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
                 continue
             if self.appear_then_click(self.I_INVITE_ENSURE, interval=0.8):
@@ -174,13 +174,13 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         while 1:
             self.screenshot()
             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):
                 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
-            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
         return True
 
@@ -461,25 +461,25 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         :param default_invite:
         :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
 
         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')
                 while 1:
                     self.screenshot()
-                    if self.appear(self.I_I_DEFAULT):
+                    if self.appear(self.I_UI_CHECK):
                         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
         # 点击确认
         while 1:
             self.screenshot()
-            if not self.appear(self.I_GI_SURE):
+            if not self.appear(self.I_UI_CONFIRM):
                 break
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
 
         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):
                 if self.appear_then_click(self.I_BUY_PLUS, interval=1):
                     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
             if self.appear_then_click(self.I_STONE_SURE, interval=2):
                 continue
@@ -769,9 +769,9 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             if self.appear(GeneralBattleAssets.I_EXIT):
                 logger.info("已经在战斗场景中")
                 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
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
                 continue

+ 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_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")
 	# 三人御魂组队左上角的协站队伍 

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

@@ -183,16 +183,16 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         while 1:
             self.screenshot()
             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):
                 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
-            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
-            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
         return True
 
@@ -496,33 +496,33 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         # 判断是否进入界面
         while 1:
             self.screenshot()
-            if self.appear(self.I_GI_SURE):
+            if self.appear(self.I_UI_CONFIRM):
                 break
         # 如果勾选了默认邀请
         if default_invite:
             logger.info('Click default invite')
             while 1:
                 self.screenshot()
-                if self.appear(self.I_I_DEFAULT):
+                if self.appear(self.I_UI_CHECK):
                     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
         else:
             logger.info('Click no default invite')
             while 1:
                 self.screenshot()
-                if self.appear(self.I_I_NO_DEFAULT):
+                if self.appear(self.I_UI_UNCHECK):
                     break
-                if self.appear_then_click(self.I_I_DEFAULT, interval=1):
+                if self.appear_then_click(self.I_UI_CHECK, interval=1):
                     continue
 
         # 点击确认
         logger.info('Click invite ensure')
         while 1:
             self.screenshot()
-            if not self.appear(self.I_GI_SURE):
+            if not self.appear(self.I_UI_CONFIRM):
                 break
-            if self.appear_then_click(self.I_GI_SURE):
+            if self.appear_then_click(self.I_UI_CONFIRM):
                 continue
 
     def check_and_invite(self, default_invite: bool=True) -> bool:
@@ -531,25 +531,25 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         :param default_invite:
         :return:
         """
-        if not self.appear(self.I_GI_SURE):
+        if not self.appear(self.I_UI_CONFIRM):
             return False
 
         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')
                 while 1:
                     self.screenshot()
-                    if self.appear(self.I_I_DEFAULT):
+                    if self.appear(self.I_UI_CHECK):
                         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
         # 点击确认
         while 1:
             self.screenshot()
-            if not self.appear(self.I_GI_SURE):
+            if not self.appear(self.I_UI_CONFIRM):
                 break
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
 
         return True
@@ -570,9 +570,9 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             # https://github.com/runhey/OnmyojiAutoScript/issues/230
             if self.appear(GeneralBattleAssets.I_EXIT):
                 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
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
                 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,
     "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",
     "imageName": "gi_gi_buff.png",

+ 1 - 1
tasks/EternitySea/script_task.py

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