From b5651b96bb1bfd53341af7fbe4cb46db54dee58c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 27 十二月 2018 14:40:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/PlayerDead/PlayerDeadModel.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/System/PlayerDead/PlayerDeadModel.cs b/System/PlayerDead/PlayerDeadModel.cs
index 9af0fd6..e49612c 100644
--- a/System/PlayerDead/PlayerDeadModel.cs
+++ b/System/PlayerDead/PlayerDeadModel.cs
@@ -34,7 +34,6 @@
isOpenPrompting = true;
this.deadCD = 0;
localBossState = false;
- playerIsDie = false;
}
public void OnPlayerLoginOk()
@@ -68,7 +67,17 @@
public bool isBossKill = false;
public float duplicatesRebornTime = 0;
private Dictionary<int, int> duplicatesRebornDict;
- public bool playerIsDie { get; private set; }
+ public bool playerIsDie
+ {
+ get {
+
+ if(PlayerDatas.Instance.hero != null)
+ {
+ return PlayerDatas.Instance.hero.ActorInfo.serverDie;
+ }
+ return false;
+ }
+ }
DungeonModel _dungeonModel;
DungeonModel dungeonModel {
@@ -166,7 +175,6 @@
{
return;
}
- playerIsDie = true;
_tagMapModel = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
if (_tagMapModel.MapFBType == 0)
{
@@ -279,7 +287,6 @@
localBossState = false;
this.deadCD = 0;
isKillByPlayer = false;
- playerIsDie = false;
TimeDownMgr.Instance.Stop(TimeDownMgr.CoolTimeType.DeadCD);
TimeDownMgr.Instance.Stop(TimeDownMgr.CoolTimeType.BossAutoReborn);
TimeDownMgr.Instance.Stop(TimeDownMgr.CoolTimeType.DuplicatesReborn);
--
Gitblit v1.8.0