From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/PlayerDead/PlayerDeadModel.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/System/PlayerDead/PlayerDeadModel.cs b/System/PlayerDead/PlayerDeadModel.cs
index 66f3f71..3d5520e 100644
--- a/System/PlayerDead/PlayerDeadModel.cs
+++ b/System/PlayerDead/PlayerDeadModel.cs
@@ -12,6 +12,9 @@
{
FuncConfigConfig funcConfig = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
dungeonKillArray = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2);
+ RebornConditions = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1);
+ FuncConfigConfig RebornTime = Config.Instance.Get<FuncConfigConfig>("DuplicatesRebornTime");
+ duplicatesRebornDict = ConfigParse.GetDic<int, int>(RebornTime.Numerical1);
SysNotifyMgr.Instance.sysNotifyEvent += RefreshPlayerDieInfo;
}
@@ -128,8 +131,6 @@
if (_tagMapModel.MapFBType == 0)
{
IsCanReborn = true;
- _tagfuncModel = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
- RebornConditions = ConfigParse.GetMultipleStr<int>(_tagfuncModel.Numerical1);
rebornTiredNum = RebornConditions[0];
rebornPrice = RebornConditions[2];
//isBossKill = StatusManager.Instance.IsExist((int)playerId,20022);
@@ -153,8 +154,6 @@
if (_dungeonOpenTimeModel.DeathTime == 1)
{
IsCanReborn = true;
- _tagfuncModel = Config.Instance.Get<FuncConfigConfig>("DuplicatesRebornTime");
- duplicatesRebornDict = ConfigParse.GetDic<int, int>(_tagfuncModel.Numerical1);
if (!duplicatesRebornDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
{
this.duplicatesRebornTime = duplicatesRebornDict[0];
@@ -216,12 +215,9 @@
public void RefreshDeadModel(HB103_tagMCPlayerDeadTime data)
{
-
if (data.DeadTime == 0)
return;
- _tagfuncModel = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
- RebornConditions = ConfigParse.GetMultipleStr<int>(_tagfuncModel.Numerical1);
double timeOffest = GetTimeOffest(TimeUtility.GetTime(data.DeadTime));
if (timeOffest <= RebornConditions[1])
{
@@ -250,6 +246,7 @@
WindowCenter.Instance.CloseImmediately<RebornWin>();
WindowCenter.Instance.CloseImmediately<ReliveWin>();
WindowCenter.Instance.CloseImmediately<RebornTiredWin>();
+ WindowCenter.Instance.CloseImmediately<ElderGodAreaRebornWin>();
if (CloseRebornWinEvent != null)
{
--
Gitblit v1.8.0