From 1aeba72a75a757dd44e2cc15ef535ce52d90e776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=A5=E6=9C=88?= <kritsu@qq.com>
Date: Wed, 22 Sep 2021 00:01:48 +0800
Subject: [PATCH] =?UTF-8?q?chore:=E5=AD=98=E6=A1=A3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PublicReference/base.py      | 11 -----------
 PublicReference/base_buff.py | 11 +----------
 PublicReference/common.py    | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/PublicReference/base.py b/PublicReference/base.py
index 61d7373..a8d68ac 100644
--- a/PublicReference/base.py
+++ b/PublicReference/base.py
@@ -4079,17 +4079,6 @@ class 角色窗口(窗口):
         except Exception as error:
             logger.error(error)
 
-    def 载入配置(self, path='set'):
-        filepath = './ResourceFiles/{}/{}/'.format(self.角色属性A.实际名称, path)
-        if os.path.exists(os.path.join(
-                filepath, "page_1.json")) or os.path.exists(
-                    os.path.join(filepath, "store.json")):
-            self.载入json(path)
-            return
-        else:
-            # 如果不存在任何存档则载入重置存档
-            self.载入json(path='reset')
-
     def 设置技能选项(self, 序号, info):
         try:
             self.等级调整[序号].setCurrentIndex(info['level'])
diff --git a/PublicReference/base_buff.py b/PublicReference/base_buff.py
index d2d656b..32b1d01 100644
--- a/PublicReference/base_buff.py
+++ b/PublicReference/base_buff.py
@@ -2278,16 +2278,7 @@ class 角色窗口(窗口):
             self.基准值 = deepcopy(self.自选计算数据)
         self.自选计算(1)
 
-    def 载入配置(self, path='set'):
-        filepath = './ResourceFiles/{}/{}/'.format(self.角色属性A.实际名称, path)
-        if os.path.exists(os.path.join(
-                filepath, "page_1.json")) or os.path.exists(
-                    os.path.join(filepath, "store.json")):
-            self.载入json(path)
-            return
-        else: 
-            # 如果不存在任何存档则载入重置存档
-            self.载入json(path = 'reset')
+
 
     def 设置技能选项(self, num, info):
 
diff --git a/PublicReference/common.py b/PublicReference/common.py
index b65d3cb..c924424 100644
--- a/PublicReference/common.py
+++ b/PublicReference/common.py
@@ -220,6 +220,9 @@ class 窗口(QWidget):
         self.calc_done_signal.connect(self.calc_done)
         self.update_remaining_signal.connect(self.update_remaining)
 
+        # 清理角色数据
+        store.delete("^/(buffer|carry)/data/.*$")
+
         self.窗口属性输入()
         self.界面()
         self.布局界面()
@@ -1047,6 +1050,20 @@ class 窗口(QWidget):
         self.存档位置 = self.存档选择.currentText()
         self.载入配置(self.存档位置)
 
+    def 载入配置(self, path='set'):
+        filepath = './ResourceFiles/{}/{}/'.format(self.角色属性A.实际名称, path)
+        if os.path.exists(os.path.join(
+                filepath, "page_1.json")) or os.path.exists(
+                    os.path.join(filepath, "store.json")):
+            self.载入json(path)
+            return
+        else: 
+            # 如果不存在任何存档则载入重置存档
+            self.载入json(path = 'reset')
+    
+    def 载入json(path):
+        pass
+
     def 存档列表读取(self):
         self.存档位置 = 'set'
         path = './ResourceFiles/' + self.角色属性A.实际名称 + '/'
-- 
Gitee