Explorar el Código

Merge pull request #922 from eiheihi/dev

增加指定好友寄养,略微降低滑动范围保证每个好友均能被识别
huangrunheng hace 1 año
padre
commit
27ec92363a

+ 3 - 1
tasks/KekkaiUtilize/assets.py

@@ -119,11 +119,13 @@ class KekkaiUtilizeAssets:
 	O_BOX_EXP = RuleOcr(roi=(654,538,179,39), area=(654,538,179,39), mode="DigitCounter", method="Default", keyword="", name="box_exp")
 	O_BOX_EXP = RuleOcr(roi=(654,538,179,39), area=(654,538,179,39), mode="DigitCounter", method="Default", keyword="", name="box_exp")
 	# 今日已领取经验(招财上宾) 
 	# 今日已领取经验(招财上宾) 
 	O_BOX_EXP_ZCSB = RuleOcr(roi=(584,542,181,35), area=(584,542,181,35), mode="DigitCounter", method="Default", keyword="", name="box_exp_zcsb")
 	O_BOX_EXP_ZCSB = RuleOcr(roi=(584,542,181,35), area=(584,542,181,35), mode="DigitCounter", method="Default", keyword="", name="box_exp_zcsb")
+	# Ocr-description 
+	O_UTILIZE_F_LIST = RuleOcr(roi=(307,171,213,416), area=(307,171,213,416), mode="Full", method="Default", keyword="", name="utilize_f_list")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets
 	# 向下滑动 
 	# 向下滑动 
-	S_U_UP = RuleSwipe(roi_front=(235,419,50,21), roi_back=(225,177,72,21), mode="default", name="u_up")
+	S_U_UP = RuleSwipe(roi_front=(237,349,50,21), roi_back=(225,177,72,21), mode="default", name="u_up")
 	# 滑动到底部 
 	# 滑动到底部 
 	S_U_END = RuleSwipe(roi_front=(175,179,26,26), roi_back=(164,518,49,102), mode="default", name="u_end")
 	S_U_END = RuleSwipe(roi_front=(175,179,26,26), roi_back=(164,518,49,102), mode="default", name="u_end")
 
 

+ 2 - 0
tasks/KekkaiUtilize/config.py

@@ -18,6 +18,7 @@ class UtilizeRule(str, Enum):
     TAIKO = 'kaiko'  # 太鼓优先
     TAIKO = 'kaiko'  # 太鼓优先
     FISH = 'fish'  # 斗鱼优先
     FISH = 'fish'  # 斗鱼优先
     AUTO = 'auto'  # 自动 兼容代码罢了
     AUTO = 'auto'  # 自动 兼容代码罢了
+    FRIEND = 'friend'  # 好友选定
 
 
 
 
 
 
@@ -28,6 +29,7 @@ class UtilizeScheduler(Scheduler):
 
 
 class UtilizeConfig(BaseModel):
 class UtilizeConfig(BaseModel):
     utilize_rule: UtilizeRule = Field(default=UtilizeRule.DEFAULT, description='utilize_rule_help')
     utilize_rule: UtilizeRule = Field(default=UtilizeRule.DEFAULT, description='utilize_rule_help')
+    utilize_friend: str = Field(default= '',description='你要指定的好友的名字,需要选择同区好友还是跨区好友(就是下面那个选项)')
     select_friend_list: SelectFriendList = Field(default=SelectFriendList.SAME_SERVER, description='select_friend_list_help')
     select_friend_list: SelectFriendList = Field(default=SelectFriendList.SAME_SERVER, description='select_friend_list_help')
     shikigami_class: ShikigamiClass = Field(default=ShikigamiClass.N, description='shikigami_class_help')
     shikigami_class: ShikigamiClass = Field(default=ShikigamiClass.N, description='shikigami_class_help')
     shikigami_order: int = Field(default=4, description='shikigami_order_help')
     shikigami_order: int = Field(default=4, description='shikigami_order_help')

+ 56 - 19
tasks/KekkaiUtilize/script_task.py

@@ -384,6 +384,22 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             # while 1:
             # while 1:
             #     self.screenshot()
             #     self.screenshot()
             return card_class
             return card_class
+        def select_friend(friend_name: str) -> bool:
+            """
+            尝试在当前界面中识别并选择指定名称的好友
+            :param friend_name: 要选择的好友名称
+            :return: 成功选择返回True
+            """
+            logger.info(f"尝试选择好友: {friend_name}")
+            while 1:
+                self.screenshot()
+                self.O_UTILIZE_F_LIST.keyword = friend_name
+                if self.ocr_appear_click(self.O_UTILIZE_F_LIST):
+                    logger.info(f"成功选择好友: {friend_name}")
+                    return True
+                else:
+                    return False
+
 
 
         logger.hr('Start utilize')
         logger.hr('Start utilize')
         self.switch_friend_list(friend)
         self.switch_friend_list(friend)
@@ -394,28 +410,49 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
         else:
         else:
             self.switch_friend_list(SelectFriendList.SAME_SERVER)
             self.switch_friend_list(SelectFriendList.SAME_SERVER)
             self.switch_friend_list(SelectFriendList.DIFFERENT_SERVER)
             self.switch_friend_list(SelectFriendList.DIFFERENT_SERVER)
-        card_best = None
-        swipe_count = 0
-        while 1:
-            self.screenshot()
-            current_card = _current_select_best(card_best)
 
 
-            if current_card is None:
-                break
-            else:
-                card_best = current_card
+        rule = self.config.kekkai_utilize.utilize_config.utilize_rule
+        friend_name = self.config.kekkai_utilize.utilize_config.utilize_friend
+        if rule == UtilizeRule.FRIEND:
+            swipe_count = 0
+            while 1:
+                self.screenshot()
+                if select_friend(friend_name):
+                    break
 
 
-            # 超过十次就退出
-            if swipe_count > 10:
-                logger.warning('Swipe count is more than 10')
-                break
+                # 超过十次就退出
+                if swipe_count > 10:
+                    logger.warning('Swipe count is more than 10')
+                    break
+
+                # 一直向下滑动
+                self.swipe(self.S_U_UP, interval=0.9)
+                swipe_count += 1
+                time.sleep(3)
+
+        else:
+            card_best = None
+            swipe_count = 0
+            while 1:
+                self.screenshot()
+                current_card = _current_select_best(card_best)
+
+                if current_card is None:
+                    break
+                else:
+                    card_best = current_card
+
+                # 超过十次就退出
+                if swipe_count > 10:
+                    logger.warning('Swipe count is more than 10')
+                    break
 
 
-            # 一直向下滑动
-            self.swipe(self.S_U_UP, interval=0.9)
-            swipe_count += 1
-            time.sleep(3)
-        # 最好的结界卡
-        logger.info('End best card is %s', card_best)
+                # 一直向下滑动
+                self.swipe(self.S_U_UP, interval=0.9)
+                swipe_count += 1
+                time.sleep(3)
+            # 最好的结界卡
+            logger.info('End best card is %s', card_best)
 
 
         # 进入结界
         # 进入结界
         self.screenshot()
         self.screenshot()

+ 9 - 0
tasks/KekkaiUtilize/utilize/ocr.json

@@ -25,5 +25,14 @@
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "今日已领取经验(招财上宾)"
     "description": "今日已领取经验(招财上宾)"
+  },
+  {
+    "itemName": "utilize_f_list",
+    "roiFront": "307,171,213,416",
+    "roiBack": "307,171,213,416",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
   }
   }
 ]
 ]

+ 2 - 2
tasks/KekkaiUtilize/utilize/swipe.json

@@ -1,7 +1,7 @@
 [
 [
   {
   {
     "itemName": "u_up",
     "itemName": "u_up",
-    "roiFront": "235,419,50,21",
+    "roiFront": "237,349,50,21",
     "roiBack": "225,177,72,21",
     "roiBack": "225,177,72,21",
     "mode": "default",
     "mode": "default",
     "description": "向下滑动"
     "description": "向下滑动"
@@ -13,4 +13,4 @@
     "mode": "default",
     "mode": "default",
     "description": "滑动到底部"
     "description": "滑动到底部"
   }
   }
-]
+]