完全取消加载动画

2021-07-17 01:38:27 +08:00
parent ce8fefe9f8
commit d3046fa588
3 changed files with 66 additions and 248 deletions
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -1,5 +1,17 @@
 local C=COLOR
 return{
+	loadText={
+		loadSFX="Loading SFX resources",
+		loadBGM="Loading BGM resources",
+		loadImage="Loading image resources",
+		loadSkin="Loading skin resources",
+		loadVoice="Loading voice resources",
+		loadFont="Loading font resources",
+		loadModeIcon="Loading mode icons",
+		loadMode="Loading modes",
+		loadOther="Loading other things",
+		finish="Loading finished",
+	},
 	anykey="Press a key!",
 	sureQuit="Press again to exit",
 	newDay="A new day, a new beginning!",
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -1,5 +1,17 @@
 local C=COLOR
 return{
+	loadText={
+		loadSFX="加载音效资源",
+		loadBGM="加载音乐资源",
+		loadImage="加载图片资源",
+		loadSkin="加载皮肤资源",
+		loadVoice="加载语音资源",
+		loadFont="缓存字体资源",
+		loadModeIcon="加载模式图标",
+		loadMode="加载模式",
+		loadOther="加载杂项",
+		finish="加载完成",
+	},
 	anykey="按任意键继续",
 	sureQuit="再按一次退出",
 	newDay="新的一天,新的开始~",
--- a/parts/scenes/load.lua
+++ b/parts/scenes/load.lua
@@ -2,73 +2,28 @@ local gc=love.graphics

 local scene={}

-local blackTime,openTime
-local shadePhase1,shadePhase2
-local progress=0
+local loading,waitTime
 local studioLogo--Studio logo text object
 local logoColor1,logoColor2
-local skip

-local light={}
-for i=0,26 do
-	table.insert(light,1050+60*math.floor(i/9))
-	table.insert(light,660-i%9*60)
-	table.insert(light,false)
-end
-for _=1,3 do
-	light[math.random(7,25)*3]=true
-end
-
-local function upFloor()
-	progress=progress+1
-	if light[3*progress+3]then
-		SFX.play('spin_0',.5)
-	end
-	light[3*progress+3]=false
-end
 local loadingThread=coroutine.wrap(function()
-	for i=1,SFX.getCount()do
-		SFX.loadOne()
-		if i%3==0 then YIELD()end
+	DAILYLAUNCH=freshDate'q'
+	if DAILYLAUNCH then
+		logoColor1=COLOR.S
+		logoColor2=COLOR.lS
+	else
+		local r=math.random()*6.2832
+		logoColor1={COLOR.rainbow(r)}
+		logoColor2={COLOR.rainbow_light(r)}
 	end
+	YIELD('loadSFX')SFX.loadAll()
+	YIELD('loadBGM')BGM.loadAll()
+	YIELD('loadImage')IMG.loadAll()
+	YIELD('loadSkin')SKIN.loadAll()
+	YIELD('loadVoice')VOC.loadAll()
+	YIELD('loadFont')for i=1,17 do getFont(15+5*i)end

-	upFloor()
-	for i=1,BGM.getCount()do
-		BGM.loadOne()
-		if i%2==0 then YIELD()end
-	end
-
-	upFloor()
-	for i=1,IMG.getCount()do
-		IMG.loadOne()
-		if i%2==0 then YIELD()end
-	end
-
-	upFloor()
-	for i=1,SKIN.getCount()do
-		SKIN.loadOne()
-		if i%4==0 then YIELD()end
-	end
-
-	upFloor()
-	for _=1,VOC.getCount()do
-		VOC.loadOne()
-		if _%5==0 then YIELD()end
-	end
-
-	upFloor()
-	for i=1,10 do
-		getFont(15+5*i)
-		if i%3==0 then YIELD()end
-	end
-
-	upFloor()
-	for i=11,17 do
-		getFont(15+5*i)
-		if i%2==0 then YIELD()end
-	end
-
-	upFloor()
+	YIELD('loadModeIcon')
 	local modeIcons={}
 	modeIcons.marathon=DOGC{32,32,
 		{"move",3,1},
@@ -93,9 +48,7 @@ local loadingThread=coroutine.wrap(function()
 		{"dRect",26,24,12,12},
 		{"dRect",42,24,12,12},
 		{"dRect",26,40,12,12},
-	}YIELD()
-
-	upFloor()
+	}
 	modeIcons.tsd=DOGC{64,64,
 		{"fRect",7,7,16,16},
 		{"fRect",7,41,16,16},
@@ -125,9 +78,9 @@ local loadingThread=coroutine.wrap(function()
 		{"dRect",20,10,23,43},
 		{"setCL",1,1,1,.7},
 		{"fRect",20,10,23,43},
-	}YIELD()
+	}

-	upFloor()
+	YIELD('loadMode')
 	for _,M in next,MODES do
 		M.records=FILE.load("record/"..M.name..".rec")or M.score and{}
 		if M.icon then
@@ -137,15 +90,9 @@ local loadingThread=coroutine.wrap(function()
 			M.icon=modeIcons[M.icon]
 		end
 	end
-
-	upFloor()
 	if not MODES[STAT.lastPlay]then
 		STAT.lastPlay='sprint_10l'
 	end
-	YIELD()
-
-	upFloor()
-	SKIN.change(SETTING.skinSet)
 	local editFlag
 	for name,rank in next,RANKS do
 		local M=MODES[name]
@@ -168,211 +115,58 @@ local loadingThread=coroutine.wrap(function()
 	if editFlag then
 		FILE.save(RANKS,'conf/unlock')
 	end
-	YIELD()

-	upFloor()
-	DAILYLAUNCH=freshDate'q'
-	if DAILYLAUNCH then
-		logoColor1=COLOR.S
-		logoColor2=COLOR.lS
-	else
-		local r=math.random()*6.2832
-		logoColor1={COLOR.rainbow(r)}
-		logoColor2={COLOR.rainbow_light(r)}
-	end
+	YIELD('loadOther')
+	SKIN.change(SETTING.skinSet)
 	STAT.run=STAT.run+1

 	--Connect to server
 	NET.wsconn_app()
-	YIELD()

-	while true do
-		if math.random()<.1626 then
-			upFloor()
-		end
-		if progress==25 then
-			SFX.play('emit',.6)
-			SFX.play('enter',.8)
-			SFX.play('welcome_sfx')
-			VOC.play('welcome_voc')
-			THEME.fresh()
-			LOADED=true
-			return
-		end
-		YIELD()
-	end
+	SFX.play('emit',.6)
+	SFX.play('enter',.8)
+	SFX.play('welcome_sfx')
+	VOC.play('welcome_voc')
+	THEME.fresh()
+	LOADED=true
+	return'finish'
 end)

 function scene.sceneInit()
-	studioLogo=gc.newText(getFont(80),"26F Studio")
-	blackTime=1
-	openTime=0
-	shadePhase1=6.26*math.random()
-	shadePhase2=6.26*math.random()
-	skip=0--Skip time
-	light[6*3],light[26*3]=true,true
+	studioLogo=gc.newText(getFont(90),"26F Studio")
+	waitTime=0
 end
 function scene.sceneBack()
 	love.event.quit()
 end

-function scene.keyDown(key,isRep)
-	if isRep then return end
-	if key=="escape"then
-		SCN.back()
-	elseif key=="s"then
-		skip=999
-	else
-		skip=skip+1
-	end
-end
 function scene.mouseDown()
 	scene.keyDown("mouse")
 end
 scene.touchDown=scene.mouseDown

 function scene.update(dt)
-	shadePhase1=shadePhase1+dt*2*(3.26-openTime)
-	shadePhase2=shadePhase2+dt*3*(3.26-openTime)
-	if blackTime>0 then
-		blackTime=blackTime-dt
-	end
-	if progress<25 then
-		local p=progress
-		repeat
-			loadingThread()
-		until LOADED or skip<=0 or progress~=p
-		if skip>0 then skip=skip-1 end
+	if not LOADED then
+		loading=loadingThread()
 	else
-		openTime=openTime+dt
-		if skip>0 then
-			openTime=openTime+.626
-			skip=skip-1
-		end
-		if openTime>=3.26 and not SCN.swapping then
+		waitTime=waitTime+dt
+		if waitTime>.626 then
 			SCN.swapTo('intro')
 		end
 	end
 end

-local function doorStencil()
-	local dx=300*(1-math.min(openTime/1.26-1,0)^2)
-	gc.rectangle('fill',640-dx,0,2*dx,720)
-end
 function scene.draw()
-	--Wall
-	gc.clear(.5,.5,.5)
+	gc.clear(.1,.1,.1)
+	gc.setColor(1,1,1)
+	mDraw(TEXTURE.title,640,240,0,.9)

-	gc.push('transform')
-	if openTime>2.26 then
-		gc.translate(640,360)
-		gc.scale(1+(openTime-2.26)^1.8)
-		gc.translate(-640,-360)
-	end
+	setFont(30)
+	mStr(text.loadText[loading],640,530)

-	--Logo
-	if progress==25 then
-		--Outside background
-		gc.setColor(.15,.15,.15)
-		gc.rectangle('fill',340,0,600,720)
-
-		gc.stencil(doorStencil)
-		gc.setStencilTest('equal',1)
-		gc.push('transform')
-
-		--Cool camera
-		gc.translate(640,360)
-		gc.rotate(.2/openTime)
-		gc.scale(1.2+.5/openTime)
-
-		--Logo layer 1
-		gc.setColor(logoColor1)
-		mDraw(studioLogo,0,(5+(3.26-openTime))*math.sin(shadePhase1))
-		mDraw(studioLogo,(7+(3.26-openTime))*math.sin(shadePhase2),0)
-
-		--Logo layer 2
-		gc.setColor(logoColor2)
-		mDraw(studioLogo,-2,2)
-		mDraw(studioLogo,-2,-2)
-		mDraw(studioLogo,2,2)
-		mDraw(studioLogo,2,-2)
-
-		--Logo layer 3
-		gc.setColor(.2,.2,.2)
-		mDraw(studioLogo,0,0)
-		gc.pop()
-
-		--Cool light
-		if openTime>.3 and openTime<1.6 then
-			local w=(1.6-openTime)/1.3
-			gc.setColor(1,1,1,w^2)
-			gc.rectangle('fill',340,360*w^2,600,720*(1-w^2))
-		end
-		gc.setStencilTest()
-	end
-
-	--Floor info frame
-	gc.setColor(.1,.1,.1)
-	gc.rectangle('fill',1020,25,180,100)
-	gc.setColor(.7,.7,.7)
-	gc.setLineWidth(4)
-	gc.rectangle('line',1020,25,180,100)
-
-	--Floor info
-	if progress>=0 then
-		local d1=(progress+1)%10
-		local d2=math.floor((progress+1)/10)
-		gc.setColor(.6,.6,.6)
-		gc.draw(TEXTURE.pixelNum[d2],1040,40-3,nil,8)
-		gc.draw(TEXTURE.pixelNum[d1],1100,40-3,nil,8)
-		gc.setColor(1,1,1)
-		gc.draw(TEXTURE.pixelNum[d2],1040,40,nil,8)
-		gc.draw(TEXTURE.pixelNum[d1],1100,40,nil,8)
-		if progress~=25 then
-			setFont(40)
-			gc.setColor(1,.9,.8)
-			gc.print("↑",1150,26)
-		end
-	end
-
-	--Elevator buttons
-	gc.setLineWidth(3)
-	setFont(25)
-	for i=0,26 do
-		local x,y=light[3*i+1],light[3*i+2]
-		gc.setColor(COLOR[i==progress and'H'or light[3*i+3]and'dO'or'dH'])
-		gc.circle('fill',x,y,23)
-		gc.setColor(.16,.16,.16)
-		gc.circle('line',x,y,23)
-		gc.setColor(1,1,1)
-		mStr(i+1,x,y-18)
-	end
-
-	--Elevator door
-	for i=1,0,-1 do
-		gc.setColor(.3,.3,.3)
-		local dx=300*(1-math.min(math.max(openTime-i*.1,0)/1.26-1,0)^2)
-		gc.rectangle('fill',340,0,300-dx,720)
-		gc.rectangle('fill',940,0,dx-300,720)
-
-		gc.setColor(.16,.16,.16)
-		gc.setLineWidth(4)
-		gc.line(640-dx,0,640-dx,720)
-		gc.line(640+dx,0,640+dx,720)
-	end
-
-	--Doorframe
-	gc.setColor(0,0,0)
-	gc.rectangle('line',340,0,600,720)
-
-	--Black screen
-	if blackTime>0 or openTime>3 then
-		gc.replaceTransform(SCR.origin)
-		gc.setColor(0,0,0,blackTime+(openTime-3)*4)
-		gc.rectangle('fill',0,0,SCR.w,SCR.h)
-		gc.replaceTransform(SCR.xOy)
-	end
-	gc.pop()
+	gc.setColor(logoColor1)mDraw(studioLogo,640,400)
+	gc.setColor(logoColor2)for dx=-2,2,2 do for dy=-2,2,2 do mDraw(studioLogo,640+dx,400+dy)end end
+	gc.setColor(.2,.2,.2)mDraw(studioLogo,640,400)
 end

 return scene