取消quickR设置，修改游戏设置布局，增加相关tip

Zframework/languages.lua

@@ -260,11 +260,10 @@ local langList={
 				ctrl="控制设置",
 				reTime="开局等待时间",
 				maxNext="最大预览数量",
-				autoPause="自动暂停",
+				autoPause="失去焦点自动暂停",
 				layout="外观",
 				key="键位设置",
 				touch="触屏设置",
-				quickR="快速重新开始",
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
 				back="返回",
@@ -720,11 +719,10 @@ local langList={
 				ctrl="控制设置",
 				reTime="开局等待时间",
 				maxNext="最大预览数量",
-				autoPause="自动暂停",
+				autoPause="失去焦点自动暂停",
 				layout="外观",
 				key="键位设置",
 				touch="触屏设置",
-				quickR="快速重新开始",
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
 				back="返回",
@@ -1169,11 +1167,10 @@ local langList={
 				ctrl="Control settings",
 				reTime="Start Delay",
 				maxNext="Next Queue Length",
-				autoPause="Auto pause",
+				autoPause="Pause when lose focus",
 				layout="Layout",
 				key="Key Mappings",
 				touch="Touch Settings",
-				quickR="Quick Retry",
 				swap="Key Combination (Change Atk. Mode)",
 				fine="Finesse Error Sound",
 				back="Back",
@@ -1618,7 +1615,6 @@ local langList={
 				layout="=-=-=",
 				key="=?",
 				touch="_?",
-				quickR="R!",
 				swap="=+=+=",
 				fine="!#!X #!#",
 				back="X",
@@ -2077,11 +2073,10 @@ local langList={
 				ctrl="改控制",
 				reTime="开局等待时间",
 				maxNext="最大预览数量",
-				autoPause="自动暂停",
+				autoPause="失去焦点自动暂停",
 				layout="外观",
 				key="改键位",
 				touch="改触屏",
-				quickR="快速重新开始",
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
 				back="返回",

Zframework/paint.lua

@@ -625,7 +625,7 @@ end
 function Pnt.setting_game()
 	gc.setColor(1,1,1)
 	mText(drawableText.setting_game,640,15)
-	gc.draw(blockSkin[int(Timer()*2)%11+1],720,540,Timer()%6.28319,2,nil,15,15)
+	gc.draw(blockSkin[int(Timer()*2)%11+1],590,540,Timer()%6.28319,2,nil,15,15)
 end
 function Pnt.setting_video()
 	gc.setColor(1,1,1)

Zframework/widgetList.lua

@@ -224,13 +224,12 @@ local Widgets={
 		newButton({name="touch",	x=990,	y=220,	w=320,h=80,	color="lBlue",	font=35,code=function()SCN.goto("setting_touch")end}),
 		newSlider({name="reTime",	x=350,	y=340,	w=300,unit=10,				font=30,disp=SETval("reTime"),	code=SETsto("reTime")}),
 		newSlider({name="maxNext",	x=350,	y=440,	w=300,unit=6,				font=30,disp=SETval("maxNext"),	code=SETsto("maxNext")}),
-		newSwitch({name="autoPause",x=350,	y=540,								font=20,disp=SETval("autoPause"),code=SETrev("autoPause")}),
+		newButton({name="layout",	x=460,	y=540,	w=140,h=70,color="white",	font=35,code=function()
-		newButton({name="layout",	x=590,	y=540,	w=140,h=70,color="white",	font=35,code=function()
 			SCN.goto("setting_skin")
 			end}),
-		newSwitch({name="quickR",	x=1050,	y=320,	font=35,disp=SETval("quickR"),	code=SETrev("quickR")}),
+		newSwitch({name="autoPause",x=1080,	y=320,	font=20,disp=SETval("autoPause"),	code=SETrev("autoPause")}),
-		newSwitch({name="swap",		x=1050,	y=400,	font=20,disp=SETval("swap"),	code=SETrev("swap")}),
+		newSwitch({name="swap",		x=1080,	y=380,	font=20,disp=SETval("swap"),		code=SETrev("swap")}),
-		newSwitch({name="fine",		x=1050,	y=480,	font=20,disp=SETval("fine"),	code=SETrev("fine")}),
+		newSwitch({name="fine",		x=1080,	y=440,	font=20,disp=SETval("fine"),		code=SETrev("fine")}),
 		newButton({name="back",		x=1140,	y=650,	w=200,h=80,color="white",	font=40,code=BACK}),
 	},
 	setting_video={

parts/default_data.lua

@@ -3,11 +3,12 @@ setting={
 	das=10,arr=2,
 	sddas=0,sdarr=2,
 	ihs=true,irs=true,ims=true,
-	reTime=4,
 	maxNext=6,
-	autoPause=true,
-	quickR=true,
 	swap=true,
+	
+	--System
+	reTime=4,
+	autoPause=true,
 	fine=false,
 	lang=1,
 	skinSet=1,

parts/getTip.lua

@@ -68,7 +68,7 @@ if setting.lang==1 or setting.lang==2 then
 		"戴上耳机以获得最佳体验",
 		"大满贯10连击消四全清!",
 		"打好块没有捷径,多练",
-		"车车人在此",
+		"你可以长按R键重新开始游戏(也不是很长)",
 		"茶娘 可爱!",
 		"草(日本语)",
 		"不要在上课时玩游戏!",
@@ -143,6 +143,7 @@ elseif setting.lang==3 then
 		"Hello world!",
 		"Headphones for better experience",
 		"Have you noticed what does \"rotating\" do to block?",
+		"Hold R key to restart game",
 		"Find out what's in the setting!",
 		"Enjoy Tech. Rotation System!",
 		"e^(pi*i/2)=i",

parts/player.lua

@@ -11,7 +11,8 @@ local gameEnv0={
 	das=10,arr=2,
 	sddas=2,sdarr=2,
 	ihs=true,irs=true,ims=true,
-	quickR=true,swap=true,
+	swap=true,
+
 	ghost=true,center=true,
 	smooth=false,grid=false,
 	bagLine=false,
@@ -2344,7 +2345,7 @@ function player.act.func(P)
 	P.gameEnv.Fkey(P)
 end
 function player.act.restart(P)
-	if P.gameEnv.quickR or game.frame<180 then
+	if game.frame<240 or game.result then
 		TASK.removeTask_code(TICK.autoPause)
 		resetPartGameData()
 	end
@@ -2689,7 +2690,7 @@ function PLY.newDemoPlayer(id,x,y,size)
 		noFly=false,
 		das=10,arr=2,
 		sddas=2,sdarr=2,
-		quickR=true,swap=true,
+		swap=true,
 		ghost=setting.ghost,center=setting.center,
 		smooth=setting.smooth,grid=setting.grid,
 		text=setting.text,