Bladeren bron

feat(task): Complete souls_tidy task

runhey 3 jaren geleden
bovenliggende
commit
5e395f5ae7

BIN
module/config/i18n/zh_CN.qm


+ 6 - 0
module/config/i18n/zh_CN.ts

@@ -686,4 +686,10 @@ Refresh:直接刷新,如果刷新操作进入CD,将标记为失败并退
 	<message><source>target_score_help</source><translation>3000以上表示为名士(也是自动斗技的最高)</translation></message>
 	<message><source>honor_full_exit_help</source><translation>这无需关心本周荣誉的上限是什么</translation></message>
 </context>
+<context>
+    <name>Args</name>
+	<message><source>SimpleTidy</source><translation>简易御魂清理</translation></message>	
+	<message><source>Greed Maneki</source><translation>贪吃鬼喂食+未升级的御魂奉纳</translation></message>	
+	<message><source>greed_maneki_help</source><translation>建议四星及一下的吃掉,五星的留给贪吃鬼</translation></message>
+</context>
 </TS>

+ 1 - 1
module/device/control.py

@@ -145,7 +145,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             'Click %s @ %s %s' % (point2str(x, y), control_name, duration)
         )
         method = self.long_click_methods.get(
-            self.config.script.emulator.control_method,
+            self.config.script.device.control_method,
             self.long_click_adb)
         method(x, y, duration)
 

+ 4 - 3
module/device/method/window.py

@@ -176,10 +176,11 @@ class Window(Handle):
         # 所有我在点击的时候会除以这个缩放比例
         x = int(x / self.window_scale_rate)
         y = int(y / self.window_scale_rate)
-        logger.info(self.control_handle_list)
+        logger.info(f'点击时间:{duration}')
         emulator_type = len(self.control_handle_list)
-        if emulator_type == 2:  # mumu模拟器
-            SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
+        if self.emulator_family == EmulatorFamily.FAMILY_MUMU:  # mumu模拟器
+            SendMessage(self.control_handle_list[0], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
+            SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             time.sleep(duration)  # 长按时间1000ms-1500ms
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口
         elif emulator_type > 2:  # 夜神模拟器

+ 7 - 0
tasks/Hunt/script_task.py

@@ -130,6 +130,8 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
         self.device.click_record_clear()
         # 战斗过程 随机点击和滑动 防封
         logger.info("Start battle process")
+        stuck_timer = Timer(180)
+        stuck_timer.start()
         while 1:
             self.screenshot()
             if self.appear(self.I_WIN):
@@ -141,6 +143,11 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 logger.info("Battle result is false")
                 self.ui_click_until_disappear(self.I_FALSE)
                 return False
+            # 如果三分钟还没打完,再延长五分钟
+            if stuck_timer and stuck_timer.reached():
+                stuck_timer = None
+                self.device.stuck_record_clear()
+                self.device.stuck_record_add('BATTLE_STATUS_S')
 
 
 

+ 57 - 1
tasks/SoulsTidy/assets.py

@@ -8,5 +8,61 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 class SoulsTidyAssets: 
-	pass
+
+
+	# Click Rule Assets
+	# 御魂详细 
+	C_ST_DETAIL = RuleClick(roi_front=(1189,321,87,74), roi_back=(1189,321,87,74), name="st_detail")
+	# 出现神赐 
+	C_ST_GOD_PRSENT = RuleClick(roi_front=(717,165,100,48), roi_back=(926,165,100,54), name="st_god_prsent")
+
+
+	# Image Rule Assets
+	# 点击御魂 
+	I_ST_SOULS = RuleImage(roi_front=(1170,226,70,80), roi_back=(1170,226,70,80), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_souls.png")
+	# 更换 
+	I_ST_REPLACE = RuleImage(roi_front=(856,170,100,100), roi_back=(856,170,100,100), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_replace.png")
+	# 奉纳 
+	I_ST_BONGNA = RuleImage(roi_front=(1154,202,77,97), roi_back=(1154,202,77,97), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_bongna.png")
+	# 贪吃鬼 
+	I_ST_GREED = RuleImage(roi_front=(1157,611,65,60), roi_back=(1157,611,65,60), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_greed.png")
+	# 整理 
+	I_ST_TIDY = RuleImage(roi_front=(1155,328,74,100), roi_back=(1155,328,74,100), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_tidy.png")
+	# 进食习惯 
+	I_ST_GREED_HABIT = RuleImage(roi_front=(817,529,165,61), roi_back=(817,529,165,61), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_greed_habit.png")
+	# 立即进食 
+	I_ST_FEED_NOW = RuleImage(roi_front=(929,593,73,65), roi_back=(929,593,73,65), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_feed_now.png")
+	# 未选中 
+	I_ST_UNSELECTED = RuleImage(roi_front=(542,342,38,37), roi_back=(542,342,38,37), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_unselected.png")
+	# 关闭贪吃鬼 
+	I_ST_GREED_CLOSE = RuleImage(roi_front=(933,211,35,37), roi_back=(933,211,35,37), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_greed_close.png")
+	# 招财猫 
+	I_ST_CAT = RuleImage(roi_front=(799,269,147,133), roi_back=(799,269,147,133), threshold=0.7, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_cat.png")
+	# 奉纳 
+	I_ST_DONATE = RuleImage(roi_front=(813,628,126,68), roi_back=(813,628,126,68), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_donate.png")
+	# 神赐 
+	I_ST_GOD_PRESENT = RuleImage(roi_front=(578,234,131,73), roi_back=(542,117,204,219), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_god_present.png")
+
+
+	# Long Click Rule Assets
+	# description 
+	L_ONE = RuleLongClick(roi_front=(88,272,100,78), roi_back=(88,272,100,78), duration=1500, name="one")
+
+
+	# Ocr Rule Assets
+	# 奉纳获得的金币 
+	O_ST_GOLD = RuleOcr(roi=(888,575,105,32), area=(888,575,105,32), mode="Digit", method="Default", keyword="", name="st_gold")
+	# 奉纳的御魂等级 
+	O_ST_FIRSET_LEVEL = RuleOcr(roi=(91,237,35,28), area=(91,237,35,28), mode="Single", method="Default", keyword="", name="st_firset_level")
+	# 入手顺序 
+	O_ST_SORT_TIME = RuleOcr(roi=(387,118,110,42), area=(387,118,110,42), mode="Single", method="Default", keyword="入手顺序", name="st_sort_time")
+	# 等级/星级 最上边的 
+	O_ST_SORT_LEVEL_1 = RuleOcr(roi=(384,115,121,45), area=(384,115,121,45), mode="Single", method="Default", keyword="等级/星级", name="st_sort_level_1")
+	# 等级/星 下边的 
+	O_ST_SORT_LEVEL_2 = RuleOcr(roi=(400,290,128,42), area=(400,290,128,42), mode="Single", method="Default", keyword="等级/星级", name="st_sort_level_2")
+	# 类型 
+	O_ST_SORT_TYPE = RuleOcr(roi=(414,118,64,43), area=(414,118,64,43), mode="Single", method="Default", keyword="类型", name="st_sort_type")
+	# 位置 
+	O_ST_SORT_LOCATION = RuleOcr(roi=(415,119,61,39), area=(415,119,61,39), mode="Single", method="Default", keyword="位置", name="st_sort_location")
+
 

+ 6 - 0
tasks/SoulsTidy/config.py

@@ -7,6 +7,12 @@ from pydantic import BaseModel, Field
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase
 
+class SimpleTidy(BaseModel):
+    # 贪吃鬼和招财猫
+    greed_maneki: bool = Field(default=False, description="greed_maneki_help")
+
+
 class SoulsTidy(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
+    simple_tidy: SimpleTidy = Field(default_factory=SimpleTidy)
 

+ 166 - 0
tasks/SoulsTidy/script_task.py

@@ -0,0 +1,166 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from time import sleep
+from datetime import timedelta, datetime, time
+from cached_property import cached_property
+
+from module.exception import TaskEnd
+from module.logger import logger
+from module.base.timer import Timer
+
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_shikigami_records
+from tasks.SoulsTidy.assets import SoulsTidyAssets
+from tasks.SoulsTidy.config import SimpleTidy
+
+class ScriptTask(GameUi, SoulsTidyAssets):
+    def run(self):
+        self.ui_get_current_page()
+        self.ui_goto(page_shikigami_records)
+        con = self.config.souls_tidy
+        if con.simple_tidy.greed_maneki:
+            self.goto_souls()
+            self.greed_maneki()
+            self.back_records()
+
+        self.set_next_run(task='SoulsTidy', success=True, finish=False)
+        raise TaskEnd('SoulsTidy')
+
+    def goto_souls(self):
+        """
+        进入到御魂的主界面
+        :return:
+        """
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_ST_GREED) and self.appear(self.I_ST_TIDY):
+                break
+
+            if self.appear_then_click(self.I_ST_REPLACE, interval=1):
+                continue
+            if self.appear_then_click(self.I_ST_SOULS, interval=1):
+                continue
+            if self.click(self.C_ST_DETAIL, interval=1.5):
+                continue
+        logger.info('Enter souls page')
+
+    def back_records(self):
+        """
+        退回到式神录
+        :return:
+        """
+        self.ui_click(self.I_UI_BACK_YELLOW, self.I_CHECK_RECORDS)
+
+    def greed_maneki(self):
+        """
+        贪吃鬼和招财猫
+        :return:
+        """
+        # 先是贪吃鬼
+        logger.hr('Greed Ghost')
+        self.ui_click(self.I_ST_GREED, self.I_ST_GREED_HABIT)
+        self.ui_click(self.I_ST_GREED_HABIT, self.I_ST_FEED_NOW)
+        logger.info('Feed greed ghost')
+        feed_count = 0
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_ST_UNSELECTED):
+                self.ui_click_until_disappear(self.I_ST_UNSELECTED)
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
+                continue
+            if feed_count >= 3:
+                break
+            if self.appear_then_click(self.I_ST_FEED_NOW, interval=1.9):
+                feed_count += 1
+                continue
+        logger.info('Feed greed ghost done')
+        # 关闭贪吃鬼, 进入奉纳
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_ST_CAT):
+                # 出现招财猫
+                break
+            if self.appear_then_click(self.I_ST_GREED_CLOSE, interval=0.7):
+                continue
+            if self.appear_then_click(self.I_ST_BONGNA, interval=1, threshold=0.6):
+                continue
+        logger.hr('Enter bongna')
+        # 确保是按照等级来排序的
+        while 1:
+            self.screenshot()
+            if self.ocr_appear(self.O_ST_SORT_LEVEL_1):
+                break
+            if self.ocr_appear_click(self.O_ST_SORT_LEVEL_2, interval=0.6):
+                continue
+            if self.ocr_appear_click(self.O_ST_SORT_TIME, interval=2):
+                continue
+            if self.ocr_appear_click(self.O_ST_SORT_TYPE, interval=2):
+                continue
+            if self.ocr_appear_click(self.O_ST_SORT_LOCATION, interval=2):
+                continue
+        logger.info('Sort by level')
+        # 开始奉纳
+        while 1:
+            self.screenshot()
+            firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
+            if firvel != '古':
+                # 问就是 把 +0 识别成了 古
+                logger.info('No zero level, bongna done')
+                break
+            # !!!!!!  这里没有检查金币是否足够
+            # 长按
+            self.click(self.L_ONE, interval=2.5)
+            gold_amount = self.O_ST_GOLD.ocr(self.device.image)
+            if not isinstance(gold_amount, int):
+                logger.warning('Gold amount not int, skip')
+                continue
+            # 点击奉纳收取奖励
+            if not self.appear(self.I_ST_DONATE):
+                logger.warning('Donate button not appear, skip')
+                continue
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
+                    continue
+                # 出现神赐, 就点击然后消失,
+                if self.appear(self.I_ST_GOD_PRESENT):
+                    sleep(0.5)
+                    self.screenshot()
+                    if not self.appear(self.I_ST_GOD_PRESENT):
+                        continue
+                    while 1:
+                        self.screenshot()
+                        if not self.appear(self.I_ST_GOD_PRESENT):
+                            break
+                        if self.click(self.C_ST_GOD_PRSENT, interval=1):
+                            continue
+                    sleep(0.5)
+                    break
+                if self.appear_then_click(self.I_ST_DONATE, interval=3.5):
+                    continue
+            logger.info('Donate one')
+
+        logger.info('Bongna done')
+
+
+
+
+
+
+
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
+    t.screenshot()
+
+
+    # t.greed_maneki()
+    t.run()
+

+ 14 - 0
tasks/SoulsTidy/simple/click.json

@@ -0,0 +1,14 @@
+[
+  {
+    "itemName": "st_detail",
+    "roiFront": "1189,321,87,74",
+    "roiBack": "1189,321,87,74",
+    "description": "御魂详细"
+  },
+  {
+    "itemName": "st_god_prsent",
+    "roiFront": "717,165,100,48",
+    "roiBack": "926,165,100,54",
+    "description": "出现神赐"
+  }
+]

+ 110 - 0
tasks/SoulsTidy/simple/image.json

@@ -0,0 +1,110 @@
+[
+  {
+    "itemName": "st_souls",
+    "imageName": "simple_st_souls.png",
+    "roiFront": "1170,226,70,80",
+    "roiBack": "1170,226,70,80",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击御魂"
+  },
+  {
+    "itemName": "st_replace",
+    "imageName": "simple_st_replace.png",
+    "roiFront": "856,170,100,100",
+    "roiBack": "856,170,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "更换"
+  },
+  {
+    "itemName": "st_bongna",
+    "imageName": "simple_st_bongna.png",
+    "roiFront": "1154,202,77,97",
+    "roiBack": "1154,202,77,97",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "奉纳"
+  },
+  {
+    "itemName": "st_greed",
+    "imageName": "simple_st_greed.png",
+    "roiFront": "1157,611,65,60",
+    "roiBack": "1157,611,65,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "贪吃鬼"
+  },
+  {
+    "itemName": "st_tidy",
+    "imageName": "simple_st_tidy.png",
+    "roiFront": "1155,328,74,100",
+    "roiBack": "1155,328,74,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "整理"
+  },
+  {
+    "itemName": "st_greed_habit",
+    "imageName": "simple_st_greed_habit.png",
+    "roiFront": "817,529,165,61",
+    "roiBack": "817,529,165,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进食习惯"
+  },
+  {
+    "itemName": "st_feed_now",
+    "imageName": "simple_st_feed_now.png",
+    "roiFront": "929,593,73,65",
+    "roiBack": "929,593,73,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "立即进食"
+  },
+  {
+    "itemName": "st_unselected",
+    "imageName": "simple_st_unselected.png",
+    "roiFront": "542,342,38,37",
+    "roiBack": "542,342,38,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "未选中"
+  },
+  {
+    "itemName": "st_greed_close",
+    "imageName": "simple_st_greed_close.png",
+    "roiFront": "933,211,35,37",
+    "roiBack": "933,211,35,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "关闭贪吃鬼"
+  },
+  {
+    "itemName": "st_cat",
+    "imageName": "simple_st_cat.png",
+    "roiFront": "799,269,147,133",
+    "roiBack": "799,269,147,133",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "招财猫"
+  },
+  {
+    "itemName": "st_donate",
+    "imageName": "simple_st_donate.png",
+    "roiFront": "813,628,126,68",
+    "roiBack": "813,628,126,68",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "奉纳"
+  },
+  {
+    "itemName": "st_god_present",
+    "imageName": "simple_st_god_present.png",
+    "roiFront": "578,234,131,73",
+    "roiBack": "542,117,204,219",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神赐"
+  }
+]

+ 9 - 0
tasks/SoulsTidy/simple/long_click.json

@@ -0,0 +1,9 @@
+[
+  {
+    "itemName": "one",
+    "roiFront": "88,272,100,78",
+    "roiBack": "88,272,100,78",
+    "duration": 1500,
+    "description": "description"
+  }
+]

+ 65 - 0
tasks/SoulsTidy/simple/ocr.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "st_gold",
+    "roiFront": "888,575,105,32",
+    "roiBack": "888,575,105,32",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "奉纳获得的金币"
+  },
+  {
+    "itemName": "st_firset_level",
+    "roiFront": "91,237,35,28",
+    "roiBack": "91,237,35,28",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "奉纳的御魂等级"
+  },
+  {
+    "itemName": "st_sort_time",
+    "roiFront": "387,118,110,42",
+    "roiBack": "387,118,110,42",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "入手顺序",
+    "description": "入手顺序"
+  },
+  {
+    "itemName": "st_sort_level_1",
+    "roiFront": "384,115,121,45",
+    "roiBack": "384,115,121,45",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "等级/星级",
+    "description": "等级/星级 最上边的"
+  },
+  {
+    "itemName": "st_sort_level_2",
+    "roiFront": "400,290,128,42",
+    "roiBack": "400,290,128,42",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "等级/星级",
+    "description": "等级/星 下边的"
+  },
+  {
+    "itemName": "st_sort_type",
+    "roiFront": "414,118,64,43",
+    "roiBack": "414,118,64,43",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "类型",
+    "description": "类型"
+  },
+  {
+    "itemName": "st_sort_location",
+    "roiFront": "415,119,61,39",
+    "roiBack": "415,119,61,39",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "位置",
+    "description": "位置"
+  }
+]

BIN
tasks/SoulsTidy/simple/simple_st_bongna.png


BIN
tasks/SoulsTidy/simple/simple_st_cat.png


BIN
tasks/SoulsTidy/simple/simple_st_donate.png


BIN
tasks/SoulsTidy/simple/simple_st_feed_now.png


BIN
tasks/SoulsTidy/simple/simple_st_god_present.png


BIN
tasks/SoulsTidy/simple/simple_st_greed.png


BIN
tasks/SoulsTidy/simple/simple_st_greed_close.png


BIN
tasks/SoulsTidy/simple/simple_st_greed_habit.png


BIN
tasks/SoulsTidy/simple/simple_st_replace.png


BIN
tasks/SoulsTidy/simple/simple_st_souls.png


BIN
tasks/SoulsTidy/simple/simple_st_tidy.png


BIN
tasks/SoulsTidy/simple/simple_st_unselected.png