From 8e89d89c282284629ae4e9a01089deb915ac87c9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 15 一月 2019 17:54:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Player/PlayerDatas.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index 56a3a00..05be617 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -34,8 +34,7 @@
public PlayerRankData rank { get { return m_Rank; } }
StoreModel m_StoreModel;
- StoreModel StoreModel
- {
+ StoreModel StoreModel {
get { return m_StoreModel ?? (m_StoreModel = ModelCenter.Instance.GetModel<StoreModel>()); }
}
@@ -306,7 +305,17 @@
}
break;
case PlayerDataRefresh.HP:
- baseData.HP = value;
+ if (CrossServerUtility.IsCrossServer())
+ {
+ if (!isMainServerData)
+ {
+ baseData.HP = value;
+ }
+ }
+ else
+ {
+ baseData.HP = value;
+ }
break;
case PlayerDataRefresh.MaxMP:
extersion.MaxMP = (int)value;
--
Gitblit v1.8.0