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

fix(KekkaiActivation): #653 Naming errors

huangrunheng 1 год назад
Родитель
Сommit
3c487259d2

+ 1 - 1
tasks/AreaBoss/script_task.py

@@ -483,7 +483,7 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('日常1')
+    c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
     # time.sleep(3)

+ 0 - 0
tasks/KekkaiActivation/a/a_a_harvest_Oboroguruma.png → tasks/KekkaiActivation/a/a_a_harvest_oboroguruma.png


+ 9 - 0
tasks/KekkaiActivation/a/image.json

@@ -214,5 +214,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "斗鱼3"
+  },
+  {
+    "itemName": "a_harvest_oboroguruma",
+    "imageName": "a_a_harvest_oboroguruma.png",
+    "roiFront": "891,165,57,39",
+    "roiBack": "854,128,132,124",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "胧车 "
   }
 ]

+ 2 - 2
tasks/KekkaiActivation/assets.py

@@ -76,8 +76,8 @@ class KekkaiActivationAssets:
 	I_A_DEMOUNT = RuleImage(roi_front=(939,575,55,47), roi_back=(903,551,107,91), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_demount.png")
 	# 斗鱼3 
 	I_A_HARVEST_FISH_3 = RuleImage(roi_front=(891,165,57,39), roi_back=(854,128,132,124), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_3.png")
-	# 胧车 
-	I_A_HARVEST_Oboroguruma = RuleImage(roi_front=(891,165,57,39), roi_back=(854,128,132,124), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_Oboroguruma.png")
+	# 胧车  
+	I_A_HARVEST_OBOROGURUMA = RuleImage(roi_front=(891,165,57,39), roi_back=(854,128,132,124), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_oboroguruma.png")
 
 
 	# Image Rule Assets

+ 1 - 1
tasks/KekkaiActivation/script_task.py

@@ -384,7 +384,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
         self.appear_then_click(self.I_A_HARVEST_FISH_6)  # 斗鱼6
         self.appear_then_click(self.I_A_HARVEST_MOON_3)  # 太阴3
         self.appear_then_click(self.I_A_HARVEST_FISH_3)  # 斗鱼三
-        self.appear_then_click(self.I_A_HARVEST_Oboroguruma)  # 胧车
+        self.appear_then_click(self.I_A_HARVEST_OBOROGURUMA)  # 胧车
 
 
 if __name__ == "__main__":

+ 12 - 11
tasks/WantedQuests/script_task.py

@@ -601,14 +601,15 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
-    img = cv2.imread(r"E:\highlight.png")
-    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
-    t.device.image = img
-    appear = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
-
-    img = cv2.imread(r"E:\normal.png")
-    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
-    t.device.image = img
-    appear_normal = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
-
-    print(appear)
+    t.run()
+    # img = cv2.imread(r"E:\highlight.png")
+    # img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    # t.device.image = img
+    # appear = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
+    #
+    # img = cv2.imread(r"E:\normal.png")
+    # img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    # t.device.image = img
+    # appear_normal = t.appear_highlight(t.I_WQ_INVITE_DIFF_SVR_HIGHLIGHT)
+    #
+    # print(appear)

+ 2 - 2
tasks/WeeklyTrifles/script_task.py

@@ -274,8 +274,8 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t._share_secret()
-    # t._share_collect()
+    # t._share_secret()
+    t._share_area_boss()
     # t.click_share(t.I_WT_SE_WECHAT)