From 10c12a7df05dc78a3f595f6f55e47e86db4f50e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 30 八月 2018 18:00:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/GameActor/GAMgr.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Fight/GameActor/GAMgr.cs b/Fight/GameActor/GAMgr.cs
index 5cb1dda..cfd77c6 100644
--- a/Fight/GameActor/GAMgr.cs
+++ b/Fight/GameActor/GAMgr.cs
@@ -574,16 +574,6 @@
/// <param name="actor"></param>
public void Release(GActor actor)
{
- var _npcfight = actor as GActorNpcFight;
-
- if (_npcfight != null)
- {
- if (OnFightNpcRequest != null)
- {
- OnFightNpcRequest((uint)_npcfight.NpcConfig.NPCID);
- }
- }
-
#if UNITY_EDITOR
string _content = string.Format("GAMgr => 瀵硅鑹� SID: {0}, CID: {1} 杩涜浜嗗洖鏀�", actor.ServerInstID, actor.ClientInstID);
RuntimeLogUtility.AddLog_Green(_content, actor.ServerInstID);
@@ -653,6 +643,16 @@
m_Cid2GA.Remove(actor.ClientInstID);
}
+ var _npcfight = actor as GActorNpcFight;
+
+ if (_npcfight != null)
+ {
+ if (OnFightNpcRelease != null)
+ {
+ OnFightNpcRelease((uint)_npcfight.NpcConfig.NPCID);
+ }
+ }
+
if (_needReSyncPlayerCount)
{
OnPlayerSyncCountChange();
--
Gitblit v1.8.0