From 6ea08d3e5b069b011a3da41adaba4b34a5a86bcc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 11:24:53 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(删除旧跨服封包)

---
 /dev/null |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213" "b/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213"
deleted file mode 100644
index e69de29..0000000
--- "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213"
+++ /dev/null
diff --git "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213.des" "b/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213.des"
deleted file mode 100644
index dc6130d..0000000
--- "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213.des"
+++ /dev/null
@@ -1 +0,0 @@
-C0 11 上传数据的活动类型 #tagActionMergeRegister
diff --git "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213.h" "b/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213.h"
deleted file mode 100644
index 6af282d..0000000
--- "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 11 \344\270\212\344\274\240\346\225\260\346\215\256\347\232\204\346\264\273\345\212\250\347\261\273\345\236\213.h"
+++ /dev/null
@@ -1,8 +0,0 @@
-//C0 11 上传数据的活动类型 #tagActionMergeRegister
-
-struct	tagActionMergeRegister
-{
-	tagHead		Head;
-	BYTE		ActionType;		//活动类型		
-};
-
diff --git "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242" "b/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242"
deleted file mode 100644
index e69de29..0000000
--- "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242"
+++ /dev/null
diff --git "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242 .des" "b/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242 .des"
deleted file mode 100644
index 097f0c4..0000000
--- "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242 .des"
+++ /dev/null
@@ -1 +0,0 @@
-C0 12 跨服上传数据账号查询  #tagMergeRegisterAccQuery
diff --git "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242 .h" "b/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242 .h"
deleted file mode 100644
index ae08bb5..0000000
--- "a/ClientPack/ClientToGameServer/CC0_CrossRealm/C0 12\350\267\250\346\234\215\344\270\212\344\274\240\346\225\260\346\215\256\350\264\246\345\217\267\346\237\245\350\257\242 .h"
+++ /dev/null
@@ -1,8 +0,0 @@
-//C0 12 跨服上传数据账号查询 #tagMergeRegisterAccQuery
-
-struct	tagMergeRegisterAccQuery
-{
-	tagHead		Head;
-	BYTE		ActionType;		//活动类型		
-};
-
diff --git a/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer b/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer
+++ /dev/null
diff --git a/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer.des b/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer.des
deleted file mode 100644
index 0a075b6..0000000
--- a/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer.des
+++ /dev/null
@@ -1 +0,0 @@
-C0 15 通知即将登录跳转到跨服服务器 #tagCGGotoMergeServer
diff --git a/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer.h b/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer.h
deleted file mode 100644
index 3263068..0000000
--- a/ClientPack/ClientToGameServer/CC0_CrossRealm/GotoMergeServer.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// C0 15 通知即将登录跳转到跨服服务器 #tagCGGotoMergeServer
-
-struct	tagCGGotoMergeServer
-{
-	tagHead		Head;	
-};
-
diff --git "a/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234" "b/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234"
deleted file mode 100644
index e69de29..0000000
--- "a/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234"
+++ /dev/null
diff --git "a/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234.des" "b/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234.des"
deleted file mode 100644
index ef4c1bb..0000000
--- "a/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234.des"
+++ /dev/null
@@ -1 +0,0 @@
-C1 08 玩家执行膜拜 #tagPlayerMergeWorship
diff --git "a/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234.h" "b/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234.h"
deleted file mode 100644
index 9b5da90..0000000
--- "a/ClientPack/ClientToMapServer/CC1_CrossRealm/C1 08 \347\216\251\345\256\266\346\211\247\350\241\214\350\206\234\346\213\234.h"
+++ /dev/null
@@ -1,7 +0,0 @@
-//C1 08 玩家执行膜拜 #tagPlayerMergeWorship
-
-struct	tagPlayerMergeWorship
-{
-	tagHead		Head;
-};
-
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport b/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport.des b/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport.des
deleted file mode 100644
index e266328..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport.des
+++ /dev/null
@@ -1 +0,0 @@
-C1 11 跨服王者争霸押注 #tagCMMergeKingSupport
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport.h b/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport.h
deleted file mode 100644
index 88eab62..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergeKingSupport.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// C1 11 跨服王者争霸押注 #tagCMMergeKingSupport
-
-struct	tagCMMergeKingSupport
-{
-	tagHead		Head;
-	BYTE		SupportType;	// 0-押注; 1-贿赂
-	BYTE		GroupType;	// 组类型;如32强、16强等
-	BYTE		BattleIndex;	// 对战组索引,每种组类型的索引从1开始
-	BYTE		MoneyType;	// 押注的货币类型
-	BYTE		AccIDLen;
-	char		TagAccID[AccIDLen];	// 支持的目标账号
-};
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch b/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch.des b/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch.des
deleted file mode 100644
index bfcf8ba..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch.des
+++ /dev/null
@@ -1 +0,0 @@
-C1 09 跨服PK匹配 #tagCMMergePKMatch
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch.h b/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch.h
deleted file mode 100644
index fede90a..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/MergePKMatch.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// C1 09 跨服PK匹配 #tagCMMergePKMatch
-
-struct	tagCMMergePKMatch
-{
-	tagHead		Head;
-	BYTE		Type;	// 0-取消匹配; 1-进行匹配
-};
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin b/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin.des b/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin.des
deleted file mode 100644
index 82feb90..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin.des
+++ /dev/null
@@ -1 +0,0 @@
-C1 10 跨服PK恢复连胜次数 #tagCMRecoverMergePKWin
diff --git a/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin.h b/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin.h
deleted file mode 100644
index 6b179be..0000000
--- a/ClientPack/ClientToMapServer/CC1_CrossRealm/RecoverMergePKWin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// C1 10 跨服PK恢复连胜次数 #tagCMRecoverMergePKWin
-
-struct	tagCMRecoverMergePKWin
-{
-	tagHead		Head;
-};
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing.des b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing.des
deleted file mode 100644
index 96bf7d7..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 25 通知可进入跨服王者争霸 #tagCanEnterMergeKing
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing.h b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing.h
deleted file mode 100644
index c958fd2..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeKing.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// D1 25 通知可进入跨服王者争霸 #tagCanEnterMergeKing
-
-struct	tagCanEnterMergeKing
-{
-	tagHead		Head;
-	BYTE		GroupType;	// 战斗赛事组类型,如16强等
-};
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK.des b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK.des
deleted file mode 100644
index d4dde8e..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 24 通知可进入跨服PK匹配 #tagCanEnterMergePK
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK.h b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK.h
deleted file mode 100644
index fb08f5d..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergePK.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// D1 24 通知可进入跨服PK匹配 #tagCanEnterMergePK
-
-struct	tagCanEnterMergePKMember
-{
-	tagHead		Head;
-	BYTE		AccIDLen;
-	char		AccID[AccIDLen];
-	BYTE		NameLen;
-	char		PlayerName[NameLen];
-	BYTE		Job;
-	DWORD		PKCnt; // 已PK次数
-	DWORD		PKCWinCnt; // 当前连胜次数
-	DWORD		Score; // 赛季积分
-	DWORD		DayScore; // 当日积分
-	DWORD		PKWinCnt; // 累计胜利次数
-	DWORD		MaxCWinCnt; // 最大连胜次数
-	BYTE		Grade; // 当前段位
-	DWORD		FightPower; // 战斗力
-	WORD		PlayerLV; // 等级
-	DWORD		MaxHP; // 最大生命值
-};
-
-struct	tagCanEnterMergePK
-{
-	tagHead		Head;	
-	DWORD		MapID; // 要进入的地图ID
-	DWORD		RoomID; // 要进入的房间ID
-	BYTE		MemberCnt; // 对战玩家个数
-	tagCanEnterMergePKMember		MemberList[MemberCnt]; // 对战玩家详细信息
-};
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer.des b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer.des
deleted file mode 100644
index 8f208c0..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 23 通知可进入跨服活动 #tagCanEnterMergeServer
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer.h b/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer.h
deleted file mode 100644
index e4c38c4..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/CanEnterMergeServer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// D1 23 通知可进入跨服活动 #tagCanEnterMergeServer
-
-struct	tagCanEnterMergeServer
-{
-	tagHead		Head;
-	BYTE		ActionType; //活动类型
-	DWORD		MapID; // 登录后在中转地图时要跳转进入的地图ID
-	DWORD		LineID; // 要进入的线路或地图扩展数据
-	BYTE		NewAccIDLen;
-	char		NewAccID[NewAccIDLen];
-	BYTE		NewPswLen;
-	char		NewPsw[NewPswLen];
-};
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234"
+++ /dev/null
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234.des" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234.des"
deleted file mode 100644
index 807c674..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234.des"
+++ /dev/null
@@ -1 +0,0 @@
-D1 08 上传数据查询结果 #tagMergeRegisterQueryResult
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234.h" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234.h"
deleted file mode 100644
index aab0777..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 08 \344\270\212\344\274\240\346\225\260\346\215\256\346\237\245\350\257\242\347\273\223\346\236\234.h"
+++ /dev/null
@@ -1,11 +0,0 @@
-//D1 08 上传数据查询结果 #tagMergeRegisterQueryResult
-
-struct	tagMergeRegisterQueryResult
-{
-	tagHead		Head;
-	BYTE		NewAccIDLen;
-	char		NewAccID[NewAccIDLen];
-	BYTE		NewPswLen;
-	char		NewPsw[NewPswLen];
-};
-
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257"
+++ /dev/null
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257 .des" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257 .des"
deleted file mode 100644
index 3f71cf2..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257 .des"
+++ /dev/null
@@ -1 +0,0 @@
-D1 16  跨服赛服务器信息 #tagMergeServerInfo
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257 .h" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257 .h"
deleted file mode 100644
index e7fc232..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 16\350\267\250\346\234\215\350\265\233\346\234\215\345\212\241\345\231\250\344\277\241\346\201\257 .h"
+++ /dev/null
@@ -1,11 +0,0 @@
-//D1 16  跨服赛服务器信息 #tagMergeServerInfo
-
-struct	tagMergeServerInfo
-{
-	tagHead		Head;
-	BYTE		ServerIPLen;
-	char		ServerIP[ServerIPLen];
-	DWORD		Port;
-	BYTE		IsMergeServer;
-};
-
diff --git "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 \350\267\250\346\234\215\346\210\230.des" "b/ServerPack/GameServerPack/HD1_CrossRealm/D1 \350\267\250\346\234\215\346\210\230.des"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/GameServerPack/HD1_CrossRealm/D1 \350\267\250\346\234\215\346\210\230.des"
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/HD1_CrossRealm.des b/ServerPack/GameServerPack/HD1_CrossRealm/HD1_CrossRealm.des
deleted file mode 100644
index 354d796..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/HD1_CrossRealm.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 跨服
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver b/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver.des b/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver.des
deleted file mode 100644
index 53eb734..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 27 通知跨服PK战斗结果 #tagMergePKOverInfo
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver.h b/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver.h
deleted file mode 100644
index 0aa809c..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKOver.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// D1 27 通知跨服PK战斗结果 #tagMergePKOverInfo
-
-struct	tagMergePKOver
-{
-	BYTE		TimeLen;
-	char		TimeStr[TimeLen]; // yyyy-MM-dd HH:mm:ss
-	DWORD		RoomID;
-	BYTE		OverType;
-	DWORD		RemainTime;
-	BYTE		WinnerAccIDLen;
-	char		WinnerAccID[WinnerAccIDLen];
-	BYTE		LoserAccIDLen;
-	char		LoserAccID[LoserAccIDLen];
-	DWORD		WinnerID;
-	DWORD		LoserID;
-	BYTE		WinnerNameLen;
-	char		WinnerName[WinnerNameLen];
-	BYTE		LoserNameLen;
-	char		LoserName[LoserNameLen];
-	WORD		WinnerAddScore;
-	BYTE		LoserAddScoreLen;
-	char		LoserAddScore[LoserAddScoreLen];	 // 失败附加分,支持负值
-	BYTE		WinnerWinCnt;	// 比分获胜方获胜次数
-	BYTE		LoserWinCnt;	// 比分失败方获胜次数
-	WORD		WinnerCWinCnt;	// 获胜者连胜数
-	DWORD		LuckyItemID;
-};
-
-struct	tagMergePKOverInfo
-{
-	tagHead		Head;
-	BYTE		Count;
-	tagMergePKOver	PKOverList[Count];
-};
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo b/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo.des b/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo.des
deleted file mode 100644
index 2d77646..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 28 跨服PK赛季信息 #tagGCMergePKSeasonInfo
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo.h b/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo.h
deleted file mode 100644
index b811026..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/MergePKSeasonInfo.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// D1 28 跨服PK赛季信息 #tagGCMergePKSeasonInfo
-
-struct	tagGCMergePKSeasonInfo
-{
-	tagHead		Head;	
-	DWORD		SeasonID; // 赛季ID
-	DWORD		SeasonStartTime; // 赛季开始时间
-	BYTE		SeasonCycle; // 赛季周期天数
-	BYTE		IsSeasonEnd; // 赛季是否结束
-};
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK b/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK.des b/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK.des
deleted file mode 100644
index f1ba97b..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK.des
+++ /dev/null
@@ -1 +0,0 @@
-D1 26 通知跨服PK续胜结果 #tagRecoverMergePKWinOK
diff --git a/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK.h b/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK.h
deleted file mode 100644
index 12194ac..0000000
--- a/ServerPack/GameServerPack/HD1_CrossRealm/RecoverMergePKWinOK.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// D1 26 通知跨服PK续胜结果 #tagRecoverMergePKWinOK
-
-struct	tagRecoverMergePKWinOK
-{
-	tagHead		Head;
-};
diff --git "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201" "b/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201"
+++ /dev/null
diff --git "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201.des" "b/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201.des"
deleted file mode 100644
index 9d048e3..0000000
--- "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201.des"
+++ /dev/null
@@ -1 +0,0 @@
-D2 01 跨服赛报名(上传数据)状态 #tagMergeWarRegisterState
diff --git "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201.h" "b/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201.h"
deleted file mode 100644
index 001471d..0000000
--- "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 01 \350\267\250\346\234\215\350\265\233\346\212\245\345\220\215\050\344\270\212\344\274\240\346\225\260\346\215\256\051\347\212\266\346\200\201.h"
+++ /dev/null
@@ -1,8 +0,0 @@
-//D2 01 跨服赛报名(上传数据)状态 #tagMergeWarRegisterState
-
-struct	tagMergeWarRegisterState
-{
-	tagHead		Head;
-	BYTE		RegisterState;
-};
-
diff --git "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 \350\267\250\346\234\215\346\210\230.des" "b/ServerPack/MapServerPack/HD2_CrossRealm/D2 \350\267\250\346\234\215\346\210\230.des"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/MapServerPack/HD2_CrossRealm/D2 \350\267\250\346\234\215\346\210\230.des"
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/HD2_CrossRealm.des b/ServerPack/MapServerPack/HD2_CrossRealm/HD2_CrossRealm.des
deleted file mode 100644
index 7b729f1..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/HD2_CrossRealm.des
+++ /dev/null
@@ -1 +0,0 @@
-D2 跨服
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord b/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord.des b/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord.des
deleted file mode 100644
index 767e425..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord.des
+++ /dev/null
@@ -1 +0,0 @@
-D2 09 跨服boss奖励领奖状态 #tagMCMergeBossAwardRecord
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord.h b/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord.h
deleted file mode 100644
index 46c0312..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergeBossAwardRecord.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// D2 09 跨服boss奖励领奖状态 #tagMCMergeBossAwardRecord
-
-struct	tagMCMergeBossAwardRecord
-{
-	tagHead		Head;	
-	BYTE		FirstJoinAwardState; // 首次参与奖励状态;0-不可领,1-可领,2-已领
-};
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo b/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo.des b/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo.des
deleted file mode 100644
index 00ff251..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-D2 07 跨服王者争霸奖励相关 #tagMCMergeKingAwardInfo
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo.h b/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo.h
deleted file mode 100644
index 52bf84a..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergeKingAwardInfo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// D2 07 跨服王者争霸奖励相关 #tagMCMergeKingAwardInfo
-
-struct	tagMCMergeKingAwardInfo
-{
-	tagHead		Head;	
-	BYTE		ServerHonour; // 全服荣耀值, 1 2 4 8等
-	BYTE		ServerHonourAward; // 全服荣耀奖励是否已领取, 0否1是
-	BYTE		RankAward; // 晋级排名奖励是否已领取, 0否1是
-	DWORD		SupportAward; // 竞猜积分奖励领取记录,按位表示
-	BYTE		WorshipState; // 今日是否已膜拜, 0否1是
-};
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord b/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord.des b/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord.des
deleted file mode 100644
index 72cb7ec..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord.des
+++ /dev/null
@@ -1 +0,0 @@
-D2 08 跨服PK奖励领奖记录 #tagMCMergePKAwardRecord
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord.h b/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord.h
deleted file mode 100644
index 998eae6..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKAwardRecord.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// D2 08 跨服PK奖励领奖记录 #tagMCMergePKAwardRecord
-
-struct	tagMCMergePKAwardRecord
-{
-	tagHead		Head;	
-	DWORD		FirstWinAwardRecord; // 首次胜利奖励记录, 按位存储是否已领
-};
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt b/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt.des b/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt.des
deleted file mode 100644
index 8e4e60a..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt.des
+++ /dev/null
@@ -1 +0,0 @@
-D2 06 跨服PK次数通知 #tagMCMergePKCnt
diff --git a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt.h b/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt.h
deleted file mode 100644
index f3845f4..0000000
--- a/ServerPack/MapServerPack/HD2_CrossRealm/MergePKCnt.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// D2 06 跨服PK次数通知 #tagMCMergePKCnt
-
-struct	tagMCMergePKCnt
-{
-	tagHead		Head;	
-	WORD		DayPKCnt; // 当日已PK次数
-	WORD		DayBuyCnt; // 当日已购买次数
-	WORD		UnUsedBuyCnt; // 未使用的购买次数
-};

--
Gitblit v1.8.0