|
@@ -206,7 +206,7 @@ class basic_operate:
|
|
|
return True
|
|
|
|
|
|
@staticmethod
|
|
|
- def get_line_num():
|
|
|
+ def get_line_num2():
|
|
|
lineStr = yys_ocrAuto(check_img.line_orc)
|
|
|
if len(lineStr) == 0:
|
|
|
return 0
|
|
@@ -219,7 +219,13 @@ class basic_operate:
|
|
|
print("未找到数字")
|
|
|
return 0
|
|
|
|
|
|
-
|
|
|
+ @staticmethod
|
|
|
+ def get_line_num():
|
|
|
+ meat_num = len(pcacc_img.find_all_image_locations(check_img.on_meat))
|
|
|
+ wood_num = len(pcacc_img.find_all_image_locations(check_img.on_wood))
|
|
|
+ mine_num = len(pcacc_img.find_all_image_locations(check_img.on_mine))
|
|
|
+ stone_num = len(pcacc_img.find_all_image_locations(check_img.on_stone))
|
|
|
+ return meat_num + wood_num + mine_num + stone_num
|
|
|
|
|
|
|
|
|
|
|
@@ -1691,6 +1697,7 @@ class task_zhuguang(dongri_task):
|
|
|
|
|
|
waitClickImg_noWait_withBool([special_activity_img.zhuguang_send, special_activity_img.zhuguang_receive], 2, 1)
|
|
|
return True
|
|
|
+
|
|
|
|
|
|
class task_testFun(dongri_task):
|
|
|
def __init__(self):
|
|
@@ -1702,6 +1709,7 @@ class task_testFun(dongri_task):
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
myTimeSleep_big()
|
|
|
+ print(basic_operate.get_line_num())
|
|
|
#task_get_fire_crystal().run()
|
|
|
#task_checkPower().run()
|
|
|
#task_testFun().run()
|
|
@@ -1747,4 +1755,4 @@ if __name__ == '__main__':
|
|
|
#task_read_mails().run()
|
|
|
#task_checkBenifitStatus().run()
|
|
|
#task_checkDiamond().run()
|
|
|
- task_zhuguang().run()
|
|
|
+ #task_zhuguang().run()
|