From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 Fight/GameActor/GAMgr.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Fight/GameActor/GAMgr.cs b/Fight/GameActor/GAMgr.cs
index 1072535..ef79311 100644
--- a/Fight/GameActor/GAMgr.cs
+++ b/Fight/GameActor/GAMgr.cs
@@ -12,6 +12,8 @@
     public Dictionary<int, string> s_NpcID2BundleName = new Dictionary<int, string>();
     public Dictionary<int, string> s_NpcID2Assetname = new Dictionary<int, string>();
 
+
+
     public event UnityAction<uint> OnGActorRequest;
     public event UnityAction<uint> OnGActorServerDie;
 
@@ -923,6 +925,8 @@
         }
 
         UpdateOffLinePlayer();
+
+        BattleEffectPlayRule.Instance.Update();
     }
 
     public void DoLateUpdate()

--
Gitblit v1.8.0