From 61b5058b990da2fe7f4b76e1e61b817d4f511432 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 30 八月 2018 10:28:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WorldMap/LocalMapWin.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/System/WorldMap/LocalMapWin.cs b/System/WorldMap/LocalMapWin.cs
index 0dfddfc..d29c1ff 100644
--- a/System/WorldMap/LocalMapWin.cs
+++ b/System/WorldMap/LocalMapWin.cs
@@ -25,6 +25,7 @@
int mapId = 0;
MapModel model { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
protected override void BindController()
{
@@ -91,13 +92,22 @@
m_MapName.text = mapConfig.Name;
m_MapLineSwitch.gameObject.SetActive(mapId == PlayerDatas.Instance.baseData.MapID);
- if (BossFakeLineUtility.Instance.showFakeLine)
+ var grabBossLine = 0;
+ fairyGrabBossModel.TryGetFairyGrabBossLine(out grabBossLine);
+ if (grabBossLine != 0 && PlayerDatas.Instance.baseData.FBID == grabBossLine)
{
- m_CurrentLine.text = Language.Get("line", 1);
+ m_CurrentLine.text = Language.Get("FairyGrabBossLine");
}
else
{
- m_CurrentLine.text = Language.Get("line", PlayerDatas.Instance.baseData.FBID + 1);
+ if (BossFakeLineUtility.Instance.showFakeLine)
+ {
+ m_CurrentLine.text = Language.Get("line", 1);
+ }
+ else
+ {
+ m_CurrentLine.text = Language.Get("line", PlayerDatas.Instance.baseData.FBID + 1);
+ }
}
}
--
Gitblit v1.8.0