Merge pull request #920 from runhey/dev

Automated PR 2025.06.26

Author: runhey

module/config/config_manual.py

@@ -19,7 +19,7 @@ class ConfigManual:
         > Pets > TalismanPass > Delegation > Hyakkiyakou
         > Secret > WeeklyTrifles > MysteryShop > Duel 
         > TrueOrochi > RichMan
-        > MetaDemon > FrogBoss > FloatParade > Quiz > KittyShop > DyeTrials
+        > MetaDemon > FrogBoss > FloatParade > Quiz > KittyShop > DyeTrials > MemoryScrolls
         """
 
     DEVICE_OVER_HTTP = False

tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1100,16,68,32",
-    "roiBack": "1100,16,68,32",
+    "roiFront": "942,16,68,32",
+    "roiBack": "942,16,68,32",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

tasks/ActivityShikigami/assets.py

@@ -76,7 +76,7 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1100,16,68,32), area=(1100,16,68,32), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(942,16,68,32), area=(942,16,68,32), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 

tasks/MemoryScrolls/assets.py

@@ -52,10 +52,10 @@ class MemoryScrollsAssets:
 
 	# Swipe Rule Assets
 	# 小碎片拉满 
-	S_MS_SWIPE_S = RuleSwipe(roi_front=(838,199,37,27), roi_back=(1131,188,66,52), mode="default", name="ms_swipe_s")
+	S_MS_SWIPE_S = RuleSwipe(roi_front=(838,199,37,27), roi_back=(1176,171,80,81), mode="default", name="ms_swipe_s")
 	# 中碎片拉满 
-	S_MS_SWIPE_M = RuleSwipe(roi_front=(838,352,37,23), roi_back=(1133,339,56,53), mode="default", name="ms_swipe_m")
+	S_MS_SWIPE_M = RuleSwipe(roi_front=(838,352,37,23), roi_back=(1176,326,83,84), mode="default", name="ms_swipe_m")
 	# 大碎片拉满 
-	S_MS_SWIPE_L = RuleSwipe(roi_front=(839,503,34,25), roi_back=(1130,492,51,48), mode="default", name="ms_swipe_l")
+	S_MS_SWIPE_L = RuleSwipe(roi_front=(839,503,34,25), roi_back=(1175,473,78,85), mode="default", name="ms_swipe_l")
 
 

tasks/MemoryScrolls/ms/swipe.json

@@ -2,21 +2,21 @@
   {
     "itemName": "ms_swipe_s",
     "roiFront": "838,199,37,27",
-    "roiBack": "1131,188,66,52",
+    "roiBack": "1176,171,80,81",
     "mode": "default",
     "description": "小碎片拉满"
   },
   {
     "itemName": "ms_swipe_m",
     "roiFront": "838,352,37,23",
-    "roiBack": "1133,339,56,53",
+    "roiBack": "1176,326,83,84",
     "mode": "default",
     "description": "中碎片拉满"
   },
   {
     "itemName": "ms_swipe_l",
     "roiFront": "839,503,34,25",
-    "roiBack": "1130,492,51,48",
+    "roiBack": "1175,473,78,85",
     "mode": "default",
     "description": "大碎片拉满"
   }

tasks/RealmRaid/script_task.py

@@ -296,7 +296,7 @@ def check_ticket(self, base: int=0) -> bool:
         cu, res, total = self.O_NUMBER.ocr(self.device.image)
 
         if total == 0:
-            self.reward_detect_click(False)
+            self.reward_detect_click(True)
             # 增加出现聊天框遮挡，处理奖励之后，重新识别票数
             cu, res, total = self.O_NUMBER.ocr(self.device.image)
         if cu == 0 and cu + res == total: