From 93dc6b4cfb11fb419a684ed76167da2cdf7a1934 Mon Sep 17 00:00:00 2001
From: Barry <870709864@qq.com>
Date: Sat, 6 Mar 2021 15:47:56 +0800
Subject: [PATCH] Dev (#366)

* feat: update speed ratio script

* feat: update install qt script

* feat: update dmgbuild to 1.4.2

* fix: run error on win

* feat: update comment
---
 .github/workflows/macos.yml     | 2 +-
 .github/workflows/ubuntu.yml    | 2 +-
 .github/workflows/windows.yml   | 2 +-
 QtScrcpy/main.cpp               | 2 +-
 ci/mac/package/requirements.txt | 2 +-
 ci/win/publish_for_win.bat      | 1 +
 keymap/gameforpeace.json        | 2 ++
 keymap/identityv.json           | 3 ++-
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f3b16b83e..105ba56af 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -31,7 +31,7 @@ jobs:
           path: ${{ env.qt-install-path }}/${{ matrix.qt-arch-install }}
           key: ${{ runner.os }}/${{ matrix.qt-ver }}/${{ matrix.qt-arch-install }}
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2.7.1
+        uses: jurplel/install-qt-action@v2.13.0
         with:
           version: ${{ matrix.qt-ver }}
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 50dc8fd13..89ec6f829 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -33,7 +33,7 @@ jobs:
           path: ${{ env.qt-install-path }}/${{ matrix.qt-arch-install }}
           key: ${{ runner.os }}/${{ matrix.qt-ver }}/${{ matrix.qt-arch-install }}
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2.7.1
+        uses: jurplel/install-qt-action@v2.13.0
         with:
           version: ${{ matrix.qt-ver }}
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0bcfc8196..bfddbb2e7 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -54,7 +54,7 @@ jobs:
       # 安装Qt
       - name: Install Qt
         # 使用外部action。这个action专门用来安装Qt
-        uses: jurplel/install-qt-action@v2.7.1
+        uses: jurplel/install-qt-action@v2.13.0
         with:
           # Version of Qt to install
           version: ${{ matrix.qt-ver }}
diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp
index 890ee431e..9f55a0f5e 100644
--- a/QtScrcpy/main.cpp
+++ b/QtScrcpy/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
     MouseTap::getInstance()->initMouseEventTap();
 #endif
 
-    //加载样式表
+    // load style sheet
     QFile file(":/qss/psblack.css");
     if (file.open(QFile::ReadOnly)) {
         QString qss = QLatin1String(file.readAll());
diff --git a/ci/mac/package/requirements.txt b/ci/mac/package/requirements.txt
index aa42ddfda..a08fd98b9 100644
--- a/ci/mac/package/requirements.txt
+++ b/ci/mac/package/requirements.txt
@@ -1 +1 @@
-dmgbuild==1.3.3
\ No newline at end of file
+dmgbuild==1.4.2
\ No newline at end of file
diff --git a/ci/win/publish_for_win.bat b/ci/win/publish_for_win.bat
index bbf912ddc..5b561122d 100644
--- a/ci/win/publish_for_win.bat
+++ b/ci/win/publish_for_win.bat
@@ -103,6 +103,7 @@ if /i %cpu_mode% == x86 (
 :: 只有在64位下需要这个
 if /i %cpu_mode% == x64 (
     cp "C:\Windows\System32\vcruntime140_1.dll" %publish_path%\vcruntime140_1.dll
+    cp "C:\Windows\System32\msvcp140_1.dll" %publish_path%\msvcp140_1.dll
 )
 
 ::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\VCRUNTIME140.dll" %publish_path%\VCRUNTIME140.dll
diff --git a/keymap/gameforpeace.json b/keymap/gameforpeace.json
index d06f0913d..11dd20ee5 100644
--- a/keymap/gameforpeace.json
+++ b/keymap/gameforpeace.json
@@ -5,6 +5,8 @@
 			"x": 0.57,
 			"y": 0.26
 		},
+		"speedRatioX": 3.25,
+		"speedRatioY": 1.25,
 		"smallEyes": {
 			"comment": "小眼睛",
 			"type": "KMT_CLICK",
diff --git a/keymap/identityv.json b/keymap/identityv.json
index c93706df6..b73f3b388 100644
--- a/keymap/identityv.json
+++ b/keymap/identityv.json
@@ -7,7 +7,8 @@
 			"x": 0.700,
 			"y": 0.410
 		},
-		"speedRatio": 2
+		"speedRatioX": 3.25,
+		"speedRatioY": 1.25
 	},
 	"keyMapNodes": [{
 			"comment": "退出",