소스 검색

!2 fix android

pcacc 2 주 전
부모
커밋
923494d363
2개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 5 5
      scriptBase/comon.py
  2. 1 1
      yys_task.py

+ 5 - 5
scriptBase/comon.py

@@ -243,7 +243,7 @@ def find_window_pos(title):
         return False, None
 
 def find_yys_pos():
-    return find_window_pos('MuMu安卓设备12')
+    return find_window_pos('MuMu安卓设备')
 
 def get_first_single_digit(string):
     pattern = r'\d'  # 匹配一个独立的单个数字
@@ -283,10 +283,10 @@ def ocrAuto(gamestr, positions):
     return lineStr
 
 def yys_ocrAuto(positions):
-    return ocrAuto('MuMu安卓设备12', positions)
+    return ocrAuto('MuMu安卓设备', positions)
 
 def yys_dragAuto(positions, isQuick=False):
-    return dragAuto('MuMu安卓设备12', positions, isQuick)
+    return dragAuto('MuMu安卓设备', positions, isQuick)
 
 def getRegion(gamestr, region, isWidth):
     tmpRet, tmpPos = find_window_pos(gamestr)
@@ -297,7 +297,7 @@ def getRegion(gamestr, region, isWidth):
     else:
         return (region[0] + tmpPos[0], region[1] + tmpPos[1], region[2] + tmpPos[0], region[3] + tmpPos[1])
 def game_region():
-    tmpRet, tmpPos = find_window_pos('MuMu安卓设备12',)
+    tmpRet, tmpPos = find_window_pos('MuMu安卓设备',)
     return tmpRet, tmpPos
 
 def save_game_screen(fileHeader=""):
@@ -334,7 +334,7 @@ def stop_recording():
 
 
 def yys_getRegion(region, isWidth= False):
-    return getRegion('MuMu安卓设备12', region, isWidth)
+    return getRegion('MuMu安卓设备', region, isWidth)
 
 def click_waitimg(pos_x,pos_y,img):
     retry_times = 3

+ 1 - 1
yys_task.py

@@ -696,7 +696,7 @@ if __name__ == '__main__':
         task_fightYaoqi(YAOQI.RIHEFANG).run()
     task_baigui().run()
     
-    tmpRet, tmpPos = find_window_pos('MuMu安卓设备12')
+    tmpRet, tmpPos = find_window_pos('MuMu安卓设备')
     pyautogui.screenshot(imageFilename='yys.png', region=tmpPos)
     #print(task_goto_place(PLACE.OUTSIDE))