From da60c7615b6aa4626aa671f1f4c2395f003b776a Mon Sep 17 00:00:00 2001
From: sctop <2094880085@qq.com>
Date: Sun, 31 Dec 2023 10:35:16 +0800
Subject: [PATCH] character_all.json too big fix

---
 data                                |  2 +-
 data_model/actual_data/character.py | 10 ++++++++--
 data_model/loader/folder_loader.py  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data b/data
index 409d514..9d04917 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit 409d5146783509ea5da21822a314259ed7f83948
+Subproject commit 9d049174372892e7a01195addeb07d6ca43b052b
diff --git a/data_model/actual_data/character.py b/data_model/actual_data/character.py
index 2cc75ea..ba586f8 100644
--- a/data_model/actual_data/character.py
+++ b/data_model/actual_data/character.py
@@ -342,8 +342,14 @@ def to_json_basic(self):
                 "collection_bg": self.collection_bg,
                 "collection_texture": str(self._id)  # deprecated by SchaleDB
             },
-            "birthday": self.birthday.to_json_basic(),
-            "school": self.school_long.to_json_basic(),
+            "birthday": {
+                "localized": self.birthday_localized.to_json(),
+                "normalized": self.birthday.to_json()
+            },
+            "school": {
+                "short": self.school.to_json(),
+                "long": self.school_long.to_json()
+            },
             "school_id": self.school_id,
             "club": self.club.to_json_basic(),
             "age": self.age.to_json_basic(),
diff --git a/data_model/loader/folder_loader.py b/data_model/loader/folder_loader.py
index da6f772..a32c469 100644
--- a/data_model/loader/folder_loader.py
+++ b/data_model/loader/folder_loader.py
@@ -234,7 +234,7 @@ def to_json_basic(self):
 
         # If the filetype is FILE_DIR_STUDENT_SINGLE or something
         try:
-            d["student"] = self.student.to_json()
+            d["student"] = self.student.to_json_basic()
         except Exception:
             pass
         return d