From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/WorldMap/MapModel.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 64c6e41..55db212 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -104,7 +104,7 @@
return;
}
- var currentMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var currentMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
if (currentMapConfig.MapFBType != 0)
{
SysNotifyMgr.Instance.ShowTip("DungeonNoGO");
@@ -125,7 +125,7 @@
return;
}
- var map = ConfigManager.Instance.GetTemplate<MapConfig>(_mapId);
+ var map = Config.Instance.Get<MapConfig>(_mapId);
var position = new Vector3(map.BornPoints[0].x, 0, map.BornPoints[0].y);
MapTransferUtility.Send_WorldTransfer(_mapId, position, MapTransferType.WorldTransport, (byte)_lineId, 0);
}
@@ -139,7 +139,7 @@
_hero.Behaviour.StopKillUntilDieAI();
}
- var mapNPCConfig = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(_eventPoint);
+ var mapNPCConfig = Config.Instance.Get<MapEventPointConfig>(_eventPoint);
MapTransferUtility.Instance.MissionFlyTo(wannaLookLocalMap, mapNPCConfig.NPCID);
}
@@ -162,7 +162,7 @@
public void RequestQueryMapLineState(int _mapId, int _lineId = 0, bool _isAllLine = true)
{
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(_mapId);
+ var config = Config.Instance.Get<MapConfig>(_mapId);
if (config.MapFBType == (int)MapType.OpenCountry)
{
var lineState = new CA003_tagPyGetLineState();
@@ -306,7 +306,7 @@
var eventPoints = new List<int>(GetMapEventPoints(_mapId));
for (int i = eventPoints.Count - 1; i >= 0; i--)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPoints[i]);
+ var config = Config.Instance.Get<MapEventPointConfig>(eventPoints[i]);
if (config.IsShowInfo == 0)
{
eventPoints.RemoveAt(i);
@@ -315,8 +315,8 @@
eventPoints.Sort((int a, int b) =>
{
- var configA = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(a);
- var configB = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(b);
+ var configA = Config.Instance.Get<MapEventPointConfig>(a);
+ var configB = Config.Instance.Get<MapEventPointConfig>(b);
return configA.LowLV < configB.LowLV ? -1 : 1;
});
@@ -325,7 +325,7 @@
var levelMatchPointIndex = 0;
for (int i = eventPoints.Count - 1; i >= 0; i--)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPoints[i]);
+ var config = Config.Instance.Get<MapEventPointConfig>(eventPoints[i]);
if (playerLevel >= config.LowLV)
{
levelMatchPointIndex = i;
@@ -351,7 +351,7 @@
recommendPoint = eventPointsPool[eventPointsPool.Count - 1];
for (int i = 0; i < eventPointsPool.Count; i++)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPointsPool[i]);
+ var config = Config.Instance.Get<MapEventPointConfig>(eventPointsPool[i]);
if (PlayerDatas.Instance.extersion.DEF >= config.Defense)
{
recommendPoint = eventPointsPool[i];
@@ -361,14 +361,14 @@
}
else
{
- var lowest = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPoints[0]);
+ var lowest = Config.Instance.Get<MapEventPointConfig>(eventPoints[0]);
if (playerLevel < lowest.LowLV)
{
recommendPoint = lowest.Key;
}
else
{
- var hightest = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPoints[eventPoints.Count - 1]);
+ var hightest = Config.Instance.Get<MapEventPointConfig>(eventPoints[eventPoints.Count - 1]);
recommendPoint = hightest.Key;
}
}
@@ -382,7 +382,7 @@
for (int i = 0; i < sortedHangUpPoints.Count; i++)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(sortedHangUpPoints[i]);
+ var config = Config.Instance.Get<MapEventPointConfig>(sortedHangUpPoints[i]);
if (IsMapUnLocked(config.MapID))
{
unLockedHangeUpPoints.Add(sortedHangUpPoints[i]);
@@ -394,7 +394,7 @@
var levelMatchPointIndex = 0;
for (int i = unLockedHangeUpPoints.Count - 1; i >= 0; i--)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(unLockedHangeUpPoints[i]);
+ var config = Config.Instance.Get<MapEventPointConfig>(unLockedHangeUpPoints[i]);
if (playerLevel >= config.LowLV)
{
levelMatchPointIndex = i;
@@ -419,7 +419,7 @@
recommendPoint = eventPointsPool[eventPointsPool.Count - 1];
for (int i = 0; i < eventPointsPool.Count; i++)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPointsPool[i]);
+ var config = Config.Instance.Get<MapEventPointConfig>(eventPointsPool[i]);
if (PlayerDatas.Instance.extersion.DEF >= config.Defense)
{
recommendPoint = eventPointsPool[i];
@@ -429,7 +429,7 @@
}
else
{
- var lowest = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(unLockedHangeUpPoints[0]);
+ var lowest = Config.Instance.Get<MapEventPointConfig>(unLockedHangeUpPoints[0]);
if (playerLevel < lowest.LowLV)
{
recommendPoint = lowest.Key;
@@ -437,7 +437,7 @@
else
{
var count = unLockedHangeUpPoints.Count;
- var hightest = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(unLockedHangeUpPoints[count - 1]);
+ var hightest = Config.Instance.Get<MapEventPointConfig>(unLockedHangeUpPoints[count - 1]);
recommendPoint = hightest.Key;
}
}
@@ -478,7 +478,7 @@
private bool CheckMapUnLocked(int _mapId)
{
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(_mapId);
+ var config = Config.Instance.Get<MapConfig>(_mapId);
var playerLevel = PlayerDatas.Instance.baseData.LV;
if (playerLevel >= config.LV)
@@ -527,7 +527,7 @@
private void ParseWorldMaps()
{
- var mapConfigs = ConfigManager.Instance.GetAllValues<MapConfig>();
+ var mapConfigs = Config.Instance.GetAllValues<MapConfig>();
foreach (var mapConfig in mapConfigs)
{
if (mapConfig.MapFBType == 0)
@@ -540,8 +540,8 @@
sortedMaps.Sort(
(int a, int b) =>
{
- var configA = ConfigManager.Instance.GetTemplate<MapConfig>(a);
- var configB = ConfigManager.Instance.GetTemplate<MapConfig>(b);
+ var configA = Config.Instance.Get<MapConfig>(a);
+ var configB = Config.Instance.Get<MapConfig>(b);
return configA.LV > configB.LV ? -1 : 1;
}
@@ -550,7 +550,7 @@
private void ParseLocalMaps()
{
- var mapEventConfigs = ConfigManager.Instance.GetAllValues<MapEventPointConfig>();
+ var mapEventConfigs = Config.Instance.GetAllValues<MapEventPointConfig>();
foreach (var config in mapEventConfigs)
{
var mapId = config.MapID;
@@ -574,8 +574,8 @@
sortedMapEventPoints.Sort((int a, int b) =>
{
- var configA = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(a);
- var configB = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(b);
+ var configA = Config.Instance.Get<MapEventPointConfig>(a);
+ var configB = Config.Instance.Get<MapEventPointConfig>(b);
return configA.LowLV < configB.LowLV ? -1 : 1;
});
@@ -583,14 +583,14 @@
for (int i = 0; i < sortedMapEventPoints.Count; i++)
{
var eventPoint = sortedMapEventPoints[i];
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPoint);
+ var config = Config.Instance.Get<MapEventPointConfig>(eventPoint);
if (GeneralConfig.Instance.autoOnHookMap.Contains(config.MapID))
{
sortedHangUpPoints.Add(eventPoint);
}
}
- var mapNpcConfigs = ConfigManager.Instance.GetAllValues<mapnpcConfig>();
+ var mapNpcConfigs = Config.Instance.GetAllValues<mapnpcConfig>();
foreach (var config in mapNpcConfigs)
{
var mapId = config.MapID;
--
Gitblit v1.8.0