From 05d0cdd1f5ab259b754a5a2b63bfb8838015da31 Mon Sep 17 00:00:00 2001
From: letheriver2007 <letheriver2007@126.com>
Date: Tue, 22 Apr 2025 22:42:20 +0800
Subject: [PATCH] fix: adventure player id incorrect using

---
 Common/Data/Excel/AdventurePlayerExcel.cs | 9 +++++----
 Common/Data/ResourceManager.cs            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Common/Data/Excel/AdventurePlayerExcel.cs b/Common/Data/Excel/AdventurePlayerExcel.cs
index e32a749e..017ed5d5 100644
--- a/Common/Data/Excel/AdventurePlayerExcel.cs
+++ b/Common/Data/Excel/AdventurePlayerExcel.cs
@@ -1,18 +1,19 @@
 namespace EggLink.DanhengServer.Data.Excel;
 
-[ResourceEntity("AdventurePlayer.json")]
+[ResourceEntity("AdventurePlayer.json,ActivityAdventurePlayer.json", true)]
 public class AdventurePlayerExcel : ExcelResource
 {
-    public int AvatarID { get; set; } = 0;
+    public int ID { get; set; }
+    public int AvatarID { get; set; }
     public string PlayerJsonPath { get; set; } = "";
 
     public override int GetId()
     {
-        return AvatarID;
+        return ID;
     }
 
     public override void Loaded()
     {
-        GameData.AdventurePlayerData[AvatarID] = this;
+        GameData.AdventurePlayerData[ID] = this;
     }
 }
\ No newline at end of file
diff --git a/Common/Data/ResourceManager.cs b/Common/Data/ResourceManager.cs
index 2c28d25c..2ba101eb 100644
--- a/Common/Data/ResourceManager.cs
+++ b/Common/Data/ResourceManager.cs
@@ -423,7 +423,7 @@ public class ResourceManager
 
                 var info = AdventureAbilityConfigListInfo.LoadFromJsonObject(obj);
 
-                GameData.AdventureAbilityConfigListData.TryAdd(avatar.AvatarID, info);
+                GameData.AdventureAbilityConfigListData.TryAdd(adventure.ID, info);
                 count++;
             }
             catch (Exception ex)