Update git tree hash

README-en.md

@@ -1,8 +1,8 @@
 # SkyAutoPlayerScript
 
-A script to play Sheets generated by [SkyStudio](https://play.google.com/store/apps/details?id=com.Maple.SkyStudio) automatically in game Sky with accessibility services using Auto.js
+A script to play Sheets generated by [SkyStudio](https://play.google.com/store/apps/details?id=com.Maple.SkyStudio) automatically in game Sky with accessibility services using AutoX
 
-[![shared sheet](https://badgen.net/badge/shared%20sheets/169%20in%20total/green)](shared_sheets/) [![sheet contributors](https://badgen.net/badge/sheet%20contributors/29/pink)](#shared-sheets) [![Hosted in](https://badgen.net/badge/CDN/jsDelivr?icon=jsdelivr)](https://www.jsdelivr.com/)
+[![shared sheet](https://badgen.net/badge/shared%20sheets/175%20in%20total/green)](shared_sheets/) [![sheet contributors](https://badgen.net/badge/sheet%20contributors/36/pink)](#shared-sheets) [![Hosted in](https://badgen.net/badge/CDN/jsDelivr?icon=jsdelivr)](https://www.jsdelivr.com/)
 
 ## [Temporary solution for error `Syntax error script.js#44(eval)#100`](https://github.com/StageGuard/SkyAutoPlayerScript/issues/17#issuecomment-1002640892)
 
@@ -20,17 +20,19 @@ There are many features in SkyAutoPlayerScript compared to other auto player scr
 
 ## Usage
 
-1. Download release `4.1.1 Alpha2 (461) -> armeabi-v7a` in [`Ericwyn/Auto.js/releases@V4.1.1.Alpha2`](https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2)
+1. Download AutoX at [Releases · kkevsekk1/AutoX](https://github.com/kkevsekk1/AutoX/releases)。
 
-2. Turn on **Accessibility service** and allow **Display pop-up window** permission for Auto.js
+> Warning: Please notice that you should check your device arch in advance, or select `universal`。
 
-3. Create a new script file in Auto.js. Copy the code below and run!
+2. Turn on **Accessibility service** and allow **Display pop-up window** permission for AutoX
+
+3. Create a new script file in AutoX. Copy the code below and run!
 
 ```javascript
 "ui";
 "use strict";
 /*
-    SkyAutoPlayer (Auto.js script)
+    SkyAutoPlayer (AutoX script)
   	Copyright © 2020-2021 StageGuard
 
   This library is free software; you can redistribute it and/or
@@ -74,7 +76,7 @@ There are many features in SkyAutoPlayerScript compared to other auto player scr
 ```
 ## Clear data
 
-`SkyAutoPlayerScript` will store data while running, if you want to delete all data, please run the code below in Auto.js
+`SkyAutoPlayerScript` will store data while running, if you want to delete all data, please run the code below in AutoX
 
 ```
 storages.remove("StageGuard:SkyAutoPlayer:Config");
@@ -192,7 +194,7 @@ Welcome everyone to contribute this project, including pull request, issue, new
 ### ⚠️WARNING
 CodeFactor Evaluation: [![CodeFactor](https://www.codefactor.io/repository/github/stageguard/skyautoplayerscript/badge)](https://www.codefactor.io/repository/github/stageguard/skyautoplayerscript)
 
-Because of the limitation of Auto.js, it is impossible to extract functions and method so all functions are defined in a single file. Also, my coding skill is poor, so it is `a little hard` to understand source code.
+This program is a single-file project which means all modules are in a single file. Also, my coding skill is poor, so it is `a little hard` to understand source code.
 
 ## Contributor
 
@@ -237,6 +239,9 @@ CoolApk [@ZyaIreZ](http://www.coolapk.com/u/1376183)<br>
 CoolApk [@星释槐](http://www.coolapk.com/u/2168596)<br>
 [KingXKK](mailto:fjjiangdonghan@outlook.com)<br>
 CoolApk [@Leotoast](http://www.coolapk.com/u/2260385)<br>
+[小柒不会玩红石](mailto:2126859202@qq.com)<br>
+[我睡着的时候不困0v0](mailto:31610766@qq.com)<br>
+[心酸的邂逅](mailto:3200546245@qq.com)<br>
 
 ## Translation
 
@@ -257,7 +262,7 @@ None
 # LICENSE
 
 ```
-    SkyAutoPlayer (Auto.js script)
+    SkyAutoPlayer (AutoX script)
 	  Copyright © 2020-2021 StageGuard
 
   This library is free software; you can redistribute it and/or

README.md

@@ -2,11 +2,11 @@
 
 English: [README-en.md](README-en.md)
 
-使用 Auto.js 提供的无障碍权限实现在 Sky光遇 中自动弹奏 [SkyStudio](https://play.google.com/store/apps/details?id=com.Maple.SkyStudio) 导出的曲谱
+使用 [AutoX](https://github.com/kkevsekk1/AutoX) 提供的无障碍权限实现在 Sky光遇 中自动弹奏 [SkyStudio](https://play.google.com/store/apps/details?id=com.Maple.SkyStudio) 导出的曲谱
 
-[![shared sheet](https://badgen.net/badge/shared%20sheets/169%20in%20total/green)](shared_sheets/) [![sheet contributors](https://badgen.net/badge/sheet%20contributors/29/pink)](#共享乐谱) [![Hosted in](https://badgen.net/badge/CDN/jsDelivr?icon=jsdelivr)](https://www.jsdelivr.com/)
+[![shared sheet](https://badgen.net/badge/shared%20sheets/175%20in%20total/green)](shared_sheets/) [![sheet contributors](https://badgen.net/badge/sheet%20contributors/36/pink)](#共享乐谱) [![Hosted in](https://badgen.net/badge/CDN/jsDelivr?icon=jsdelivr)](https://www.jsdelivr.com/)
 
-~~不会进一步支持原神的 m21键琴和上传21键位的共享乐谱，反正15键又不是不能弹。~~
+~~不会进一步支持原神的21键琴和上传21键位的共享乐谱，反正15键又不是不能弹。~~
 
 ## [暂时解决 `Syntax error script.js#44(eval)#100` 的方法](https://github.com/StageGuard/SkyAutoPlayerScript/issues/17#issuecomment-1002640892)
 
@@ -24,35 +24,28 @@ English: [README-en.md](README-en.md)
 
 ## 使用
 
-1. Auto.js `4.1.1 Alpha2 (461) -> armeabi-v7a` 版本下载: [`Ericwyn/Auto.js/releases@V4.1.1.Alpha2`](https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2)
+以下两种方式仅需选择一种
 
-2. 为 Auto.js 开启**无障碍服务**和**悬浮窗权限**。
+<details> <summary>拷贝脚本（推荐）</summary>
 
-3. 在 Auto.js 中新建一个脚本并粘贴以下代码并运行：
+1. 在 [Releases · kkevsekk1/AutoX](https://github.com/kkevsekk1/AutoX/releases) 中下载 AutoX。
+
+> 注意：请提前悉知设备架构选择 `arm64-v8a` 或 `armeabi-v7a`，否则选择 `universal`。
+
+2. 为 AutoX 开启**无障碍服务**和**悬浮窗权限**和**存储权限**。
+
+3. 在 AutoX 中新建一个脚本并粘贴以下代码并运行：
 
 ```javascript
 "ui";
 "use strict";
-/*
+const okhttp3 = Packages["okhttp3"];
-    SkyAutoPlayer (Auto.js script)
-  	Copyright © 2020-2021 StageGuard
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-  USA
-*/
 (function(emitter) {
+  const client = (new okhttp3.OkHttpClient.Builder())
+    .connectTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
+    .writeTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
+    .readTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
+    .build();
   threads.start(function () {
     emitter.emit("evaluate", (function () {
       //Many sources 
@@ -63,25 +56,43 @@ English: [README-en.md](README-en.md)
         "https://raw.githubusercontent.com/StageGuard/SkyAutoPlayerScript/master/source/SkyAutoplayer.js"
       ];
       for (let i in sources) {
-        let resp = http.get(sources[i]);
+        try {
-        if (resp.statusCode >= 200 && resp.statusCode < 300) {
+          let resp = client.newCall(
-          return resp.body.string();
+            (new okhttp3.Request.Builder()).url(sources[i]).build()
+          ).execute();
+          if (resp.code() == 200) return resp.body().string();
+        } catch(e) {
+          let err = "Failed on source " + sources[i] + " : " + e;
+          console.log(err); toast(err);
         }
       }
-      return "console.show();console.log(\"Failed to load script\")";
+      console.show();
+      return null;
     }()));
   });
-  emitter.on('evaluate', function (s) {
+  emitter.on('evaluate', s => { if(s != null) eval(s); });
-    eval(s);
-  });
 }(events.emitter(threads.currentThread())));
 ```
 
-在 Auto.js 版本 `4.1.1 Alpha2 (461)` 中测试通过，**不保证其他版本的兼容性**(取决于其他版本相对于此版本的API是否有 `breaking changes`)
+</details>
+
+<details> <summary>安装独立程序（仅 <code>arm64-v8a</code> 可用）</summary>
+
+在 [Releases · StageGuard/SkyAutoPlayerScript](https://github.com/StageGuard/SkyAutoPlayerScript/releases) 中下载脚本独立打包程序，安装后即可使用。
+
+首次启动时请同意程序申请的权限：**无障碍服务**和**悬浮窗权限**和**存储权限**。
+
+> 注意：本程序申请的权限为 AutoX 打包程序自动控制，且仅申请使脚本运行的必要权限。
+
+</details>
+
+## 兼容性
+
+在 AutoX 版本 `6.3.6` 中测试通过。
 
 ## 清除数据
 
-`SkyAutoPlayerScript` 在使用过程中会产生本地数据存储，若想全部删除，请使用 Auto.js 执行以下代码
+`SkyAutoPlayerScript` 在使用过程中会产生本地数据存储，若想全部删除，请使用 AutoX 执行以下代码
 
 ```
 storages.remove("StageGuard:SkyAutoPlayer:Config");
@@ -197,7 +208,7 @@ Gitee 用户[嗨游圈(@vipssp)](https://gitee.com/vipssp)在**未经乐谱上
 ### ⚠️警告
 CodeFactor 代码评估: [![CodeFactor](https://www.codefactor.io/repository/github/stageguard/skyautoplayerscript/badge)](https://www.codefactor.io/repository/github/stageguard/skyautoplayerscript)
 
-由于 Auto.js 的限制，无法将不同的功能分离，所以所有功能都在一个文件实现；再加上我糟糕的代码技能，源码会非常难读。
+由于项目为单脚本文件，未将不同模块分离至文件，即所有功能均在一个文件实现；再加上我糟糕的代码技能，源码会非常难读。
 
 ## 贡献者
 
@@ -242,6 +253,9 @@ Twitter [Phoebe@huunhut1217](https://mobile.twitter.com/huunhut1217)<br>
 酷安[@星释槐](http://www.coolapk.com/u/2168596)<br>
 [KingXKK](mailto:fjjiangdonghan@outlook.com)<br>
 酷安[@Leotoast](http://www.coolapk.com/u/2260385)<br>
+[小柒不会玩红石](mailto:2126859202@qq.com)<br>
+[我睡着的时候不困0v0](mailto:31610766@qq.com)<br>
+[心酸的邂逅](mailto:3200546245@qq.com)<br>
 
 ## 翻译
 
@@ -262,7 +276,7 @@ SkyAutoplayerScript 在版本 21 已支持多语言并可以在线获取语言
 # 许可证协议
 
 ```
-    SkyAutoPlayer (Auto.js script)
+    SkyAutoPlayer (AutoX script)
 	  Copyright © 2020-2021 StageGuard
 
   This library is free software; you can redistribute it and/or

gitVersion

@@ -1 +1 @@
-eab7c61cc00ba326b88e8916cbd3be119f575999
+6067ff139bc0bd3c7542535ecacc83e4d1831b1a

resources/language_pack/en_US.json

@@ -3,7 +3,7 @@
     "code": "en_US",
     "version": 5,
     "content": {
-        "launch_tip_in_content": "If you can't see a diamond popup dialog,<br>make sure that Auto.js is allowed to <u><b>display pop-up window</u></b><br><br><br>Version <b>4.1.1 Alpha2</b> is recommended.<br><b>4.1.1 Alpha2</b> Download: <a href=https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2>https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2</a>",
+        "launch_tip_in_content": "If you can't see a diamond popup dialog,<br>make sure that AutoX is allowed to <u><b>display pop-up window</u></b>",
         "launch_tip_force_exit": "FORCE EXIT",
         "launch_tip_storage_on_android11": "In Android R, access private data folder of other apps is forbidden, sheet folder has set to {0}",
     

resources/language_pack/zh_CN.json

@@ -3,7 +3,7 @@
     "code": "zh_CN",
     "version": 5,
     "content": {
-        "launch_tip_in_content": "当你发现什么事情都没有发生时<br>也许你应该看看是否授予了Auto.js<u><b>悬浮窗权限</u></b><br><br><br>建议使用 <b>4.1.1 Alpha2</b> 版本！<br><b>4.1.1 Alpha2</b> 版本下载: <a href=https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2>https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2</a>",
+        "launch_tip_in_content": "当你发现什么事情都没有发生时<br>也许你应该看看是否授予了 AutoX<u><b>悬浮窗权限</u></b>",
         "launch_tip_force_exit": "强制退出",
         "launch_tip_storage_on_android11": "安卓11不允许外部应用读取应用私有文件夹，乐谱文件夹移至 {0}",
     

shared_sheets.json

@@ -1,5 +1,93 @@
 {
   "sheets": [
+    {
+      "name": "人鱼的眼泪",
+      "file": "人鱼的眼泪.txt",
+      "author": "心酸的邂逅",
+      "desc": "<a href=mailto:3200546245@qq.com>@心酸的邂逅<a/> 分享乐谱 人鱼的眼泪",
+      "bpm": 552,
+      "suggested_instrument": 1,
+      "keyCount": 15,
+      "pitchLevel": 5,
+      "noteCount": 1254,
+      "social": [
+        {
+          "platform": "mail",
+          "name": "3200546245@qq.com",
+          "link": "3200546245@qq.com"
+        }
+      ]
+    },
+    {
+      "name": "漠河舞厅.",
+      "file": "漠河舞厅.txt",
+      "author": "柳爽",
+      "desc": "<a href=mailto:31610766@qq.com>@我睡着的时候不困0v0<a/> 分享乐谱 漠河舞厅.",
+      "bpm": 280,
+      "suggested_instrument": 1,
+      "keyCount": 15,
+      "pitchLevel": 0,
+      "noteCount": 878,
+      "social": [
+        {
+          "platform": "mail",
+          "name": "31610766@qq.com",
+          "link": "31610766@qq.com"
+        }
+      ]
+    },
+    {
+      "name": "rush e",
+      "file": "rush e.txt",
+      "author": "小柒不会玩红石",
+      "desc": "<a href=mailto:2126859202@qq.com>@小柒不会玩红石<a/> 分享乐谱 rush e",
+      "bpm": 1024,
+      "suggested_instrument": 1,
+      "keyCount": 15,
+      "pitchLevel": 0,
+      "noteCount": 2465,
+      "social": [
+        {
+          "platform": "mail",
+          "name": "2126859202@qq.com",
+          "link": "2126859202@qq.com"
+        }
+      ]
+    },
+    {
+      "name": "那女孩对我说(完整版)",
+      "file": "那女孩对我说(完整版).txt",
+      "author": "Hxina",
+      "desc": "<a href=mailto:xicisw@gmail.com>@Hxina<a/>完整版《那女孩对我说》",
+      "bpm": 320,
+      "keyCount": 15,
+      "pitchLevel": 0,
+      "noteCount": 610,
+      "social": [
+        {
+          "platform": "mail",
+          "name": "xicisw@gmail.com",
+          "link": "xicisw@gmail.com"
+        }
+      ]
+    },
+    {
+      "name": "相思（无和弦）",
+      "file": "相思（无和弦）.txt",
+      "author": "Hxina",
+      "desc": "<a href=mailto:xicisw@gmail.com>@Hxina<a/>简易《相思（无和弦）》",
+      "bpm": 160,
+      "keyCount": 15,
+      "pitchLevel": 0,
+      "noteCount": 230,
+      "social": [
+        {
+          "platform": "mail",
+          "name": "xicisw@gmail.com",
+          "link": "xicisw@gmail.com"
+        }
+      ]
+    },
     {
       "name": "夜空中最亮的星",
       "file": "夜空中最亮的星.txt",

source/SkyAutoplayer.js

@@ -1,7 +1,7 @@
 "ui";
 "use strict";
 /*
-    SkyAutoPlayer (Auto.js script)
+    SkyAutoPlayer (AutoX script)
 	Copyright © 2020-2021 StageGuard
 	  Contact : 
 	  (QQ: 1355416608)
@@ -29,13 +29,13 @@
 
 const user_agreements = 
 	"请仔细阅读以下使用须知！\n\n" + 
-	"1. 未充分测试，若遇到BUG，请酷安私信@StageGuard或新建Issue来反馈BUG！\n\n" + 
+	"1. 未充分测试，若遇到 BUG，请酷安私信 @StageGuard 或新建 Issue 来反馈 BUG！\n\n" + 
-	"2. SkyAutoplayerScript是完全免费且开源的软件/脚本(https://github.com/StageGuard/SkyAutoPlayerScript)，使用 SkyAutoplayerScript 盈利的同时请标注源项目链接。\n\n" + 
+	"2. SkyAutoplayerScript 是完全免费且开源的软件/脚本(https://github.com/StageGuard/SkyAutoPlayerScript)，使用 SkyAutoplayerScript 盈利的同时请标注源项目链接。\n\n" + 
-	"3. 共享乐谱不遵守LGPL-2.1协议，如您想在SkyAutoPlayer以外使用这些乐谱，请自行找乐谱作者授权！\n\n" + 
+	"3. 共享乐谱不遵守 LGPL-2.1 协议，如您想在SkyAutoPlayer以外使用这些乐谱，请自行找乐谱作者授权！\n\n" + 
-	"4. 本脚本仅可用作娱乐用途，请不要在正规场合使用本脚本(请自行体会\"正规场合\"是什么意思)，若因使用本脚本所出现了一些不友好的问题，与脚本作者StageGuard无关。\n\n" + 
+	"4. 本脚本仅可用作娱乐用途，请不要在正规场合使用本脚本(请自行体会\"正规场合\"是什么意思)，若因使用本脚本所出现了一些不友好的问题，与脚本作者 StageGuard 无关。\n\n" + 
 	"5. 脚本只能给你一时满足感而不能使你进步，请适当使用，只有真正的技术才是王道，才能使你感到快乐。\n\n" + 
 	"6. 本脚本只是一个\"弹奏机\"，并不内置曲谱，请在 GooglePlay 下载 SkyStudio 编谱。\n\n" + 
-	"7. 本脚本的发行遵守LGPL-2.1协议，若你不了解协议内容，请访问 https://www.gnu.org/licenses 查看"
+	"7. 本脚本的发行遵守 LGPL-2.1 协议，若你不了解协议内容，请访问 https://www.gnu.org/licenses 查看"
 ;
 
 //Script global scope
@@ -58,7 +58,7 @@ scope.dp = context.getResources().getDisplayMetrics().density;
 //show error;
 const error = function(text) {
 	console.show();
-	console.error("SkyAutoPlayer发生了一个错误，请酷安私信@StageGuard或在github中的StageGuard/SkyAutoPlayerScript新建Issue来反馈这个BUG！\n详细信息：" + text);
+	console.error("SkyAutoPlayer发生了一个错误，请酷安私信 @StageGuard 或在 Github 中的 StageGuard/SkyAutoPlayerScript 新建 Issue 来反馈这个 BUG！\n详细信息：" + text);
 };
 
 String.format = function() {
@@ -409,7 +409,7 @@ config = {
 
 	languages: {
 		zh_CN: {
-			launch_tip_in_content: "当你发现什么事情都没有发生时<br>也许你应该看看是否授予了Auto.js<u><b>悬浮窗权限</u></b><br><br><br>建议使用 <b>4.1.1 Alpha2</b> 版本！<br><b>4.1.1 Alpha2</b> 版本下载: <a href=https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2>https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2</a>",
+			launch_tip_in_content: "当你发现什么事情都没有发生时<br>也许你应该看看是否授予了 AutoX <u><b>悬浮窗权限</u></b>",
 			launch_tip_force_exit: "强制退出",
 			launch_tip_storage_on_android11: "安卓11不允许外部应用读取应用私有文件夹，乐谱文件夹移至 {0}",
 
@@ -643,7 +643,7 @@ config = {
 	},
 	
 	checkVersion: function() {
-		this.values.gitVersion = http.get("http://81.70.194.140:8090/StageGuard/SkyAutoPlayerScript/raw/branch/master/gitVersion").body.string();
+		this.values.gitVersion = http.get("https://cdn.jsdelivr.net/gh/StageGuard/SkyAutoPlayerScript/gitVersion").body.string();
 		var periodVersion = this._global_storage.get("version", this.values.currentVersion);
 		var currentVersion = this.values.currentVersion;
 		if(periodVersion < currentVersion) {
@@ -727,9 +727,7 @@ config = {
 
 	fetchRepoFile: function(path, successCbk, failCbk) {
 		var repos = [
-			"http://81.70.194.140:8090/StageGuard/SkyAutoPlayerScript/raw/branch/master/" + path,
 			"https://cdn.jsdelivr.net/gh/StageGuard/SkyAutoPlayerScript@" + config.values.gitVersion + "/" + path,
-			"https://dl.skyautoplayerscript.stageguard.top/" + path,
 			"https://gitee.com/stageguard/SkyAutoPlayerScript/raw/master/" + path,
 			"https://raw.githubusercontent.com/StageGuard/SkyAutoPlayerScript/master/" + path
 		];

source/language_list.json

@@ -2,10 +2,10 @@
     "list": [{
         "code": "zh_CN",
         "name": "简体中文",
-        "version": 5
+        "version": 6
     }, {
         "code": "en_US",
         "name": "English (US)",
-        "version": 5
+        "version": 6
     }]
 }