runhey пре 3 година
родитељ
комит
0f5a3aca1b

BIN
module/config/i18n/zh_CN.qm


+ 12 - 1
module/config/i18n/zh_CN.ts

@@ -620,7 +620,18 @@ Refresh:直接刷新,如果刷新操作进入CD,将标记为失败并退
 	<message><source>share_collect_help</source><translation>每周一张票、不要白不要</translation></message>
 	<message><source>share_area_boss_help</source><translation>没什么建议,勾上就对了</translation></message>
 	<message><source>share_secret_help</source><translation>建议在秘闻结束后再来执行这个任务</translation></message>
-	<message><source>trifles_broken_amulet_help</source><translation>建议设置大点每周清空去</translation></message>
+	<message><source>trifles_broken_amulet_help</source><translation>建议设置较大的数值以每周清空</translation></message>
 	<message><source>Trifles</source><translation>启用</translation></message>
 </context>		
+<context>
+    <name>Args</name>
+	<message><source>SecretConfig</source><translation>秘闻</translation></message>	
+	<message><source>Secret Gold 50</source><translation>金币加成50%</translation></message>	
+	<message><source>Secret Gold 100</source><translation>金币加成100%</translation></message>
+	<message><source>Layer 10</source><translation>挑战十层</translation></message>
+	<message><source>Layer 9</source><translation>挑战九层</translation></message>
+	<message><source>secret_gold_50_help</source><translation>这将会在低层[1-5]自动打开加成并且自动关闭加成</translation></message>
+	<message><source>secret_gold_100_help</source><translation>同上</translation></message>
+	<message><source>layer_10_help</source><translation>考虑到练度,这将不是默认打开的</translation></message>
+</context>	
 </TS>

+ 1 - 1
module/ocr/sub_ocr.py

@@ -70,7 +70,7 @@ class Single(BaseCor):
         """
         检测某个固定位置的roi的文本。可以是横方向也可以是竖方向
         :param image:
-        :return: 返回到识别的文字
+        :return: 返回到识别的文字, 如果没有返回空字符串
         """
         if self.roi:
             result = self.ocr_single_line(image)

+ 41 - 1
tasks/Secret/assets.py

@@ -8,5 +8,45 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 class SecretAssets: 
-	pass
+
+
+	# Click Rule Assets
+	# description 
+	C_SE_CLICK_LAYER = RuleClick(roi_front=(434,155,100,100), roi_back=(434,155,100,100), name="se_click_layer")
+
+
+	# Image Rule Assets
+	# 进入 
+	I_SE_ENTER = RuleImage(roi_front=(1145,593,100,100), roi_back=(1145,593,100,100), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_enter.png")
+	# 秘闻挑战 
+	I_SE_FIRE = RuleImage(roi_front=(1108,551,100,100), roi_back=(1108,551,100,100), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_fire.png")
+	# 排行 
+	I_SE_PLACEMENT = RuleImage(roi_front=(1011,568,50,48), roi_back=(1011,568,50,48), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_placement.png")
+	# 勾玉 
+	I_SE_JADE = RuleImage(roi_front=(305,208,28,33), roi_back=(305,208,28,33), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_jade.png")
+	# 最后一个的勾玉 
+	I_SE_JADE_LAST = RuleImage(roi_front=(302,565,37,40), roi_back=(302,565,37,40), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_jade_last.png")
+	# 战斗赢 
+	I_SE_BATTLE_WIN = RuleImage(roi_front=(436,62,100,100), roi_back=(436,62,100,100), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_battle_win.png")
+
+
+	# Ocr Rule Assets
+	# 未通关 
+	O_SE_NO_PASS = RuleOcr(roi=(428,151,262,248), area=(428,151,262,248), mode="Full", method="Default", keyword="未通关", name="se_no_pass")
+	# 第一个位置的层数 
+	O_SE_LAYER_1 = RuleOcr(roi=(211,149,37,35), area=(211,149,37,35), mode="Single", method="Default", keyword="", name="se_layer_1")
+	# Ocr-description 
+	O_SE_LAYER_10 = RuleOcr(roi=(210,507,34,34), area=(210,507,34,34), mode="Single", method="Default", keyword="拾", name="se_layer_10")
+	# Ocr-description 
+	O_SE_LAYER_9 = RuleOcr(roi=(211,373,35,33), area=(211,373,35,33), mode="Single", method="Default", keyword="玖", name="se_layer_9")
+	# Ocr-description 
+	O_SE_LAYER_8 = RuleOcr(roi=(212,237,34,34), area=(212,237,34,34), mode="Single", method="Default", keyword="捌", name="se_layer_8")
+	# 后面的时候识别为通关的 
+	O_SE_NO_PASS_LAST = RuleOcr(roi=(429,381,180,234), area=(429,381,180,234), mode="Full", method="Default", keyword="", name="se_no_pass_last")
+
+
+	# Swipe Rule Assets
+	# 向下滑动 
+	S_SE_DOWN_SEIPE = RuleSwipe(roi_front=(229,520,124,27), roi_back=(217,390,145,35), mode="default", name="se_down_seipe")
+
 

+ 14 - 0
tasks/Secret/config.py

@@ -6,12 +6,26 @@ from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler as BaseScheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 class Scheduler(BaseScheduler):
     success_interval: TimeDelta = Field(default=TimeDelta(days=7), description='success_interval_help')
     failure_interval: TimeDelta = Field(default=TimeDelta(days=7), description='failure_interval_help')
 
+class SecretConfig(BaseModel):
+    secret_gold_50: bool = Field(title='Secret Gold 50', default=False, description='secret_gold_50_help')
+    secret_gold_100: bool = Field(title='Secret Gold 100', default=False, description='secret_gold_100_help')
+    layer_10: bool = Field(title='Layer 10', default=False, description='layer_10_help')
+    layer_9: bool = Field(title='Layer 9', default=False)
+
 
 class Secret(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
+    secret_config: SecretConfig = Field(default_factory=SecretConfig)
+    general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+    switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+
+
+
 

+ 195 - 2
tasks/Secret/script_task.py

@@ -1,17 +1,210 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+import time
+from cached_property import cached_property
+
 from module.exception import TaskEnd
 from module.logger import logger
 from module.base.timer import Timer
+from module.atom.ocr import RuleOcr
 
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_team
+from tasks.GameUi.page import page_main, page_secret_zones, page_shikigami_records
+from tasks.Secret.config import SecretConfig, Secret
+from tasks.Secret.assets import SecretAssets
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
+from tasks.Component.GeneralBuff.config_buff import BuffClass
+
+class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
+    lay_list = ['壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖', '拾']
 
-class ScriptTask(GameUi):
+    @cached_property
+    def match_layer(self) -> dict:
+        return {
+            '壹': 1, '贰': 2,
+            '叁': 3, '肆': 4,
+            '伍': 5, '陆': 6,
+            '柒': 7, '捌': 8,
+            '玖': 9, '拾': 10,
+        }
+
+    @cached_property
+    def battle_config(self) -> GeneralBattleConfig:
+        return GeneralBattleConfig()
 
     def run(self):
+        secret: Secret = self.config.secret
+        con = secret.secret_config
+        if secret.switch_soul.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(secret.switch_soul.switch_group_team)
+        self.ui_get_current_page()
+        self.ui_goto(page_secret_zones)
+
+        # 进入
+        success = True
+        self.ui_click(self.I_SE_ENTER, self.I_SE_FIRE)
+        if not self.appear(self.I_SE_PLACEMENT):
+            logger.warning('Unsuccessful entry. You must have entered the secret zone before.')
+            success = False
+        time.sleep(1)   # 有一个很傻逼的动画
+
+        # 开始
+        logger.info('Start secret zone')
+        first_battle = True
+        while 1:
+            self.screenshot()
+            if not success:
+                logger.warning('Secret zone failed to enter, skip')
+                break
+            if not self.appear(self.I_SE_FIRE):
+                continue
+            layer = self.find_battle()
+            if not layer:
+                continue
+            if first_battle and layer <= 5:
+                first_battle = False
+                buff = []
+                if con.secret_gold_50:
+                    buff.append(BuffClass.GOLD_50)
+                if con.secret_gold_100:
+                    buff.append(BuffClass.GOLD_100)
+                if buff is []:
+                    buff = None
+                self.click_battle()
+                success = self.run_general_battle(self.battle_config, buff=buff)
+                continue
+            if not first_battle and layer == 6:
+                # 第六次关闭加成,但是发现没有这个接口。。。!!!居然没有注意到
+                self.click_battle()
+                success = self.run_general_battle(self.battle_config)
+                continue
+            elif not first_battle and layer == 9 and con.layer_9:
+                self.click_battle()
+                success = self.run_general_battle(self.battle_config)
+                continue
+            elif not first_battle and layer == 10 and con.layer_10:
+                self.click_battle()
+                success = self.run_general_battle(self.battle_config)
+                break
+            elif not first_battle:
+                # 其他层
+                self.click_battle()
+                success = self.run_general_battle(self.battle_config)
+                continue
+
 
         self.set_next_run(task='Secret', success=True, finish=True)
         raise TaskEnd('Secret')
 
+    def find_battle(self, screenshot: bool=False) -> int or None:
+        """
+        自动寻找挑战的层数并且选定 , 找不到会向下划一点
+        :return: 如果找得到返回层数,找不到返回None
+        """
+        def set_layer_roi(ocr_target: RuleOcr, roi: tuple):
+            ocr_target.roi[0] = int(roi[0]) - 225
+            ocr_target.roi[1] = int(roi[1]) - 40
+        def check_layer(ocr_target: RuleOcr, roi=None) -> int or None:
+            #
+            # 手动留了一个bug: 即使匹配到了未通关 但是在判断层数的时候还是会先判断第一个是什么的
+            level = ocr_target.ocr(self.device.image)
+            if not isinstance(level, str):
+                logger.warning(f'OCR failed, try again {level}')
+            if level not in self.lay_list and roi:
+                print(roi)
+                print(ocr_target.roi)
+                set_layer_roi(ocr_target, roi)
+                self.screenshot()
+                level = ocr_target.ocr(self.device.image)
+            try:
+                return self.match_layer[level]
+            except KeyError:
+                logger.warning(f'OCR failed, try again {level}')
+                return None
+
+
+        if screenshot:
+            self.screenshot()
+        text_pos = self.O_SE_NO_PASS.ocr(self.device.image)
+        if text_pos != (0, 0, 0, 0):
+            # 如果能找得到 未通关 ,那可以挑战
+            layer = check_layer(self.O_SE_LAYER_1, text_pos)
+            # 如果第一个文字就找得到的,就点击这个
+            if layer:
+                self.C_SE_CLICK_LAYER.roi_front = text_pos
+                self.click(self.C_SE_CLICK_LAYER, interval=1)
+                return layer
+            else:
+                return None
+
+        else:
+            # TODO
+            # 如果不是就向下滑动,继续找或者是判断
+            last_text_pos = self.O_SE_NO_PASS_LAST.ocr(self.device.image)
+            if last_text_pos != (0, 0, 0, 0):
+                # 如果是后面找得到
+                layer = check_layer(self.O_SE_LAYER_10, last_text_pos)
+                # 如果第一个文字就找得到的,就点击这个
+                if layer:
+                    self.C_SE_CLICK_LAYER.roi_front = last_text_pos
+                    self.click(self.C_SE_CLICK_LAYER, interval=1)
+                else:
+                    return None
+
+            else:
+                # 如果不是就一直滑动
+                self.swipe(self.S_SE_DOWN_SEIPE, interval=3)
+                time.sleep(2)
+
+    def click_battle(self):
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_SE_FIRE):
+                break
+            if self.appear_then_click(self.I_SE_FIRE, interval=1):
+                continue
+
+    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")
+        # win: bool = False
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_SE_BATTLE_WIN):
+                logger.info('Win battle')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_SE_BATTLE_WIN):
+                        break
+                    if self.appear_then_click(self.I_SE_BATTLE_WIN, interval=1):
+                        continue
+                return True
+
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FALSE):
+                        break
+                    if self.appear_then_click(self.I_FALSE, interval=1):
+                        continue
+                return False
+
+
+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.run()

+ 8 - 0
tasks/Secret/se/click.json

@@ -0,0 +1,8 @@
+[
+  {
+    "itemName": "se_click_layer",
+    "roiFront": "434,155,100,100",
+    "roiBack": "434,155,100,100",
+    "description": "description"
+  }
+]

+ 56 - 0
tasks/Secret/se/image.json

@@ -0,0 +1,56 @@
+[
+  {
+    "itemName": "se_enter",
+    "imageName": "se_se_enter.png",
+    "roiFront": "1145,593,100,100",
+    "roiBack": "1145,593,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入"
+  },
+  {
+    "itemName": "se_fire",
+    "imageName": "se_se_fire.png",
+    "roiFront": "1108,551,100,100",
+    "roiBack": "1108,551,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "秘闻挑战"
+  },
+  {
+    "itemName": "se_placement",
+    "imageName": "se_se_placement.png",
+    "roiFront": "1011,568,50,48",
+    "roiBack": "1011,568,50,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "排行"
+  },
+  {
+    "itemName": "se_jade",
+    "imageName": "se_se_jade.png",
+    "roiFront": "305,208,28,33",
+    "roiBack": "305,208,28,33",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "勾玉"
+  },
+  {
+    "itemName": "se_jade_last",
+    "imageName": "se_se_jade_last.png",
+    "roiFront": "302,565,37,40",
+    "roiBack": "302,565,37,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "最后一个的勾玉"
+  },
+  {
+    "itemName": "se_battle_win",
+    "imageName": "se_se_battle_win.png",
+    "roiFront": "436,62,100,100",
+    "roiBack": "436,62,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗赢"
+  }
+]

+ 56 - 0
tasks/Secret/se/ocr.json

@@ -0,0 +1,56 @@
+[
+  {
+    "itemName": "se_no_pass",
+    "roiFront": "428,151,262,248",
+    "roiBack": "428,151,262,248",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "未通关",
+    "description": "未通关"
+  },
+  {
+    "itemName": "se_layer_1",
+    "roiFront": "211,149,37,35",
+    "roiBack": "211,149,37,35",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "第一个位置的层数"
+  },
+  {
+    "itemName": "se_layer_10",
+    "roiFront": "210,507,34,34",
+    "roiBack": "210,507,34,34",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "拾",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "se_layer_9",
+    "roiFront": "211,373,35,33",
+    "roiBack": "211,373,35,33",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "玖",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "se_layer_8",
+    "roiFront": "212,237,34,34",
+    "roiBack": "212,237,34,34",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "捌",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "se_no_pass_last",
+    "roiFront": "429,381,180,234",
+    "roiBack": "429,381,180,234",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "后面的时候识别为通关的"
+  }
+]

BIN
tasks/Secret/se/se_se_battle_win.png


BIN
tasks/Secret/se/se_se_enter.png


BIN
tasks/Secret/se/se_se_fire.png


BIN
tasks/Secret/se/se_se_jade.png


BIN
tasks/Secret/se/se_se_jade_last.png


BIN
tasks/Secret/se/se_se_placement.png


+ 9 - 0
tasks/Secret/se/swipe.json

@@ -0,0 +1,9 @@
+[
+  {
+    "itemName": "se_down_seipe",
+    "roiFront": "229,520,124,27",
+    "roiBack": "217,390,145,35",
+    "mode": "default",
+    "description": "向下滑动"
+  }
+]