TriM-Organization/Musicreater
2
0
Fork 0
mirror of https://github.com/TriM-Organization/Musicreater.git synced 2024-11-11 01:27:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更新一下，马上回来

Browse Source
This commit is contained in:
EillesWan 2021-11-24 13:46:45 +08:00
parent 2f6c0e23d7
commit 061d8bfa96
27 changed files with 238 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Musicreater.py
View File

@ -896,7 +896,7 @@ def __main__():
def world2RyStruct():
outdir = tkinter.filedialog.askdirectory(title='请选择世界文件夹生成的位置', initialdir=r'./');
outdir = tkinter.filedialog.askdirectory(title='请选择世界文件夹所在的位置', initialdir=r'./');
if outdir == None or outdir == '':
return;
else:
@ -1219,13 +1219,13 @@ def __main__():
# 创建其他功能菜单
otherMenu = tk.Menu(main_menu_bar, tearoff=0)
otherMenu.add_command(label=u"生成符合当前音乐的函数播放器…", command=MakeFuncPlayer)
worldmenu.add_separator();
otherMenu.add_separator();
otherMenu.add_command(label=u"将选中音轨以指令存储生成.bdx文件…", command=toScbBDXfile)
otherMenu.add_command(label=u"由地图导出至.bdx文件…", command=world2BDX)
otherMenu.add_command(label=u"由地图导出至.RyStruct文件…", command=world2RyStruct)
worldmenu.add_separator();
worldmenu.add_command(label=u"将函数载入世界…", command=func2World);
worldmenu.add_command(label=u"将大函数分割并建立执行链…", command=bigFunc2World);
otherMenu.add_separator();
otherMenu.add_command(label=u"将函数载入世界…", command=func2World);
otherMenu.add_command(label=u"将大函数分割并建立执行链…", command=bigFunc2World);
main_menu_bar.add_cascade(label=u"辅助功能", menu=otherMenu);
@ -1389,7 +1389,7 @@ def __main__():
# 进入窗口消息循环
root.mainloop()
log("退出")
del filemenu, editmenu, helpmenu
del filemenu, editmenu, helpmenu, otherMenu
exitapp()

BIN
fcwslib/__pycache__/__init__.cpython-38.pyc Normal file
View File

Binary file not shown.

3
log/2021-11-24 12_37_45.msct.log
View File

@ -1,3 +0,0 @@
12:37:45 更新执行位置，当前文件位置F:\W-YI\Programming\音·创\程序\Musicreater.py
12:37:45 启动root.mainloop（窗口）
12:38:04 程序正常退出

BIN
msctspt/__pycache__/bdxOpera_CP.cpython-38.pyc Normal file
View File

Binary file not shown.

BIN
msctspt/__pycache__/bugReporter.cpython-38.pyc
View File

Binary file not shown.

BIN
msctspt/__pycache__/funcOpera.cpython-38.pyc Normal file
View File

Binary file not shown.

BIN
msctspt/__pycache__/transfer.cpython-38.pyc
View File

Binary file not shown.

BIN
msctspt/__pycache__/values.cpython-38.pyc Normal file
View File

Binary file not shown.

2
msctspt/bugReporter.py
View File

@ -99,7 +99,7 @@ class report():
class version:
libraries = ('mido','amulet','amulet-core','amulet-nbt','piano_transcription_inference','pypinyin','briefcase','toga','pyinstaller','kivy','py7zr')
libraries = ('mido','amulet','amulet-core','amulet-nbt','piano_transcription_inference','pypinyin','briefcase','toga','pyinstaller','kivy','py7zr','websockets')
'''当前所需库，有一些是开发用的，用户不需要安装'''
version = ('0.0.4.2','Beta',)

9
msctspt/transfer.py
View File

@ -55,7 +55,7 @@ def formCmdBlock(direction:list,command:str,particularValue:int,impluse:int,cond
def note2bdx(filePath:str,dire:list,Notes : list,ScoreboardName:str,Instrument:str, PlayerSelect:str='',isProsess:bool=False) :
def note2bdx(filePath:str,dire:list,Notes : list,ScoreboardName:str,Instrument:str, PlayerSelect:str='',isProsess:bool=False,height:int = 200) :
'''使用方法同Note2Cmd
:param 参数说明：
filePath: 生成.bdx文件的位置
@ -65,6 +65,7 @@ def note2bdx(filePath:str,dire:list,Notes : list,ScoreboardName:str,Instrument:s
Instrument: 播放的乐器
PlayerSelect: 执行的玩家选择器
isProsess: 是否显示进度条（会很卡）
height: 生成结构的最高高度
:return 返回一个BdxConverter类（实际上没研究过），同时在指定位置生成.bdx文件'''
@ -84,11 +85,11 @@ def note2bdx(filePath:str,dire:list,Notes : list,ScoreboardName:str,Instrument:s
blocks = [formCmdBlock(dire,cdl.pop(0),1,1)]
dire[1]+=1;
for j in cdl:
if dire[1]+i > 200:
if dire[1]+i > height:
dire[0]+=1
i=0
down = not down
if dire[1]+i == 200 :
if dire[1]+i == height :
blocks.append(formCmdBlock([dire[0],dire[1]+i,dire[2]],j,5,2,False,False))
else:
if down:
@ -97,7 +98,7 @@ def note2bdx(filePath:str,dire:list,Notes : list,ScoreboardName:str,Instrument:s
blocks.append(formCmdBlock([dire[0],dire[1]+i,dire[2]],j,1,2,False,False))
i+=1
del i, cdl, down, cmd
return BdxConverter(filePath,'RyounMusicreater',blocks)
return BdxConverter(filePath,'Build by RyounMusicreater',blocks)

BIN
nmcsup/__pycache__/trans.cpython-38.pyc Normal file
View File

Binary file not shown.

4
nmcsup/trans.py
View File

@ -200,12 +200,12 @@ def Blocks2World(world:str,dire:list,Datas:list):
from nmcsup.const import Blocks
level = amulet.load_level(world)
i = 0
def setblock(block:Block,pos:list):
def setblock(block:str,pos:list):
'''pos : list[int,int,int]'''
cx, cz = block_coords_to_chunk_coords(pos[0], pos[2])
chunk = level.get_chunk(cx, cz, "minecraft:overworld")
offset_x, offset_z = pos[0] - 16 * cx, pos[2] - 16 * cz
chunk.blocks[offset_x, pos[1], offset_z] = level.block_palette.get_add_block(block)
chunk.blocks[offset_x, pos[1], offset_z] = level.block_palette.get_add_block(Block("minecraft",block))
chunk.changed = True
for j in Datas:
if dire[1]+1 >= 255:

1
测试用/Canyon.msct
View File

File diff suppressed because one or more lines are too long

BIN
测试用/CanyonTest/db/000064.ldb
View File

Binary file not shown.

0
测试用/CanyonTest/db/000091.log
View File

1
测试用/CanyonTest/db/CURRENT
View File

@ -1 +0,0 @@
MANIFEST-000089

0
测试用/CanyonTest/db/LOCK
View File

BIN
测试用/CanyonTest/db/MANIFEST-000089
View File

Binary file not shown.

1
测试用/CanyonTest/db/presets.json
View File

@ -1 +0,0 @@
[]

BIN
测试用/CanyonTest/level.dat
View File

Binary file not shown.

1
测试用/CanyonTest/levelname.txt
View File

@ -1 +0,0 @@
476168

BIN
测试用/HarryPorter.mid
View File

Binary file not shown.

224
测试用/RyounTeamSong.ry.nfc Normal file
View File

@ -0,0 +1,224 @@
{
"mainset": {
"PackName": "RyounTeamSong",
"MusicTitle": "RyounUp",
"IsRepeat": false,
"PlayerSelect": ""
},
"musics": [
{
"set": {
"EntityName": "MusicSupport",
"ScoreboardName": "MusicSupport",
"Instrument": "harp",
"FileName": "RyounUp_RyounTeamSong"
},
"notes": [
[
".5",
1.0
],
[
"1",
1.0
],
[
"1",
1.0
],
[
"3",
1.5
],
[
"3",
0.5
],
[
"2",
1.5
],
[
"1",
0.5
],
[
"2",
1.0
],
[
"5",
1.0
],
[
"3",
1.5
],
[
"2",
0.5
],
[
".6",
1.0
],
[
".5",
1.0
],
[
"3",
1.5
],
[
"2",
0.5
],
[
"1",
1.0
],
[
"5",
1.0
],
[
"5",
1.0
],
[
"6",
0.5
],
[
"5",
0.5
],
[
"3",
1.0
],
[
"5",
0.5
],
[
"3",
0.5
],
[
"2",
1.0
],
[
"2",
1.0
],
[
"3",
0.5
],
[
"2",
0.5
],
[
"1",
1.0
],
[
"1",
1.0
],
[
"3",
1.0
],
[
"3",
1.0
],
[
"5",
1.0
],
[
"0",
1.0
],
[
".5",
0.5
],
[
".6",
0.5
],
[
"1",
1.0
],
[
"1",
1.0
],
[
"6",
1.0
],
[
"1",
1.0
],
[
"2",
1.0
],
[
"3",
1.0
],
[
"3",
1.0
],
[
"3",
1.0
],
[
"3",
1.0
],
[
"2",
1.0
],
[
"5",
1.5
],
[
".5",
0.5
],
[
"1",
1.0
],
[
"1",
1.0
],
[
"0",
1.0
],
[
"0",
1.0
]
]
}
]
}

BIN
测试用/canyon.mid
View File

Binary file not shown.

1
测试用/test.RyStruct
View File

@ -1 +0,0 @@
{}

BIN
测试用/义勇军进行曲.mid Normal file
View File

Binary file not shown.

1
测试用/义勇军进行曲.msct
View File

File diff suppressed because one or more lines are too long