From fe40cc1ecea971a8794d99bdb8f4cb4e60ce5ba7 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 29 十二月 2018 18:15:32 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/snxxz_scripts
---
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs | 8 ++++++++
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs | 9 ++++++++-
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs | 9 ++++++++-
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs | 8 ++++++++
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs
index 8b345c8..44d0401 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs
@@ -9,6 +9,14 @@
{
base.Done(vNetPack);
+ if (GameNetSystem.Instance.crossServerSocketConnected)
+ {
+ if (vNetPack.socketType == GameNetSystem.SocketType.Main)
+ {
+ return;
+ }
+ }
+
H0406_tagNPCAppear vNetData = vNetPack as H0406_tagNPCAppear;
if (vNetData == null)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs
index 4c89209..4358c40 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs
@@ -8,9 +8,16 @@
public override void Done(GameNetPackBasic vNetPack)
{
-
base.Done(vNetPack);
+ if (GameNetSystem.Instance.crossServerSocketConnected)
+ {
+ if (vNetPack.socketType == GameNetSystem.SocketType.Main)
+ {
+ return;
+ }
+ }
+
H0408_tagPlayerSummonNPCAppear vNetData = vNetPack as H0408_tagPlayerSummonNPCAppear;
if (vNetData == null)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs
index ac47c3e..9e6bd85 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs
@@ -12,6 +12,14 @@
{
base.Done(vNetPack);
+ if (GameNetSystem.Instance.crossServerSocketConnected)
+ {
+ if (vNetPack.socketType == GameNetSystem.SocketType.Main)
+ {
+ return;
+ }
+ }
+
var vNetData = vNetPack as H0434_tagAreaPlayerAppearEx;
if (vNetData == null)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs
index c8215ad..081014e 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs
@@ -10,9 +10,16 @@
public override void Done(GameNetPackBasic vNetPack)
{
-
base.Done(vNetPack);
+ if (GameNetSystem.Instance.crossServerSocketConnected)
+ {
+ if (vNetPack.socketType == GameNetSystem.SocketType.Main)
+ {
+ return;
+ }
+ }
+
H0435_tagPetAppear vNetData = vNetPack as H0435_tagPetAppear;
if (vNetData == null)
--
Gitblit v1.8.0