From 31463848256bb0ea493bbd0d5d4f506e849fdaf9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 21:21:46 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/SystemSetting/SettingEffectMgr.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 99cc692..7773a06 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -9,7 +9,7 @@
[XLua.LuaCallCSharp]
public class SettingEffectMgr : SingletonMonobehaviour<SettingEffectMgr>
-
+
{
private bool _isAutoHangUp = false;
private ItemConfig _tagItemModel;
@@ -49,6 +49,7 @@
{
get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }
}
+ DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
public bool isPlayerDie { get; private set; }
@@ -228,6 +229,8 @@
/// </summary>
private void AutoDrugSetting()
{
+ int dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
+ if (dataMapId == CrossServerOneVsOneModel.CrossServerDataMapId) return;
float hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100);
if (hpPercent <= HangUpSetModel.Instance.GetHpSet())
--
Gitblit v1.8.0