From ad3ac1661daaf4b445914f87009d3d88c990f040 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

---
 Main/Core/GameEngine/Player/PlayerBaseData.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs
index abc24d9..c9b1843 100644
--- a/Main/Core/GameEngine/Player/PlayerBaseData.cs
+++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs
@@ -68,6 +68,7 @@
     public uint chatBox;    //鎵╁睍灞炴��10锛屽悇椤圭洰涓撶敤
     public uint ExAttr11;    //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�121 鐜伴噾浠e竵锛堜唬閲戝埜锛�
     public uint ExAttr16;    //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�    鍏ㄨ韩鐗规晥
+    public uint ExAttr17;   //璐﹀彿鐘舵�� 鎸変綅 4 灏佸彿 5绂佽█ 6绂佽澶�
     public uint ServerGroupId;    //鏈嶅姟鍣ㄧ粍ID
     public uint hangTime;//鐜颁负鑴辨満鎸傚墿浣欐椂闂� 23
     public uint faction; //闃佃惀 107
@@ -204,6 +205,7 @@
         ExAttr11 = _serverInfo.ExAttr11;
         leaveGuildInfo = (int)_serverInfo.ExAttr12;
         ExAttr16 = _serverInfo.ExAttr16;
+        ExAttr17 = _serverInfo.ExAttr17;
         ServerGroupId = _serverInfo.ExAttr13;
         faction = _serverInfo.Faction;
         coinPointTotal = _serverInfo.ChangeCoinPointTotal;

--
Gitblit v1.8.0