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

fix(ActivityShikigami): Update

neptine 1 месяц назад
Родитель
Сommit
b3d6fe983b

BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main_2.png


+ 1 - 1
tasks/ActivityShikigami/as/image.json

@@ -4,7 +4,7 @@
     "imageName": "as_lock.png",
     "roiFront": "825,657,28,25",
     "roiBack": "739,432,440,266",
-    "method": "Template matching",
+    "method": "Multi-scale template matching",
     "threshold": 0.5,
     "description": "上锁图标"
   },

+ 4 - 4
tasks/ActivityShikigami/as/pages.json

@@ -38,8 +38,8 @@
   {
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "302,178,98,111",
-    "roiBack": "223,110,238,269",
+    "roiFront": "220,247,97,44",
+    "roiBack": "172,122,238,269",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
@@ -83,8 +83,8 @@
   {
     "itemName": "to_battle_main_2",
     "imageName": "as_to_battle_main_2.png",
-    "roiFront": "15,94,247,38",
-    "roiBack": "2,68,311,100",
+    "roiFront": "819,458,103,33",
+    "roiBack": "799,431,142,87",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "description"

+ 16 - 16
tasks/ActivityShikigami/assets.py

@@ -25,7 +25,7 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,432,440,266), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,432,440,266), threshold=0.5, method="Multi-scale template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
 	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,426,444,276), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 活动爬塔标志 
@@ -46,7 +46,7 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	# 进入主要的战斗界面 
-	I_TO_BATTLE_MAIN = RuleImage(roi_front=(302,178,98,111), roi_back=(223,110,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(220,247,97,44), roi_back=(172,122,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
 	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1111,248,37,136), roi_back=(979,142,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
@@ -56,30 +56,30 @@ class ActivityShikigamiAssets:
 	# 从main进入到式神录 
 	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1001,558,39,42), roi_back=(966,534,140,100), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
 	# description 
-	I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(15,94,247,38), roi_back=(2,68,311,100), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
+	I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(819,458,103,33), roi_back=(799,431,142,87), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
 	# 确认跳过 
 	I_CONFIRM_SKIP = RuleImage(roi_front=(707,442,137,38), roi_back=(656,397,231,124), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_confirm_skip.png")
 
 
 	# Image Rule Assets
 	# description 
-	I_PASS_1 = RuleImage(roi_front=(359,295,100,53), roi_back=(68,203,1138,369), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_1.png")
+	I_PASS_1 = RuleImage(roi_front=(594,330,37,58), roi_back=(462,310,337,91), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_1.png")
 	# description 
-	I_PASS_2 = RuleImage(roi_front=(645,224,92,57), roi_back=(98,205,1076,366), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_2.png")
+	I_PASS_2 = RuleImage(roi_front=(625,335,31,44), roi_back=(562,326,182,66), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_2.png")
 	# description 
-	I_PASS_3 = RuleImage(roi_front=(648,227,91,55), roi_back=(103,162,1077,416), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_3.png")
+	I_PASS_3 = RuleImage(roi_front=(1178,620,71,61), roi_back=(1149,606,111,92), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_3.png")
 	# description 
-	I_PASS_4 = RuleImage(roi_front=(586,424,100,58), roi_back=(99,194,1080,398), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_4.png")
-	# 箱子 
-	I_PASS_5 = RuleImage(roi_front=(946,415,65,48), roi_back=(97,194,1036,398), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_5.png")
+	I_PASS_4 = RuleImage(roi_front=(482,499,58,54), roi_back=(448,439,126,137), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_4.png")
+	# 第一个 
+	I_PASS_5 = RuleImage(roi_front=(421,286,65,48), roi_back=(419,287,69,51), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_5.png")
 	# 印记 
-	I_PASS_6 = RuleImage(roi_front=(668,221,54,50), roi_back=(107,159,1012,394), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_6.png")
+	I_PASS_6 = RuleImage(roi_front=(548,333,54,50), roi_back=(547,335,58,52), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_6.png")
 	# description 
-	I_PASS_7 = RuleImage(roi_front=(329,233,51,51), roi_back=(95,180,1056,394), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_7.png")
+	I_PASS_7 = RuleImage(roi_front=(672,381,51,51), roi_back=(668,377,59,60), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_7.png")
 	# 印记选中间的 
-	I_PASS_8 = RuleImage(roi_front=(579,276,100,100), roi_back=(577,296,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_8.png")
-	# description 
-	I_PASS_9 = RuleImage(roi_front=(558,643,160,44), roi_back=(480,601,306,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_9.png")
+	I_PASS_8 = RuleImage(roi_front=(794,333,62,63), roi_back=(791,334,70,67), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_8.png")
+	# 第五个 
+	I_PASS_9 = RuleImage(roi_front=(929,285,50,40), roi_back=(921,278,70,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_9.png")
 	# 印记选左边的 
 	I_PASS_10 = RuleImage(roi_front=(279,309,100,100), roi_back=(291,305,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_10.png")
 	# 印记选右边的 
@@ -94,9 +94,9 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1135,599,85,49), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(584,17,63,27), area=(583,16,63,30), mode="Digit", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(777,16,63,27), area=(776,15,63,30), mode="Digit", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(791,18,50,29), area=(791,18,49,28), mode="Digit", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(1153,24,50,29), area=(1153,26,49,28), mode="Digit", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 

BIN
tasks/ActivityShikigami/fire/fire_pass_1.png


BIN
tasks/ActivityShikigami/fire/fire_pass_2.png


BIN
tasks/ActivityShikigami/fire/fire_pass_3.png


BIN
tasks/ActivityShikigami/fire/fire_pass_4.png


+ 20 - 20
tasks/ActivityShikigami/fire/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "pass_1",
     "imageName": "fire_pass_1.png",
-    "roiFront": "359,295,100,53",
-    "roiBack": "68,203,1138,369",
+    "roiFront": "594,330,37,58",
+    "roiBack": "462,310,337,91",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -11,8 +11,8 @@
   {
     "itemName": "pass_2",
     "imageName": "fire_pass_2.png",
-    "roiFront": "645,224,92,57",
-    "roiBack": "98,205,1076,366",
+    "roiFront": "625,335,31,44",
+    "roiBack": "562,326,182,66",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -20,8 +20,8 @@
   {
     "itemName": "pass_3",
     "imageName": "fire_pass_3.png",
-    "roiFront": "648,227,91,55",
-    "roiBack": "103,162,1077,416",
+    "roiFront": "1178,620,71,61",
+    "roiBack": "1149,606,111,92",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "pass_4",
     "imageName": "fire_pass_4.png",
-    "roiFront": "586,424,100,58",
-    "roiBack": "99,194,1080,398",
+    "roiFront": "482,499,58,54",
+    "roiBack": "448,439,126,137",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,17 +38,17 @@
   {
     "itemName": "pass_5",
     "imageName": "fire_pass_5.png",
-    "roiFront": "946,415,65,48",
-    "roiBack": "97,194,1036,398",
+    "roiFront": "421,286,65,48",
+    "roiBack": "419,287,69,51",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "箱子"
+    "description": "第一个"
   },
   {
     "itemName": "pass_6",
     "imageName": "fire_pass_6.png",
-    "roiFront": "668,221,54,50",
-    "roiBack": "107,159,1012,394",
+    "roiFront": "548,333,54,50",
+    "roiBack": "547,335,58,52",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "印记"
@@ -56,8 +56,8 @@
   {
     "itemName": "pass_7",
     "imageName": "fire_pass_7.png",
-    "roiFront": "329,233,51,51",
-    "roiBack": "95,180,1056,394",
+    "roiFront": "672,381,51,51",
+    "roiBack": "668,377,59,60",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "description"
@@ -65,8 +65,8 @@
   {
     "itemName": "pass_8",
     "imageName": "fire_pass_8.png",
-    "roiFront": "579,276,100,100",
-    "roiBack": "577,296,100,100",
+    "roiFront": "794,333,62,63",
+    "roiBack": "791,334,70,67",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "印记选中间的"
@@ -74,11 +74,11 @@
   {
     "itemName": "pass_9",
     "imageName": "fire_pass_9.png",
-    "roiFront": "558,643,160,44",
-    "roiBack": "480,601,306,100",
+    "roiFront": "929,285,50,40",
+    "roiBack": "921,278,70,56",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "第五个"
   },
   {
     "itemName": "pass_10",

+ 4 - 4
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap",
-    "roiFront": "584,17,63,27",
-    "roiBack": "583,16,63,30",
+    "roiFront": "777,16,63,27",
+    "roiBack": "776,15,63,30",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "remain_pass",
-    "roiFront": "791,18,50,29",
-    "roiBack": "791,18,49,28",
+    "roiFront": "1153,24,50,29",
+    "roiBack": "1153,26,49,28",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

+ 69 - 12
tasks/ActivityShikigami/script_task.py

@@ -158,7 +158,16 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
                 method_func = getattr(self, f'_run_{climb_type}')
                 method_func()
             except LimitCountOut as e:
-                self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=2.8)
+                while 1:
+                    self.screenshot()
+                    if self.appear(self.I_TO_BATTLE_MAIN):
+                        break
+                    if self.appear_then_click(self.I_UI_BACK_CIRCLE, interval=1.5):
+                        continue
+                    if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=2.5):
+                        continue
+                    if self.appear_then_click(self.I_UI_BACK_RED, interval=1.5):
+                        continue
             except LimitTimeOut as e:
                 break
             finally:
@@ -178,10 +187,43 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
             更新前请先看 ./README.md
         """
         logger.hr(f'Start run climb type PASS', 1)
-        self.ui_clicks([self.I_TO_BATTLE_MAIN, self.I_TO_BATTLE_MAIN_2],
-                       stop=self.I_CHECK_BATTLE_MAIN, interval=1)
+        # self.ui_clicks([self.I_TO_BATTLE_MAIN_2],
+        #                stop=self.I_CHECK_BATTLE_MAIN, interval=1)
+        #
+        while 1:
+            self.screenshot()
+
+            if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_PASS_4):
+                break
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=0.5):
+                continue
+            if self.appear_then_click(self.I_TO_BATTLE_MAIN_2, interval=1.5):
+                continue
+            if not self.appear(self.I_PASS_3):
+                continue
+            if self.appear_then_click(self.I_PASS_1, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_PASS_2, interval=1.5):
+                continue
+        logger.info('Enter occupation reward screen')  # 进入到占领奖励
+        index = 0
+        clicks = [self.I_PASS_5, self.I_PASS_6, self.I_PASS_7, self.I_PASS_8, self.I_PASS_9]
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_CHECK_BATTLE_MAIN):
+                break
+            if self.click(clicks[index], interval=1.5):
+                sleep(1)
+            index = (index + 1) % len(clicks)
+        logger.info('Enter challenge screen')  # 正式进入挑战界面
+
+
+
+
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
-        self.switch_climb_mode_in_game('pass')
+        # self.switch_climb_mode_in_game('pass')
 
         ocr_limit_timer = Timer(1).start()
         click_limit_timer = Timer(4).start()
@@ -209,17 +251,23 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
             if self.start_battle():
                 continue
 
-        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=4.5)
+        # self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=4.5)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_TO_BATTLE_MAIN):
+                break
+            if self.appear(self.I_CHECK_BATTLE_MAIN) and self.appear_then_click(self.I_UI_BACK_YELLOW, interval=2.5):
+                continue
 
     def _run_ap(self):
         """
             更新前请先看 ./README.md
         """
         logger.hr(f'Start run climb type AP')
-        self.ui_clicks([self.I_TO_BATTLE_MAIN, self.I_TO_BATTLE_MAIN_2],
+        self.ui_clicks([self.I_TO_BATTLE_MAIN],
                        stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
-        self.switch_climb_mode_in_game('ap')
+        # self.switch_climb_mode_in_game('ap')
 
         ocr_limit_timer = Timer(1).start()
         while 1:
@@ -242,7 +290,19 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
             if self.start_battle():
                 continue
 
-        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=4.5)
+        # self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=3.5, timeout=10)
+        while 1:
+            self.screenshot()
+
+            if self.appear(self.I_TO_BATTLE_MAIN):
+                break
+            if self.appear_then_click(self.I_UI_BACK_CIRCLE, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=2.5):
+                continue
+            if self.appear_then_click(self.I_UI_BACK_RED, interval=1.5):
+                continue
+
 
     def _run_boss(self):
         """
@@ -294,7 +354,7 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
                 continue
         # 运行战斗
         strategies, options = self.loadout_from_config(self.get_general_battle_conf())
-        strategies['success'] = 'activity'
+        # strategies['success'] = 'activity'
         self.loadout_show((strategies, options))
         self.state_show()
         with battle_wait_strategy(**strategies), battle_wait_options(**options):
@@ -305,9 +365,6 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
             logger.info(f'Count {self.climb_type}: {self.count_map[self.climb_type]}')
         return win
 
-    # @battle_wait_strategy(success='activity')
-    # def battle_wait(self, *args, **kwargs):
-    #     return self.battle_wait_with_strategy(*args, **kwargs)
 
     def switch_soul(self, enter_button: RuleImage, cur_img: RuleImage):
         conf = self.conf.switch_soul_config

+ 1 - 1
tasks/GlobalGame/assets.py

@@ -70,6 +70,6 @@ class GlobalGameAssets:
 	# 知道了 
 	I_UI_GOTIT_SMALL = RuleImage(roi_front=(678,396,127,60), roi_back=(622,371,242,100), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_gotit_small.png")
 	# 圆形返回按钮(移植自mine) 
-	I_UI_BACK_CIRCLE = RuleImage(roi_front=(24,21,36,39), roi_back=(0,0,95,101), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_back_circle.png")
+	# I_UI_BACK_CIRCLE = RuleImage(roi_front=(24,21,36,39), roi_back=(0,0,95,101), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_back_circle.png")