From 45dc7ce48270b41e9c287ddab3e827d52480cf8c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 08 一月 2019 14:48:35 +0800
Subject: [PATCH] 5725 【前端】【1.5】跨服BOSS开发

---
 Core/GameEngine/Model/Player/Character/PlayerBaseData.cs |  138 ++++++++++++++++++++++-----------------------
 1 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index b26ef23..0b72679 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -1,7 +1,6 @@
 锘縫ublic class PlayerBaseData
 {
-
-    PartDataBuf mainServerDataBuf = new PartDataBuf();//
+    public int mainServerMapIdRecord = 0;
 
     public string AccID;    //_KEY_i_甯愬彿鍚�, 璇ヨ鑹叉墍鍦ㄧ殑甯愬彿鐨勭敤鎴峰悕
     public uint PlayerID;    //_IDT_
@@ -97,6 +96,11 @@
         Silver = _serverInfo.Silver;
         SilverPaper = _serverInfo.SilverPaper;
         MapID = _serverInfo.MapID;
+        if (_serverInfo.socketType==GameNetSystem.SocketType.Main)
+        {
+            mainServerMapIdRecord = MapID;
+        }
+
         PosX = _serverInfo.PosX;
         PosY = _serverInfo.PosY;
         State = _serverInfo.State;
@@ -162,82 +166,74 @@
             }
         }
 
-        if (_serverInfo.socketType == GameNetSystem.SocketType.Main)
-        {
-            mainServerDataBuf.PlayerName = PlayerName;
-            mainServerDataBuf.MapID = MapID;
-            mainServerDataBuf.FBID = FBID;
-            mainServerDataBuf.dungeonLineId = dungeonLineId;
-            mainServerDataBuf.PosX = PosX;
-            mainServerDataBuf.PosY = PosY;
-            mainServerDataBuf.HP = HP;
-        }
     }
 
-    public void ApplyMainServerDataBuf()
+    public void UpdateData(HA112_tagMCDBPlayer serverInfo)
     {
-        PlayerName = mainServerDataBuf.PlayerName;
-        MapID = mainServerDataBuf.MapID;
-        FBID = mainServerDataBuf.FBID;
-        dungeonLineId = mainServerDataBuf.dungeonLineId;
-        PosX = mainServerDataBuf.PosX;
-        PosY = mainServerDataBuf.PosY;
-        HP = mainServerDataBuf.HP;
+        AccID = serverInfo.AccID;
+        PlayerID = serverInfo.PlayerID;
+        PlayerName = serverInfo.PlayerName.Trim().Replace(" ", "");
+        AccState = serverInfo.AccState;
+        GMLevel = serverInfo.GMLevel;
+        Sex = serverInfo.Sex;
+        Job = serverInfo.Job;
+        LV = serverInfo.LV;
+        LVEx = serverInfo.LVEx;
+        LV2 = serverInfo.LV2;
+        ExpPoint = serverInfo.ExpPoint;
+        TotalExp = serverInfo.TotalExp;
+        Family = serverInfo.Family;
+        FamilyName = serverInfo.FamilyName.Trim().Replace(" ", "");
+        Gold = serverInfo.Gold;
+        GoldPaper = serverInfo.GoldPaper;
+        Silver = serverInfo.Silver;
+        SilverPaper = serverInfo.SilverPaper;
+        MapID = serverInfo.MapID;
+        if (serverInfo.socketType == GameNetSystem.SocketType.Main)
+        {
+            mainServerMapIdRecord = MapID;
+        }
+        PosX = serverInfo.PosX;
+        PosY = serverInfo.PosY;
+        State = serverInfo.State;
+        XP = serverInfo.XP;
+        FreePoint = serverInfo.FreePoint;
+        FreeSkillPoint = serverInfo.FreeSkillPoint;
+        STR = serverInfo.STR;
+        PNE = serverInfo.PNE;
+        PHY = serverInfo.PHY;
+        CON = serverInfo.CON;
+        AttackMode = serverInfo.AttackMode;
+        FBID = serverInfo.FBID;
+        ExAttr1 = serverInfo.ExAttr1;
+        ExAttr2 = serverInfo.ExAttr2;
+        dungeonLineId = (int)serverInfo.ExAttr3;
+        ExAttr4 = serverInfo.ExAttr4;
+        ExAttr5 = serverInfo.ExAttr5;
+        realmLevel = serverInfo.OfficialRank;
+        VIPLv = serverInfo.VIPLv;
+        ExAttr6 = serverInfo.ExAttr6;
+        ExAttr7 = serverInfo.ExAttr7;
+        ExAttr8 = serverInfo.ExAttr8;
+        ExAttr9 = serverInfo.ExAttr9;
+        bubbleId = serverInfo.ExAttr10;
+        ExAttr11 = serverInfo.ExAttr11;
+        ExAttr12 = serverInfo.ExAttr12;
+        ExAttr13 = serverInfo.ExAttr13;
+        ExAttr14 = serverInfo.ExAttr14;
+        HappyPoint = serverInfo.HappyPoint;
+        faction = serverInfo.Faction;
+        coinPointTotal = serverInfo.ChangeCoinPointTotal;
+        godWeaponLV_1 = (int)serverInfo.ExAttr15;
+        godWeaponLV_2 = (int)serverInfo.ExAttr16;
+        godWeaponLV_3 = (int)serverInfo.ExAttr17;
+        godWeaponLV_4 = (int)serverInfo.ExAttr18;
+
         if (PlayerDatas.Instance.hero != null)
         {
-            PlayerDatas.Instance.hero.ActorInfo.serverDie = mainServerDataBuf.heroServerDie;
+            PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)serverInfo.HP);
         }
     }
 
-    public void RecordMainServerData(bool isMainServerData, PlayerDataRefresh playerDataType, uint value)
-    {
-        if (!isMainServerData)
-        {
-            return;
-        }
-
-        switch (playerDataType)
-        {
-            case PlayerDataRefresh.PlayerName:
-                break;
-            case PlayerDataRefresh.MapID:
-                mainServerDataBuf.MapID = (ushort)value;
-                break;
-            case PlayerDataRefresh.FBID:
-                mainServerDataBuf.FBID = (byte)value;
-                break;
-            case PlayerDataRefresh.ExAttr3:
-                mainServerDataBuf.dungeonLineId = (byte)value;
-                break;
-            case PlayerDataRefresh.PosX:
-                mainServerDataBuf.PosX = (ushort)value;
-                break;
-            case PlayerDataRefresh.PosY:
-                mainServerDataBuf.PosY = (ushort)value;
-                break;
-            case PlayerDataRefresh.HP:
-                mainServerDataBuf.HP = value;
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void RecordMainServerDie(bool isMainServerData, bool serverDie)
-    {
-        mainServerDataBuf.heroServerDie = serverDie;
-    }
-
-    public class PartDataBuf
-    {
-        public string PlayerName;
-        public ushort MapID;
-        public byte FBID;
-        public int dungeonLineId;
-        public ushort PosX;
-        public ushort PosY;
-        public uint HP;
-        public bool heroServerDie;
-    }
 
 }

--
Gitblit v1.8.0