LeonMMcoset/LeonOS
1
0
Fork 0
mirror of https://github.com/CCLeonOS/LeonOS.git synced 2026-03-03 15:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 更新版本号至0.2.2并改进开机音乐

Browse Source 
- 将installer.lua和bios.lua中的版本号从0.2.1更新至0.2.2
- 改进50_audio.lua中的开机音乐实现，使用更精确的乐器音高参数
This commit is contained in:
Leonmmcoset
2025-09-01 17:20:01 +08:00
parent f62fe9483e
commit 4256803084
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/computercraft/lua/bios.lua
View File

@@ -1,4 +1,4 @@
_G._HOST = _G._HOST .. " (LeonOS 0.2.1)" _G._HOST = _G._HOST .. " (LeonOS 0.2.2)"
local fs = rawget(_G, "fs") local fs = rawget(_G, "fs")
_G._RC_ROM_DIR = _RC_ROM_DIR or (...) and fs.exists("/leonos") and "/leonos" or "/rom" _G._RC_ROM_DIR = _RC_ROM_DIR or (...) and fs.exists("/leonos") and "/leonos" or "/rom"
@@ -32,7 +32,7 @@ local rc = {
_VERSION = { _VERSION = {
major = 0, major = 0,
minor = 2, minor = 2,
patch = 1 patch = 2
}, },
queueEvent = pull(os, "queueEvent"), queueEvent = pull(os, "queueEvent"),
startTimer = pull(os, "startTimer"), startTimer = pull(os, "startTimer"),

20
data/computercraft/lua/rom/startup/50_audio.lua
View File

@@ -6,20 +6,22 @@ local speaker = peripheral.find("speaker")
-- 检查是否连接了扬声器 -- 检查是否连接了扬声器
if speaker then if speaker then
-- 简单的开机音乐（C大调音阶） -- 简单的开机音乐（C大调音阶）
-- 格式: {instrument = 乐器, pitch = 音高(半音), duration = 持续时间}
local notes = { local notes = {
{note = "C4", duration = 0.25}, {instrument = "harp", pitch = 6, duration = 0.25}, -- C4
{note = "D4", duration = 0.25}, {instrument = "harp", pitch = 8, duration = 0.25}, -- D4
{note = "E4", duration = 0.25}, {instrument = "harp", pitch = 10, duration = 0.25}, -- E4
{note = "F4", duration = 0.25}, {instrument = "harp", pitch = 11, duration = 0.25}, -- F4
{note = "G4", duration = 0.25}, {instrument = "harp", pitch = 13, duration = 0.25}, -- G4
{note = "A4", duration = 0.25}, {instrument = "harp", pitch = 15, duration = 0.25}, -- A4
{note = "B4", duration = 0.25}, {instrument = "harp", pitch = 17, duration = 0.25}, -- B4
{note = "C5", duration = 0.5} {instrument = "harp", pitch = 18, duration = 0.5} -- C5
} }
-- 播放音乐 -- 播放音乐
for _, note_info in ipairs(notes) do for _, note_info in ipairs(notes) do
speaker.playNote(note_info.note) -- 播放音符，使用默认音量1.0
speaker.playNote(note_info.instrument, 1.0, note_info.pitch)
rc.sleep(note_info.duration) rc.sleep(note_info.duration)
end end
end end

2
installer.lua
View File

@@ -1,5 +1,5 @@
-- LeonOS installer -- LeonOS installer
local INSTALLER_VERSION = "0.2.1" local INSTALLER_VERSION = "0.2.2"
local DEFAULT_ROM_DIR = "/leonos" local DEFAULT_ROM_DIR = "/leonos"
print("Start loading LeonOS installer ("..INSTALLER_VERSION..")...") print("Start loading LeonOS installer ("..INSTALLER_VERSION..")...")