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

Merge pull request #873 from yEs1do/feat(ActivityShikigami)

蔽日轮回活动更新(前20次可能出现卡结算)
huangrunheng 1 год назад
Родитель
Сommit
5719f6e61b

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_battle_1.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 20 - 11
tasks/ActivityShikigami/as/image.json

@@ -3,7 +3,7 @@
     "itemName": "shi",
     "imageName": "as_shi.png",
     "roiFront": "519,165,33,34",
-    "roiBack": "64,115,1110,427",
+    "roiBack": "507,150,66,67",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,12 +20,21 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "1081,301,35,135",
-    "roiBack": "1042,208,153,315",
+    "roiFront": "937,308,35,135",
+    "roiBack": "892,214,153,315",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入爬塔"
   },
+  {
+    "itemName": "battle_1",
+    "imageName": "as_battle_1.png",
+    "roiFront": "541,663,191,26",
+    "roiBack": "506,622,273,96",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "进入爬塔1"
+  },
   {
     "itemName": "drum",
     "imageName": "as_drum.png",
@@ -38,8 +47,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "827,655,25,32",
-    "roiBack": "749,592,139,116",
+    "roiFront": "732,613,25,28",
+    "roiBack": "707,592,76,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "上锁图标"
@@ -47,8 +56,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "823,654,28,28",
-    "roiBack": "776,610,112,87",
+    "roiFront": "730,613,28,28",
+    "roiBack": "704,595,78,74",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +65,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1140,583,84,78",
-    "roiBack": "1099,536,150,160",
+    "roiFront": "1052,562,84,46",
+    "roiBack": "1021,521,150,160",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "点击战斗"
@@ -65,8 +74,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1093,667,23,24",
-    "roiBack": "1088,638,103,71",
+    "roiFront": "1065,612,23,24",
+    "roiBack": "1044,589,103,71",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"

+ 2 - 2
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "98,583,42,25",
-    "roiBack": "98,583,42,25",
+    "roiFront": "1102,26,57,26",
+    "roiBack": "1102,26,57,26",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 9 - 7
tasks/ActivityShikigami/assets.py

@@ -45,21 +45,23 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(519,165,33,34), roi_back=(64,115,1110,427), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(519,165,33,34), roi_back=(507,150,66,67), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(1081,301,35,135), roi_back=(1042,208,153,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(937,308,35,135), roi_back=(892,214,153,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	# 进入爬塔1 
+	I_BATTLE_1 = RuleImage(roi_front=(541,663,191,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(827,655,25,32), roi_back=(749,592,139,116), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(732,613,25,28), roi_back=(707,592,76,80), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(776,610,112,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(730,613,28,28), roi_back=(704,595,78,74), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1140,583,84,78), roi_back=(1099,536,150,160), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1052,562,84,46), roi_back=(1021,521,150,160), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1093,667,23,24), roi_back=(1088,638,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1065,612,23,24), roi_back=(1044,589,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
 	I_AP_ACTIVITY = RuleImage(roi_front=(1147,667,21,27), roi_back=(1095,654,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
@@ -74,7 +76,7 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(98,583,42,25), area=(98,583,42,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1102,26,57,26), area=(1102,26,57,26), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(715,18,95,28), area=(715,18,95,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 

+ 2 - 0
tasks/ActivityShikigami/script_task.py

@@ -153,6 +153,8 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 continue
             if self.appear_then_click(self.I_BATTLE, interval=1):
                 continue
+            if self.appear_then_click(self.I_BATTLE_1, interval=1):
+                continue
 
     def main_home(self) -> bool:
         """