From 5fad96c186ea82bf6aa105824023fc1077ce64cd Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 16 二月 2019 16:25:46 +0800
Subject: [PATCH] 6197 【前端】【1.6】跨服匹配添加机器人
---
Fight/Actor/State/SMB/STM_BaseAttack.cs | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/Fight/Actor/State/SMB/STM_BaseAttack.cs b/Fight/Actor/State/SMB/STM_BaseAttack.cs
index 5f6dd41..37110f3 100644
--- a/Fight/Actor/State/SMB/STM_BaseAttack.cs
+++ b/Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -723,29 +723,37 @@
if (m_NpcPosList.Count > 0)
{
- CB402_tagCMNPCBeatBack _beatBack = new CB402_tagCMNPCBeatBack();
- _beatBack.ObjType = (byte)GameObjType.gotNPC;
- _beatBack.Count = (byte)m_NpcPosList.Count;
- _beatBack.NPCPosList = new CB402_tagCMNPCBeatBack.tagCMNPCPos[_beatBack.Count];
-
- for (int i = 0; i < _beatBack.Count; ++i)
+ if (!ClientDungeonStageUtility.isClientDungeon
+#if UNITY_EDITOR
+ && !RuntimeLogUtility.TEST_CLIENT_PVP
+#endif
+ )
{
- _beatBack.NPCPosList[i] = new CB402_tagCMNPCBeatBack.tagCMNPCPos
+ CB402_tagCMNPCBeatBack _beatBack = new CB402_tagCMNPCBeatBack();
+ _beatBack.ObjType = (byte)GameObjType.gotNPC;
+ _beatBack.Count = (byte)m_NpcPosList.Count;
+ _beatBack.NPCPosList = new CB402_tagCMNPCBeatBack.tagCMNPCPos[_beatBack.Count];
+
+ for (int i = 0; i < _beatBack.Count; ++i)
{
- ObjID = (uint)m_NpcPosList[i].objId,
- PosX = (ushort)(m_NpcPosList[i].posX + GA_Hero.MapOffset.x),
- PosY = (ushort)(m_NpcPosList[i].posY + GA_Hero.MapOffset.z)
- };
+ _beatBack.NPCPosList[i] = new CB402_tagCMNPCBeatBack.tagCMNPCPos
+ {
+ ObjID = (uint)m_NpcPosList[i].objId,
+ PosX = (ushort)(m_NpcPosList[i].posX + GA_Hero.MapOffset.x),
+ PosY = (ushort)(m_NpcPosList[i].posY + GA_Hero.MapOffset.z)
+ };
+ }
+
+ if (!CrossServerUtility.IsCrossServer())
+ {
+ GameNetSystem.Instance.SendInfo(_beatBack);
+ }
+ else
+ {
+ GameNetSystem.Instance.SendToCrossServer(_beatBack);
+ }
}
- if (!CrossServerUtility.IsCrossServer())
- {
- GameNetSystem.Instance.SendInfo(_beatBack);
- }
- else
- {
- GameNetSystem.Instance.SendToCrossServer(_beatBack);
- }
}
}
@@ -1044,6 +1052,15 @@
return;
}
+ if (ClientDungeonStageUtility.isClientDungeon
+#if UNITY_EDITOR
+ || RuntimeLogUtility.TEST_CLIENT_PVP
+#endif
+ )
+ {
+ return;
+ }
+
if (_fight.ServerInstID == PlayerDatas.Instance.PlayerId)
{
if (PreFightMission.Instance.IsFinished())
--
Gitblit v1.8.0