Merge branch 'master' of http://mobile.173on.com:10010/r/snxxz_scripts

client_Wu Xijin

2018-12-29 fe40cc1ecea971a8794d99bdb8f4cb4e60ce5ba7

Merge branch 'master' of http://mobile.173on.com:10010/r/snxxz_scripts

 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)


 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)

 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)


 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)