From 2df58aeacbf1177ec01167bdeccfe89d6a8d5804 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 13 二月 2019 14:20:28 +0800
Subject: [PATCH] 3335 配置表读取重构,修改配置表读取接口1
---
Fight/MapTransferUtility.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index a56fc3c..7f2f65f 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -36,7 +36,7 @@
public void Initialize()
{
- FuncConfigConfig _funcModel = Config.Instance.Get<FuncConfigConfig>("ConversationDistanc");
+ FuncConfigConfig _funcModel = FuncConfigConfig.Get("ConversationDistanc");
if (_funcModel != null)
{
conversationDistSqrt = float.Parse(_funcModel.Numerical1);
@@ -200,7 +200,7 @@
}
}
- NPCConfig _config = Config.Instance.Get<NPCConfig>(npcID);
+ NPCConfig _config = NPCConfig.Get(npcID);
if (_config == null)
{
@@ -270,7 +270,7 @@
if (_findLocation)
{
- var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);
+ var _mapConfig = MapConfig.Get(_npcLocation.mapId);
// 涓珛鍦板浘
if (_mapConfig.Camp == 5 && (isWorldBoss || isDogzBoss || isCrossServerBoss))
{
@@ -317,7 +317,7 @@
else
{
//Debug.LogFormat(" |-- 涓嶅湪瑙嗛噹鍐�");
- var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);
+ var _mapConfig = MapConfig.Get(_npcLocation.mapId);
var _lineID = 0;
var _forceTransfer = false;
@@ -478,7 +478,7 @@
return;
}
- var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var _curMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��
if (_curMapConfig.MapFBType != 0)
{
@@ -504,7 +504,7 @@
{
GA_Hero _hero = PlayerDatas.Instance.hero;
- NPCConfig _config = Config.Instance.Get<NPCConfig>(npcID);
+ NPCConfig _config = NPCConfig.Get(npcID);
// 鐩爣鐐�, 榛樿涓轰富瑙掑潗鏍�, 鎵句笉鍒颁换鍔$粓鐐圭殑鏃跺�欎笉绉诲姩
Vector3 _destPos = _hero.Pos;
@@ -680,7 +680,7 @@
// 濡傛灉澶勪簬鐩稿悓鍦板浘涓旇窛绂诲皬浜庝竴瀹氱殑鍊�, 鍒欎笉浼犻��
if (mapId == PlayerDatas.Instance.baseData.MapID)
{
- FuncConfigConfig _func = Config.Instance.Get<FuncConfigConfig>("flyMinDistance");
+ FuncConfigConfig _func = FuncConfigConfig.Get("flyMinDistance");
if (_func != null)
{
float _distance = float.Parse(_func.Numerical1);
@@ -695,7 +695,7 @@
}
else
{
- var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var _curMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��(鏌愪簺鐗瑰畾鍦板浘鍙互杩涜浼犻�乑xw)
var mainModel = ModelCenter.Instance.GetModel<PlayerMainDate>();
int MapId = PlayerDatas.Instance.baseData.MapID;
@@ -750,7 +750,7 @@
// 濡傛灉澶勪簬鐩稿悓鍦板浘涓旇窛绂诲皬浜庝竴瀹氱殑鍊�, 鍒欎笉浼犻��
if (mapID == PlayerDatas.Instance.baseData.MapID && lineID == PlayerDatas.Instance.baseData.FBID)
{
- FuncConfigConfig _func = Config.Instance.Get<FuncConfigConfig>("flyMinDistance");
+ FuncConfigConfig _func = FuncConfigConfig.Get("flyMinDistance");
if (_func != null)
{
float _distance = float.Parse(_func.Numerical1);
@@ -765,7 +765,7 @@
}
else
{
- var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var _curMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��
if (_curMapConfig.MapFBType != 0)
@@ -841,7 +841,7 @@
// return;
//}
- //NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(NpcID);
+ //NPCConfig _npcConfig = NPCConfig.Get(NpcID);
//if (_npcConfig == null)
//{
// return;
@@ -883,7 +883,7 @@
}
// 鎵句笉鍒伴厤缃�, 涓嶅仛鍚庣画鎿嶄綔
- NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(NpcID);
+ NPCConfig _npcConfig = NPCConfig.Get(NpcID);
if (_npcConfig == null)
{
Clear();
--
Gitblit v1.8.0