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

契灵组队实现,队长队员切换(按次数的一半)身份必选handoff1和handoff2

ljxun 1 год назад
Родитель
Сommit
09859e0244

+ 2 - 5
tasks/BondlingFairyland/assets.py

@@ -51,13 +51,10 @@ class BondlingFairylandAssets:
 	I_BALL_HELP = RuleImage(roi_front=(963,571,100,100), roi_back=(963,571,100,100), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/ball_ball_help.png")
 	# 契灵创建队伍 
 	I_CREATE_TEAM = RuleImage(roi_front=(569,491,141,50), roi_back=(569,491,141,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/create_team.png")
-	# 点击邀请
-	I_INVITE_ENSURE = RuleImage(roi_front=(500,541,132,60), roi_back=(478,523,378,92), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
-	# 判断是否点中好友了
-	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(380,157,568,350), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_selected.png")
-	# 用来判断当前的列表是哪儿的
+	# 用来判断当前的列表是哪儿的 
 	I_FLAG_1_ON = RuleImage(roi_front=(373,127,22,21), roi_back=(373,127,22,21), threshold=0.7, method="Template matching", file="./tasks/BondlingFairyland/ball/gi_flag_1_on.png")
 
+
 	# Image Rule Assets
 	# description 
 	I_BF_SEARSH = RuleImage(roi_front=(1133,577,100,100), roi_back=(1133,577,100,100), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/bf/bf_bf_searsh.png")

+ 2 - 20
tasks/BondlingFairyland/ball/image.json

@@ -53,31 +53,13 @@
     "threshold": 0.8,
     "description": "契灵创建队伍"
   },
-  {
-    "itemName": "invite_ensure",
-    "imageName": "gi_invite_ensure.png",
-    "roiFront": "500,541,132,60",
-    "roiBack": "478,523,378,92",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "点击邀请"
-  },
-  {
-    "itemName": "selected",
-    "imageName": "gi_selected.png",
-    "roiFront": "895,373,33,32",
-    "roiBack": "380,157,568,350",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "判断是否点中好友了"
-  },
   {
     "itemName": "flag_1_on",
     "imageName": "gi_flag_1_on.png",
     "roiFront": "373,127,22,21",
-    "roiBack": "3373,127,22,21",
+    "roiBack": "373,127,22,21",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "用来判断当前的列表是哪儿的"
   }
 ]

+ 2 - 0
tasks/BondlingFairyland/config.py

@@ -34,6 +34,8 @@ class UserStatus(str, Enum):
     LEADER = 'leader'
     MEMBER = 'member'
     ALONE = 'alone'
+    handoff1 = 'handoff1'
+    handoff2 = 'handoff2'
     # WILD = 'wild'  # 还不打算实现
 class BondlingConfig(ConfigBase):
     # 身份

+ 6 - 3
tasks/BondlingFairyland/general_invite.py

@@ -45,7 +45,7 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
 
     """
 
-    def run_invite(self, config: InviteConfig, is_first: bool = False) -> bool:
+    def run_invite(self, config: InviteConfig, is_first: bool = False, is_over: bool = True) -> bool:
         """
         队长!!身份。。。在组队界面邀请好友( 如果开启is_first) 等待队员进入开启挑战
         请注意,返回的时候成功时是进入战斗了!!!
@@ -120,8 +120,11 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
 
             # 点击挑战
             if fire:
-                self.click_fire()
-                return True
+                if is_over:
+                    self.click_fire()
+                    return True
+                else:
+                    return True
 
             if self.timer_invite and self.timer_invite.reached():
                 if is_first:

+ 39 - 20
tasks/BondlingFairyland/script_task.py

@@ -70,6 +70,17 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         self.current_count = 0
         self.limit_count: int = limit_count
 
+        if UserStatus.handoff1 == cong.bondling_config.user_status:
+            self.limit_count: int = limit_count//2
+            self.switch_ball()
+        if UserStatus.handoff2 == cong.bondling_config.user_status:
+            self.limit_count: int = limit_count//2
+            self.run_member()
+            self.current_count = 0
+            self.ui_get_current_page()
+            self.ui_goto(page_bondling_fairyland)
+            self.switch_ball()
+
         match cong.bondling_config.user_status:
             case UserStatus.LEADER:
                 self.switch_ball()
@@ -106,7 +117,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             #     logger.info('Orochi count limit out')
             #     break
             if datetime.now() - self.start_time >= self.limit_time:
-                logger.info('Orochi time limit out')
+                logger.info('BondlingFairyland time limit out')
                 break
 
             if self.check_then_accept():
@@ -138,15 +149,13 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             # 如果还在战斗中,就退出战斗
             if self.exit_battle():
                 pass
-
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
-
-        if success:
+                # 引用配置
+        if UserStatus.MEMBER == self.config.bondling_fairyland.bondling_config.user_status:
+            self.ui_get_current_page()
+            self.ui_goto(page_main)
             self.set_next_run(task='BondlingFairyland', finish=True, success=True)
-        else:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=False)
-        raise TaskEnd
+            raise TaskEnd
+
 
     def switch_ball(self):
         cong = self.config.bondling_fairyland
@@ -212,13 +221,10 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
         self.ui_get_current_page()
         self.ui_goto(page_main)
-
-        if success:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=True)
-        else:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=False)
+        self.set_next_run(task='BondlingFairyland', finish=True, success=True)
         raise TaskEnd
 
+
     def run_stone(self, bondling_stone_enable: bool, bondling_stone_class: BondlingClass):
         """
         使用结契石 进行召唤 契灵
@@ -384,6 +390,12 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 case UserStatus.LEADER:
                     if self.run_leader():
                         return success
+                case UserStatus.handoff1:
+                    if self.run_leader():
+                        return success
+                case UserStatus.handoff2:
+                    if self.run_leader():
+                        return success
                 case UserStatus.ALONE:
                     self.run_alone()
                     if self.run_battle(battle_config, limit_count=self.limit_count):
@@ -682,6 +694,10 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
             if self.current_count >= self.limit_count:
                 if self.appear(self.I_GI_IN_ROOM):
+                    # 次数达到也要邀请好友进房间,然后退出,不然队员无法判断是否完成契灵,出现异常
+                    self.run_invite(config=self.config.bondling_fairyland.invite_config, is_over=False)
+                    # 等待三秒让队员进房间,避免队员没进房间出现异常
+                    sleep(3)
                     logger.info('bondling_fairyland count limit out')
                     break
 
@@ -722,12 +738,14 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             pass
 
         self.ui_get_current_page()
+        self.ui_goto(page_bondling_fairyland)
+        # 引用配置
+        if UserStatus.handoff1 == self.config.bondling_fairyland.bondling_config.user_status:
+            self.current_count = 0
+            self.run_member()
+        self.ui_get_current_page()
         self.ui_goto(page_main)
-
-        if success:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=True)
-        else:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=False)
+        self.set_next_run(task='BondlingFairyland', finish=True, success=True)
         raise TaskEnd
 
     def wait_battle(self, wait_time: time) -> bool:
@@ -865,6 +883,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 break
 
             if self.is_in_room():
+                logger.info("进入到组队房间!is_in_room")
                 return True
             # 被秒开
             # https://github.com/runhey/OnmyojiAutoScript/issues/230
@@ -896,7 +915,7 @@ if __name__ == '__main__':
     from module.device.device import Device
     import cv2
 
-    config = Config('oas1')
+    config = Config('du')
     device = Device(config)
     task = ScriptTask(config, device)
     image = task.screenshot()