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

Merge pull request #279 from runhey/dev

Dev
huangrunheng 2 лет назад
Родитель
Сommit
d6919d4553

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_switch.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


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

@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "883,291,35,165",
-    "roiBack": "840,218,138,315",
+    "roiFront": "854,108,35,165",
+    "roiBack": "790,58,138,315",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"
@@ -38,8 +38,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "816,655,25,32",
-    "roiBack": "816,655,25,32",
+    "roiFront": "827,655,25,32",
+    "roiBack": "749,592,139,116",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "上锁图标"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "813,656,28,28",
-    "roiBack": "813,656,28,28",
+    "roiFront": "823,654,28,28",
+    "roiBack": "802,610,86,87",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1117,564,107,108",
-    "roiBack": "1117,564,107,108",
+    "roiFront": "1143,585,84,78",
+    "roiBack": "1117,498,142,174",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "984,474,29,26",
-    "roiBack": "984,474,29,26",
+    "roiFront": "1135,515,29,26",
+    "roiBack": "1092,487,103,71",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "987,476,27,25",
-    "roiBack": "987,476,27,25",
+    "roiFront": "1133,516,27,25",
+    "roiBack": "1090,500,84,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1075,480,23,23",
-    "roiBack": "1075,480,23,23",
+    "roiFront": "1221,518,23,23",
+    "roiBack": "1200,497,69,56",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1155,672,87,25",
-    "roiBack": "1155,672,87,25",
+    "roiFront": "1165,672,87,25",
+    "roiBack": "1165,672,87,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "1062,13,95,30",
-    "roiBack": "1062,13,95,30",
+    "roiFront": "912,25,95,30",
+    "roiBack": "912,25,95,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 9 - 9
tasks/ActivityShikigami/assets.py

@@ -38,21 +38,21 @@ class ActivityShikigamiAssets:
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(883,291,35,165), roi_back=(840,218,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(854,108,35,165), roi_back=(790,58,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(885,310,29,145), roi_back=(860,244,87,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(816,655,25,32), roi_back=(816,655,25,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.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_UNLOCK = RuleImage(roi_front=(813,656,28,28), roi_back=(813,656,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(802,610,86,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1117,564,107,108), roi_back=(1117,564,107,108), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1143,585,84,78), roi_back=(1117,498,142,174), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(984,474,29,26), roi_back=(984,474,29,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1135,515,29,26), roi_back=(1092,487,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(987,476,27,25), roi_back=(987,476,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1133,516,27,25), roi_back=(1090,500,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1075,480,23,23), roi_back=(1075,480,23,23), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1221,518,23,23), roi_back=(1200,497,69,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
 	# 购买活动的体力 
 	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	# 增加到最大 
@@ -63,9 +63,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1155,672,87,25), area=(1155,672,87,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1165,672,87,25), area=(1165,672,87,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(1062,13,95,30), area=(1062,13,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(912,25,95,30), area=(912,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 

+ 23 - 24
tasks/ActivityShikigami/script_task.py

@@ -32,9 +32,9 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         self.ui_goto(page_main)
         self.home_main()
 
-        # 2024-04-04 ---------------------start
-        config.general_climb.ap_mode = ApMode.AP_GAME
-        # 2024-04-04 ---------------------end
+        # # 2024-04-04 ---------------------start
+        # config.general_climb.ap_mode = ApMode.AP_GAME
+        # # 2024-04-04 ---------------------end
         # 选择是游戏的体力还是活动的体力
         current_ap = config.general_climb.ap_mode
         self.switch(current_ap)
@@ -178,27 +178,26 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         :param current_ap:
         :return:
         """
-        pass
-        # if current_ap == ApMode.AP_ACTIVITY:
-        #     logger.info("Select activity ap")
-        #     while 1:
-        #         self.screenshot()
-        #         if self.appear(self.I_AP_ACTIVITY):
-        #             break
-        #         if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
-        #             continue
-        #         if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
-        #             continue
-        #         if self.appear(self.I_AP, interval=1):
-        #             self.appear_then_click(self.I_SWITCH, interval=2)  # 点击切换
-        # else:
-        #     logger.info("Select game ap")
-        #     while 1:
-        #         self.screenshot()
-        #         if self.appear(self.I_AP):
-        #             break
-        #         if self.appear(self.I_AP_ACTIVITY, interval=1):
-        #             self.appear_then_click(self.I_SWITCH, interval=2)
+        if current_ap == ApMode.AP_ACTIVITY:
+            logger.info("Select activity ap")
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_AP_ACTIVITY):
+                    break
+                if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                    continue
+                if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                    continue
+                if self.appear(self.I_AP, interval=1):
+                    self.appear_then_click(self.I_SWITCH, interval=2)  # 点击切换
+        else:
+            logger.info("Select game ap")
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_AP):
+                    break
+                if self.appear(self.I_AP_ACTIVITY, interval=1):
+                    self.appear_then_click(self.I_SWITCH, interval=2)
 
     # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
     #     # 重写

+ 0 - 13
tasks/RichMan/assets.py

@@ -337,19 +337,6 @@ class RichManAssets:
 	I_CENTER2 = RuleImage(roi_front=(76,590,79,75), roi_back=(65,575,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/shrine/shrine_center2.png")
 
 
-	# Ocr Rule Assets
-	# Ocr-description 
-	O_S_TOTAL = RuleOcr(roi=(1134,11,112,36), area=(1134,11,112,36), mode="Digit", method="Default", keyword="", name="s_total")
-	# 已兑换 
-	O_S_BLACK = RuleOcr(roi=(582,179,84,48), area=(582,179,84,48), mode="Single", method="Default", keyword="", name="s_black")
-	# Ocr-description 
-	O_S_WHITE_FIVE = RuleOcr(roi=(774,174,69,44), area=(774,174,69,44), mode="Single", method="Default", keyword="", name="s_white_five")
-	# Ocr-description 
-	O_S_WHITE_FOUR = RuleOcr(roi=(952,168,74,60), area=(952,168,74,60), mode="Single", method="Default", keyword="", name="s_white_four")
-	# 买两个四星蛋 
-	O_S_FOUR_NUMBER = RuleOcr(roi=(581,414,46,45), area=(581,414,46,45), mode="Digit", method="Default", keyword="2", name="s_four_number")
-
-
 	# Image Rule Assets
 	# 千物宝库 
 	I_TT_ENTER = RuleImage(roi_front=(1140,585,73,76), roi_back=(1140,585,73,76), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_enter.png")

+ 0 - 1
tasks/RichMan/shrine.py

@@ -130,7 +130,6 @@ class Shrine(GameUi, RichManAssets):
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    from memory_profiler import profile
 
     c = Config('oas1')
     d = Device(c)

+ 2 - 12
tasks/RichMan/shrine/ocr.json

@@ -1,47 +1,37 @@
 [
   {
     "itemName": "s_total",
-    "roiFront": "1134,11,112,36",
-    "roiBack": "1134,11,112,36",
-    "mode": "Digit",
+    "roiFront": "1164,11,74,36",
+    "roiBack": "1164,11,74,36",
     "method": "Default",
-    "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_black",
     "roiFront": "582,179,84,48",
     "roiBack": "582,179,84,48",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "",
     "description": "已兑换"
   },
   {
     "itemName": "s_white_five",
     "roiFront": "774,174,69,44",
     "roiBack": "774,174,69,44",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_white_four",
     "roiFront": "952,168,74,60",
     "roiBack": "952,168,74,60",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_four_number",
     "roiFront": "581,414,46,45",
     "roiBack": "581,414,46,45",
-    "mode": "Digit",
     "method": "Default",
-    "keyword": "2",
     "description": "买两个四星蛋"
   }
 ]

+ 6 - 0
tasks/base_task.py

@@ -479,6 +479,8 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param click_image:
         :return:
         """
+        _timer = Timer(10)
+        _timer.start()
         while 1:
             self.screenshot()
 
@@ -495,6 +497,9 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                     if self.ui_reward_appear_click():
                         continue
                 break
+            if _timer.reached():
+                logger.warning('Get reward timeout')
+                break
 
             if isinstance(click_image, RuleImage):
                 if self.appear_then_click(click_image, interval=click_interval):
@@ -506,6 +511,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 if self.click(click_image, interval=click_interval):
                     continue
 
+
         return True
 
     def ui_click(self, click, stop, interval=1):