From d9d49b04ccb42ce2559a41f83c4d9289adf2bd27 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 28 十二月 2018 21:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/SystemSetting/SettingEffectMgr.cs | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 7773a06..7aebb14 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -51,8 +51,6 @@
}
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
- public bool isPlayerDie { get; private set; }
-
private float delayTime = 2f;
private bool isGetNewItem = false;
public bool isStartDecompose { get; set; }
@@ -61,7 +59,6 @@
private void Awake()
{
isGetNewItem = false;
- isPlayerDie = false;
delayTime = 2;
HeroBehaviour.OnStartHandupAI -= OnStartHandupAI;
HeroBehaviour.OnStopHandupAI -= OnStopHandupAI;
@@ -102,7 +99,7 @@
if(halfSecondTimer >= 0.5f)
{
halfSecondTimer = 0f;
- if (!isPlayerDie)
+ if (!DeadModel.playerIsDie)
{
bool isCool;
KnapsackTimeCDMgr.Instance.GetItemCoolByCDType(1, out isCool);
@@ -143,7 +140,6 @@
private void PlayerRebornSuccess()
{
- isPlayerDie = false;
StopAllCoroutines();
}
@@ -229,8 +225,7 @@
/// </summary>
private void AutoDrugSetting()
{
- int dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
- if (dataMapId == CrossServerOneVsOneModel.CrossServerDataMapId) return;
+ if (PlayerDatas.Instance.baseData.ExAttr5 == 1) return;
float hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100);
if (hpPercent <= HangUpSetModel.Instance.GetHpSet())
@@ -273,13 +268,6 @@
private int rebornPrice;
private void OnPlayerDie()
{
- if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
- {
- WindowCenter.Instance.Close<FunctionForecastWin>();
- }
- isPlayerDie = true;
-
-
if (!_isAutoHangUp || !HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoReborn)
|| !DeadModel.IsCanReborn || IsDungeon())
return;
--
Gitblit v1.8.0