From dd74fd907cbd90b0476e5078deecf6ee45e0d3cd Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 25 四月 2019 10:35:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/ClientCollectUtility.cs | 8 +++-----
System/HazyRegion/ClientHazyGrassStage.cs | 10 +++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Fight/ClientCollectUtility.cs b/Fight/ClientCollectUtility.cs
index fc31d6b..ded547b 100644
--- a/Fight/ClientCollectUtility.cs
+++ b/Fight/ClientCollectUtility.cs
@@ -255,12 +255,10 @@
GAMgr.Instance.Release(_npc);
}
- else
+
+ if (OnCollectFinished != null)
{
- if (OnCollectFinished != null)
- {
- OnCollectFinished(m_CurrentSID);
- }
+ OnCollectFinished(m_CurrentSID);
}
}
}
diff --git a/System/HazyRegion/ClientHazyGrassStage.cs b/System/HazyRegion/ClientHazyGrassStage.cs
index f0fed20..454bb5a 100644
--- a/System/HazyRegion/ClientHazyGrassStage.cs
+++ b/System/HazyRegion/ClientHazyGrassStage.cs
@@ -1,7 +1,7 @@
锘縰sing Snxxz.UI;
using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
using UnityEngine;
public class ClientHazyGrassStage : DungeonStage
{
@@ -50,7 +50,7 @@
UnloadAllNpc();
- GA_NpcClientCollect.OnCollectFinished += OnCollectFinished;
+ ClientCollectUtility.OnCollectFinished += OnCollectFinished;
}
protected override void OnStageLoadFinish()
@@ -90,7 +90,7 @@
UnloadAllNpc();
- GA_NpcClientCollect.OnCollectFinished -= OnCollectFinished;
+ ClientCollectUtility.OnCollectFinished -= OnCollectFinished;
}
int GetNpcRefreshCount(HazyGrassNpcInfo npcInfo)
@@ -257,4 +257,4 @@
}
#endif
}
-
+
--
Gitblit v1.8.0