From 02189c42627eaa36478f16881756709d72bf5ea1 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 9 Aug 2021 11:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9O=E5=9D=97?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=96=B9=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_zh2.lua   |  8 +-------
 parts/scenes/setting_skin.lua | 10 +++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua
index 89a0b1de..8a7e3d03 100644
--- a/parts/language/lang_zh2.lua
+++ b/parts/language/lang_zh2.lua
@@ -62,13 +62,7 @@ return{
 			ihs="提前暂存",
 		},
 		setting_skin={
-			spin1="转",
-			spin2="转",
-			spin3="转",
-			spin4="转",
-			spin5="转",
-			spin6="转",
-			spin7="转",
+			spin1="转",spin2="转",spin3="转",spin4="转",spin5="转",spin6="转",spin7="转",
 		},
 		customGame={
 			mod="模组(F1)",
diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua
index 61c67162..720cc5a4 100644
--- a/parts/scenes/setting_skin.lua
+++ b/parts/scenes/setting_skin.lua
@@ -2,12 +2,14 @@ local gc=love.graphics
 local int=math.floor
 local sin=math.sin
 
+local selRS
 local minoRot={0,0,0,0,0,0,0}
 local minoRot0={}
 
 local scene={}
 
 function scene.sceneInit()
+	selRS=RSlist[SETTING.RS]
 	for i=1,7 do
 		minoRot0[i]=SETTING.face[i]*1.57
 		minoRot[i]=minoRot0[i]
@@ -29,14 +31,16 @@ function scene.draw()
 		gc.rotate(minoRot[n]+sin(t*3-n*.5)*.08)
 		local color=SETTING.skin[n]
 		local B=BLOCKS[n][0]
-		local x,y=-45-DSCP[n][0][2]*30,15+DSCP[n][0][1]*30
+		local x,y=-45-selRS.centerPos[n][0][2]*30,15+selRS.centerPos[n][0][1]*30
 		local col=#B[1]
 		for i=1,#B do for j=1,col do
 			if B[i][j]then
 				gc.draw(texture[color],x+30*j,y-30*i)
 			end
 		end end
-		gc.circle('fill',0,0,sin(t*10)+5)
+		if selRS.centerDisp[n]then
+			mDraw(selRS.centerTex)
+		end
 		gc.pop()
 	end
 	for i=1,5 do
@@ -85,7 +89,7 @@ scene.widgetList={
 	WIDGET.newButton{name="spin3",	x=410,y=540,w=90,h=65,code=function()nextDir(3)end},
 	WIDGET.newButton{name="spin4",	x=550,y=540,w=90,h=65,code=function()nextDir(4)end},
 	WIDGET.newButton{name="spin5",	x=690,y=540,w=90,h=65,code=function()nextDir(5)end},
-	--WIDGET.newButton{name="spin6",x=825,y=540,w=90,h=65,code=function()nextDir(6)end},--Cannot rotate O
+	WIDGET.newButton{name="spin6",	x=825,y=540,w=90,h=65,code=function()nextDir(6)end},
 	WIDGET.newButton{name="spin7",	x=970,y=540,w=90,h=65,code=function()nextDir(7)end},
 
 	WIDGET.newButton{name="skinR",	x=200,y=640,w=220,h=80,color='lV',font=35,