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/PlayerDead/PlayerDeadModel.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/PlayerDead/PlayerDeadModel.cs b/System/PlayerDead/PlayerDeadModel.cs
index bb485de..66f3f71 100644
--- a/System/PlayerDead/PlayerDeadModel.cs
+++ b/System/PlayerDead/PlayerDeadModel.cs
@@ -10,7 +10,7 @@
public int[]dungeonKillArray { get; private set; }
public override void Init()
{
- FuncConfigConfig funcConfig = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RebornArguments");
+ FuncConfigConfig funcConfig = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
dungeonKillArray = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2);
SysNotifyMgr.Instance.sysNotifyEvent += RefreshPlayerDieInfo;
}
@@ -94,7 +94,7 @@
case "GeRen_chenxin_279029":
if(infolist.Count > 0)
{
- NPCConfig nPCConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(int.Parse(infolist[0].ToString()));
+ NPCConfig nPCConfig = Config.Instance.Get<NPCConfig>(int.Parse(infolist[0].ToString()));
if(nPCConfig != null)
{
killerName = nPCConfig.charName;
@@ -124,11 +124,11 @@
localBossState = PlayerDatas.Instance.extersion.bossState;
playerIsDie = true;
- _tagMapModel = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ _tagMapModel = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
if (_tagMapModel.MapFBType == 0)
{
IsCanReborn = true;
- _tagfuncModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RebornArguments");
+ _tagfuncModel = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
RebornConditions = ConfigParse.GetMultipleStr<int>(_tagfuncModel.Numerical1);
rebornTiredNum = RebornConditions[0];
rebornPrice = RebornConditions[2];
@@ -146,14 +146,14 @@
}
else
{
- _dungeonOpenTimeModel = ConfigManager.Instance.GetTemplate<DungeonOpenTimeConfig>(dungeonModel.GetDungeonDataIdByMapId(PlayerDatas.Instance.baseData.MapID));
+ _dungeonOpenTimeModel = Config.Instance.Get<DungeonOpenTimeConfig>(dungeonModel.GetDungeonDataIdByMapId(PlayerDatas.Instance.baseData.MapID));
if (_dungeonOpenTimeModel == null)
return;
if (_dungeonOpenTimeModel.DeathTime == 1)
{
IsCanReborn = true;
- _tagfuncModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("DuplicatesRebornTime");
+ _tagfuncModel = Config.Instance.Get<FuncConfigConfig>("DuplicatesRebornTime");
duplicatesRebornDict = ConfigParse.GetDic<int, int>(_tagfuncModel.Numerical1);
if (!duplicatesRebornDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
{
@@ -220,7 +220,7 @@
if (data.DeadTime == 0)
return;
- _tagfuncModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RebornArguments");
+ _tagfuncModel = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
RebornConditions = ConfigParse.GetMultipleStr<int>(_tagfuncModel.Numerical1);
double timeOffest = GetTimeOffest(TimeUtility.GetTime(data.DeadTime));
if (timeOffest <= RebornConditions[1])
@@ -295,7 +295,7 @@
private bool isOpenPrompting = true;
public void InpacleReborn()
{
- ItemConfig itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(2107);
+ ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(2107);
if (isOpenPrompting)
{
ConfirmCancel.IconConfirmCancel(Language.Get("Mail101"), Language.Get("PlayerReborn102", itemConfig.ItemName), itemConfig.ID,
--
Gitblit v1.8.0