snxxz_scripts.git

parent: 6e59d861 | 补丁 | 提交 | ignore whitespace

client_Wu Xijin

2018-12-14 2adf9f32a1e56c00685dc1e633b8e6fae99c8dde

5398 【前端】【1.4】跨服竞技场开发

4个文件已修改

	Core/GameEngine/DataToCtl/PackageRegedit.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/NetworkPackage/NetPkgCtl.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/NetworkPackage/Socket/ClientSocket.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -462,7 +462,7 @@
    /// </summary>

    /// <param name="vBytes"></param>

    /// <returns></returns>

    public static GameNetPackBasic TransPack(ushort cmd, byte[] vBytes)

    public static GameNetPackBasic TransPack(GameNetSystem.SocketType socketType, ushort cmd, byte[] vBytes)

    {

#if UNITY_EDITOR

        int length = vBytes.Length;

@@ -487,14 +487,14 @@
            }



#if UNITY_EDITOR

            NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, packageInstance.ToString(), FieldPrint.PrintFields(packageInstance), FieldPrint.PrintFieldsExpand(packageInstance, true));

            NetPkgCtl.AddNetPkg(socketType, vStr, NetPkgType.Server, packageInstance.ToString(), FieldPrint.PrintFields(packageInstance), FieldPrint.PrintFieldsExpand(packageInstance, true));

#endif

            return packageInstance;

        }

        else

        {

#if UNITY_EDITOR

            NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, string.Empty, string.Empty, null);

            NetPkgCtl.AddNetPkg(socketType, vStr, NetPkgType.Server, string.Empty, string.Empty, null);

#endif

        }

        return null;


 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs

@@ -23,8 +23,8 @@
        //修改技能快捷设置发包顺序

        PlayerDatas.Instance.skill.CheckQuickSet();



        if (StageManager.Instance.StageType == Stage.E_StageType.Dungeon

         && StageManager.Instance.isServerPreparing == false)

        if (vNetData.socketType == GameNetSystem.SocketType.Main

            && GameNetSystem.Instance.crossServerData.crossState == GameNetSystem.CrossServerState.Yes)

        {

            C0107_tagCInitMapOK mapOk = new C0107_tagCInitMapOK();

            mapOk.MapID = PlayerDatas.Instance.baseData.MapID;

@@ -33,7 +33,18 @@
        }

        else

        {

            Debug.LogFormat("Recieve 0109,would not send0107,Current Stage:{0},Server Preparing:{1}", StageManager.Instance.StageType, StageManager.Instance.isServerPreparing);

            if (StageManager.Instance.StageType == Stage.E_StageType.Dungeon

                && StageManager.Instance.isServerPreparing == false)

            {

                C0107_tagCInitMapOK mapOk = new C0107_tagCInitMapOK();

                mapOk.MapID = PlayerDatas.Instance.baseData.MapID;

                mapOk.Type = 0;

                GameNetSystem.Instance.SendInfo(mapOk);

            }

            else

            {

                Debug.LogFormat("Recieve 0109,would not send0107,Current Stage:{0},Server Preparing:{1}", StageManager.Instance.StageType, StageManager.Instance.isServerPreparing);

            }

        }



        StageManager.Instance.isServerPreparing = false;


 Core/NetworkPackage/NetPkgCtl.cs

@@ -17,7 +17,7 @@
    /// </summary>

    /// <param name="gameNetPkg"></param>

    /// <param name="typeLst"></param>

    public static void AddNetPkg(string pkgByte, NetPkgType netPkgType, string _packName, string _fields, List<string> _fieldDetails)

    public static void AddNetPkg( GameNetSystem.SocketType socketType, string pkgByte, NetPkgType netPkgType, string _packName, string _fields, List<string> _fieldDetails)

    {

#if UNITY_EDITOR

        if (_typeLst == null)

@@ -32,6 +32,7 @@
        getNewPackage = true;



        NetPkg netPkg = new NetPkg();

        netPkg.socketType = socketType;

        netPkg.SendOrGetTime = DateTime.Now.ToString("HH:mm:ss:fff");

        netPkg.NetPkgTp = netPkgType;



@@ -117,6 +118,7 @@


public class NetPkg

{

    public GameNetSystem.SocketType socketType;

    public string SendOrGetTime;

    public string GameNetPkgStr;

    public string GameNetName;


 Core/NetworkPackage/Socket/ClientSocket.cs

@@ -275,7 +275,7 @@
                var cmd = (ushort)((ushort)(vCmdBytes[0] << 8) + vCmdBytes[1]);
                if (PackageRegedit.Contain(cmd))
                {
                    vNetpack = PackageRegedit.TransPack(cmd, vPackBytes);
                    vNetpack = PackageRegedit.TransPack(socketType,cmd, vPackBytes);
                    if (vNetpack != null)
                    {
                        if (DebugEx.EnableNetLog)
@@ -291,7 +291,7 @@
                else
                {
#if UNITY_EDITOR
                    PackageRegedit.TransPack(cmd, vPackBytes);
                    PackageRegedit.TransPack(socketType, cmd, vPackBytes);
#endif
                    CSharpCallLua.OnRecieveLuaNetPackage(cmd, vPackBytes);
                }
@@ -333,7 +333,7 @@
        }
        protocol.CombineDatas(encoder);
#if UNITY_EDITOR
        NetPkgCtl.AddNetPkg(protocol.vInfoCont, NetPkgType.Client, protocol.ToString(), FieldPrint.PrintFields(protocol), FieldPrint.PrintFieldsExpand(protocol, true));
        NetPkgCtl.AddNetPkg(socketType, protocol.vInfoCont, NetPkgType.Client, protocol.ToString(), FieldPrint.PrintFields(protocol), FieldPrint.PrintFieldsExpand(protocol, true));
#endif
        sendBytesTotal += protocol.combineBytes.Length;
        SendBytes(protocol.combineBytes);

			@@ -462,7 +462,7 @@
			/// </summary>
			/// <param name="vBytes"></param>
			/// <returns></returns>
			public static GameNetPackBasic TransPack(ushort cmd, byte[] vBytes)
			public static GameNetPackBasic TransPack(GameNetSystem.SocketType socketType, ushort cmd, byte[] vBytes)
			{
			#if UNITY_EDITOR
			int length = vBytes.Length;
			@@ -487,14 +487,14 @@
			}

			#if UNITY_EDITOR
			NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, packageInstance.ToString(), FieldPrint.PrintFields(packageInstance), FieldPrint.PrintFieldsExpand(packageInstance, true));
			NetPkgCtl.AddNetPkg(socketType, vStr, NetPkgType.Server, packageInstance.ToString(), FieldPrint.PrintFields(packageInstance), FieldPrint.PrintFieldsExpand(packageInstance, true));
			#endif
			return packageInstance;
			}
			else
			{
			#if UNITY_EDITOR
			NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, string.Empty, string.Empty, null);
			NetPkgCtl.AddNetPkg(socketType, vStr, NetPkgType.Server, string.Empty, string.Empty, null);
			#endif
			}
			return null;

			@@ -23,8 +23,8 @@
			//修改技能快捷设置发包顺序
			PlayerDatas.Instance.skill.CheckQuickSet();

			if (StageManager.Instance.StageType == Stage.E_StageType.Dungeon
			&& StageManager.Instance.isServerPreparing == false)
			if (vNetData.socketType == GameNetSystem.SocketType.Main
			&& GameNetSystem.Instance.crossServerData.crossState == GameNetSystem.CrossServerState.Yes)
			{
			C0107_tagCInitMapOK mapOk = new C0107_tagCInitMapOK();
			mapOk.MapID = PlayerDatas.Instance.baseData.MapID;
			@@ -33,7 +33,18 @@
			}
			else
			{
			Debug.LogFormat("Recieve 0109,would not send0107,Current Stage:{0},Server Preparing:{1}", StageManager.Instance.StageType, StageManager.Instance.isServerPreparing);
			if (StageManager.Instance.StageType == Stage.E_StageType.Dungeon
			&& StageManager.Instance.isServerPreparing == false)
			{
			C0107_tagCInitMapOK mapOk = new C0107_tagCInitMapOK();
			mapOk.MapID = PlayerDatas.Instance.baseData.MapID;
			mapOk.Type = 0;
			GameNetSystem.Instance.SendInfo(mapOk);
			}
			else
			{
			Debug.LogFormat("Recieve 0109,would not send0107,Current Stage:{0},Server Preparing:{1}", StageManager.Instance.StageType, StageManager.Instance.isServerPreparing);
			}
			}

			StageManager.Instance.isServerPreparing = false;

			@@ -17,7 +17,7 @@
			/// </summary>
			/// <param name="gameNetPkg"></param>
			/// <param name="typeLst"></param>
			public static void AddNetPkg(string pkgByte, NetPkgType netPkgType, string _packName, string _fields, List<string> _fieldDetails)
			public static void AddNetPkg( GameNetSystem.SocketType socketType, string pkgByte, NetPkgType netPkgType, string _packName, string _fields, List<string> _fieldDetails)
			{
			#if UNITY_EDITOR
			if (_typeLst == null)
			@@ -32,6 +32,7 @@
			getNewPackage = true;

			NetPkg netPkg = new NetPkg();
			netPkg.socketType = socketType;
			netPkg.SendOrGetTime = DateTime.Now.ToString("HH:mm:ss:fff");
			netPkg.NetPkgTp = netPkgType;

			@@ -117,6 +118,7 @@

			public class NetPkg
			{
			public GameNetSystem.SocketType socketType;
			public string SendOrGetTime;
			public string GameNetPkgStr;
			public string GameNetName;

			@@ -275,7 +275,7 @@
			var cmd = (ushort)((ushort)(vCmdBytes[0] << 8) + vCmdBytes[1]);
			if (PackageRegedit.Contain(cmd))
			{
			vNetpack = PackageRegedit.TransPack(cmd, vPackBytes);
			vNetpack = PackageRegedit.TransPack(socketType,cmd, vPackBytes);
			if (vNetpack != null)
			{
			if (DebugEx.EnableNetLog)
			@@ -291,7 +291,7 @@
			else
			{
			#if UNITY_EDITOR
			PackageRegedit.TransPack(cmd, vPackBytes);
			PackageRegedit.TransPack(socketType, cmd, vPackBytes);
			#endif
			CSharpCallLua.OnRecieveLuaNetPackage(cmd, vPackBytes);
			}
			@@ -333,7 +333,7 @@
			}
			protocol.CombineDatas(encoder);
			#if UNITY_EDITOR
			NetPkgCtl.AddNetPkg(protocol.vInfoCont, NetPkgType.Client, protocol.ToString(), FieldPrint.PrintFields(protocol), FieldPrint.PrintFieldsExpand(protocol, true));
			NetPkgCtl.AddNetPkg(socketType, protocol.vInfoCont, NetPkgType.Client, protocol.ToString(), FieldPrint.PrintFields(protocol), FieldPrint.PrintFieldsExpand(protocol, true));
			#endif
			sendBytesTotal += protocol.combineBytes.Length;
			SendBytes(protocol.combineBytes);