Merge pull request #295 from runhey/dev

Dev

Author: runhey

.gitignore

@@ -33,7 +33,7 @@ module/config/argument/setting.json
 !dev_tools/Spyxx/spyxx_amd64.exe
 !dev_tools/ViewWizard2/ViewWizard2.exe
 !dev_tools/ViewWizard3/ViewWizard.exe
-hya
+./hya
 
 
 

README.md

@@ -53,6 +53,8 @@ This project is licensed under the GNU General Public License v3.0.
 
 ## 声明 Announcement
 本软件开源、免费，仅供学习交流使用。开发者团队拥有本项目的最终解释权。使用本软件产生的所有问题与本项目与开发者团队无关。
+OAS is a free open source software, if you paid for OAS from any channel, please refund.
+OAS 是一款免费开源软件，如果你在任何渠道付费购买了OAS，请退款。
 
 ## 关于 Alas
 OAS 基于碧蓝航线脚本 [AzurLaneAutoScript](https://github.com/LmeSzinc/AzurLaneAutoScript) 开发，考虑到星穹铁道脚本 [StarRailCopilot](https://github.com/LmeSzinc/StarRailCopilot) 中所提及的问题，

config/template.json

@@ -4,6 +4,7 @@
     "device": {
       "serial": "auto",
       "handle": "",
+      "emulatorinfo_path": "",
       "package_name": "auto",
       "screenshot_method": "auto",
       "control_method": "minitouch",
@@ -889,4 +890,4 @@
       "netherworld_group_team": "-1,-1"
     }
   }
-}
+}

dev_tools/assets_test.py

@@ -34,13 +34,13 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\Ryland\Desktop\QQ截图20240407130042.png"
+IMAGE_FILE = r"C:\Users\萌萌哒\Desktop\341978692-fdceb33c-eec1-4965-a2b9-8f75cd54d5e2.png"
 if __name__ == '__main__':
-    from tasks.KekkaiActivation.assets import KekkaiActivationAssets
-    from tasks.GameUi.assets import GameUiAssets
-
-    targe = GameUiAssets.I_MAIN_GOTO_TEAM
+    from tasks.RyouToppa.assets import RyouToppaAssets
+    targe = RyouToppaAssets.I_RYOU_TOPPA
     print(detect_image(IMAGE_FILE, targe))
+
+    # ocr demo
     # from tasks.KekkaiActivation.assets import KekkaiActivationAssets
     # target = KekkaiActivationAssets.O_CARD_ALL_TIME
     # print(detect_ocr(IMAGE_FILE, target))

module/config/config_manual.py

@@ -17,7 +17,7 @@ class ConfigManual:
         > BondlingFairyland > EvoZone > GoryouRealm
         > TrueOrochi > RichMan
         > CollectiveMissions
-        > Pets > TalismanPass > SoulsTidy > Delegation
+        > Pets > TalismanPass > SoulsTidy > Delegation > Hyakkiyakou
         > Secret > WeeklyTrifles > MysteryShop > Duel > MetaDemon > FrogBoss
         """
 

module/config/config_menu.py

@@ -25,7 +25,8 @@ def __init__(self) -> None:
                                    'TalismanPass', 'DemonEncounter', 'Pets', 'SoulsTidy', 'Delegation', 'WantedQuests',
                                    'Tako']
         # 很肝的任务
-        self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland', 'EvoZone', 'GoryouRealm', 'Exploration',]
+        self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland', 'EvoZone', 'GoryouRealm', 'Exploration',
+                                                'Hyakkiyakou']
         # 阴阳寮
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'CollectiveMissions',
                               'Hunt']

module/config/config_model.py

@@ -54,6 +54,7 @@
 from tasks.BondlingFairyland.config import BondlingFairyland
 from tasks.EvoZone.config import EvoZone
 from tasks.GoryouRealm.config import GoryouRealm
+from tasks.Hyakkiyakou.config import Hyakkiyakou
 # ----------------------------------------------------------------------------------------------------------------------
 
 # 每周任务---------------------------------------------------------------------------------------------------------------
@@ -106,6 +107,7 @@ class ConfigModel(ConfigBase):
     bondling_fairyland: BondlingFairyland = Field(default_factory=BondlingFairyland)
     evo_zone: EvoZone = Field(default_factory=EvoZone)
     goryou_realm: GoryouRealm = Field(default_factory=GoryouRealm)
+    hyakkiyakou: Hyakkiyakou = Field(default_factory=Hyakkiyakou)
 
     # 这些是每周任务
     true_orochi: TrueOrochi = Field(default_factory=TrueOrochi)

module/daemon/benchmark.py

@@ -216,7 +216,7 @@ def run_simple_screenshot_benchmark(self):
         Returns:
             str: The fastest screenshot method on current device.
         """
-        screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'DroidCast_raw', 'DroidCast', 'window_background']
+        screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'DroidCast_raw', 'DroidCast', 'window_background', 'nemu_ipc']
 
         def remove(*args):
             return [l for l in screenshot if l not in args]
@@ -242,6 +242,6 @@ def remove(*args):
     config = Config('oas1')
     device = Device(config)
     b = Benchmark(config=config, device=device)
-    # print(b.run_simple_screenshot_benchmark())
-    screenshot, click = b.get_test_methods()
-    b.benchmark(set(), click)
+    print(b.run_simple_screenshot_benchmark())
+    # screenshot, click = b.get_test_methods()
+    # b.benchmark(set(), click)

module/device/device.py

@@ -99,6 +99,8 @@ def release_during_wait(self):
         # self.config.script.device.screenshot_method = 'scrcpy'
         if self.config.script.device.screenshot_method == 'scrcpy':
             self._scrcpy_server_stop()
+        if self.config.Emulator_ScreenshotMethod == 'nemu_ipc':
+            self.nemu_ipc_release()
 
     def stuck_record_add(self, button):
         """