Merge pull request wangshub#632 from wangshub/dev

Dev to master

Author: 常伟佳

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+
+<!--
+感谢您的 pull request!
+
+在 PR 前请尽量做到：
+
+- PR 应基于最新的 master 分支
+- 尽量遵守 PEP8 规范
+- 分支名是有意义的名称，如 add-config-file-for-mi5s 而不是 patch-1
+- 把分支发到 dev
+
+请描述一下 PR 做的事情，更新算法或配置文件请附上最高分数
+-->
+
+本次 PR 主要做的事情：
+
+- x
+
+修改后最高分数：x

WechatJump/Config.py

@@ -7,6 +7,7 @@
 import json
 import re
 
+
 def open_accordant_config():
     '''
     调用配置文件
@@ -32,7 +33,7 @@ def _get_screen_size():
     '''
     size_str = os.popen('adb shell wm size').read()
     if not size_str:
-        print('请安装ADB及驱动并配置环境变量')
+        print('请安装 ADB 及驱动并配置环境变量')
         sys.exit()
     m = re.search(r'(\d+)x(\d+)', size_str)
     if m:

WechatJump/Debug.py

@@ -9,23 +9,26 @@
 
 screenshot_backup_dir = 'screenshot_backups/'
 
+
 def make_debug_dir(screenshot_backup_dir):
     '''
     创建备份文件夹
     '''
     if not os.path.isdir(screenshot_backup_dir):
         os.mkdir(screenshot_backup_dir)
 
+
 def backup_screenshot(ts):
     '''
     为了方便失败的时候 debug
     '''
     make_debug_dir(screenshot_backup_dir)
     shutil.copy('autojump.png', '{}{}.png'.format(screenshot_backup_dir, ts))
 
+
 def save_debug_screenshot(ts, im, piece_x, piece_y, board_x, board_y):
     '''
-    对debug图片加上详细的注释
+    对 debug 图片加上详细的注释
     '''
     make_debug_dir(screenshot_backup_dir)
     draw = ImageDraw.Draw(im)
@@ -39,23 +42,25 @@ def save_debug_screenshot(ts, im, piece_x, piece_y, board_x, board_y):
     del draw
     im.save('{}{}_d.png'.format(screenshot_backup_dir, ts))
 
+
 def dump_device_info():
     '''
     显示设备信息
     '''
     size_str = os.popen('adb shell wm size').read()
     device_str = os.popen('adb shell getprop ro.product.model').read()
     density_str = os.popen('adb shell wm density').read()
-    print("如果你的脚本无法工作，上报issue时请copy如下信息:\n**********\
-        \nScreen: {size}\
-        \nDensity: {dpi}\
-        \nDeviceType: {type}\
-        \nOS: {os}\
-        \nPython: {python}\n**********".format(
-            size=size_str.strip(),
-            type=device_str.strip(),
-            dpi=density_str.strip(),
-            os=sys.platform,
-            python=sys.version
-        )
-    )
+    print("""如果你的脚本无法工作，上报 issue 时请 copy 如下信息：
+**********
+Screen: {size}
+Density: {dpi}
+DeviceType: {type}
+OS: {os}
+Python: {python}
+**********""".format(
+        size=size_str.strip(),
+        type=device_str.strip(),
+        dpi=density_str.strip(),
+        os=sys.platform,
+        python=sys.version
+    ))

config/1280x720/config.json

@@ -3,10 +3,10 @@
     "press_coefficient": 2.099,
     "piece_base_height_1_2": 13,
     "piece_body_width": 47,
-    "swipe" : {
-      "x1": 374,
-      "y1": 1060,
-      "x2": 374,
-      "y2": 1060
+    "swipe": {
+        "x1": 374,
+        "y1": 1060,
+        "x2": 374,
+        "y2": 1060
     }
 }

config/1440x720/config.json

@@ -0,0 +1,12 @@
+{
+    "under_game_score_y": 200,
+    "press_coefficient": 2.099,
+    "piece_base_height_1_2": 13,
+    "piece_body_width": 47,
+    "swipe" : {
+      "x1": 360,
+      "y1": 1140,
+      "x2": 360,
+      "y2": 1142
+    }
+}

config/1920x1080/config.json

@@ -3,10 +3,10 @@
     "press_coefficient": 1.392,
     "piece_base_height_1_2": 20,
     "piece_body_width": 70,
-    "swipe" : {
-      "x1": 500,
-      "y1": 1600,
-      "x2": 500,
-      "y2": 1602
+    "swipe": {
+        "x1": 500,
+        "y1": 1600,
+        "x2": 500,
+        "y2": 1602
     }
 }

config/2560x1440/config.json

@@ -3,10 +3,10 @@
     "press_coefficient": 1.035,
     "piece_base_height_1_2": 28,
     "piece_body_width": 110,
-    "swipe" : {
-      "x1": 320,
-      "y1": 410,
-      "x2": 320,
-      "y2": 410
+    "swipe": {
+        "x1": 320,
+        "y1": 410,
+        "x2": 320,
+        "y2": 410
     }
 }

config/huawei/honor_note8_config.json

@@ -3,10 +3,10 @@
     "press_coefficient": 1.04,
     "piece_base_height_1_2": 90,
     "piece_body_width": 120,
-    "swipe" : {
-      "x1": 730,
-      "y1": 2100,
-      "x2": 720,
-      "y2": 2100
+    "swipe": {
+        "x1": 730,
+        "y1": 2100,
+        "x2": 720,
+        "y2": 2100
     }
 }

config/iPhone/6_config.json

@@ -3,8 +3,7 @@
     "press_coefficient": 2.0,
     "piece_base_height_1_2": 13,
     "piece_body_width": 49,
-
-    "swipe" : {
+    "swipe": {
         "x1": 375,
         "y1": 1055,
         "x2": 375,

config/iPhone/8P_7P_6sP_6P_config.json

@@ -3,10 +3,10 @@
     "press_coefficient": 1.2,
     "piece_base_height_1_2": 20,
     "piece_body_width": 70,
-    "swipe" : {
-      "x1": 320,
-      "y1": 410,
-      "x2": 320,
-      "y2": 410
+    "swipe": {
+        "x1": 320,
+        "y1": 410,
+        "x2": 320,
+        "y2": 410
     }
 }