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

fix(Dokan): use assets_extractor.py to generate assest.py for Dokan

jackyhwei 2 лет назад
Родитель
Сommit
b5051ed9ed
3 измененных файлов с 8 добавлено и 3 удалено
  1. 6 1
      tasks/Dokan/assets.py
  2. 1 1
      tasks/Dokan/res/list.json
  3. 1 1
      tasks/Dokan/script_task.py

+ 6 - 1
tasks/Dokan/assets.py

@@ -88,7 +88,7 @@ class DokanAssets:
 
 	# List Rule Assets
 	# 这个是当前活跃的竂活动列表界面 
-	L_LAYER_LIST = RuleList(folder="./tasks/Dokan/res", direction="vertical", mode="ocr", roi_back=(35,157,37,250), size=(42, 27), 
+	L_RYOU_ACTIVITY_LIST = RuleList(folder="./tasks/Dokan/res", direction="vertical", mode="ocr", roi_back=(35,157,37,250), size=(42, 27), 
 					 array=["道馆", "首领", "狭间"])
 
 
@@ -105,3 +105,8 @@ class DokanAssets:
 	O_DOKAN_SUCCEEDED = RuleOcr(roi=(1122,546,92,51), area=(1122,546,92,51), mode="Full", method="Default", keyword="关闭", name="dokan_succeeded")
 
 
+	# Click Rule Assets
+	# 选择第一个寮 
+	C_SELECT_FIRST_RYOU = RuleClick(roi_front=(1148,138,21,22), roi_back=(1148,138,21,22), name="select_first_ryou")
+
+

+ 1 - 1
tasks/Dokan/res/list.json

@@ -1,5 +1,5 @@
 {
-    "name": "layer_list",
+    "name": "ryou_activity_list",
     "direction": "vertical",
     "type": "ocr",
     "roiBack": "35,157,37,250",

+ 1 - 1
tasks/Dokan/script_task.py

@@ -153,7 +153,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, DokanAssets):
                 # 战斗
                 success = self.dokan_battle(cfg)
                 # 战斗结束后,随便点三下,确保跳过各种结算画面
-                self.click(click=self.C_DOKAN_READY_FOR_BATLLE, interval=1.5)
+                self.click(click=self.C_DOKAN_READY_FOR_BATTLE, interval=1.5)
                 self.click(click=self.C_DOKAN_RANDOM_CLICK_AREA2, interval=2.2)
                 self.click(click=self.C_DOKAN_RANDOM_CLICK_AREA3, interval=1.8)
                 # 每次战斗结束都重置绿标