Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 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()