From 252d46b8642ad4ecebe1a8b9d3a0678913413ebf Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 14 十一月 2018 15:30:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/GameActor/GAMgr.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Fight/GameActor/GAMgr.cs b/Fight/GameActor/GAMgr.cs
index efa18c7..7e7c9ab 100644
--- a/Fight/GameActor/GAMgr.cs
+++ b/Fight/GameActor/GAMgr.cs
@@ -7,7 +7,7 @@
[XLua.LuaCallCSharp]
public class GAMgr : SingletonMonobehaviour<GAMgr>
-
+
{
private List<BossSkillTip_JudgeSummon> m_BossSkillTipList = new List<BossSkillTip_JudgeSummon>();
@@ -458,7 +458,7 @@
if (_actor != null)
{
- _actor.Init(serverInstID, m_ClientId.Request(), npcID, group, package);
+ _actor.Init(serverInstID, m_ClientId.Request(), group, package);
BuildManagerRelation(_actor, _actorClassType);
}
@@ -503,7 +503,7 @@
if (_actor != null)
{
- _actor.Init(serverInstID, m_ClientId.Request(), npcID, group, package);
+ _actor.Init(serverInstID, m_ClientId.Request(), group, package);
BuildManagerRelation(_actor, _actorClassType);
@@ -541,7 +541,7 @@
if (_actor != null)
{
- _actor.Init(serverInstID, m_ClientId.Request(), npcID, group, null);
+ _actor.Init(serverInstID, m_ClientId.Request(), group, null);
BuildManagerRelation(_actor, _actorClassType);
}
@@ -571,7 +571,7 @@
if (_actor != null)
{
- _actor.Init(serverInstID, m_ClientId.Request(), npcID, group, null);
+ _actor.Init(serverInstID, m_ClientId.Request(), group, null);
BuildManagerRelation(_actor, _actorClassType);
}
--
Gitblit v1.8.0