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

Merge branch 'runhey:dev' into dev

yEs1do 1 год назад
Родитель
Сommit
f865f058a5

+ 5 - 0
module/device/handle.py

@@ -257,6 +257,11 @@ class Handle:
         # 事实上 我们只需要最后一个 'MuMu模拟器12',其他的不重要
         if 'MuMu模拟器12' in emu_list and 'MuMuPlayer' in emu_list:
             emulator_title = 'MuMu模拟器12'
+        
+        # MuMu5.0更新,窗体标题改动: 'MuMu模拟器','MuMuNxDevice','MuMu安卓设备'
+        # 如果没有匹配上旧版本,尝试匹配MuMu5.0窗口名                                                                  
+        if emulator_title == '' and 'MuMu安卓设备' in emu_list:
+            emulator_title = 'MuMu安卓设备'
 
         if len(emu_list) > 1 and emulator_title == '':
             logger.warning(f'Find more than one emulator handle, oas will use the first one {emu_list[0]}')

+ 8 - 1
tasks/ActivityShikigami/script_task.py

@@ -192,6 +192,14 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 break
 
     def switch_buff(self, climb_conf: GeneralClimb):
+        buffs = getattr(climb_conf, f'{self.climb_type}_buff', None)
+        if not buffs:
+            logger.info('Not set buff, skip')
+            return
+        buff_list = [buff.strip() for buff in buffs.split(',')]
+        if not buff_list:
+            logger.info('Buff incorrect formatting, skip')
+            return
         self.ui_get_current_page()
         self.ui_goto(page_climb_act_buff)
         buff_box_list = [self.C_BUFF_1_BOX, self.C_BUFF_2_BOX]
@@ -203,7 +211,6 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             'buff_4': self.C_BUFF_4_UP,
             'buff_5': self.C_BUFF_5_UP
         }
-        buff_list = [buff.strip() for buff in getattr(climb_conf, f'{self.climb_type}_buff').split(',')]
         logger.info(f'start switch {self.climb_type} {buff_list}')
         for i, buff_box in enumerate(buff_box_list):
             logger.info(f'Start down {buff_list[i]}')

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

@@ -34,11 +34,11 @@ class GeneralClimb(ConfigBase):
     run_sequence: str = Field(default='pass,boss,ap',
                               description='爬塔运行顺序,英文逗号分隔,从左到右运行,若没启用自动跳过对应类型(pass:门票,boss:boss战,ap:体力)')
     # 门票爬塔buff
-    pass_buff: str = Field(default='buff_4,buff_5', description='门票爬塔加成,buff1-5,加成页从左往右顺序')
+    pass_buff: str = Field(default='buff_4,buff_5', description='门票爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
     # 体力爬塔buff
-    ap_buff: str = Field(default='buff_4,buff_5', description='体力爬塔加成,buff1-5,加成页从左往右顺序')
+    ap_buff: str = Field(default='buff_4,buff_5', description='体力爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
     # boss爬塔buff
-    boss_buff: str = Field(default='buff_1,buff_3', description='boss战爬塔加成,buff1-5,加成页从左往右顺序')
+    boss_buff: str = Field(default='buff_1,buff_3', description='boss战爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
     # 结束后激活 御魂清理
     active_souls_clean: bool = Field(default=False, description='是否运行结束后清理御魂')
     # 点击战斗随机休息

+ 1 - 1
tasks/Orochi/assets.py

@@ -30,7 +30,7 @@ class OrochiAssets:
 	# List Rule Assets
 	# 这个是御魂界面选择不同层数的 
 	L_LAYER_LIST = RuleList(folder="./tasks/Orochi/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(45, 88), 
-					 array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾", "悲", "神"])
+					 array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾", "悲", "神", "虚"])
 
 
 	# Ocr Rule Assets

+ 4 - 0
tasks/Orochi/config.py

@@ -31,6 +31,8 @@ class Layer(str, Enum):
     TEN = '拾层'
     ELEVEN = '悲鸣'
     TWELVE = '神罚'
+    THIRTEEN = '虚无'
+
 
 class OrochiConfig(ConfigBase):
     # 身份
@@ -57,6 +59,8 @@ class SwitchSoulConfig(BaseSwitchSoulConfig):
     eleven_switch: str = Field(default='-1,-1', description='eleven_switch_help')
     # 神罚 config
     twelve_switch: str = Field(default='-1,-1', description='twelve_switch_help')
+    # 虚无 config
+    thirteen_switch: str = Field(default='-1,-1', description='thirteen_switch_help')
 
 
 class Orochi(ConfigBase):

+ 4 - 0
tasks/Orochi/res/list.json

@@ -52,6 +52,10 @@
     {
       "itemName": "神",
       "roiFront": "277,534,46,86"
+    },
+    {
+      "itemName": "虚",
+      "roiFront": "277,534,46,86"
     }
   ]
 }

+ 2 - 0
tasks/Orochi/script_task.py

@@ -489,6 +489,8 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
                 group_team = orochi_switch_soul.eleven_switch
             case Layer.TWELVE:
                 group_team = orochi_switch_soul.twelve_switch
+            case Layer.THIRTEEN:
+                group_team = orochi_switch_soul.thirteen_switch
 
         if orochi_switch_soul.auto_switch_soul:
             self.ui_get_current_page()

+ 2 - 1
tasks/SoulsTidy/config.py

@@ -9,7 +9,8 @@ from tasks.Component.config_base import ConfigBase
 
 class SimpleTidy(BaseModel):
     # 贪吃鬼和招财猫
-    greed_maneki: bool = Field(default=False, description="greed_maneki_help")
+    enable_greed: bool = Field(default=False, description="是否启用贪吃鬼")
+    enable_maneki: bool = Field(default=False, description="是否启用奉纳")
 
 
 class SoulsTidy(ConfigBase):

+ 86 - 84
tasks/SoulsTidy/script_task.py

@@ -20,7 +20,7 @@ class ScriptTask(GameUi, SoulsTidyAssets):
         self.ui_get_current_page()
         self.ui_goto(page_shikigami_records)
         con = self.config.souls_tidy
-        if con.simple_tidy.greed_maneki:
+        if con.simple_tidy.enable_greed or con.simple_tidy.enable_maneki:
             self.goto_souls()
             self.greed_maneki()
             self.back_records()
@@ -61,31 +61,32 @@ class ScriptTask(GameUi, SoulsTidyAssets):
         :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=3.5):
-                feed_count += 1
-                continue
-        logger.info('Feed greed ghost done')
+        if self.config.souls_tidy.simple_tidy.enable_greed:
+            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=3.5):
+                    feed_count += 1
+                    continue
+            logger.info('Feed greed ghost done')
         # 关闭贪吃鬼, 进入奉纳
         while 1:
             self.screenshot()
             if self.appear(self.I_ST_CAT):
                 # 出现招财猫
                 break
-            
+
             # https://github.com/runhey/OnmyojiAutoScript/issues/662
             if self.appear(self.I_ST_UNSELECTED):
                 self.ui_click_until_disappear(self.I_ST_UNSELECTED)
@@ -97,76 +98,77 @@ class ScriptTask(GameUi, SoulsTidyAssets):
                 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.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
-            self.screenshot()
-            # 非+0的不弃置 双保险
-            if not self.appear(self.I_ST_LEVEL_0):
-                logger.info("First Orichi isn't Level 0,quit")
-                break
-            firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
-            if firvel is None or firvel == '':
-                logger.info('ocr result is Null')
-                continue
-            if firvel != '古':
-                # 问就是 把 +0 识别成了 古
-                logger.info('No zero level, bongna done')
-                break
-
-            # !!!!!!  这里没有检查金币是否足够
-            # 长按
-            self.click(self.L_ONE, interval=2.5)
-            self.screenshot()
-            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 gold_amount == 0:
-                continue
-
-            # 点击奉纳收取奖励
-            if not self.appear(self.I_ST_DONATE):
-                logger.warning('Donate button not appear, skip')
-                continue
-            # 点击奉纳 及收取奖励
+        if self.config.souls_tidy.simple_tidy.enable_maneki:
+            logger.hr('Enter bongna')
+            # 进入已弃置界面
+            """
+            现在默认进入就是已弃置界面,所以不需要点击
+            """
+            # 确保是按照等级来排序的
             while 1:
                 self.screenshot()
-                if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
+                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.ui_reward_appear_click():
+                if self.ocr_appear_click(self.O_ST_SORT_TYPE, interval=2):
                     continue
-                # 出现神赐, 就点击然后消失,
-                if self.appear(self.I_ST_GOD_PRESENT):
-                    logger.info('God present appear')
-                    self.click(self.C_ST_GOD_PRSENT, interval=2)
+                if self.ocr_appear_click(self.O_ST_SORT_LOCATION, interval=2):
                     continue
-                if self.appear_then_click(self.I_ST_DONATE, interval=5.5):
-                    self.wait_until_appear(self.I_ST_GOLD, True, wait_time=5)
+            logger.info('Sort by level')
+            # 开始奉纳
+            while 1:
+                self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
+                self.screenshot()
+                # 非+0的不弃置 双保险
+                if not self.appear(self.I_ST_LEVEL_0):
+                    logger.info("First Orichi isn't Level 0,quit")
+                    break
+                firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
+                if firvel is None or firvel == '':
+                    logger.info('ocr result is Null')
                     continue
-                if not self.appear(self.I_ST_GOLD):
+                if firvel != '古':
+                    # 问就是 把 +0 识别成了 古
+                    logger.info('No zero level, bongna done')
                     break
-            logger.info('Donate one')
+
+                # !!!!!!  这里没有检查金币是否足够
+                # 长按
+                self.click(self.L_ONE, interval=2.5)
+                self.screenshot()
+                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 gold_amount == 0:
+                    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.ui_reward_appear_click():
+                        continue
+                    # 出现神赐, 就点击然后消失,
+                    if self.appear(self.I_ST_GOD_PRESENT):
+                        logger.info('God present appear')
+                        self.click(self.C_ST_GOD_PRSENT, interval=2)
+                        continue
+                    if self.appear_then_click(self.I_ST_DONATE, interval=5.5):
+                        self.wait_until_appear(self.I_ST_GOLD, True, wait_time=5)
+                        continue
+                    if not self.appear(self.I_ST_GOLD):
+                        break
+                logger.info('Donate one')
 
         logger.info('Bongna done')
 
@@ -175,7 +177,7 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas1')
+    c = Config('oas3')
     d = Device(c)
     t = ScriptTask(c, d)