From bb9a35c16187ceb258d0fb8e58d8efbfc48d813b Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 6 Dec 2021 20:57:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=91=E5=AD=98=E6=A1=A3/?=
 =?UTF-8?q?=E8=AF=BB=E6=A1=A3=E7=9A=84=E4=B8=80=E5=A4=84=E5=B0=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gameFuncs.lua |  2 +-
 parts/net.lua       | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua
index a8480607..1939a4c5 100644
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -79,7 +79,7 @@ do--function loadFile(name,args), function saveFile(data,name,args)
         local text=text or t
         local res,mes=pcall(FILE.save,data,name,args)
         if res then
-            return mes
+            return true
         else
             MES.new('error',
                 mes:find'duplicate'and
diff --git a/parts/net.lua b/parts/net.lua
index 5dac8a9f..ebdec25d 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -240,8 +240,8 @@ function NET.uploadSave()
             {section=3,data=STRING.packTable(SETTING)},
             {section=4,data=STRING.packTable(KEY_MAP)},
             {section=5,data=STRING.packTable(VK_ORG)},
-            {section=6,data=STRING.packTable(loadFile('conf/vkSave1'))},
-            {section=7,data=STRING.packTable(loadFile('conf/vkSave2'))},
+            {section=6,data=STRING.packTable(loadFile('conf/vkSave1','-canSkip')or{})},
+            {section=7,data=STRING.packTable(loadFile('conf/vkSave2','-canSkip')or{})},
         }..'}}')
         MES.new('info',"Uploading")
     end
@@ -287,10 +287,12 @@ function NET.loadSavedData(sections)
     TABLE.cover(NET.cloudData.VK_org,VK_ORG)
     success=success and saveFile(VK_ORG,'conf/virtualkey')
 
-    success=success and saveFile(NET.cloudData.vkSave1,'conf/vkSave1')
-    success=success and saveFile(NET.cloudData.vkSave2,'conf/vkSave2')
+    if #NET.cloudData.vkSave1[1]then success=success and saveFile(NET.cloudData.vkSave1,'conf/vkSave1')end
+    if #NET.cloudData.vkSave2[1]then success=success and saveFile(NET.cloudData.vkSave2,'conf/vkSave2')end
     if success then
         MES.new('check',text.saveDone)
+    else
+        MES.new('warn',text.dataCorrupted)
     end
 end