From bd1d1f8ae4afe99b05046515d30632a9ef1e96b5 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 23 Jul 2021 17:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=87=BD=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E8=AE=BE=E7=BD=AE=E5=90=8E?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E8=AE=BE=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua                  | 5 +----
 parts/gametoolfunc.lua    | 7 +++++++
 parts/net.lua             | 1 +
 parts/scenes/savedata.lua | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/main.lua b/main.lua
index da59f533..04f6b3ea 100644
--- a/main.lua
+++ b/main.lua
@@ -318,10 +318,7 @@ do
 end
 
 --Apply system setting
-LANG.set(SETTING.lang)
-VK.setShape(SETTING.VKSkin)
-applyBlockSatur(SETTING.blockSatur)
-applyFieldSatur(SETTING.fieldSatur)
+applySettings()
 
 --Load replays
 for _,fileName in next,fs.getDirectoryItems('replay')do
diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index 7ec2a564..aedfcfc8 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -12,6 +12,13 @@ local SETTING,GAME,SCR=SETTING,GAME,SCR
 
 
 --System
+function applySettings()
+	love.window.setFullscreen(SETTING.fullscreen)
+	LANG.set(SETTING.lang)
+	VK.setShape(SETTING.VKSkin)
+	applyBlockSatur(SETTING.blockSatur)
+	applyFieldSatur(SETTING.fieldSatur)
+end
 function switchFullscreen()
 	SETTING.fullscreen=not SETTING.fullscreen
 	love.window.setFullscreen(SETTING.fullscreen)
diff --git a/parts/net.lua b/parts/net.lua
index 12ca03ce..2fbfc339 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -262,6 +262,7 @@ function NET.loadSavedData(sections)
 		success=success and FILE.save(RANKS,'conf/unlock')
 
 		TABLE.update(NET.cloudData.SETTING,SETTING)
+		applySettings()
 		success=success and FILE.save(SETTING,'conf/settings')
 
 		TABLE.update(NET.cloudData.keyMap,keyMap)
diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua
index f2e5c37c..979fc15d 100644
--- a/parts/scenes/savedata.lua
+++ b/parts/scenes/savedata.lua
@@ -55,6 +55,7 @@ scene.widgetList={
 			local D=parseCB()
 			if D then
 				TABLE.update(D,SETTING)
+				applySettings()
 				if FILE.save(SETTING,'conf/settings')then
 					MES.new('check',text.importSuccess)
 				end