From 352aa7d689efc459b45ed2ad6b4fd7b57367a118 Mon Sep 17 00:00:00 2001 From: Kawaa <89033115+Kawaa-qwq@users.noreply.github.com> Date: Fri, 5 Aug 2022 17:35:44 +0800 Subject: [PATCH] Improve some documentation and JSON (#1618) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commits: * Updated instructions * 更新说明 * 更新说明 * 更新说明 * 更新说明 * 更新说明 * Updated instructions * Updated instructions --- README_zh-CN.md | 13 ++++++++++--- src/main/resources/languages/en-US.json | 2 +- src/main/resources/languages/es-ES.json | 2 +- src/main/resources/languages/fr-FR.json | 2 +- src/main/resources/languages/ko-KR.json | 3 +-- src/main/resources/languages/pl-PL.json | 2 +- src/main/resources/languages/ro-RO.json | 2 +- src/main/resources/languages/ru-RU.json | 2 +- src/main/resources/languages/zh-CN.json | 4 ++-- src/main/resources/languages/zh-TW.json | 2 +- 10 files changed, 20 insertions(+), 14 deletions(-) diff --git a/README_zh-CN.md b/README_zh-CN.md index aae572844..815a83892 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -78,15 +78,21 @@ Grasscutter 使用 Gradle 来处理依赖及编译。 - [Java SE Development Kits - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) - [Git](https://git-scm.com/downloads) -##### Windows +##### Windows（在线克隆代码） ```shell -git clone https://github.com/Grasscutters/Grasscutter.git +git clone https://github.com/Grasscutters/Grasscutter.git # 或使用自己的fork地址 cd Grasscutter .\gradlew.bat # 建立开发环境 .\gradlew jar # 编译 ``` +##### Windows（本地编译） +```shell +cd <本地地址>/Grasscutter +.\gradlew.bat # 建立开发环境 +.\gradlew jar # 编译 +``` ##### Linux ```bash @@ -96,7 +102,8 @@ chmod +x gradlew ./gradlew jar # 编译 ``` -编译后的 JAR 文件存放在根目录 +* 编译后的 JAR 文件存放在根目录 +* Windows如创建为.bat文件请删除注释 ### 命令列表请到 [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands) 查看 diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json index c6cafc301..110e70680 100644 --- a/src/main/resources/languages/en-US.json +++ b/src/main/resources/languages/en-US.json @@ -330,7 +330,7 @@ "weather": { "success": "Set weather ID to %s with climate type %s.", "status": "Current weather ID is %s with climate type %s.", - "description": "Changes weather ID and climate type. Weather IDs can be found in WeatherExcelConfigData.json.\nClimate types: sunny, cloudy, rain, thunderstorm, snow, mist" + "description": "Changes weather ID and climate type. Weather IDs can be found in ./Resources/ExcelBinOutput/WeatherExcelConfigData.json.\nClimate types: sunny, cloudy, rain, thunderstorm, snow, mist" }, "ban": { "success": "Successful.", diff --git a/src/main/resources/languages/es-ES.json b/src/main/resources/languages/es-ES.json index 216fc925f..7cf91618f 100644 --- a/src/main/resources/languages/es-ES.json +++ b/src/main/resources/languages/es-ES.json @@ -330,7 +330,7 @@ "weather": { "success": "Establece el ID del clima %s con el tipo de clima %s.", "status": "El ID del clima actual es %s con tipo de clima %s.", - "description": "Cambia el ID del clima y el tipo de clima. Los IDs de climas pueden ser encontrados en WeatherExcelConfigData.json.\nTipos de clima: sunny, cloudy, rain, thunderstorm, snow, mist" + "description": "Cambia el ID del clima y el tipo de clima. Los IDs de climas pueden ser encontrados en ./Resources/ExcelBinOutput/WeatherExcelConfigData.json.\nTipos de clima: sunny, cloudy, rain, thunderstorm, snow, mist" }, "ban": { "success": "Exitoso.", diff --git a/src/main/resources/languages/fr-FR.json b/src/main/resources/languages/fr-FR.json index 5e2023746..f50cc7617 100644 --- a/src/main/resources/languages/fr-FR.json +++ b/src/main/resources/languages/fr-FR.json @@ -330,7 +330,7 @@ "weather": { "success": "L'ID de la météo à été défini a %s avec le type de climat %s.", "status": "L'ID de la météo accutel est %s avec le type de climat %s.", - "description": "Change la météo. Les ID de la météo peuvent être trouvés dans WeatherExcelConfigData.json.\nTypes de climatss: sunny, cloudy, rain, thunderstorm, snow, mist." + "description": "Change la météo. Les ID de la météo peuvent être trouvés dans ./Resources/ExcelBinOutput/WeatherExcelConfigData.json.\nTypes de climatss: sunny, cloudy, rain, thunderstorm, snow, mist." }, "ban": { "success": "Succès.", diff --git a/src/main/resources/languages/ko-KR.json b/src/main/resources/languages/ko-KR.json index c204dfb3f..e946e83a4 100644 --- a/src/main/resources/languages/ko-KR.json +++ b/src/main/resources/languages/ko-KR.json @@ -344,10 +344,9 @@ "description": "플레이어의 위치를 이동시킵니다." }, "weather": { - "usage": "사용법: weather [날씨ID] [climateType]\n날씨 ID들은 WeatherExcelConfigData.json에서 찾을 수 있습니다.\n날씨 타입: sunny, cloudy, rain, thunderstorm, snow, mist", "success": "설정 날씨 ID %s 를 %s 로.", "status": "현재 날씨 ID 는 %s 기후는 %s입니다.", - "description": "날씨 ID와 기후를 변경합니다. 날씨 ID들은 WeatherExcelConfigData.json에서 찾을 수 있습니다.\n날씨 타입: sunny, cloudy, rain, thunderstorm, snow, mist" + "description": "날씨 ID와 기후를 변경합니다. 날씨 ID들은 ./Resources/ExcelBinOutput/WeatherExcelConfigData.json에서 찾을 수 있습니다.\n날씨 타입: sunny, cloudy, rain, thunderstorm, snow, mist" }, "ban": { "command_usage": "사용법: ban <@플레이어ID> [timestamp] [reason]", diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json index a50565142..d313045f7 100644 --- a/src/main/resources/languages/pl-PL.json +++ b/src/main/resources/languages/pl-PL.json @@ -330,7 +330,7 @@ "weather": { "success": "ID pogody został ustawiony na %s, a typ klimatu na %s.", "status": "Bieżące ID pogody to %s, a typ klimatu to %s.", - "description": "Zmień ID pogody i typ klimatu." + "description": "Zmień identyfikator pogody i typ klimatu. I dentyfikator pogody można znaleźć w folderze ./Resources/ExcelBinOutput/WeatherExcelConfigData.json.\nRodzaje klimatu: słoneczny, pochmurny, deszcz, burze, śnieg, mgła " }, "ban": { "success": "Pomyślnie zbanowano podanego gracza.", diff --git a/src/main/resources/languages/ro-RO.json b/src/main/resources/languages/ro-RO.json index 5abb91376..b83a3f2da 100644 --- a/src/main/resources/languages/ro-RO.json +++ b/src/main/resources/languages/ro-RO.json @@ -330,7 +330,7 @@ "weather": { "success": "A setat ID-ul meteo la %s cu tipul de climă %s", "status": "ID-ul actual al vremii este %s cu tipul de climă %s", - "description": "Schimbă ID-ul vremii și tipul de climă. ID-urile de vreme pot fi găsite în WeatherExcelConfigData.json.\nTipuri de climă: sunny, cloudy, rain, thunderstorm, snow, mist" + "description": "Schimbă ID-ul vremii și tipul de climă. ID-urile de vreme pot fi găsite în ./Resources/ExcelBinOutput/WeatherExcelConfigData.json.\nTipuri de climă: sunny, cloudy, rain, thunderstorm, snow, mist" }, "ban": { "success": "Succes.", diff --git a/src/main/resources/languages/ru-RU.json b/src/main/resources/languages/ru-RU.json index 089db6fb1..62fa966cc 100644 --- a/src/main/resources/languages/ru-RU.json +++ b/src/main/resources/languages/ru-RU.json @@ -330,7 +330,7 @@ "weather": { "success": "Установлен ID погоды %s, тип климата: %s.", "status": "Текущий ID погоды: %s, тип климата: %s.", - "description": "Изменяет ID погоды и тип климата. ID погоды можно найти в WeatherExcelConfigData.json.\nТипы климата: sunny (солнечно), cloudy (облачно), rain (дождь), thunderstorm (гроза), snow (снег), mist (туман)" + "description": "Изменяет ID погоды и тип климата. ID погоды можно найти в ./Resources/ExcelBinOutput/WeatherExcelConfigData.json.\nТипы климата: sunny (солнечно), cloudy (облачно), rain (дождь), thunderstorm (гроза), snow (снег), mist (туман)" }, "ban": { "success": "Успех.", diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json index 0666928c1..80e5e68c0 100644 --- a/src/main/resources/languages/zh-CN.json +++ b/src/main/resources/languages/zh-CN.json @@ -308,7 +308,7 @@ "add_too_much": "服务端仅允许你队伍里至多有 %d 名角色。", "failed_to_add_avatar": "无法根据ID %s 添加角色。", "failed_to_parse_index": "无法解析索引：%s", - "remove_too_much": "你不能删除那么多角色，你的队伍列表将会变空。", + "remove_too_much": "你不能删除那么多角色，你的队伍列表将为空。", "ignore_index": "忽略的索引列表：%s", "index_out_of_range": "你指定的索引超出了范围。", "failed_parse_avatar_id": "无法解析的角色ID：%s", @@ -330,7 +330,7 @@ "weather": { "success": "已设置天气ID 为 %s，气候类型为 %s。", "status": "当前天气ID 为 %s，气候类型为 %s。", - "description": "更改天气ID和气候类型。天气ID可以在 WeatherExcelConfigData.json 中找到。\n气候类型：sunny(晴天), cloudy(多云), rain(雨), thunderstorm(雷雨), snow(雪), mist(雾)" + "description": "更改天气ID和气候类型。天气ID可以在 ./Resources/ExcelBinOutput/WeatherExcelConfigData.json 中找到。\n气候类型：sunny(晴天), cloudy(多云), rain(雨), thunderstorm(雷雨), snow(雪), mist(雾)" }, "ban": { "success": "成功封禁玩家。", diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json index 70a361584..ccfd1fc92 100644 --- a/src/main/resources/languages/zh-TW.json +++ b/src/main/resources/languages/zh-TW.json @@ -330,7 +330,7 @@ "weather": { "success": "已設定天氣ID 為 %s，氣候型別為 %s。", "status": "當前天氣ID 為 %s，氣候型別為 %s。", - "description": "更改天氣ID和氣候型別。天氣ID可以在 WeatherExcelConfigData.json 中找到。\n氣候型別：sunny(晴天), cloudy(多雲), rain(雨), thunderstorm(雷雨), snow(雪), mist(霧)" + "description": "更改天氣ID和氣候型別。天氣ID可以在 ./Resources/ExcelBinOutput/WeatherExcelConfigData.json 中找到。\n氣候型別：sunny(晴天), cloudy(多雲), rain(雨), thunderstorm(雷雨), snow(雪), mist(霧)" }, "ban": { "success": "停權成功。",