Introduce "Smart Place" and "One-Click Remove" functionality for Shikigami management, with assets and task flow enhancements.

Author: gfwong

…ilize/utilize/utilize_auto_switch_up.png …sks/KekkaiActivation/a/a_smart_place.pngtasks/KekkaiUtilize/utilize/utilize_auto_switch_up.png renamed to tasks/KekkaiActivation/a/a_smart_place.png tasks/KekkaiUtilize/utilize/utilize_auto_switch_up.png renamed to tasks/KekkaiActivation/a/a_smart_place.png

@@ -214,5 +214,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "斗鱼3"
+  },
+  {
+    "itemName": "smart_remove",
+    "imageName": "a_smart_remove.png",
+    "roiFront": "1148,505,45,48",
+    "roiBack": "1139,498,60,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "一键卸下(式神育成)"
+  },
+  {
+    "itemName": "smart_place",
+    "imageName": "a_smart_place.png",
+    "roiFront": "1149,507,44,45",
+    "roiBack": "1123,478,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "智能放入(式神育成)"
   }
 ]

…ize/utilize/utilize_auto_switch_down.png …ks/KekkaiActivation/a/a_smart_remove.pngtasks/KekkaiUtilize/utilize/utilize_auto_switch_down.png renamed to tasks/KekkaiActivation/a/a_smart_remove.png tasks/KekkaiUtilize/utilize/utilize_auto_switch_down.png renamed to tasks/KekkaiActivation/a/a_smart_remove.png

@@ -78,6 +78,10 @@ class KekkaiActivationAssets:
 	I_A_DEMOUNT = RuleImage(roi_front=(939,575,55,47), roi_back=(903,551,107,91), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_demount.png")
 	# 斗鱼3 
 	I_A_HARVEST_FISH_3 = RuleImage(roi_front=(891,165,57,39), roi_back=(854,128,160,174), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_3.png")
+	# 一键卸下(式神育成) 
+	I_SMART_REMOVE = RuleImage(roi_front=(1148,505,45,48), roi_back=(1139,498,60,61), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_smart_remove.png")
+	# 智能放入(式神育成) 
+	I_SMART_PLACE = RuleImage(roi_front=(1149,507,44,45), roi_back=(1123,478,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_smart_place.png")
 
 
 	# Image Rule Assets

tasks/KekkaiActivation/a/image.json

@@ -361,25 +361,62 @@ def _card_not_found(self):
         self.set_next_run("KekkaiActivation", target=next_run)
         raise TaskEnd
 
+    def _smart_place_shikigami(self, shikigami_class: ShikigamiClass = ShikigamiClass.N, timeout: int = 30):
+        """
+        使用智能放入和一键卸下放置式神 (替代逐个手动: unset_shikigami_max_lv + set_shikigami)
+        前提: 已在式神育成界面
+        """
+        logger.info('Smart place: start')
+        # 1) 一键卸下现有式神
+        self.screenshot()
+        if self.appear(self.I_SMART_REMOVE):
+            logger.info('Smart place: one-click remove existing shikigami')
+            self.appear_then_click(self.I_SMART_REMOVE, interval=2)
+            time.sleep(1)
+
+        # 2) 切换式神分类
+        self.switch_shikigami_class(shikigami_class)
+
+        # 3) 智能放入
+        timer = Timer(timeout).start()
+        while 1:
+            self.screenshot()
+            # 放置完成: I_RS_NO_ADD 从屏幕上消失表示已放入式神
+            if not self.appear(self.I_RS_NO_ADD):
+                logger.info('Smart place: shikigami placed successfully')
+                return True
+            if timer.reached():
+                logger.warning('Smart place: timeout')
+                return False
+            # 确认弹窗
+            if self.appear_then_click(self.I_U_CONFIRM_SMALL, interval=0.5):
+                continue
+            # SP式神替换确认
+            if self.appear_then_click(self.I_U_CIRCLE_ALTERNATE, interval=2.5):
+                self.appear_then_click(self.I_U_CONFIRM_ALTERNATE, interval=1.5)
+                continue
+            # 点击智能放入
+            if self.appear_then_click(self.I_SMART_PLACE, interval=2):
+                logger.info('Smart place: clicked smart place button')
+                continue
+
     def check_max_lv(self, shikigami_class: ShikigamiClass = ShikigamiClass.N):
         """
         在结界界面，进入式神育成，检查是否有满级的，如果有就换下一个
+        通过智能放入和一键卸下完成，不再逐个手动点击
         退出的时候还是结界界面
         :return:
         """
         self.realm_goto_grown()
         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.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
+            # 存在满级的式神 -> 智能换入
+            logger.info('Exist max level shikigami, smart replace')
+            self._smart_place_shikigami(shikigami_class)
         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.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
+            self._smart_place_shikigami(shikigami_class)
 
         # 回到结界界面
         while 1:

tasks/KekkaiActivation/assets.py

@@ -205,23 +205,5 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
-  },
-  {
-    "itemName": "auto_switch_up",
-    "imageName": "utilize_auto_switch_up.png",
-    "roiFront": "1149,507,44,45",
-    "roiBack": "1123,478,100,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "智能放入"
-  },
-  {
-    "itemName": "auto_switch_down",
-    "imageName": "utilize_auto_switch_down.png",
-    "roiFront": "1148,505,45,48",
-    "roiBack": "1139,498,60,61",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "一键卸下"
   }
 ]