Compare commits

..

3 Commits

Author SHA1 Message Date
HKXluo
3d7485b2a1 Merge branch 'main' of https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player 2025-11-12 16:37:23 +08:00
HKXluo
6173155509 修复文件名错误 2025-11-12 16:37:20 +08:00
HKXluo
767a1d8043 修改下载分支为main 2025-11-12 16:35:55 +08:00

View File

@@ -3,8 +3,8 @@
local mypath = "/"..fs.getDir(shell.getRunningProgram()) local mypath = "/"..fs.getDir(shell.getRunningProgram())
if not fs.exists(mypath.."/lib/basalt.lua") then shell.run("wget https://git.liulikeji.cn/GitHub/Basalt/releases/download/v1.6.6/basalt.lua lib/basalt.lua") end if not fs.exists(mypath.."/lib/basalt.lua") then shell.run("wget https://git.liulikeji.cn/GitHub/Basalt/releases/download/v1.6.6/basalt.lua lib/basalt.lua") end
if not fs.exists(mypath.."/speakerlib.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/1.1.0/speakerlib.lua") end if not fs.exists(mypath.."/speakerlib.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/main/speakerlib.lua") end
if not fs.exists(mypath.."/MusicLyrics.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/1.1.0/MusicLyrics.lua") end if not fs.exists(mypath.."/MusicLyrics.lua") then shell.run("wget https://git.liulikeji.cn/xingluo/ComputerCraft-Music168-Player/raw/branch/main/MusicLyrics.lua") end
--*GUI库导入 --*GUI库导入
basalt = require(mypath.."/lib/basalt") basalt = require(mypath.."/lib/basalt")
@@ -335,7 +335,7 @@ function speakerp()
sleep(0.1) sleep(0.1)
--dfpwmURL = http.post("http://gmapi.liulikeji.cn:15842/dfpwm",textutils.serialiseJSON({ ["url"] = GetmusicUrl(_G.music168_music_id) } )) --dfpwmURL = http.post("http://gmapi.liulikeji.cn:15842/dfpwm",textutils.serialiseJSON({ ["url"] = GetmusicUrl(_G.music168_music_id) } ))
shell.run(mypath.."/speakerlib play "..GetmusicUrl(_G.music168_music_id)) shell.run(mypath.."/speakerlib.lua play "..GetmusicUrl(_G.music168_music_id))
-- 检查是否播放完成自动跳转下一首 -- 检查是否播放完成自动跳转下一首
if _G.music168_playopen then if _G.music168_playopen then
play_set_0() play_set_0()