From a4cc7c497333356c340a08debcbc7c240145708f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 29 八月 2018 15:43:41 +0800
Subject: [PATCH] 2960 抢Boss活动(修改线路id判断)
---
System/WorldMap/LocalMapWin.cs | 12 ++++++------
System/WorldMap/MapLineBehaviour.cs | 2 +-
System/WorldMap/MapModel.cs | 18 ------------------
Fight/MapTransferUtility.cs | 5 +++--
System/FairyAu/FairyGrabBossModel.cs | 4 ++--
System/GeneralConfig/GeneralConfig.cs | 6 ++++++
6 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 3ca33d1..539c2ff 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -278,9 +278,10 @@
{
//Debug.LogFormat(" |-- 杩欐槸涓�鍙椿鍔╞oss");
// 鍙栧緱鍒嗙嚎
- if (GeneralConfig.Instance.fairyGrabBossMapLines != null
- && GeneralConfig.Instance.fairyGrabBossMapLines.TryGetValue(_npcLocation.mapId, out _lineID))
+ if (GeneralConfig.Instance.fairyGrabBossMapLines != null)
{
+ _lineID = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(_npcLocation.mapId) ?
+ GeneralConfig.Instance.fairyGrabBossMapLines[_npcLocation.mapId] : 0;
// 濡傛灉褰撳墠澶勪簬涓嶅悓鐨勫垎绾�, 鍒欎笅闈㈢殑澶勭悊涓�,鍦板浘ID鐩稿悓涔熷垏绾�
if (_lineID != PlayerDatas.Instance.baseData.FBID)
{
diff --git a/System/FairyAu/FairyGrabBossModel.cs b/System/FairyAu/FairyGrabBossModel.cs
index b47035d..145c28f 100644
--- a/System/FairyAu/FairyGrabBossModel.cs
+++ b/System/FairyAu/FairyGrabBossModel.cs
@@ -163,8 +163,8 @@
}
var mapId = PlayerDatas.Instance.baseData.MapID;
var grabBossLine = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(mapId) ?
- GeneralConfig.Instance.fairyGrabBossMapLines[mapId] : 1;
- if (PlayerDatas.Instance.baseData.FBID != grabBossLine - 1)
+ GeneralConfig.Instance.fairyGrabBossMapLines[mapId] : 0;
+ if (PlayerDatas.Instance.baseData.FBID != grabBossLine)
{
CloseGrabBossHint();
return;
diff --git a/System/GeneralConfig/GeneralConfig.cs b/System/GeneralConfig/GeneralConfig.cs
index bde4249..c020688 100644
--- a/System/GeneralConfig/GeneralConfig.cs
+++ b/System/GeneralConfig/GeneralConfig.cs
@@ -4,6 +4,7 @@
using TableConfig;
using System;
using System.Text.RegularExpressions;
+using System.Linq;
public class GeneralConfig : Singleton<GeneralConfig>
{
@@ -437,6 +438,11 @@
dungeonRebornClientTimes = ConfigParse.GetDic<int, int>(GetInputString("DuplicatesRebornTime", 2));
fairyGrabBossMapLines = ConfigParse.GetDic<int, int>(GetInputString("MapLine", 2));
+ var grabBossMaps = fairyGrabBossMapLines.Keys.ToList();
+ foreach (var _key in grabBossMaps)
+ {
+ fairyGrabBossMapLines[_key] = fairyGrabBossMapLines[_key] - 1;
+ }
}
catch (Exception ex)
{
diff --git a/System/WorldMap/LocalMapWin.cs b/System/WorldMap/LocalMapWin.cs
index f64a138..d29c1ff 100644
--- a/System/WorldMap/LocalMapWin.cs
+++ b/System/WorldMap/LocalMapWin.cs
@@ -92,17 +92,17 @@
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
{
- var grabBossLine = 0;
- fairyGrabBossModel.TryGetFairyGrabBossLine(out grabBossLine);
- if (grabBossLine != 0 && PlayerDatas.Instance.baseData.FBID + 1 == grabBossLine)
+ if (BossFakeLineUtility.Instance.showFakeLine)
{
- m_CurrentLine.text = Language.Get("FairyGrabBossLine");
+ m_CurrentLine.text = Language.Get("line", 1);
}
else
{
diff --git a/System/WorldMap/MapLineBehaviour.cs b/System/WorldMap/MapLineBehaviour.cs
index 4399d84..bfac959 100644
--- a/System/WorldMap/MapLineBehaviour.cs
+++ b/System/WorldMap/MapLineBehaviour.cs
@@ -26,7 +26,7 @@
line = (MapLine)_data;
var grabBossLine = 0;
- if (fairyGrabBossModel.TryGetFairyGrabBossLine(out grabBossLine) && line.lineIndex == grabBossLine)
+ if (fairyGrabBossModel.TryGetFairyGrabBossLine(out grabBossLine) && line.lineIndex == grabBossLine + 1)
{
m_Title.text = Language.Get("FairyGrabBossLine");
}
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 4d9e41b..5118ce7 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -187,29 +187,11 @@
{
if (mapLines.ContainsKey(_mapId))
{
- //List<MapLine> _mapLines = new List<MapLine>(mapLines[_mapId]);
- //CheckSpecialLines(_mapLines);
return mapLines[_mapId];
}
else
{
return null;
- }
- }
-
- void CheckSpecialLines(List<MapLine> list)
- {
- var lineId = 0;
- if (fairyGrabBossModel.TryGetFairyGrabBossLine(out lineId) && !fairyGrabBossModel.InActivityTime)
- {
- var index = list.FindIndex((x) =>
- {
- return x.lineIndex == lineId;
- });
- if (index != -1)
- {
- list.RemoveAt(index);
- }
}
}
--
Gitblit v1.8.0