快速重开不播放入场动画

parts/gametoolfunc.lua

@@ -485,40 +485,39 @@ function loadGame(M,ifQuickPlay)--Load a mode and go to game scene
 		SFX.play("enter")
 	end
 end
-function initPlayerPosition()--Set initial position for every player
+function initPlayerPosition(sudden)--Set initial position for every player
 	local L=PLAYERS.alive
-	local y=#L<=5 and 360 or -62
+	if not sudden then
-	for i=1,#L do
+		for i=1,#L do
-		L[i]:setPosition(640,y,0)
+			L[i]:setPosition(640,#L<=5 and 360 or -62,0)
+		end
 	end
-	resetPlayerPosition()
+
-end
+	local method=sudden and"setPosition"or"movePosition"
-function resetPlayerPosition()--Set position & size for every player
+	L[1][method](L[1],340,75,1)
-	local L=PLAYERS.alive
-	L[1]:movePosition(340,75,1)
 	if #L<=5 then
-		if L[2]then L[2]:movePosition(965,390,.5)end
+		if L[2]then L[2][method](L[2],965,390,.5)end
-		if L[3]then L[3]:movePosition(965,30,.5)end
+		if L[3]then L[3][method](L[3],965,30,.5)end
-		if L[4]then L[4]:movePosition(20,390,.5)end
+		if L[4]then L[4][method](L[4],20,390,.5)end
-		if L[5]then L[5]:movePosition(20,30,.5)end
+		if L[5]then L[5][method](L[5],20,30,.5)end
 	elseif #L==49 then
 		local n=2
 		for i=1,4 do for j=1,6 do
-			L[n]:movePosition(78*i-54,115*j-98,.09)
+			L[n][method](L[n],78*i-54,115*j-98,.09)
 			n=n+1
 		end end
 		for i=9,12 do for j=1,6 do
-			L[n]:movePosition(78*i+267,115*j-98,.09)
+			L[n][method](L[n],78*i+267,115*j-98,.09)
 			n=n+1
 		end end
 	elseif #L==99 then
 		local n=2
 		for i=1,7 do for j=1,7 do
-			L[n]:movePosition(46*i-36,97*j-72,.068)
+			L[n][method](L[n],46*i-36,97*j-72,.068)
 			n=n+1
 		end end
 		for i=15,21 do for j=1,7 do
-			L[n]:movePosition(46*i+264,97*j-72,.068)
+			L[n][method](L[n],46*i+264,97*j-72,.068)
 			n=n+1
 		end end
 	end
@@ -538,7 +537,7 @@ local function tick_showMods()
 		end
 	end
 end
-function resetGameData(replaying)
+function resetGameData(replaying,ifQuick)
 	if PLAYERS[1]and not GAME.replaying and(GAME.frame>400 or GAME.result)then
 		mergeStat(STAT,PLAYERS[1].stat)
 		STAT.todayTime=STAT.todayTime+PLAYERS[1].stat.time
@@ -567,7 +566,7 @@ function resetGameData(replaying)
 
 	destroyPlayers()
 	GAME.curMode.load()
-	initPlayerPosition()
+	initPlayerPosition(ifQuick)
 	restoreVirtualKey()
 	if GAME.modeEnv.task then
 		for i=1,#PLAYERS do

parts/player/player.lua

@@ -1838,8 +1838,10 @@ function Player.act_func(P)
 	P.gameEnv.Fkey(P)
 end
 function Player.act_restart()
-	if GAME.frame<240 or GAME.result then
+	if GAME.frame<240 then
-		resetGameData()
+		resetGameData(false,true)
+	elseif GAME.result then
+		resetGameData(false,false)
 	else
 		LOG.print(text.holdR,20,COLOR.orange)
 	end

parts/scenes/pause.lua

@@ -137,11 +137,11 @@ function scene.keyDown(key)
 		GAME.prevBG=BG.cur
 		SCN.go("setting_sound")
 	elseif key=="r"then
-		resetGameData()
+		resetGameData(false,false)
 		SCN.swapTo("play","none")
 	elseif key=="p"then
 		if(GAME.result or GAME.replaying)and #PLAYERS==1 then
-			resetGameData(true)
+			resetGameData(true,false)
 			SCN.swapTo("play","none")
 		end
 	elseif key=="o"then

parts/scenes/play.lua

@@ -30,7 +30,7 @@ function scene.sceneInit()
 	love.keyboard.setKeyRepeat(false)
 	GAME.restartCount=0
 	if GAME.init then
-		resetGameData()
+		resetGameData(false,false)
 		GAME.init=nil
 	end
 	noKey=GAME.replaying
@@ -204,7 +204,7 @@ function scene.update(dt)
 	elseif P1.keyPressing[10]then
 		GAME.restartCount=GAME.restartCount+1
 		if GAME.restartCount>20 then
-			resetGameData()
+			resetGameData(false,false)
 			return
 		end
 	elseif GAME.restartCount>0 then