Jelajahi Sumber

Merge pull request #119 from runhey/master

Update dev branch
huangrunheng 3 tahun lalu
induk
melakukan
38d47d1a02

+ 2 - 1
.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,5 +1,4 @@
 name: 🐛问题反馈
 name: 🐛问题反馈
-title: '🐛'
 description: 在使用 oas 过程中遇到了错误
 description: 在使用 oas 过程中遇到了错误
 labels: bug
 labels: bug
 body:
 body:
@@ -16,6 +15,8 @@ body:
         required: true
         required: true
       - label: 这个问题出现了至少三次,不是偶发的
       - label: 这个问题出现了至少三次,不是偶发的
         required: false
         required: false
+      - label: 我使用 OAS 最新版
+        required: false
   - type: textarea
   - type: textarea
     id: describe
     id: describe
     attributes:
     attributes:

+ 2 - 0
tasks/Component/GeneralBuff/assets.py

@@ -42,6 +42,8 @@ class GeneralBuffAssets:
 	O_EXP_50 = RuleOcr(roi=(426,119,335,394), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的经验增加50%", name="exp_50")
 	O_EXP_50 = RuleOcr(roi=(426,119,335,394), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的经验增加50%", name="exp_50")
 	# Ocr-description 
 	# Ocr-description 
 	O_EXP_100 = RuleOcr(roi=(421,127,342,388), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的经验增加100%", name="exp_100")
 	O_EXP_100 = RuleOcr(roi=(421,127,342,388), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的经验增加100%", name="exp_100")
+	# 打开buff加成 
+	O_GB_BUFF_2 = RuleOcr(roi=(348,31,93,51), area=(363,36,29,43), mode="Single", method="Default", keyword="加成", name="gb_buff_2")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets

+ 9 - 0
tasks/Component/GeneralBuff/gb/ocr.json

@@ -34,5 +34,14 @@
     "method": "Default",
     "method": "Default",
     "keyword": "战斗胜利获得的经验增加100%",
     "keyword": "战斗胜利获得的经验增加100%",
     "description": "Ocr-description"
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "gb_buff_2",
+    "roiFront": "348,31,93,51",
+    "roiBack": "363,36,29,43",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "加成",
+    "description": "打开buff加成"
   }
   }
 ]
 ]

+ 1 - 1
tasks/Component/GeneralBuff/general_buff.py

@@ -25,7 +25,7 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_CLOUD):
             if self.appear(self.I_CLOUD):
                 break
                 break
-            if self.appear_then_click(self.I_BUFF_1, interval=2):
+            if self.appear_then_click(self.I_BUFF_1, interval=2) or self.ocr_appear_click(self.O_GB_BUFF_2, interval=2):
                 continue
                 continue
 
 
         check_image = self.I_AWAKE
         check_image = self.I_AWAKE