瀏覽代碼

fix(Dokan): remove useless assets which may cause errors

jackyhwei 2 年之前
父節點
當前提交
81dca34e5a
共有 4 個文件被更改,包括 6 次插入 和 28 次删除
  1. 1 5
      tasks/Dokan/assets.py
  2. 1 1
      tasks/Dokan/res/click.json
  3. 0 18
      tasks/Dokan/res/image.json
  4. 4 4
      tasks/Dokan/script_task.py

+ 1 - 5
tasks/Dokan/assets.py

@@ -15,7 +15,7 @@ class DokanAssets:
 	C_DOKAN_RANDOM_CLICK_AREA = RuleClick(roi_front=(142,294,107,555), roi_back=(142,294,107,555), name="dokan_random_click_area")
 	C_DOKAN_RANDOM_CLICK_AREA = RuleClick(roi_front=(142,294,107,555), roi_back=(142,294,107,555), name="dokan_random_click_area")
 	# 道馆随机点击安全区域1:竂友突破信息 
 	# 道馆随机点击安全区域1:竂友突破信息 
 	C_DOKAN_RANDOM_CLICK_AREA1 = RuleClick(roi_front=(42,594,10,100), roi_back=(42,594,10,100), name="dokan_random_click_area1")
 	C_DOKAN_RANDOM_CLICK_AREA1 = RuleClick(roi_front=(42,594,10,100), roi_back=(42,594,10,100), name="dokan_random_click_area1")
-	# 道馆随机点击安全区域2:切换查看队伍模式 
+	# 道馆随机点击安全区域2:切换查看队伍模式。初步测试下来这个地方最安全,除了庭院、町中、逢魔外其他各场景都可用。 
 	C_DOKAN_RANDOM_CLICK_AREA2 = RuleClick(roi_front=(1122,360,10,40), roi_back=(1122,360,10,40), name="dokan_random_click_area2")
 	C_DOKAN_RANDOM_CLICK_AREA2 = RuleClick(roi_front=(1122,360,10,40), roi_back=(1122,360,10,40), name="dokan_random_click_area2")
 	# 道馆随机点击安全区域3 
 	# 道馆随机点击安全区域3 
 	C_DOKAN_RANDOM_CLICK_AREA3 = RuleClick(roi_front=(333,44,107,20), roi_back=(333,44,107,20), name="dokan_random_click_area3")
 	C_DOKAN_RANDOM_CLICK_AREA3 = RuleClick(roi_front=(333,44,107,20), roi_back=(333,44,107,20), name="dokan_random_click_area3")
@@ -66,10 +66,6 @@ class DokanAssets:
 	I_RYOU_DOKAN_BATTLE_OVER = RuleImage(roi_front=(571,503,106,49), roi_back=(571,503,106,49), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_battle_over.png")
 	I_RYOU_DOKAN_BATTLE_OVER = RuleImage(roi_front=(571,503,106,49), roi_back=(571,503,106,49), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_battle_over.png")
 	# 状态:战斗中,左上角的加油图标 
 	# 状态:战斗中,左上角的加油图标 
 	I_RYOU_DOKAN_FIGHTING = RuleImage(roi_front=(232,36,42,19), roi_back=(232,36,42,19), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_fighting.png")
 	I_RYOU_DOKAN_FIGHTING = RuleImage(roi_front=(232,36,42,19), roi_back=(232,36,42,19), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_fighting.png")
-	# 状态:加油中,左下角有鼓 
-	I_RYOU_DOKAN_CHEERING = RuleImage(roi_front=(68,597,69,33), roi_back=(68,597,69,33), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering.png")
-	# 状态:加油中,左下角有鼓,灰色的鼓 
-	I_RYOU_DOKAN_CHEERING_GRAY = RuleImage(roi_front=(59,600,81,38), roi_back=(59,600,81,38), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering_gray.png")
 	# 状态:道馆已经结束 
 	# 状态:道馆已经结束 
 	I_RYOU_DOKAN_FINISHED = RuleImage(roi_front=(658,649,91,27), roi_back=(658,649,91,27), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_finished.png")
 	I_RYOU_DOKAN_FINISHED = RuleImage(roi_front=(658,649,91,27), roi_back=(658,649,91,27), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_finished.png")
 	# 状态:道馆挑战失败,投票NO 
 	# 状态:道馆挑战失败,投票NO 

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

@@ -15,7 +15,7 @@
     "itemName": "dokan_random_click_area2",
     "itemName": "dokan_random_click_area2",
     "roiFront": "1122,360,10,40",
     "roiFront": "1122,360,10,40",
     "roiBack": "1122,360,10,40",
     "roiBack": "1122,360,10,40",
-    "description": "道馆随机点击安全区域2:切换查看队伍模式"
+    "description": "道馆随机点击安全区域2:切换查看队伍模式。初步测试下来这个地方最安全,除了庭院、町中、逢魔外其他各场景都可用。"
   },
   },
   {
   {
     "itemName": "dokan_random_click_area3",
     "itemName": "dokan_random_click_area3",

+ 0 - 18
tasks/Dokan/res/image.json

@@ -193,24 +193,6 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "状态:战斗中,左上角的加油图标"
     "description": "状态:战斗中,左上角的加油图标"
   },
   },
-  {
-    "itemName": "ryou_dokan_cheering",
-    "imageName": "res_ryou_dokan_cheering.png",
-    "roiFront": "68,597,69,33",
-    "roiBack": "68,597,69,33",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "状态:加油中,左下角有鼓"
-  },
-  {
-    "itemName": "ryou_dokan_cheering_gray",
-    "imageName": "res_ryou_dokan_cheering_gray.png",
-    "roiFront": "59,600,81,38",
-    "roiBack": "59,600,81,38",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "状态:加油中,左下角有鼓,灰色的鼓"
-  },
   {
   {
     "itemName": "ryou_dokan_finished",
     "itemName": "ryou_dokan_finished",
     "imageName": "res_ryou_dokan_finished.png",
     "imageName": "res_ryou_dokan_finished.png",

+ 4 - 4
tasks/Dokan/script_task.py

@@ -478,10 +478,10 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, DokanAssets):
         # 状态:达到失败次数,CD中
         # 状态:达到失败次数,CD中
         if self.appear(self.I_RYOU_DOKAN_CD, threshold=0.8):
         if self.appear(self.I_RYOU_DOKAN_CD, threshold=0.8):
             return True, DokanScene.RYOU_DOKAN_SCENE_CD
             return True, DokanScene.RYOU_DOKAN_SCENE_CD
-        # 状态:加油中,左下角有鼓
-        if self.appear_then_click(self.I_RYOU_DOKAN_CHEERING, threshold=0.8) or self.appear(
-                self.I_RYOU_DOKAN_CHEERING_GRAY, threshold=0.8):
-            return True, DokanScene.RYOU_DOKAN_SCENE_CHEERING
+        # # 状态:加油中,左下角有鼓
+        # if self.appear_then_click(self.I_RYOU_DOKAN_CHEERING, threshold=0.8) or self.appear(
+        #         self.I_RYOU_DOKAN_CHEERING_GRAY, threshold=0.8):
+        #     return True, DokanScene.RYOU_DOKAN_SCENE_CHEERING
         # # 状态:战斗中,左上角的加油图标
         # # 状态:战斗中,左上角的加油图标
         # if self.appear(self.I_RYOU_DOKAN_FIGHTING, threshold=0.8):
         # if self.appear(self.I_RYOU_DOKAN_FIGHTING, threshold=0.8):
         #     return True, DokanScene.RYOU_DOKAN_SCENE_FIGHTING
         #     return True, DokanScene.RYOU_DOKAN_SCENE_FIGHTING