From ce441e4905f0b36fb528bb7219c87e066547768d Mon Sep 17 00:00:00 2001 From: EillesWan Date: Fri, 14 Jan 2022 22:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=80=E4=BA=9B=E4=B8=9C?= =?UTF-8?q?=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 - LICENSE | 13 +- Musicreater.py | 19 ++- Musicreater_ONLY DEV.py | 6 +- languages/__pycache__/lang.cpython-38.pyc | Bin 3944 -> 3953 bytes languages/lang.py | 6 +- languages/lang_en.py | 142 +++++++++++----------- resources/myWords.txt | 4 +- 8 files changed, 97 insertions(+), 96 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3516cb9..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.formatting.provider": "autopep8" -} \ No newline at end of file diff --git a/LICENSE b/LICENSE index 29f81d8..7060aa2 100644 --- a/LICENSE +++ b/LICENSE @@ -175,18 +175,8 @@ END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] + Copyright 2022 Eilles Wan (金羿) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -199,3 +189,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/Musicreater.py b/Musicreater.py index 042655d..d275e75 100644 --- a/Musicreater.py +++ b/Musicreater.py @@ -8,6 +8,21 @@ # 版权所有 Team-Ryoun 金羿 # 若需转载或借鉴 请附作者 +''' + Copyright 2022 Eilles Wan (金羿) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +''' # 代码写的并非十分的漂亮，还请大佬多多包涵；本软件源代码依照Apache软件协议公开 @@ -1318,12 +1333,10 @@ def __main__(): # 下半部分框容器 DownFrame = tk.Frame(root, bg='blue') + #经典名言语录 import random - texts = open('./resources/myWords.txt','r',encoding='utf-8').readlines() - tk.Label(DownFrame,text=texts[random.randint(0,len(texts)-1)].replace('\n','').replace('\\n','\n'),fg='white',bg='black',font=('DengXian Light',20)).pack(fill='x') - del texts # 音符列表菜单 diff --git a/Musicreater_ONLY DEV.py b/Musicreater_ONLY DEV.py index 652eaea..dad9ea2 100644 --- a/Musicreater_ONLY DEV.py +++ b/Musicreater_ONLY DEV.py @@ -33,7 +33,7 @@ __author__ = 'W-YI （金羿）' - +from languages.lang import READABLETEXT @@ -1320,12 +1320,10 @@ def __main__(): # 下半部分框容器 DownFrame = tk.Frame(root, bg='blue') + #经典名言语录 import random - texts = open('./resources/myWords.txt','r',encoding='utf-8').readlines() - tk.Label(DownFrame,text=texts[random.randint(0,len(texts)-1)].replace('\n','').replace('\\n','\n'),fg='white',bg='black',font=('DengXian Light',20)).pack(fill='x') - del texts # 音符列表菜单 diff --git a/languages/__pycache__/lang.cpython-38.pyc b/languages/__pycache__/lang.cpython-38.pyc index 98f9ba3a584f01ce2f73b04c6c17df1c2ba51714..0ccabd5fdb5de24a72b3ce525c10b6277c6238db 100644 GIT binary patch delta 94 zcmaDM_fd{Fl$V!_0SM~YZze9>$Scjvs4`iTS(@$T{LN2xPMGY;>?|Mzlz!2-{b~O+ upy2a0%QjDAc46e=1d2Xg*Ym7n!sh2JIh@?4K)#z*Ot@~O=jKR0entTQMIdwl delta 85 zcmew;_dtMmC-Lz!0std|8Rq~1 diff --git a/languages/lang.py b/languages/lang.py index 49de98f..30215b8 100644 --- a/languages/lang.py +++ b/languages/lang.py @@ -26,10 +26,10 @@ READABLETEXT = { 17:"QQ: 2647547478", 18:"讨论群: 861684859", 19:"音·创 - 帮助", - 20:"请选择钢琴声音的 MP3 文件", + 20:"请选择钢琴声音的音乐文件", 21:"请选择 MIDI 文件", 22:"请选择 音符文本 文件", - 23:"获取信息", + 23:"获取音符信息", 24:"音符数据写入{}", 25:"请选择文件生成的位置", 26:"请选择文件夹生成的位置", @@ -39,7 +39,7 @@ READABLETEXT = { 30:"请选择函数包生成的位置", 31:"请选择 .mcfunction 文件", 32:"请选择需要生成的.bdx文件", - 33:"完成！✔", + 33:"完成✔", 34:"输入播放速度", 35:"创建中", 36:"请选择世界文件夹所在的位置", diff --git a/languages/lang_en.py b/languages/lang_en.py index 4a38957..d2253d8 100644 --- a/languages/lang_en.py +++ b/languages/lang_en.py @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- -# 由金羿翻译工具生成字符串列表 -# 请在所需翻译文件前from 此文件 import READABLETEXT +# 由金羿翻译工具generate字符串列表 +# 请在所需翻译 file 前from 此 file import READABLETEXT @@ -26,88 +26,88 @@ READABLETEXT = { 17:"QQ: 2647547478", 18:"QQ group: 861684859", 19:"Musicreater - Help", - 20:"请选择钢琴声音的 MP3 文件", - 21:"请选择 MIDI 文件", - 22:"请选择 音符文本 文件", - 23:"获取信息", - 24:"音符数据写入{}", - 25:"请选择文件生成的位置", - 26:"请选择文件夹生成的位置", - 27:"请选择.mcpack文件生成的位置", - 28:"坐标信息输入", - 29:"请选择世界文件夹生成的位置", - 30:"请选择函数包生成的位置", - 31:"请选择 .mcfunction 文件", - 32:"请选择需要生成的.bdx文件", - 33:"完成！✔", - 34:"输入播放速度", - 35:"创建中", - 36:"请选择世界文件夹所在的位置", - 37:"请确认", - 38:"生成.RyStruct文件", - 39:"失败❌", + 20:"Select sound file", + 21:"Select MIDI file", + 22:"Select NoteText file", + 23:"Get Note info", + 24:"Write in Note info: {}", + 25:"Select generating file", + 26:"Select generating folder", + 27:"Select generating .mcpack file", + 28:"Input position info", + 29:"Select generating world folder", + 30:"Select generating Function Pack", + 31:"Select .mcfunction file ", + 32:"Select .bdx file ", + 33:"DONE✔", + 34:"Input playing rate", + 35:"Generating", + 36:"Select a world folder", + 37:"Make sure", + 38:"Generate .RyStruct file", + 39:"FAILED❌", 40:"邮件反馈信息输入", - 41:"音·创 - 金羿 - {}", - 42:"执行实体名：{}", - 43:"使用计分板：{}", - 44:"所用的乐器：{}", - 45:"当前音轨名：{}", - 46:"包名：{}", - 47:"音乐标题：{}", - 48:"是否重复：{}", - 49:"玩家选择器：{}", + 41:"Musicreater - Eilles - {}", + 42:"执行实体名: {}", + 43:"使用计分板: {}", + 44:"所用的乐器: {}", + 45:"当前音轨名: {}", + 46:"Pack Name: {}", + 47:"MusicTitle: {}", + 48:"IsRepeat?: {}", + 49:"玩家选择器: {}", 50:"修改主设置", 51:"修改节设置", - 52:"游戏内置乐器如下：请输入英文\n", - 53:"打开音·创项目...", - 54:"打开旧项目...", - 55:"保存项目", - 56:"另存为...", - 57:"退出", - 58:"文件", - 59:"从钢琴MP3导入音轨", - 60:"从midi导入音轨", - 61:"从文本文件导入音轨", - 62:"输入音符至音轨", - 63:"编辑", - 64:"生成文件至...", - 65:"生成函数包至...", - 66:"生成附加包文件至...", - 67:"函数(包)", - 68:"将音乐以方块存储生成地图", - 69:"将音乐以方块存储载入地图…", - 70:"将音乐以指令存储生成地图", - 71:"将音乐以指令存储载入地图…", - 72:"将音乐以音符盒存储生成地图", - 73:"将音乐以音符盒存储载入地图…", - 74:"世界", - 75:"生成符合当前音乐的函数播放器…", - 76:"将选中音轨以指令存储生成.bdx文件…", - 77:"由地图导出至.bdx文件…", - 78:"由地图导出至.RyStruct文件…", - 79:"将函数载入世界…", - 80:"将大函数分割并建立执行链…", + 52:"游戏内置乐器如下: 请输入英文\n", + 53:"Open...", + 54:"Open Old Project...", + 55:"Save", + 56:"Save as...", + 57:"Exit", + 58:"File", + 59:"Load tracks from sound", + 60:"Load tracks from Midi", + 61:"Load tracks from Text", + 62:"Input notes to track", + 63:"Edit", + 64:"Generate file...", + 65:"Generate function pack...", + 66:"Generate .mcpack file...", + 67:"Functions(Pack)", + 68:"Save music as blocks into a map", + 69:"Save music as blocks into a exist map...", + 70:"Save music as commands into a map", + 71:"Save music as commands into a exist map...", + 72:"Save music as notebox into a map", + 73:"Save music as notebox into a exist map...", + 74:"World", + 75:"generate符合当前音乐的函数播放器...", + 76:"Save selected track as commands in .bdx file...", + 77:"由 map导出至.bdx file...", + 78:"由 map导出至.RyStruct file...", + 79:"将函数载入 world...", + 80:"将大函数分割并建立执行链...", 81:"辅助功能", - 82:"展示生成结果", + 82:"Show generating result", 83:"建立位于localhost:8080上的websocket服务器播放选中音轨", 84:"实验功能", - 85:"清除临时文件", - 86:"清除存在文件", + 85:"清除临时 file ", + 86:"清除存在 file ", 87:"帮助", 88:"关于", 89:"发送错误日志反馈", 90:"帮助与疑问", 91:"音乐总设置(项目设置)", - 92:"地图/函数包名：", - 93:"音乐标题：", - 94:"是否重复：", - 95:"玩家选择器：", + 92:" map/函数包名: ", + 93:"音乐标题: ", + 94:"是否重复: ", + 95:"玩家选择器: ", 96:"重置项目设置", 97:"当前音轨设置(段落设置)", - 98:"执行实体名：", - 99:"使用计分板：", - 100:"所用的乐器：", - 101:"当前音轨名：", + 98:"执行实体名: ", + 99:"使用计分板: ", + 100:"所用的乐器: ", + 101:"当前音轨名: ", 102:"删除选中音轨", } \ No newline at end of file diff --git a/resources/myWords.txt b/resources/myWords.txt index 42f5b4b..d078307 100644 --- a/resources/myWords.txt +++ b/resources/myWords.txt @@ -23,4 +23,6 @@ 你的眼眸是剔透的晶灯 散发着醉人心扉的清光 海波激出透人心脾的欢呼 英雄何必要站在光中？\n深入黑暗，我自发光。 -如果我们有三生三世的时间\n那我们将渡过三百乘以三百六十个潮涨潮落 \ No newline at end of file +如果我们有三生三世的时间\n那我们将渡过三百乘以三百六十个潮涨潮落 +善善不能用 恶恶不能去 +知行合一，格物致知；远沂博索，夕惕若厉；\n蕙心执质，嘉言懿行；怀瑾握瑜，心若芷萱。 \ No newline at end of file