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
---
Fight/MapTransferUtility.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 1cfe48b..9d9ca65 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -38,7 +38,7 @@
public void Initialize()
{
- FuncConfigConfig _funcModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ConversationDistanc");
+ FuncConfigConfig _funcModel = Config.Instance.Get<FuncConfigConfig>("ConversationDistanc");
if (_funcModel != null)
{
conversationDistSqrt = float.Parse(_funcModel.Numerical1);
@@ -182,7 +182,7 @@
public void MoveToNPC(int npcID)
{
- NPCConfig _config = ConfigManager.Instance.GetTemplate<NPCConfig>(npcID);
+ NPCConfig _config = Config.Instance.Get<NPCConfig>(npcID);
if (_config == null)
{
@@ -247,7 +247,7 @@
GActor _npc = null;
// 鍔犲叆鍒ゆ柇鏄惁涓栫晫BOSS鍒ゆ柇
- WorldBossConfig _worldBoss = ConfigManager.Instance.GetTemplate<WorldBossConfig>(npcID);
+ WorldBossConfig _worldBoss = Config.Instance.Get<WorldBossConfig>(npcID);
bool _isWorldBoss = _worldBoss != null;
if (_isWorldBoss && _findLocation)
{
@@ -262,7 +262,7 @@
else
{
//Debug.LogFormat(" |-- 涓嶅湪瑙嗛噹鍐�");
- var _mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(_npcLocation.mapId);
+ var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);
// 濡傛灉涓嶆槸澶勪簬鐩稿悓鍦板浘, 鍒欏垏鍥�
if (_npcLocation.mapId != PlayerDatas.Instance.baseData.MapID)
@@ -379,7 +379,7 @@
return;
}
- var _curMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��
if (_curMapConfig.MapFBType != 0)
{
@@ -582,7 +582,7 @@
// 濡傛灉澶勪簬鐩稿悓鍦板浘涓旇窛绂诲皬浜庝竴瀹氱殑鍊�, 鍒欎笉浼犻��
if (mapId == PlayerDatas.Instance.baseData.MapID)
{
- FuncConfigConfig _func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("flyMinDistance");
+ FuncConfigConfig _func = Config.Instance.Get<FuncConfigConfig>("flyMinDistance");
if (_func != null)
{
float _distance = float.Parse(_func.Numerical1);
@@ -597,7 +597,7 @@
}
else
{
- var _curMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��(鏌愪簺鐗瑰畾鍦板浘鍙互杩涜浼犻�乑xw)
var mainModel = ModelCenter.Instance.GetModel<PlayerMainDate>();
int MapId = PlayerDatas.Instance.baseData.MapID;
@@ -661,7 +661,7 @@
// 濡傛灉澶勪簬鐩稿悓鍦板浘涓旇窛绂诲皬浜庝竴瀹氱殑鍊�, 鍒欎笉浼犻��
if (mapID == PlayerDatas.Instance.baseData.MapID && lineID == PlayerDatas.Instance.baseData.FBID)
{
- FuncConfigConfig _func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("flyMinDistance");
+ FuncConfigConfig _func = Config.Instance.Get<FuncConfigConfig>("flyMinDistance");
if (_func != null)
{
float _distance = float.Parse(_func.Numerical1);
@@ -676,7 +676,7 @@
}
else
{
- var _curMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��
if (_curMapConfig.MapFBType != 0)
@@ -793,7 +793,7 @@
}
// 鎵句笉鍒伴厤缃�, 涓嶅仛鍚庣画鎿嶄綔
- NPCConfig _npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(NpcID);
+ NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(NpcID);
if (_npcConfig == null)
{
Clear();
--
Gitblit v1.8.0