Explorar o código

Merge pull request #1101 from yEs1do/feat(KekkaiActivation_SmartExchange)

加入智能放入功能
huangrunheng hai 1 ano
pai
achega
83fd4c247a

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

@@ -79,6 +79,8 @@ class ReplaceShikigamiAssets:
 	I_RS_RECORDS_SHIKI = RuleImage(roi_front=(1148,548,49,43), roi_back=(1145,548,55,90), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_records_shiki.png")
 	# 检测到已经满级了 
 	I_RS_LEVEL_MAX = RuleImage(roi_front=(487,248,23,21), roi_back=(52,238,1118,37), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_level_max.png")
+	# 智能放入 
+	I_RS_SMART_EXCHANGE = RuleImage(roi_front=(1150,507,40,44), roi_back=(1128,488,86,162), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_smart_exchange.png")
 
 
 	# Image Rule Assets

+ 9 - 0
tasks/Component/ReplaceShikigami/rs/image.json

@@ -133,5 +133,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "检测到已经满级了"
+  },
+  {
+    "itemName": "rs_smart_exchange",
+    "imageName": "rs_rs_smart_exchange.png",
+    "roiFront": "1150,507,40,44",
+    "roiBack": "1128,488,86,162",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "智能放入"
   }
 ]

BIN=BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_smart_exchange.png


+ 1 - 0
tasks/KekkaiActivation/config.py

@@ -20,6 +20,7 @@ class ActivationConfig(BaseModel):
     card_rule: MultiLine = Field(default='auto', description='card_rule_help')
     exchange_before: bool = Field(default=True, description='exchange_before_help')
     exchange_max: bool = Field(default=True, description='exchange_max_help')
+    exchange_smart: bool = Field(default=False, description='是否启用智能放入')
     shikigami_class: ShikigamiClass = Field(default=ShikigamiClass.N, description='shikigami_class_help')
 
 

+ 9 - 5
tasks/KekkaiActivation/script_task.py

@@ -30,7 +30,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
         # 进入寮结界
         self.goto_realm()
         if con.exchange_before:
-            self.check_max_lv(con.shikigami_class)
+            self.check_max_lv(con)
         self.harvest_card()
 
         self.run_activation(con)
@@ -45,7 +45,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
                 continue
 
         if con.exchange_max:
-            self.check_max_lv(con.shikigami_class)
+            self.check_max_lv(con)
         self.back_guild()
 
         raise TaskEnd('KekkaiActivation')
@@ -340,24 +340,28 @@ class ScriptTask(KU, KekkaiActivationAssets):
         self.appear_then_click(target, interval=0.5)
         return current_card
 
-    def check_max_lv(self, shikigami_class: ShikigamiClass = ShikigamiClass.N):
+    def check_max_lv(self, con: ActivationConfig):
         """
         在结界界面,进入式神育成,检查是否有满级的,如果有就换下一个
         退出的时候还是结界界面
         :return:
         """
         self.realm_goto_grown()
+        # 直接进行智能放入
+        if con.exchange_smart:
+            logger.info('Smart exchange')
+            self.ui_click_until_disappear(self.I_RS_SMART_EXCHANGE)
         if self.appear(self.I_RS_LEVEL_MAX):
             # 存在满级的式神
             logger.info('Exist max level shikigami and replace it')
             self.unset_shikigami_max_lv()
-            self.switch_shikigami_class(shikigami_class)
+            self.switch_shikigami_class(con.shikigami_class)
             self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
         else:
             logger.info('No max level shikigami')
         if self.detect_no_shikigami():
             logger.warning('There are no any shikigami grow room')
-            self.switch_shikigami_class(shikigami_class)
+            self.switch_shikigami_class(con.shikigami_class)
             self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
 
         # 回到结界界面