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/MainInterfacePanel/MainInterfaceWin.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 538a84c..61887b6 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -139,7 +139,7 @@
#region Built-in
protected override void BindController()
{
- switcherTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1);
+ switcherTime = int.Parse(Config.Instance.Get<FuncConfigConfig>("AutomaticSwitch").Numerical1);
recordPositionBool = true;
m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
// m_LowSettingTipGroup.localPosition = m_position2_L.localPosition;
@@ -152,7 +152,7 @@
LeftImage.SetActive(true);
RightImg.SetActive(false);
ListBossMapId.Clear();
- string strBoss = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskRetract").Numerical1;
+ string strBoss = Config.Instance.Get<FuncConfigConfig>("TaskRetract").Numerical1;
string[] bossList = ConfigParse.GetMultipleStr(strBoss);//瑙ｆ瀽鍑烘暟缁剕
for (int i = 0; i < bossList.Length; i++)
{
@@ -468,7 +468,7 @@
{
WindowCenter.Instance.Open<NeutralMarkWin>();
int mapID = PlayerDatas.Instance.baseData.MapID;
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(mapID);
+ var config = Config.Instance.Get<MapConfig>(mapID);
int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
if (atkInt.Length > 1 && Buffmodel.PkType != 5)
{
@@ -864,7 +864,7 @@
void ArticleExperience()//鍏充簬缁忛獙鏉�
{
int NowLv = (int)PlayerDatas.Instance.baseData.LV;
- if (ConfigManager.Instance.GetTemplate<PlayerLVConfig>(NowLv) != null)
+ if (Config.Instance.Get<PlayerLVConfig>(NowLv) != null)
{
ulong maxValue = (ulong)PlayerLVConfig.GetExpByPlayerLv(NowLv);
ulong nowVlaue = (ulong)PlayerDatas.Instance.baseData.TotalExp + (ulong)PlayerDatas.Instance.baseData.ExpPoint * 100000000;
@@ -945,7 +945,7 @@
private bool IsDungeon()
{
var mapId = PlayerDatas.Instance.baseData.MapID;
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ var mapConfig = Config.Instance.Get<MapConfig>(mapId);
return mapConfig != null && mapConfig.MapFBType != 0;
}
@@ -1016,7 +1016,7 @@
recordPositionBool = true;
_MarkRay.gameObject.SetActive(false);
}
- var _cfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);
+ var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
if (_skillId != 0)
{
--
Gitblit v1.8.0