From e40a47e6889372bfd7846d675bc931eab32220b1 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 27 六月 2025 15:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Core/GameEngine/Player/PlayerBaseData.cs |  111 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs
index 1d85dec..95a26de 100644
--- a/Main/Core/GameEngine/Player/PlayerBaseData.cs
+++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs
@@ -9,8 +9,9 @@
     public byte Job;    //鑱屼笟, 
     public ushort LV;    //绛夌骇
     public int TitleID;
-    public uint ExpPoint;    //鎵╁厖缁忛獙鐐规暟
-    public uint TotalExp;    //鎬荤粡楠�
+    public uint ExpPoint;    //鎵╁厖缁忛獙鐐规暟锛堜嚎锛�
+    public uint TotalExp;    //鎬荤粡楠�(灏忎簬浜块儴鍒�)
+    public ulong curExp { get { return ExpPoint + TotalExp * Constants.ExpPointValue; } }
     public uint FamilyId;    //瀹舵棌
     public string FamilyName;    //瀹舵棌鍚嶇О
     public uint diamond;    //浠欑帀
@@ -31,7 +32,7 @@
     public string Setting;    //璁惧畾
     public byte AttackMode;    //鏀诲嚮妯″紡
     public byte FBID;    //fb id
-    public byte realmLevel;    //鏃ф湇鍔$瀹橀樁锛岀幇椤圭洰鐢ㄤ簬澧冪晫
+    public byte realmLevel;    //瀹樿亴
     public byte VIPLv;    //VIP绛夌骇
     public uint ExAttr1;    // 鍗忓姪鐩爣鐜╁ID锛岄潪0鍙�0閫�鍑哄崗鍔�
     public uint teamAutoOperateFlag;    //鎵╁睍灞炴��2锛屽悇椤圭洰涓撶敤
@@ -137,58 +138,58 @@
     }
 
     public void UpdateData(H0102_tagCDBPlayer _serverInfo)
-    {
-
-        AccID = _serverInfo.AccID;
-        PlayerID = _serverInfo.PlayerID;
-        PlayerName = _serverInfo.PlayerName.Trim().Replace("\0", "");
-        GMLevel = _serverInfo.GMLevel;
-        Job = _serverInfo.Job;
-        LV = _serverInfo.LV;
-        ExpPoint = _serverInfo.ExpPoint;
-        TotalExp = _serverInfo.TotalExp;
-        FamilyId = _serverInfo.Family;
-        FamilyName = _serverInfo.FamilyName.Trim().Replace("\0", "");
-        diamond = _serverInfo.Gold;
-        bindDiamond = _serverInfo.GoldPaper;
-        copper = _serverInfo.Silver;
-        MapID = _serverInfo.MapID;
-        PosX = _serverInfo.PosX;
-        PosY = _serverInfo.PosY;
-        FreePoint = _serverInfo.FreePoint;
-        FreeSkillPoint = _serverInfo.FreeSkillPoint;
-        STR = _serverInfo.STR;
-        PNE = _serverInfo.PNE;
-        PHY = _serverInfo.PHY;
-        CON = _serverInfo.CON;
-        Setting = _serverInfo.Setting;
-        FBID = _serverInfo.FBID;
-        ExAttr1 = _serverInfo.ExAttr1;
-        teamAutoOperateFlag = _serverInfo.ExAttr2;
-        dungeonLineId = (int)_serverInfo.ExAttr3 % 1000;
-        dungeonMapId = (int)_serverInfo.ExAttr3 / 1000;
-        shield = _serverInfo.ExAttr4;
-        CrossServerFlag = _serverInfo.ExAttr5;
-        realmLevel = _serverInfo.OfficialRank;
-        VIPLv = _serverInfo.VIPLv;
-        copperExtend = _serverInfo.ExAttr6;
-        sp = _serverInfo.ExAttr7;
-        spExtend = _serverInfo.ExAttr8;
-        bubbleId = _serverInfo.ExAttr10;
-        ExAttr11 = _serverInfo.ExAttr11;
-        ExAttr16 = _serverInfo.ExAttr16;
-        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;
-
+    {
+
+        AccID = _serverInfo.AccID.Trim().Replace("\0", "");
+        PlayerID = _serverInfo.PlayerID;
+        PlayerName = _serverInfo.PlayerName.Trim().Replace("\0", "");
+        GMLevel = _serverInfo.GMLevel;
+        Job = _serverInfo.Job;
+        LV = _serverInfo.LV;
+        ExpPoint = _serverInfo.ExpPoint;
+        TotalExp = _serverInfo.TotalExp;
+        FamilyId = _serverInfo.Family;
+        FamilyName = _serverInfo.FamilyName.Trim().Replace("\0", "");
+        diamond = _serverInfo.Gold;
+        bindDiamond = _serverInfo.GoldPaper;
+        copper = _serverInfo.Silver;
+        MapID = _serverInfo.MapID;
+        PosX = _serverInfo.PosX;
+        PosY = _serverInfo.PosY;
+        FreePoint = _serverInfo.FreePoint;
+        FreeSkillPoint = _serverInfo.FreeSkillPoint;
+        STR = _serverInfo.STR;
+        PNE = _serverInfo.PNE;
+        PHY = _serverInfo.PHY;
+        CON = _serverInfo.CON;
+        Setting = _serverInfo.Setting;
+        FBID = _serverInfo.FBID;
+        ExAttr1 = _serverInfo.ExAttr1;
+        teamAutoOperateFlag = _serverInfo.ExAttr2;
+        dungeonLineId = (int)_serverInfo.ExAttr3 % 1000;
+        dungeonMapId = (int)_serverInfo.ExAttr3 / 1000;
+        shield = _serverInfo.ExAttr4;
+        CrossServerFlag = _serverInfo.ExAttr5;
+        realmLevel = _serverInfo.OfficialRank;
+        VIPLv = _serverInfo.VIPLv;
+        copperExtend = _serverInfo.ExAttr6;
+        sp = _serverInfo.ExAttr7;
+        spExtend = _serverInfo.ExAttr8;
+        bubbleId = _serverInfo.ExAttr10;
+        ExAttr11 = _serverInfo.ExAttr11;
+        ExAttr16 = _serverInfo.ExAttr16;
+        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;
+
     }
 
     // 閮ㄥ垎鎯呭喌闇�瑕佹湇鍔$闈為噸鐧绘儏鍐典笅鍚屾鎵�鏈夋暟鎹�

--
Gitblit v1.8.0