多语音包系统实装，等待naki语音

LANG/lang_en.lua

@@ -242,6 +242,8 @@ return{
 			bgm="BGM",
 			vib="Vibration",
 			voc="Voice",
+			cv="Voice Pack",
+			apply="Apply",
 		},
 		setting_control={
 			title="Control Settings",

LANG/lang_yygq.lua

@@ -86,7 +86,7 @@ return{
 			spawn="出块",
 			bgm="曲",
 			vib="嗡嗡",
-			voc="语音",
+			cv="谁",
 		},
 		setting_control={
 			title="改控制",

LANG/lang_zh.lua

@@ -245,6 +245,8 @@ return{
 			bgm="音乐",
 			vib="振动",
 			voc="语音",
+			cv="语音包",
+			apply="应用",
 		},
 		setting_control={
 			title="控制设置",

Zframework/voice.lua

@@ -10,28 +10,25 @@ VOC.name={
 	"perfect_clear","half_clear",
 	"win","lose","bye",
 	"test","happy","doubt","sad","egg",
-	"welcome_voc"
+	"welcome_voc",
 }
 VOC.list={}
 
 local function loadVoiceFile(N,vocName)
-	local fileName="VOICE/"..vocName..".ogg"
+	local fileName="VOICE/"..SETTING.cv.."/"..vocName..".ogg"
 	if love.filesystem.getInfo(fileName)then
 		bank[vocName]={love.audio.newSource(fileName,"static")}
 		table.insert(VOC.list[N],vocName)
 		return true
 	end
 end
-function VOC.loadOne(_)
+function VOC.loadOne(name)
-	local N=VOC.name[_]
+	local N=VOC.name[name]
 	VOC.list[N]={}
-	local i=1
+
-	while true do
+	local i=0
-		if not loadVoiceFile(N,N.."_"..i)then
+	repeat i=i+1 until not loadVoiceFile(N,N.."_"..i)
-			break
+
-		end
-		i=i+1
-	end
 	if i==1 then
 		if not loadVoiceFile(N,N)then
 			LOG.print("No VOICE file: "..N,5,color.orange)
@@ -43,6 +40,7 @@ function VOC.loadAll()
 	for i=1,#VOC.name do
 		VOC.loadOne(i)
 	end
+	collectgarbage()
 end
 
 function VOC.getFreeChannel()

parts/default_data.lua

@@ -44,6 +44,7 @@ SETTING={
 	stereo=.6,
 	vib=0,
 	voc=0,
+	cv="miya",
 
 	--Virtualkey
 	VKSFX=.2,--SFX volume

parts/scenes/setting_sound.lua

@@ -6,8 +6,9 @@ local rnd=math.random
 
 function sceneInit.setting_sound()
 	sceneTemp={
-		last=0,--Last sound time
+		last=0,--Last touch time
 		jump=0,--Animation timer(10 to 0)
+		cv=SETTING.cv,
 	}
 	BG.set("space")
 end
@@ -64,5 +65,7 @@ WIDGET.init("setting_sound",{
 	WIDGET.newSlider({name="bgm",		x=180,	y=400,w=400,		font=35,change=function()BGM.freshVolume()end,	disp=WIDGET.lnk.SETval("bgm"),code=WIDGET.lnk.SETsto("bgm")}),
 	WIDGET.newSlider({name="vib",		x=750,	y=200,w=400,unit=5,	font=25,change=function()VIB(2)end,				disp=WIDGET.lnk.SETval("vib"),code=WIDGET.lnk.SETsto("vib")}),
 	WIDGET.newSlider({name="voc",		x=750,	y=300,w=400,		font=35,change=function()VOC.play("test")end,	disp=WIDGET.lnk.SETval("voc"),code=WIDGET.lnk.SETsto("voc")}),
+	WIDGET.newSelector({name="cv",		x=1100,	y=380,w=200,		list={"miya"},							disp=WIDGET.lnk.STPval("cv"),code=WIDGET.lnk.STPsto("cv")}),
+	WIDGET.newButton({name="apply",		x=1100,	y=460,w=180,h=80,	code=function()SETTING.cv=sceneTemp.cv VOC.loadAll()end,hide=function()return SETTING.cv==sceneTemp.cv end}),
 	WIDGET.newButton({name="back",		x=1140,	y=640,w=170,h=80,	font=40,code=WIDGET.lnk.BACK}),
 })