From 09428d88210a4b176884f89529953a58c95662a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 19 十二月 2018 20:18:49 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
Core/GameEngine/Model/Player/PlayerDatas.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index 54d82ff..fad48b8 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -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