From 7389500beb462a96b60ba54734743a85cf35c716 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 十月 2018 10:06:56 +0800
Subject: [PATCH] Merge branch '2287上古战场'

---
 Fight/GameActor/GA_Hero.cs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Fight/GameActor/GA_Hero.cs b/Fight/GameActor/GA_Hero.cs
index 1ba8773..9b98e90 100644
--- a/Fight/GameActor/GA_Hero.cs
+++ b/Fight/GameActor/GA_Hero.cs
@@ -418,7 +418,8 @@
         var titleModel = ModelCenter.Instance.GetModel<TitleModel>();
         var _title = titleModel.GetTitleEquip();
         uint _titleID = 0;
-        if (_title != null && titleModel.IsTitleGain(_title.id))//涓婂彜鎴樺満涓嶆樉绀虹О鍙�
+        if (_title != null && titleModel.IsTitleGain(_title.id)
+            && PlayerDatas.Instance.baseData.MapID != 31160)//涓婂彜鎴樺満涓嶆樉绀虹О鍙�
         {
             _titleID = (uint)_title.id;
         }
@@ -438,6 +439,7 @@
         }
 
         base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);
+        CheckAncientHeadUp();
     }
 
     public sealed override void SwitchRedName(bool on)

--
Gitblit v1.8.0