Преглед изворни кода

Merge pull request #1028 from runhey/dev

Dev
huangrunheng пре 1 година
родитељ
комит
f4f6f8acf4

+ 2 - 1
script.py

@@ -489,7 +489,8 @@ class Script:
                     content=f"<{self.config_name}> 任务连续失败三次,请上线查看"
                     content=f"<{self.config_name}> 任务连续失败三次,请上线查看"
                 )
                 )
                 # 关闭模拟器
                 # 关闭模拟器
-                self.device.emulator_stop()
+                if self.config.script.error.error_repeated:
+                    self.device.emulator_stop()
                 exit(1)
                 exit(1)
 
 
             if success:
             if success:

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


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

@@ -2,7 +2,7 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "1183,241,47,38",
+    "roiFront": "1183,319,47,38",
     "roiBack": "1164,134,83,318",
     "roiBack": "1164,134,83,318",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -20,16 +20,16 @@
   {
   {
     "itemName": "battle",
     "itemName": "battle",
     "imageName": "as_battle.png",
     "imageName": "as_battle.png",
-    "roiFront": "1088,244,35,135",
-    "roiBack": "1043,152,154,315",
+    "roiFront": "475,194,35,135",
+    "roiBack": "454,107,154,315",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
-    "description": "巡梦环游"
+    "description": "霜火寂境"
   },
   },
   {
   {
     "itemName": "battle_1",
     "itemName": "battle_1",
     "imageName": "as_battle_1.png",
     "imageName": "as_battle_1.png",
-    "roiFront": "541,663,191,26",
+    "roiFront": "541,197,149,26",
     "roiBack": "506,622,273,96",
     "roiBack": "506,622,273,96",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -47,7 +47,7 @@
   {
   {
     "itemName": "lock",
     "itemName": "lock",
     "imageName": "as_lock.png",
     "imageName": "as_lock.png",
-    "roiFront": "781,650,28,25",
+    "roiFront": "884,648,28,25",
     "roiBack": "761,613,255,76",
     "roiBack": "761,613,255,76",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
   {
     "itemName": "unlock",
     "itemName": "unlock",
     "imageName": "as_unlock.png",
     "imageName": "as_unlock.png",
-    "roiFront": "781,650,28,25",
+    "roiFront": "884,648,28,25",
     "roiBack": "758,607,242,85",
     "roiBack": "758,607,242,85",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -74,7 +74,7 @@
   {
   {
     "itemName": "ap",
     "itemName": "ap",
     "imageName": "as_ap.png",
     "imageName": "as_ap.png",
-    "roiFront": "1114,546,23,24",
+    "roiFront": "1091,550,23,24",
     "roiBack": "1081,532,103,71",
     "roiBack": "1081,532,103,71",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -83,7 +83,7 @@
   {
   {
     "itemName": "ap_activity",
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1152,552,21,25",
+    "roiFront": "1140,550,21,25",
     "roiBack": "1108,542,84,54",
     "roiBack": "1108,542,84,54",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -92,8 +92,8 @@
   {
   {
     "itemName": "switch",
     "itemName": "switch",
     "imageName": "as_switch.png",
     "imageName": "as_switch.png",
-    "roiFront": "1242,553,23,23",
-    "roiBack": "1222,541,54,49",
+    "roiFront": "1215,551,23,23",
+    "roiBack": "1204,538,74,49",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "切换按键"
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
 [
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "roiFront": "98,591,38,28",
-    "roiBack": "98,591,38,28",
+    "roiFront": "910,18,62,28",
+    "roiBack": "910,18,62,28",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap_activity2",
     "itemName": "remain_ap_activity2",
-    "roiFront": "740,25,71,29",
-    "roiBack": "740,25,71,29",
+    "roiFront": "558,18,47,29",
+    "roiBack": "558,18,47,29",
     "mode": "Digit",
     "mode": "Digit",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -37,11 +37,11 @@
   },
   },
   {
   {
     "itemName": "entry_activity",
     "itemName": "entry_activity",
-    "roiFront": "71,241,98,32",
-    "roiBack": "71,241,98,32",
+    "roiFront": "70,103,98,32",
+    "roiBack": "70,103,98,32",
     "mode": "Single",
     "mode": "Single",
     "method": "Default",
     "method": "Default",
-    "keyword": "阵练演武",
-    "description": "Ocr-description"
+    "keyword": "驻守平安",
+    "description": "从左侧进入战斗"
   }
   }
 ]
 ]

+ 13 - 13
tasks/ActivityShikigami/assets.py

@@ -45,27 +45,27 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入活动 
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1183,241,47,38), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1183,319,47,38), roi_back=(1164,134,83,318), 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_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=(1088,244,35,135), roi_back=(1043,152,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	# 霜火寂境 
+	I_BATTLE = RuleImage(roi_front=(475,194,35,135), roi_back=(454,107,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 进入爬塔1 
 	# 进入爬塔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_BATTLE_1 = RuleImage(roi_front=(541,197,149,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_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=(781,650,28,25), roi_back=(761,613,255,76), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(761,613,255,76), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(781,650,28,25), roi_back=(758,607,242,85), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(758,607,242,85), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
 	# 点击战斗 
 	I_FIRE = RuleImage(roi_front=(1131,598,103,54), roi_back=(1123,589,124,88), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	I_FIRE = RuleImage(roi_front=(1131,598,103,54), roi_back=(1123,589,124,88), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 寿司体力 
 	# 寿司体力 
-	I_AP = RuleImage(roi_front=(1114,546,23,24), roi_back=(1081,532,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1091,550,23,24), roi_back=(1081,532,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1152,552,21,25), roi_back=(1108,542,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1140,550,21,25), roi_back=(1108,542,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1242,553,23,23), roi_back=(1222,541,54,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1215,551,23,23), roi_back=(1204,538,74,49), 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")
 	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")
 	# 增加到最大 
 	# 增加到最大 
@@ -80,14 +80,14 @@ class ActivityShikigamiAssets:
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 体力的数量检测 
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(98,591,38,28), area=(98,591,38,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(910,18,62,28), area=(910,18,62,28), 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")
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), 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")
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 
 	# 活动票数(没有百分比) 
-	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(740,25,71,29), area=(740,25,71,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
-	# Ocr-description 
-	O_ENTRY_ACTIVITY = RuleOcr(roi=(71,241,98,32), area=(71,241,98,32), mode="Single", method="Default", keyword="阵练演武", name="entry_activity")
+	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(558,18,47,29), area=(558,18,47,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
+	# 从左侧进入战斗 
+	O_ENTRY_ACTIVITY = RuleOcr(roi=(70,103,98,32), area=(70,103,98,32), mode="Single", method="Default", keyword="驻守平安", name="entry_activity")
 
 
 
 

+ 41 - 34
tasks/ActivityShikigami/script_task.py

@@ -45,6 +45,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
 
 
+        # 某些活动需要开启御魂加成
         # self.open_buff()
         # self.open_buff()
         # self.soul(is_open=True)
         # self.soul(is_open=True)
         # self.close_buff()
         # self.close_buff()
@@ -154,6 +155,8 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 break
                 break
             if self.appear_then_click(self.I_SHI, interval=1):
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
                 continue
+            if self.ocr_appear_click(self.O_ENTRY_ACTIVITY, interval=1):
+                continue
             if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
             if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
                 continue
                 continue
             if self.appear_then_click(self.I_SKIP_BUTTON, interval=1.5):
             if self.appear_then_click(self.I_SKIP_BUTTON, interval=1.5):
@@ -249,42 +252,45 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)
                     self.appear_then_click(self.I_SWITCH, interval=2)
 
 
-    # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-    #     # 重写
-    #     self.device.stuck_record_add('BATTLE_STATUS_S')
-    #     self.device.click_record_clear()
-    #     logger.info("Start battle process")
-    #     self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
-    #     while 1:
-    #         self.screenshot()
-    #         # 如果出现了 “获得奖励”
-    #         reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
-    #         if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
-    #             continue
-    #         # 如果出现了 “鼓”
-    #         if self.appear(self.I_WIN):
-    #             logger.info("Win")
-    #             while 1:
-    #                 self.screenshot()
-    #                 if not self.appear(self.I_WIN):
-    #                     break
-    #                 if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
-    #                     continue
-    #             return True
-    #         # 失败 -> 正常人不会失败
-    #         if self.appear(self.I_FALSE):
-    #             logger.warning('False battle')
-    #             self.ui_click_until_disappear(self.I_FALSE)
-    #             return False
-    #         # 如果开启战斗过程随机滑动
-    #         if random_click_swipt_enable:
-    #             self.random_click_swipt()
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 重写,不出现达摩版本999专用
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        logger.info("Start battle process")
+        self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
+        self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
+        click_count = 0
+        while 1:
+            self.screenshot()
+            # 如果出现了 “获得奖励”
+            reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
+            if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
+                click_count += 1
+                continue
+            # 如果出现了 “鼓”
+            if self.appear(self.I_WIN) or click_count >= 1:
+                logger.info("Win")
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_WIN):
+                        break
+                    if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
+                        continue
+                return True
+            # 失败 -> 正常人不会失败
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                self.ui_click_until_disappear(self.I_FALSE)
+                return False
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
 
 
+    """
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-        # 重写
+        # 重写,出现达摩版本月度常用
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.click_record_clear()
         self.device.click_record_clear()
         logger.info("Start battle process")
         logger.info("Start battle process")
@@ -325,6 +331,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             # 如果开启战斗过程随机滑动
             # 如果开启战斗过程随机滑动
             if random_click_swipt_enable:
             if random_click_swipt_enable:
                 self.random_click_swipt()
                 self.random_click_swipt()
+    """
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 4 - 3
tasks/Component/BaseActivity/config_activity.py

@@ -65,6 +65,7 @@ class GeneralClimb(ConfigBase):
             return def_value
             return def_value
         return def_value
         return def_value
 
 
-    @field_validator('ap_mode', mode='after')
-    def check_mode(cls, value):
-        return ApMode.AP_GAME
+    # 适用于活动爬塔仅有游戏体力的情况
+    # @field_validator('ap_mode', mode='after')
+    # def check_mode(cls, value):
+    #     return ApMode.AP_GAME

+ 1 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -401,7 +401,7 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
                 case 2:
                 case 2:
                     self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
                     self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
             # 重新设置为长战斗
             # 重新设置为长战斗
-            self.device.stuck_record_add('BATTLE_STATUS_S')
+            # self.device.stuck_record_add('BATTLE_STATUS_S')
         else:
         else:
             time.sleep(0.4)  # 这样的好像不对
             time.sleep(0.4)  # 这样的好像不对
 
 

+ 3 - 1
tasks/Duel/assets.py

@@ -88,9 +88,10 @@ class DuelAssets:
 	I_D_BATTLE2 = RuleImage(roi_front=(1171,592,69,78), roi_back=(1119,566,154,143), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle2.png")
 	I_D_BATTLE2 = RuleImage(roi_front=(1171,592,69,78), roi_back=(1119,566,154,143), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle2.png")
 	# 禁用 
 	# 禁用 
 	I_BAN = RuleImage(roi_front=(1112,537,100,100), roi_back=(1112,537,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_ban.png")
 	I_BAN = RuleImage(roi_front=(1112,537,100,100), roi_back=(1112,537,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_ban.png")
-	# 左上角的退出
+	# 左上角的退出 
 	I_DUEL_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/gb_exit.png")
 	I_DUEL_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/gb_exit.png")
 
 
+
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 荣誉 
 	# 荣誉 
 	O_D_HONOR = RuleOcr(roi=(699,562,131,31), area=(699,562,131,31), mode="DigitCounter", method="Default", keyword="", name="d_honor")
 	O_D_HONOR = RuleOcr(roi=(699,562,131,31), area=(699,562,131,31), mode="DigitCounter", method="Default", keyword="", name="d_honor")
@@ -105,3 +106,4 @@ class DuelAssets:
 	# 被办式神名称 
 	# 被办式神名称 
 	O_D_BAN_NAME = RuleOcr(roi=(92,97,82,25), area=(92,97,82,25), mode="Single", method="Default", keyword="", name="d_ban_name")
 	O_D_BAN_NAME = RuleOcr(roi=(92,97,82,25), area=(92,97,82,25), mode="Single", method="Default", keyword="", name="d_ban_name")
 
 
+

+ 5 - 14
tasks/Duel/script_task.py

@@ -117,25 +117,16 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, DuelAssets):
             if self.appear(self.I_BATTLE_WITH_TRAIN) or self.appear(self.I_BATTLE_WITH_TRAIN2):
             if self.appear(self.I_BATTLE_WITH_TRAIN) or self.appear(self.I_BATTLE_WITH_TRAIN2):
                 break
                 break
 
 
-            # if con.honor_full_exit and self.check_honor():
-            #     # 荣誉满了,退出
-            #     logger.info('Duel task is over honor')
-            #     break
+            if con.honor_full_exit and self.check_honor():
+                # 荣誉满了,退出
+                logger.info('Duel task is over honor')
+                break
 
 
             # 当前分数跟目标分数比较
             # 当前分数跟目标分数比较
             if current_score >= con.target_score:
             if current_score >= con.target_score:
                 # 分数够了
                 # 分数够了
                 logger.info('Duel task is over score')
                 logger.info('Duel task is over score')
-                # 是否刷满荣誉就退出
-                if con.honor_full_exit:
-                    if self.check_honor():
-                        # 荣誉满了,退出
-                        # self.save_image(content=f'分数: {current_score}, 本周斗技结束', push_flag=True)
-                        logger.info('Duel task is over honor')
-                        duel_week_over = True
-                        break
-                else:
-                    break
+                break
 
 
             # 进行一次斗技
             # 进行一次斗技
             self.duel_one(current_score, con.green_enable, con.green_mark, celeb_con.ban_name)
             self.duel_one(current_score, con.green_enable, con.green_mark, celeb_con.ban_name)

+ 2 - 2
tasks/FallenSun/assets.py

@@ -27,8 +27,8 @@ class FallenSunAssets:
 
 
 	# List Rule Assets
 	# List Rule Assets
 	# 这个是御魂界面选择不同层数的 
 	# 这个是御魂界面选择不同层数的 
-	L_LAYER_LIST = RuleList(folder="./tasks/FallenSun/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(40, 93), 
-					 array=["壹", "贰", "叁"])
+	L_LAYER_LIST = RuleList(folder="./tasks/FallenSun/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(43, 87), 
+					 array=["壹", "贰", "叁", "日"])
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

+ 3 - 0
tasks/FallenSun/config.py

@@ -18,10 +18,13 @@ class UserStatus(str, Enum):
     ALONE = 'alone'
     ALONE = 'alone'
     WILD = 'wild'  # 还不打算实现
     WILD = 'wild'  # 还不打算实现
 
 
+
 class Layer(str, Enum):
 class Layer(str, Enum):
     ONE = '壹层'
     ONE = '壹层'
     TWO = '贰层'
     TWO = '贰层'
     THREE = '叁层'
     THREE = '叁层'
+    FOUR = '日蚀'
+
 
 
 class FallenSunConfig(ConfigBase):
 class FallenSunConfig(ConfigBase):
     # 身份
     # 身份

+ 6 - 2
tasks/FallenSun/res/list.json

@@ -11,11 +11,15 @@
     },
     },
     {
     {
       "itemName": "贰",
       "itemName": "贰",
-      "roiFront": "283,293,39,85"
+      "roiFront": "283,254,39,85"
     },
     },
     {
     {
       "itemName": "叁",
       "itemName": "叁",
-      "roiFront": "281,439,43,93"
+      "roiFront": "282,360,43,93"
+    },
+    {
+      "itemName": "日",
+      "roiFront": "271,473,54,69"
     }
     }
   ]
   ]
 }
 }

+ 58 - 23
tasks/FallenSun/script_task.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+import random
 from time import sleep
 from time import sleep
 from datetime import time, datetime, timedelta
 from datetime import time, datetime, timedelta
 
 
@@ -58,8 +59,6 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
 
         raise TaskEnd
         raise TaskEnd
 
 
-
-
     def fallen_sun_enter(self) -> bool:
     def fallen_sun_enter(self) -> bool:
         logger.info('Enter fallen_sun')
         logger.info('Enter fallen_sun')
         while True:
         while True:
@@ -101,7 +100,6 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
                 if self.appear_then_click(self.I_FALLEN_SUN_LOCK, interval=1):
                 if self.appear_then_click(self.I_FALLEN_SUN_LOCK, interval=1):
                     continue
                     continue
 
 
-
     def run_leader(self):
     def run_leader(self):
         logger.info('Start run leader')
         logger.info('Start run leader')
         self.ui_get_current_page()
         self.ui_get_current_page()
@@ -148,8 +146,6 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
                     logger.info('FallenSun time limit out')
                     logger.info('FallenSun time limit out')
                     break
                     break
 
 
-
-
             # 如果没有进入房间那就不需要后面的邀请
             # 如果没有进入房间那就不需要后面的邀请
             if not self.is_in_room():
             if not self.is_in_room():
                 # 如果在探索界面或者是出现在组队界面, 那就是可能房间死了
                 # 如果在探索界面或者是出现在组队界面, 那就是可能房间死了
@@ -302,40 +298,79 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         self.ui_current = page_soul_zones
         self.ui_current = page_soul_zones
         self.ui_goto(page_main)
         self.ui_goto(page_main)
 
 
-
-
     def run_wild(self):
     def run_wild(self):
         logger.error('Wild mode is not implemented')
         logger.error('Wild mode is not implemented')
         pass
         pass
 
 
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        """
+        重写战斗等待
+        # https://github.com/runhey/OnmyojiAutoScript/issues/95
+        :param random_click_swipt_enable:
+        :return:
+        """
+        # 重写
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        self.C_REWARD_1.name = 'C_REWARD'
+        self.C_REWARD_2.name = 'C_REWARD'
+        self.C_REWARD_3.name = 'C_REWARD'
+        # 战斗过程 随机点击和滑动 防封
+        logger.info("Start battle process")
+        while 1:
+            self.screenshot()
+            action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
+            if self.appear_then_click(self.I_WIN, action=action_click ,interval=0.8):
+                # 赢的那个鼓
+                continue
+            if self.appear(self.I_GREED_GHOST):
+                # 贪吃鬼
+                logger.info('Win battle')
+                self.wait_until_appear(self.I_REWARD, wait_time=1.5)
+                self.screenshot()
+                if not self.appear(self.I_GREED_GHOST):
+                    logger.warning('Greedy ghost disappear. Maybe it is a false battle')
+                    continue
+                while 1:
+                    self.screenshot()
+                    action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
+                    if not self.appear(self.I_GREED_GHOST):
+                        break
+                    if self.click(action_click, interval=1.5):
+                        continue
+                return True
+            if self.appear(self.I_REWARD):
+                # 魂
+                logger.info('Win battle')
+                while 1:
+                    self.screenshot()
+                    action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
+                    if self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5):
+                        continue
+                    if not self.appear(self.I_REWARD):
+                        break
+                return True
 
 
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                self.ui_click_until_disappear(self.I_FALSE)
+                return False
 
 
-
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
-    from memory_profiler import profile
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
 
 
-    # t.run()
-
-    # t.check_layer('悲')
-
-    from module.base.timer import timer
+    t.run()
+    # t.check_layer('日蚀')
 
 
-    @timer
-    @profile
-    def test_memory():
-        t.screenshot()
-        print(t.ocr_appear(t.O_O_TEST_OCR))
-        print(t.L_LAYER_LIST.image_appear(t.device.image, '叁'))
-    for i in range(4):
-        test_memory()
-        print('=====================')
 
 
 
 
 
 

+ 1 - 2
tasks/Orochi/script_task.py

@@ -17,6 +17,7 @@ from tasks.Orochi.config import Orochi, UserStatus, Layer
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 
 
+
 class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi, SwitchSoul, OrochiAssets):
 class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi, SwitchSoul, OrochiAssets):
 
 
     def run(self) -> bool:
     def run(self) -> bool:
@@ -71,8 +72,6 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
 
         raise TaskEnd
         raise TaskEnd
 
 
-
-
     def orochi_enter(self) -> bool:
     def orochi_enter(self) -> bool:
         logger.info('Enter orochi')
         logger.info('Enter orochi')
         while True:
         while True:

+ 2 - 0
tasks/Script/config_error.py

@@ -10,6 +10,8 @@ from module.logger import logger
 class Error(BaseModel):
 class Error(BaseModel):
     handle_error: bool = Field(default=True,
     handle_error: bool = Field(default=True,
                                description='handle_error_help')
                                description='handle_error_help')
+    error_repeated: bool = Field(default=False,
+                               description='是否多次出错关闭模拟器')
     save_error: bool = Field(default=True,
     save_error: bool = Field(default=True,
                              description='')
                              description='')
     screenshot_length: int = Field(default=1,
     screenshot_length: int = Field(default=1,