From e2324f8cb793ba2f51ff798de4464fd846fff255 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 21 十二月 2018 16:56:23 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

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

diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index 0604699..9ed5389 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -157,6 +157,10 @@
         PosX = mainServerDataBuf.PosX;
         PosY = mainServerDataBuf.PosY;
         HP = mainServerDataBuf.HP;
+        if (PlayerDatas.Instance.hero != null)
+        {
+            PlayerDatas.Instance.hero.ActorInfo.serverDie = mainServerDataBuf.heroServerDie;
+        }
     }
 
     public void RecordMainServerData(bool isMainServerData, PlayerDataRefresh playerDataType, uint value)
@@ -193,6 +197,11 @@
         }
     }
 
+    public void RecordMainServerDie(bool isMainServerData, bool serverDie)
+    {
+        mainServerDataBuf.heroServerDie = serverDie;
+    }
+
     public class PartDataBuf
     {
         public string PlayerName;
@@ -202,6 +211,7 @@
         public ushort PosX;
         public ushort PosY;
         public uint HP;
+        public bool heroServerDie;
     }
 
 }

--
Gitblit v1.8.0