From 38a70bd799ca8bd62ba0b49995a0e9234c3cf77c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 15 一月 2019 16:20:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into 5725【1.5】跨服聊天
---
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index 4c7e79d..2ef5cc8 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -64,8 +64,10 @@
public int BasicsScoreAHit;//鍩虹鍛戒腑
public int BasicsDodge;//鍩虹闂伩
public uint equipShowSwitch;//瑁呭鏄鹃殣寮�鍏�
- public long treasurePotentialSp {
- get {
+ public long treasurePotentialSp
+ {
+ get
+ {
return ExAttr8 * (long)100000000 + ExAttr7;
}
}
@@ -111,7 +113,6 @@
PHY = _serverInfo.PHY;
CON = _serverInfo.CON;
Setting = _serverInfo.Setting;
- AttackMode = _serverInfo.AttackMode;
FBID = _serverInfo.FBID;
ExAttr1 = _serverInfo.ExAttr1;
ExAttr2 = _serverInfo.ExAttr2;
@@ -153,11 +154,13 @@
if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
{
HP = _serverInfo.HP;
+ AttackMode = _serverInfo.AttackMode;
}
}
else
{
HP = _serverInfo.HP;
+ AttackMode = _serverInfo.AttackMode;
}
if (PlayerDatas.Instance.hero != null)
--
Gitblit v1.8.0