From bb463ef0b13236738a1da9cd04f57def3e7e2c7c Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 29 八月 2025 15:21:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Core/GameEngine/Player/PlayerBaseData.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs
index 8c33b85..f0f8fe1 100644
--- a/Main/Core/GameEngine/Player/PlayerBaseData.cs
+++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs
@@ -18,7 +18,7 @@
     public uint bindDiamond;  //鐏电煶
     public uint copper;    //閾滈挶
     public long allCopper { get { return copper + copperExtend * Constants.ExpPointValue; } }
-    public long FightPoint;    //鎴樻枟鍊�
+    public long UseHarmerCount;    //娑堣�楅敜瀛愪釜鏁�(鍊嶆暟)
     public ushort MapID;    //瑙掕壊鎵�鍦ㄥ湴鍥�  鍦板浘瑙勫垯锛欳/S涓�涓�瀵瑰簲鐨勫父瑙勫湴鍥撅紝C鍋囧湴鍥撅紙ExAttr14锛夛紝澶欳涓�涓猄鍦板浘锛圗xAttr3锛�
     public ushort PosX;    //瑙掕壊鍧愭爣
     public ushort PosY;
@@ -34,7 +34,7 @@
     public byte FBID;    //fb id
     public byte realmLevel;    //瀹樿亴
     public byte VIPLv;    //VIP绛夌骇
-    public uint ExAttr1;    // 鍗忓姪鐩爣鐜╁ID锛岄潪0鍙�0閫�鍑哄崗鍔�
+    public uint ExAttr1;    // 绛栧垝閰嶇疆鍏冲崱ID涓�201锛屽嵆 杩囧叧2-1(0/1) ,浣跨敤 ExAttr1 鍊煎垽鏂紝濡侲xAttr1鍊间负20103浠h〃褰撳墠宸茬粡杩囦簡绗�2绔犵1鍏崇3娉紝鍖呭惈浜嗘尝锛岄渶瑕佸嚮璐ヨ鍏冲崱boss鍚庢墠绠楄鍏宠繃鍏�
     public uint teamAutoOperateFlag;    //鎵╁睍灞炴��2锛屽悇椤圭洰涓撶敤
     public int dungeonLineId;    // 鍓湰绾胯矾id
     public int dungeonMapId;    // 鍓湰鐢ㄤ綔 DataMapId,鍗曚汉鍓湰瀛樺湪1.鍋囧壇鏈� 2.鏈嶅姟绔�1瀵瑰鎴风澶氬湴鍥惧悓鍒嗙嚎 3.鏈嶅姟绔�1瀵瑰鎴风澶氬湴鍥句笉鍚屽垎绾�
@@ -52,10 +52,13 @@
     uint m_coinPointTotal;
     public int face;//澶村儚
     public int facePic;//澶村儚澶栨
+    public long FightPower;    //鎴樻枟鍔�
 
-    public uint coinPointTotal { 
+    public uint coinPointTotal
+    {
         private get { return m_coinPointTotal; }
-        set {
+        set
+        {
             CoinChangeEvent?.Invoke((int)m_coinPointTotal, (int)value);
             m_coinPointTotal = value;
         }
@@ -164,7 +167,7 @@
         CON = _serverInfo.CON;
         Setting = _serverInfo.Setting;
         FBID = _serverInfo.FBID;
-        ExAttr1 = _serverInfo.ExAttr1;
+        ExAttr1 = _serverInfo.ExAttr1;  //绛栧垝閰嶇疆鍏冲崱ID涓�201锛屽嵆 杩囧叧2-1(0/1) ,浣跨敤 ExAttr1 鍊煎垽鏂紝濡侲xAttr1鍊间负20103浠h〃褰撳墠宸茬粡杩囦簡绗�2绔犵1鍏崇3娉紝鍖呭惈浜嗘尝锛岄渶瑕佸嚮璐ヨ鍏冲崱boss鍚庢墠绠楄鍏宠繃鍏�
         teamAutoOperateFlag = _serverInfo.ExAttr2;
         dungeonLineId = (int)_serverInfo.ExAttr3 % 1000;
         dungeonMapId = (int)_serverInfo.ExAttr3 / 1000;
@@ -189,6 +192,7 @@
 
         HP = _serverInfo.HP + _serverInfo.HPEx * Constants.ExpPointValue;
         AttackMode = _serverInfo.AttackMode;
+        UseHarmerCount = (int)_serverInfo.FightPoint;   //閿ゅ瓙鍊嶆暟锛岄潪鎴樻枟鍔�
 
     }
 

--
Gitblit v1.8.0