From 8ded444f1b932f053435b3d06e3fe90fb814d217 Mon Sep 17 00:00:00 2001
From: fuyn101 <fuynshile@outlook.com>
Date: Thu, 5 Jun 2025 11:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=90=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ArknightsGameData     |  2 +-
 ArknightsGameResource |  2 +-
 ArknightsResource     |  2 +-
 auto_get_res.py       | 31 +++++++++++++++++--------------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ArknightsGameData b/ArknightsGameData
index 071be555..f0aecdea 160000
--- a/ArknightsGameData
+++ b/ArknightsGameData
@@ -1 +1 @@
-Subproject commit 071be5553087863c2307d40847c6557c3920658b
+Subproject commit f0aecdea27666471f632789af1d3e93aac943b77
diff --git a/ArknightsGameResource b/ArknightsGameResource
index ee1c12b5..01db7cae 160000
--- a/ArknightsGameResource
+++ b/ArknightsGameResource
@@ -1 +1 @@
-Subproject commit ee1c12b50370653b62bb29c4053bda21ed4d1ef6
+Subproject commit 01db7cae8fc29cd73941155a17048678f8223c8e
diff --git a/ArknightsResource b/ArknightsResource
index 911bdb6f..65399126 160000
--- a/ArknightsResource
+++ b/ArknightsResource
@@ -1 +1 @@
-Subproject commit 911bdb6f8e6172503e6e306c83bff4e40840ffd2
+Subproject commit 65399126faa1c844ae1be945ffa25aa5423bcd25
diff --git a/auto_get_res.py b/auto_get_res.py
index bafb68d8..07919ea2 100644
--- a/auto_get_res.py
+++ b/auto_get_res.py
@@ -31,16 +31,16 @@ class Arknights数据处理器:
         仓库_2 = "ArknightsGameData/zh_CN/gamedata/excel"  # noqa: F841
         仓库_3 = "ArknightsResource/gamedata/excel"  # noqa: F841
 
-        self.物品表 = 加载json(f"./{仓库_3}/item_table.json")
-        self.干员表 = 加载json(f"./{仓库_2}/character_table.json")
-        self.阿米娅表 = 加载json(f"./{仓库_2}/char_patch_table.json")
-        self.抽卡表 = 加载json(f"./{仓库_2}/gacha_table.json")
-        self.关卡表 = 加载json(f"./{仓库_2}/stage_table.json")
-        self.活动表 = 加载json(f"./{仓库_2}/activity_table.json")
-        self.基建表 = 加载json(f"./{仓库_2}/building_data.json")
-        self.游戏变量 = 加载json(f"./{仓库_2}/gamedata_const.json")
-        self.模组 = 加载json(f"./{仓库_2}/uniequip_table.json")
-        self.战斗技能 = 加载json(f"./{仓库_2}/skill_table.json")
+        self.物品表 = 加载json(f"./{仓库_1}/item_table.json")
+        self.干员表 = 加载json(f"./{仓库_1}/character_table.json")
+        self.阿米娅表 = 加载json(f"./{仓库_1}/char_patch_table.json")
+        self.抽卡表 = 加载json(f"./{仓库_1}/gacha_table.json")
+        self.关卡表 = 加载json(f"./{仓库_1}/stage_table.json")
+        self.活动表 = 加载json(f"./{仓库_1}/activity_table.json")
+        self.基建表 = 加载json(f"./{仓库_1}/building_data.json")
+        self.游戏变量 = 加载json(f"./{仓库_1}/gamedata_const.json")
+        self.模组 = 加载json(f"./{仓库_1}/uniequip_table.json")
+        self.战斗技能 = 加载json(f"./{仓库_1}/skill_table.json")
         self.装仓库物品的字典 = {"NORMAL": [], "CONSUME": [], "MATERIAL": []}
         self.常驻关卡 = 加载json("mower/data/stage_data.json")
 
@@ -142,7 +142,8 @@ class Arknights数据处理器:
                 "profession": 干员数据["profession"],
                 "name": 干员数据["appellation"],
             }
-            干员头像路径 = f"./ArknightsResource/avatar/ASSISTANT/{干员代码}.png"
+            干员头像路径 = f"./ArknightsGameResource/avatar/{干员代码}.png"
+            # 干员头像路径 = f"./ArknightsResource/avatar/ASSISTANT/{干员代码}.png"
             目标路径 = f"./ui/public/avatar/{干员数据['name']}.webp"
             if os.path.exists(目标路径):
                 continue
@@ -684,9 +685,11 @@ class Arknights数据处理器:
                     f"./mower/static/avatar_skill/{干员数据['name']}/{技能数 + 1}.png"
                 )
                 if not os.path.exists(目标路径):
-                    shutil.copy(干员技能路径, 目标路径)
-                    print(目标路径)
-
+                    try:
+                        shutil.copy(干员技能路径, 目标路径)
+                        print(目标路径)
+                    except:
+                        pass
 
 roomType = {
     "POWER": "发电站",