From e1314bdc52b860e07801a614de7e5d2e7fc7346f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 11 八月 2018 14:23:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/SystemSetting/SettingEffectMgr.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index e03dbc5..be147ed 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -99,9 +99,9 @@
if (secondTimer > 1f)
{
- secondTimer = 0f;
- if (isGetNewItem)
+ if(isGetNewItem)
{
+ secondTimer = 0f;
delayTime -= 1;
if (delayTime <= 0)
{
@@ -161,6 +161,7 @@
return;
}
+ DealBagItem();
isGetNewItem = true;
}
@@ -173,7 +174,8 @@
{
if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour))
{
- if (playerPack.GetCanDevourModellist().Count > 0)
+ List<ItemModel> list = playerPack.GetCanDevourModellist();
+ if (list != null && list.Count > 0)
{
playerPack.SendEquipdevourQuest();
}
--
Gitblit v1.8.0