From 2b783e434f8ee83cc1b5970a3be678ed8335ac55 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 05 一月 2019 14:53:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index c28b6e2..3cf2167 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -64,8 +64,10 @@
public int BasicsDefense;//鍩虹闃插尽
public int BasicsScoreAHit;//鍩虹鍛戒腑
public int BasicsDodge;//鍩虹闂伩
- public long treasurePotentialSp {
- get {
+ public long treasurePotentialSp
+ {
+ get
+ {
return ExAttr8 * (long)100000000 + ExAttr7;
}
}
@@ -91,10 +93,6 @@
ExpPoint = _serverInfo.ExpPoint;
TotalExp = _serverInfo.TotalExp;
Family = _serverInfo.Family;
- if (PlayerDatas.Instance. hero != null)
- {
- PlayerDatas.Instance.hero.ActorInfo.familyID = Family;
- }
FamilyName = _serverInfo.FamilyName.Trim().Replace(" ", "");
Gold = _serverInfo.Gold;
GoldPaper = _serverInfo.GoldPaper;
@@ -104,7 +102,6 @@
PosX = _serverInfo.PosX;
PosY = _serverInfo.PosY;
State = _serverInfo.State;
- HP = _serverInfo.HP;
XP = _serverInfo.XP;
FreePoint = _serverInfo.FreePoint;
FreeSkillPoint = _serverInfo.FreeSkillPoint;
@@ -139,6 +136,34 @@
godWeaponLV_3 = (int)_serverInfo.ExAttr17;
godWeaponLV_4 = (int)_serverInfo.ExAttr18;
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ {
+ if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ HP = _serverInfo.HP;
+ }
+ }
+ else
+ {
+ HP = _serverInfo.HP;
+ }
+
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.familyID = Family;
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ {
+ if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_serverInfo.HP);
+ }
+ }
+ else
+ {
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_serverInfo.HP);
+ }
+ }
+
if (_serverInfo.socketType == GameNetSystem.SocketType.Main)
{
mainServerDataBuf.PlayerName = PlayerName;
--
Gitblit v1.8.0