From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/Core/GameEngine/Player/PlayerBaseData.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs
index 3c5ec04..c9b1843 100644
--- a/Main/Core/GameEngine/Player/PlayerBaseData.cs
+++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs
@@ -65,9 +65,10 @@
public uint copperExtend; //鎵╁睍灞炴��6锛屽悇椤圭洰涓撶敤
public uint sp; //鎵╁睍灞炴��7锛屽悇椤圭洰涓撶敤
public uint spExtend; //鎵╁睍灞炴��8锛屽悇椤圭洰涓撶敤
- public uint bubbleId; //鎵╁睍灞炴��10锛屽悇椤圭洰涓撶敤
+ public uint chatBox; //鎵╁睍灞炴��10锛屽悇椤圭洰涓撶敤
public uint ExAttr11; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�121 鐜伴噾浠ｅ竵锛堜唬閲戝埜锛�
public uint ExAttr16; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬� 鍏ㄨ韩鐗规晥
+ public uint ExAttr17; //璐﹀彿鐘舵�� 鎸変綅 4 灏佸彿 5绂佽█ 6绂佽澶�
public uint ServerGroupId; //鏈嶅姟鍣ㄧ粍ID
public uint hangTime;//鐜颁负鑴辨満鎸傚墿浣欐椂闂� 23
public uint faction; //闃佃惀 107
@@ -75,7 +76,7 @@
public int face;//澶村儚
public int facePic;//澶村儚澶栨
public long FightPower; //鎴樻枟鍔�
-
+ public int modelMark; //褰㈣薄
public uint coinPointTotal
{
private get { return m_coinPointTotal; }
@@ -101,7 +102,7 @@
public int BasicsDefense;//鍩虹闃插尽
public int BasicsScoreAHit;//鍩虹鍛戒腑
public int BasicsDodge;//鍩虹闂伩
- public uint equipShowSwitch;//褰撳墠閰嶇疆鐨勫潗楠戝瑙侷D瀛樺偍鍦� 涓綅鏁板崄浣嶆暟锛堟渶澶ф敮鎸� 1~99锛�
+ public uint equipShowSwitch;//褰撳墠閰嶇疆鐨勫潗楠戝瑙侷D瀛樺偍鍦紙鏈�澶ф敮鎸� 1~999锛�
public int mater;//鐏垫牴灞炴�р�斺�旈噾
public int wood;//鐏垫牴灞炴�р�斺�旀湪
public int water;//鐏垫牴灞炴�р�斺�旀按
@@ -201,22 +202,24 @@
copperExtend = _serverInfo.ExAttr6;
sp = _serverInfo.ExAttr7;
spExtend = _serverInfo.ExAttr8;
- bubbleId = _serverInfo.ExAttr10;
ExAttr11 = _serverInfo.ExAttr11;
leaveGuildInfo = (int)_serverInfo.ExAttr12;
ExAttr16 = _serverInfo.ExAttr16;
+ ExAttr17 = _serverInfo.ExAttr17;
ServerGroupId = _serverInfo.ExAttr13;
faction = _serverInfo.Faction;
coinPointTotal = _serverInfo.ChangeCoinPointTotal;
equipShowSwitch = _serverInfo.EquipShowSwitch;
mapRealmSelect = (int)_serverInfo.ExAttr18;
leaveFamilyTime = (int)_serverInfo.ExAttr19;
- face = (int)_serverInfo.Face;
- facePic = (int)_serverInfo.FacePic;
-
HP = _serverInfo.HP + _serverInfo.HPEx * Constants.ExpPointValue;
AttackMode = _serverInfo.AttackMode;
UseHarmerCount = (int)_serverInfo.FightPoint; //閿ゅ瓙鍊嶆暟锛岄潪鎴樻枟鍔�
+ face = (int)_serverInfo.Face;
+ facePic = (int)_serverInfo.FacePic;
+ modelMark = (int)_serverInfo.ModelMark;
+ chatBox = (uint)_serverInfo.ExAttr10;
+ TitleID = (int)_serverInfo.ExAttr3;
}
--
Gitblit v1.8.0