From bf4e1051ef18bf57299d3c830f921864b6fda444 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 十二月 2018 10:38:10 +0800
Subject: [PATCH] Merge branch 'master' into 【1.4】聚魂功能
---
Core/GameEngine/Model/Player/PlayerDatas.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index caae8a3..bcc573d 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -670,7 +670,7 @@
extersion.ComboDamPer = (int)value;
break;
case PlayerDataRefresh.MaxProDef:
- extersion.MaxProDef = (int)value;
+ extersion.MaxProDef = (int)value;
break;
case PlayerDataRefresh.ComboDamRate:
extersion.ComboDamPerRate = (int)value;
@@ -683,21 +683,24 @@
break;
case PlayerDataRefresh.PlayerPKState:
extersion.pkState = (int)value;
- if (hero != null)
+ if (baseData.MapID != 31220)
{
- if (value == 1)
+ if (hero != null)
{
- if (MapArea.IsOutMapArea(hero.CurMapArea, MapArea.E_Type.Neutral))
+ if (value == 1)
{
- hero.SwitchGrayName(true);
+ if (MapArea.IsOutMapArea(hero.CurMapArea, MapArea.E_Type.Neutral))
+ {
+ hero.SwitchGrayName(true);
+ }
}
- }
- else if (value == 0)
- {
- hero.SwitchGrayName(false);
- if (StatusMgr.Instance.IsExist(PlayerId, StatusMgr.Instance.redNameBuffID))
+ else if (value == 0)
{
- hero.SwitchRedName(true);
+ hero.SwitchGrayName(false);
+ if (StatusMgr.Instance.IsExist(PlayerId, StatusMgr.Instance.redNameBuffID))
+ {
+ hero.SwitchRedName(true);
+ }
}
}
}
--
Gitblit v1.8.0