From 509698eab007cb52788cd2da6f3f743ee47414d4 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 26 三月 2019 17:25:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxPyNetPack

---
 ServerPack/MapServerPack/HA3_Function/RealmExpInfo.des                  |    1 
 ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.des             |    1 
 ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.des              |    1 
 ServerPack/MapServerPack/HB1_Role/RolePointInfo                         |    0 
 ClientPack/ClientToMapServer/CA3_Item/ItemTimeout                       |    0 
 ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.h                |    8 ++
 ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp               |    0 
 GameServerToMapServer/GameFunc/GMRequestCompensationResult.h            |    2 
 ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.h                     |    9 +++
 ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.des           |    1 
 ServerPack/MapServerPack/HB1_Role/RolePointInfo.h                       |    9 +++
 ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.h                 |    6 ++
 ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.des               |    1 
 ServerPack/MapServerPack/HB1_Role/RolePointInfo.des                     |    1 
 ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.des             |    2 
 ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.h               |   10 +--
 ServerPack/GameServerPack/HB5_Bourse/BiddingItemInfo.h                  |    1 
 ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo                  |    0 
 ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange     |    0 
 ServerPack/GameServerPack/HB5_Bourse/PlayerAuctionItemInfo.h            |    1 
 ServerPack/MapServerPack/HA3_Function/RealmExpInfo                      |    0 
 ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.h             |    6 ++
 ServerPack/GameServerPack/HB5_Bourse/RefreshAuctionItemInfo.h           |    1 
 ClientPack/ClientToGameServer/CB5_Bourse/QueryAuctionItem.h             |    3 
 ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.h             |   10 +++
 ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp               |    0 
 ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.des             |    1 
 ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.h   |    8 ++
 ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.h               |   14 ++++
 ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.h             |   17 +++++
 ServerPack/GameServerPack/HB5_Bourse/AttentionAuctionItemInfo.h         |    1 
 /dev/null                                                               |   19 ------
 ServerPack/GameServerPack/HB5_Bourse/AuctionItemInfo.h                  |    6 +
 ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.des               |    1 
 ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo                 |    0 
 ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.des |    1 
 ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint                   |    0 
 ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.des                   |    1 
 ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.des           |    1 
 ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo               |    0 
 ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo                 |    0 
 ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.des           |    2 
 ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.h               |    7 ++
 ServerPack/GameServerPack/HB5_Bourse/FamilyAuctionItemInfo.h            |    1 
 ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.h                 |    9 +++
 ServerPack/MapServerPack/HA3_Function/RealmExpInfo.h                    |    9 +++
 ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve                   |    0 
 47 files changed, 142 insertions(+), 30 deletions(-)

diff --git "a/ClientPack/ClientToGameServer/CAD_SaleActivity/AD \347\211\271\346\203\240\346\264\273\345\212\250.des" "b/ClientPack/ClientToGameServer/CAD_SaleActivity/AD \347\211\271\346\203\240\346\264\273\345\212\250.des"
deleted file mode 100644
index e69de29..0000000
--- "a/ClientPack/ClientToGameServer/CAD_SaleActivity/AD \347\211\271\346\203\240\346\264\273\345\212\250.des"
+++ /dev/null
diff --git a/ClientPack/ClientToGameServer/CAD_SaleActivity/CAD_SaleActivity.des b/ClientPack/ClientToGameServer/CAD_SaleActivity/CAD_SaleActivity.des
deleted file mode 100644
index 757a72b..0000000
--- a/ClientPack/ClientToGameServer/CAD_SaleActivity/CAD_SaleActivity.des
+++ /dev/null
@@ -1 +0,0 @@
-AD 特惠活动
diff --git a/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo b/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo
+++ /dev/null
diff --git a/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo.des b/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo.des
deleted file mode 100644
index 7d514e4..0000000
--- a/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AD 01 查询特惠活动信息 #tagCGQueryTeHuiActivetyInfo
diff --git a/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo.h b/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo.h
deleted file mode 100644
index c52f036..0000000
--- a/ClientPack/ClientToGameServer/CAD_SaleActivity/QueryTeHuiActivetyInfo.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// AD 01 查询特惠活动信息 #tagCGQueryTeHuiActivetyInfo
-
-struct    tagCGQueryTeHuiActivetyInfo
-
-{
-	tagHead		Head;
-	BYTE		ActivityType;	// 活动类型
-};
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem b/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange
similarity index 100%
rename from ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem
rename to ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.des b/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.des
new file mode 100644
index 0000000..73286db
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.des
@@ -0,0 +1 @@
+B5 18 拍卖行修改关注物品 #tagCGAttentionAuctionItemChange
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.h b/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.h
new file mode 100644
index 0000000..415089e
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB5_Bourse/AttentionAuctionItemChange.h
@@ -0,0 +1,8 @@
+// B5 18 拍卖行修改关注物品 #tagCGAttentionAuctionItemChange
+
+struct	tagCGAttentionAuctionItemChange
+{
+	tagHead		Head;
+	DWORD		ItemID;
+	BYTE		IsAttention;	//是否关注,取消关注发0
+};
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryAuctionItem.h b/ClientPack/ClientToGameServer/CB5_Bourse/QueryAuctionItem.h
index 042c51d..6494d92 100644
--- a/ClientPack/ClientToGameServer/CB5_Bourse/QueryAuctionItem.h
+++ b/ClientPack/ClientToGameServer/CB5_Bourse/QueryAuctionItem.h
@@ -9,6 +9,7 @@
 	BYTE	ClassLV;	//过滤阶数,0为不限制
 	BYTE	SpecItemIDCount;	//指定物品ID个数
 	DWORD	SpecItemIDList[SpecItemIDCount];	//指定物品ID
-	WORD	FromNum;	//查询起始数 (从1开始)
+	char	FromItemGUID[40];		//从哪个物品开始查询
+	BYTE	QueryDir;		//查询方向,1-往后查,2-往前查
 	BYTE	QueryCount;	//查询个数,0为全部
 };
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem.des b/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem.des
deleted file mode 100644
index 9e8e63d..0000000
--- a/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem.des
+++ /dev/null
@@ -1 +0,0 @@
-B5 15 拍卖行查询仙盟拍卖中的拍品 #tagCGQueryFamilyAuctionItem
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem.h b/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem.h
deleted file mode 100644
index 4f2e524..0000000
--- a/ClientPack/ClientToGameServer/CB5_Bourse/QueryFamilyAuctionItem.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// B5 15 拍卖行查询仙盟拍卖中的拍品 #tagCGQueryFamilyAuctionItem
-
-struct	tagCGQueryFamilyAuctionItem
-{
-	tagHead	Head;
-};
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem b/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem
+++ /dev/null
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem.des b/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem.des
deleted file mode 100644
index b19a207..0000000
--- a/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem.des
+++ /dev/null
@@ -1 +0,0 @@
-B5 11 拍卖行查询个人拍卖中的物品 #tagCGQueryPlayerAuctionItem
diff --git a/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem.h b/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem.h
deleted file mode 100644
index 43f398a..0000000
--- a/ClientPack/ClientToGameServer/CB5_Bourse/QueryPlayerAuctionItem.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// B5 11 拍卖行查询个人拍卖中的物品 #tagCGQueryPlayerAuctionItem
-
-struct	tagCGQueryPlayerAuctionItem
-{
-	tagHead	Head;
-};
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem b/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem.des b/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem.des
deleted file mode 100644
index 7d90d9a..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem.des
+++ /dev/null
@@ -1 +0,0 @@
-A2 08 购买自定义商店物品 #tagCMBuyShopItem
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem.h b/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem.h
deleted file mode 100644
index f21a57c..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/BuyShopItem.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// A2 08 购买自定义商店物品 #tagCMBuyShopItem
-
-struct	tagCMBuyShopItem
-{
-	tagHead		Head;
-	DWORD		ShopID;
-	WORD		ItemShopIndex;
-	WORD		BuyCount; //购买数量
-};
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem b/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem.des b/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem.des
deleted file mode 100644
index 8db6d50..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem.des
+++ /dev/null
@@ -1 +0,0 @@
-A2 07 请求自定义商店物品信息 #tagCMQueryShopItem
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem.h b/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem.h
deleted file mode 100644
index 4570fd9..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/QueryShopItem.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// A2 07 请求自定义商店物品信息 #tagCMQueryShopItem
-
-struct	tagCMQueryShopItem
-{
-	tagHead		Head;
-	DWORD		ShopID;
-};
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem b/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem.des b/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem.des
deleted file mode 100644
index 43606c3..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem.des
+++ /dev/null
@@ -1 +0,0 @@
-A2 14 刷新定时神秘商店物品#tagCMRefreshShopItem
diff --git a/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem.h b/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem.h
deleted file mode 100644
index ebe108d..0000000
--- a/ClientPack/ClientToMapServer/CA2_Interaction/RefreshShopItem.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// A2 14 刷新定时神秘商店物品#tagCMRefreshShopItem
-
-struct	tagCMRefreshShopItem
-{
-	tagHead		Head;
-	DWORD		ShopID;
-};
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuitCompose b/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve
similarity index 100%
rename from ClientPack/ClientToMapServer/CA3_Item/SuitCompose
rename to ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve
diff --git a/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.des b/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.des
new file mode 100644
index 0000000..cbaef2c
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.des
@@ -0,0 +1 @@
+A3 16 装备强化进化 #tagCMEquipPlusEvolve
diff --git a/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.h b/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.h
new file mode 100644
index 0000000..dc26bb0
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA3_Item/EquipPlusEvolve.h
@@ -0,0 +1,6 @@
+// A3 16 装备强化进化 #tagCMEquipPlusEvolve
+struct	tagCMEquipPlusEvolve
+{
+	tagHead		Head;
+	WORD		ItemIndex;		//装备在背包中索引
+};
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuitCompose b/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout
similarity index 100%
copy from ClientPack/ClientToMapServer/CA3_Item/SuitCompose
copy to ClientPack/ClientToMapServer/CA3_Item/ItemTimeout
diff --git a/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.des b/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.des
new file mode 100644
index 0000000..1d3d947
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.des
@@ -0,0 +1 @@
+A3 08 物品过期 #tagCMItemTimeout
diff --git a/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.h b/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.h
new file mode 100644
index 0000000..3e07d7a
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA3_Item/ItemTimeout.h
@@ -0,0 +1,9 @@
+// A3 08 物品过期 #tagCMItemTimeout
+
+struct	tagCMItemTimeout
+
+{
+	tagHead		Head;
+	BYTE		PackType;		//背包类型
+	BYTE		ItemIndex;		//物品在背包中索引
+};
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuitCompose.des b/ClientPack/ClientToMapServer/CA3_Item/SuitCompose.des
deleted file mode 100644
index 34ec168..0000000
--- a/ClientPack/ClientToMapServer/CA3_Item/SuitCompose.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 17 套装合成#tagCMSuitCompose
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuitCompose.h b/ClientPack/ClientToMapServer/CA3_Item/SuitCompose.h
deleted file mode 100644
index cbaebef..0000000
--- a/ClientPack/ClientToMapServer/CA3_Item/SuitCompose.h
+++ /dev/null
@@ -1,7 +0,0 @@
-//A3 17 套装合成#tagCMSuitCompose
-struct tagCMSuitCompose
-{
-	tagHead Head;
-	BYTE	SuiteType;	// 套装类型 1普通 2强化
-	BYTE	EquipPlace;	// 装备位置
-};
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose b/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose.des b/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose.des
deleted file mode 100644
index 765b200..0000000
--- a/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 08 套装拆解 #tagCMSuiteDecompose
diff --git a/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose.h b/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose.h
deleted file mode 100644
index bf99a39..0000000
--- a/ClientPack/ClientToMapServer/CA3_Item/SuiteDecompose.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// A3 08 套装拆解 #tagCMSuiteDecompose
-
-struct    tagCMSuiteDecompose
-{
-	tagHead		Head;
-	BYTE	EquipPlace;  //部位索引
-	BYTE	SuiteType; //套装类型 0代表全部类型
-}; 
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul.des b/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul.des
deleted file mode 100644
index 65a1a9e..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 12 激活法宝之魂 #tagCMActiveMWSoul
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul.h b/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul.h
deleted file mode 100644
index e5706fb..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// A5 12 激活法宝之魂 #tagCMActiveMWSoul
-
-struct	tagCMActiveMWSoul
-
-{
-	tagHead		Head;
-	BYTE		ID;	//编号
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD b/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD.des b/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD.des
deleted file mode 100644
index 7ecdb58..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 36 天梯清除挑战CD#tagCMHighLadderClearCD
diff --git a/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD.h b/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD.h
deleted file mode 100644
index 64fac8f..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/CMHighLadderClearCD.h
+++ /dev/null
@@ -1,5 +0,0 @@
-//A5 36 天梯清除挑战CD#tagCMHighLadderClearCD
-struct	tagCMHighLadderClearCD
-{
-	tagHead		Head;	
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward b/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward.des b/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward.des
deleted file mode 100644
index 134befb..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 35 查询天梯竞技场奖励#tagCMQueryHighLadderReward
diff --git a/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward.h b/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward.h
deleted file mode 100644
index e30234b..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/CMQueryHighLadderReward.h
+++ /dev/null
@@ -1,6 +0,0 @@
-//A5 35 查询天梯竞技场奖励#tagCMQueryHighLadderReward
-struct	tagCMQueryHighLadderReward
-{
-	tagHead		Head;
-	BYTE		Type;	//0,查询  1,领取	
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul b/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp
similarity index 100%
rename from ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul
rename to ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp
diff --git a/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.des b/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.des
new file mode 100644
index 0000000..ad15093
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.des
@@ -0,0 +1 @@
+A5 C5 装备部位升星 #tagCMEquipPartStarUp
diff --git a/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.h b/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.h
new file mode 100644
index 0000000..eb494a2
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA5_Function/EquipPartStarUp.h
@@ -0,0 +1,10 @@
+// A5 C5 装备部位升星 #tagCMEquipPartStarUp
+
+struct	tagCMEquipPartStarUp
+{
+	tagHead		Head;
+	WORD	EquipPackIndex;	// 部位格子索引
+	BYTE	CostEquipCnt;	// 装备个数
+	WORD	CostEquipIndex[CostEquipCnt];	// 装备索引
+	DWORD	CostEquipID[CostEquipCnt];	// 装备物品ID
+};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount.des b/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount.des
deleted file mode 100644
index 7a9f96f..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 37 天梯增加挑战次数#tagCMHighLadderAddCount
diff --git a/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount.h b/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount.h
deleted file mode 100644
index 7da6092..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount.h
+++ /dev/null
@@ -1,5 +0,0 @@
-//A5 37 天梯增加挑战次数#tagCMHighLadderAddCount
-struct	tagCMHighLadderAddCount
-{
-	tagHead		Head;	
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo b/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo.des b/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo.des
deleted file mode 100644
index 1033412..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 34 查询天梯竞技场状态#tagCMQueryHighLadderState
diff --git a/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo.h b/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo.h
deleted file mode 100644
index c5d905d..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/QueryHighLadderInfo.h
+++ /dev/null
@@ -1,5 +0,0 @@
-//A5 34 查询天梯竞技场状态#tagCMQueryHighLadderState
-struct	tagCMQueryHighLadderState
-{
-	tagHead		Head;
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime b/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime.des b/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime.des
deleted file mode 100644
index 7b0603c..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 0C 使用道具减少渡劫打坐时间 #tagCMReduceSitTime
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime.h b/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime.h
deleted file mode 100644
index 9df9bf1..0000000
--- a/ClientPack/ClientToMapServer/CA5_Function/ReduceSitTime.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// A5 0C 使用道具减少渡劫打坐时间 #tagCMReduceSitTime
-
-struct tagCMReduceSitTime
-{
-	tagHead		Head;
-	WORD		ItemCnt;   	// 道具数量
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul b/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp
similarity index 100%
copy from ClientPack/ClientToMapServer/CA5_Function/ActiveMWSoul
copy to ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp
diff --git a/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.des b/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.des
new file mode 100644
index 0000000..de55120
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.des
@@ -0,0 +1 @@
+A5 21 境界修为池提取 #tagCMTakeOutRealmExp
diff --git a/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.h b/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.h
new file mode 100644
index 0000000..73a7587
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CA5_Function/TakeOutRealmExp.h
@@ -0,0 +1,6 @@
+// A5 21 境界修为池提取 #tagCMTakeOutRealmExp
+
+struct	tagCMTakeOutRealmExp
+{
+	tagHead		Head;
+};
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward b/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward.des b/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward.des
deleted file mode 100644
index e0f1102..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 02 领取升阶功能特惠奖励 #tagCMGetClassUPDayAward
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward.h b/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward.h
deleted file mode 100644
index 9fd6f40..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetClassUPDayAward.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// AA 02 领取升阶功能特惠奖励 #tagCMGetClassUPDayAward
-
-struct	 tagCMGetClassUPDayAward
-{
-	tagHead		Head;
-	BYTE		DayType;	 // 升阶日类型
-	BYTE		ClassLV;	 // 阶级
-};
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward b/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward.des b/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward.des
deleted file mode 100644
index 8d49ea0..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 04 领取消费奖励 #tagCMGetCostAward
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward.h b/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward.h
deleted file mode 100644
index 07af282..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetCostAward.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// AA 04 领取消费奖励 #tagCMGetCostAward
-
-struct	 tagCMGetCostAward
-{
-	tagHead		Head;
-	DWORD		ActionID;		 // 活动ID
-	BYTE		Index;		 // 索引
-};
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward b/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward
+++ /dev/null
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward.des b/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward.des
deleted file mode 100644
index 0c093b1..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 03 领取充值特惠奖励 #tagCMGetRechargeTeHuiAward
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward.h b/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward.h
deleted file mode 100644
index bf8e986..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GetRechargeTeHuiAward.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// AA 03 领取充值特惠奖励 #tagCMGetRechargeTeHuiAward
-
-
-struct	 tagCMGetRechargeTeHuiAward
-{
-	tagHead		Head;
-	DWORD		ActionID;		 // 活动ID
-	BYTE		Index;		 // 规则索引
-};
diff --git a/ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount b/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint
similarity index 100%
rename from ClientPack/ClientToMapServer/CA5_Function/HighLadderAddCount
rename to ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint
diff --git a/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.des b/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.des
new file mode 100644
index 0000000..f416686
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.des
@@ -0,0 +1 @@
+B2 06 玩家加点 #tagCMAddPoint
diff --git a/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.h b/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.h
new file mode 100644
index 0000000..1568ba8
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CB2_NewFunction/AddPoint.h
@@ -0,0 +1,9 @@
+// B2 06 玩家加点 #tagCMAddPoint
+
+struct    tagCMAddPoint
+{
+	tagHead		 Head;
+	BYTE		PointAttrIDCount;	// 加点属性ID个数
+	BYTE		PointAttrIDList[PointAttrIDCount];	// 加点属性ID列表
+	WORD		PointValueList[PointAttrIDCount];	// 加点属性ID对应的点数列表
+};
diff --git a/GameServerToMapServer/GameFunc/GMRequestCompensationResult.h b/GameServerToMapServer/GameFunc/GMRequestCompensationResult.h
index 9630cd8..5fc18ee 100644
--- a/GameServerToMapServer/GameFunc/GMRequestCompensationResult.h
+++ b/GameServerToMapServer/GameFunc/GMRequestCompensationResult.h
@@ -14,11 +14,13 @@
 	DWORD		PlayerID;		//玩家ID
 	BYTE		CompensationType;	//补偿类型 0 全服 1 个人
 	char		GUID[40];	//对应的补偿ID
+	char	CreateTime[30];	//邮件接收时间
 	DWORD	TextLen;		//文字内容长度
 	char	Text[TextLen];	//文字内容
 	BYTE	Count;		//当前补偿物品数
 	DWORD	Gold;		//仙玉
 	DWORD	GoldPaper;	//绑定仙玉
 	DWORD	Silver;		//铜钱
+	BYTE	MoneySource;	//货币来源
 	tagGMCompensationItem	Items[Count];	//补偿物品信息
 };
diff --git a/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt b/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt
deleted file mode 100644
index e69de29..0000000
--- a/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt
+++ /dev/null
diff --git a/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt.des b/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt.des
deleted file mode 100644
index cdf27ef..0000000
--- a/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt.des
+++ /dev/null
@@ -1 +0,0 @@
-03 01 天梯竞技场玩家挑战结果同步#tagGMHighLadderChallengeReuslt
diff --git a/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt.h b/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt.h
deleted file mode 100644
index a2d3016..0000000
--- a/GameServerToMapServer/GameFunc/HighLadderChallengeReuslt.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//03 01 天梯竞技场玩家挑战结果同步#tagGMHighLadderChallengeReuslt
-
-struct	tagGMHighLadderChallengeReuslt
-{
-	tagHead		Head;
-	DWORD		PlayerID;			//玩家ID
-	BYTE		Result;			//结果
-	WORD		PlusInfoSize;	
-	char		PlusInfo[PlusInfoSize];	//附带信息
-};
diff --git a/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge b/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge
deleted file mode 100644
index e69de29..0000000
--- a/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge
+++ /dev/null
diff --git a/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge.des b/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge.des
deleted file mode 100644
index d810d0d..0000000
--- a/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge.des
+++ /dev/null
@@ -1 +0,0 @@
-03 02 天梯竞技场玩家发起挑战#tagMGHighLadderChallenge
diff --git a/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge.h b/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge.h
deleted file mode 100644
index ed7262e..0000000
--- a/MapServerToGameServer/PlayerMagicTreasure/HighLadderChallenge.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//03 02 天梯竞技场玩家发起挑战#tagMGHighLadderChallenge
-struct	tagHightLadderItemInfo
-{		
-	DWORD		ItemTypeID;		//物品ID
-	BYTE		ItemPlaceType;     //物品位置的背包类型
-   	BYTE		ItemPlaceIndex;    //物品所在的索引
-	WORD		Count;		//单组数量
-	BYTE		ItemStarLV;		//装备星级
-	BYTE		IdentifyPar;		//鉴定参数
-	DWORD		CurDurg;		//当前耐久
-	DWORD		MaxDurg;		//最大耐久
-	BYTE		CanPlaceStoneCount;		//可镶嵌宝石数0表示不可以镶嵌宝石
-	BYTE		ItemProperty;		//装备五行
-	WORD		SoulProperty;		//灵魂属性属性
-	DWORD		Maker;		//制作者ID
-	char		MakerName[33];		//制造者名字
-	DWORD		Stone1;		//镶嵌宝石1
-	DWORD		Stone2;		//镶嵌宝石
-	DWORD		Stone3;		//镶嵌宝石
-	DWORD		Stone4;		//镶嵌宝石
-	DWORD		Stone5;		//镶嵌宝石
-	DWORD		Stone6;		//镶嵌宝石
-	DWORD		Stone7;		//镶嵌宝石
-	DWORD		Stone8;		//镶嵌宝石
-	DWORD		Stone9;		//镶嵌宝石
-	BYTE		IsRenZhu;		//是否认主
-	DWORD		EquipDefenseValue;		//用于记录装备的防御值
-	DWORD		EquipMinAtkValue;		//用于记录装备的最小伤害值
-	DWORD		EquipMaxAtkValue;		//用于记录装备的最大伤害值
-	DWORD		UserDataLen;
-	char		UserData[UserDataLen];		//自定义数据
-	BYTE		FitLV;				//物品契合等级
-	DWORD		Proficiency;			//熟练度
-	BYTE		IsSuite;				//是否已经套装化
-	DWORD		BaseHP;				// HP基础值
-	DWORD		BaseMagicDef;			//内防基础值
-	BYTE		MaxAddSkillCnt;			// 最大附魔次数
-	DWORD		PetID;				//装备该装备的宠物ID,为0则未装备
-	DWORD		EquipMagicDefValue;		//装备内防值
-	DWORD		EquipMinMagicAtkValue;		//装备最小内攻
-	DWORD		EquipMaxMagicAtkValue;		//装备最大内攻
-};
-struct	tagMGHighLadderChallenge
-{
-	tagHead		Head;
-	DWORD		PlayerID;		//玩家ID
-	char		PlayerName[33];
-	WORD		PlayerLV;
-	DWORD		FightPower;
-	DWORD		FightPropertyDataLen;
-	char		FightPropertyData[FightPropertyDataLen];	//Python自定义数据
-	BYTE		EquipCount;
-	tagHightLadderItemInfo	EquipList[EquipCount];	//装备信息列表
-	WORD		VSOrder;		//要挑战的排位
-};
diff --git a/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo b/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo
similarity index 100%
rename from ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo
rename to ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo
diff --git a/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.des b/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.des
new file mode 100644
index 0000000..1136675
--- /dev/null
+++ b/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.des
@@ -0,0 +1 @@
+A4 0C 多仙盟boss活动信息 #tagGCAllFamilyBossInfo
diff --git a/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.h b/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.h
new file mode 100644
index 0000000..e21f532
--- /dev/null
+++ b/ServerPack/GameServerPack/HA4_Family/AllFamilyBossInfo.h
@@ -0,0 +1,8 @@
+// A4 0C 多仙盟boss活动信息 #tagGCAllFamilyBossInfo
+
+struct    tagGCAllFamilyBossInfo
+
+{
+	tagHead		Head;
+	BYTE		IsEnd;		// 是否已结束
+};
diff --git a/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo.des b/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo.des
deleted file mode 100644
index 1dd66f2..0000000
--- a/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A9 05 天梯竞技场每日奖励信息#tagGCHighLadderRewardInfo
diff --git a/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo.h b/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo.h
deleted file mode 100644
index 6576964..0000000
--- a/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo.h
+++ /dev/null
@@ -1,7 +0,0 @@
-//A9 05 天梯竞技场每日奖励信息#tagGCHighLadderRewardInfo
-struct	tagGCHighLadderRewardInfo
-{
-	tagHead		Head;
-	BYTE		hadGot;		 //是否已领取
-	WORD		Order;		//奖励排名
-};
diff --git a/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList b/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList.des b/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList.des
deleted file mode 100644
index c4339f1..0000000
--- a/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList.des
+++ /dev/null
@@ -1 +0,0 @@
-A9 07 定时商店刷新倒计时 #tagGCShopRefreshTimeList
diff --git a/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList.h b/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList.h
deleted file mode 100644
index 9b238a0..0000000
--- a/ServerPack/GameServerPack/HA9_Function/ShopRefreshTimeList.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// A9 07 定时商店刷新倒计时 #tagGCShopRefreshTimeList
-
-struct    tagGCShopRefreshTime
-{
-	tagHead		Head;
-	DWORD		ShopID;		// 商店ID
-	DWORD		RemainSecond;	// 多少秒后刷新
-};
-
-struct    tagGCShopRefreshTimeList
-
-{
-	tagHead		Head;
-	BYTE		ShopCnt;			//商店信息个数
-	tagGCShopRefreshTime	ShopTimeInfoList[ShopCnt];	//商店信息列表
-};
diff --git a/ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo b/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo
similarity index 100%
copy from ServerPack/GameServerPack/HA9_Function/MCHighLadderRewardInfo
copy to ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo
diff --git a/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.des b/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.des
new file mode 100644
index 0000000..39b7a40
--- /dev/null
+++ b/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.des
@@ -0,0 +1 @@
+AC 07 骑宠Boss信息 #tagGCHorsePetBossInfo
diff --git a/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.h b/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.h
new file mode 100644
index 0000000..d4a6115
--- /dev/null
+++ b/ServerPack/GameServerPack/HAC_Activity/HorsePetBossInfo.h
@@ -0,0 +1,7 @@
+// AC 07 骑宠Boss信息 #tagGCHorsePetBossInfo
+struct    tagGCHorsePetBossInfo
+
+{
+	tagHead		Head;
+	DWORD		IsEnd;		// 是否已结束(按位代表对应线路是否结束)
+};
diff --git "a/ServerPack/GameServerPack/HAD_SaleActivity/AD \347\211\271\346\203\240\346\264\273\345\212\250.des" "b/ServerPack/GameServerPack/HAD_SaleActivity/AD \347\211\271\346\203\240\346\264\273\345\212\250.des"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/GameServerPack/HAD_SaleActivity/AD \347\211\271\346\203\240\346\264\273\345\212\250.des"
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HAD_SaleActivity/HAD_SaleActivity.des b/ServerPack/GameServerPack/HAD_SaleActivity/HAD_SaleActivity.des
deleted file mode 100644
index 757a72b..0000000
--- a/ServerPack/GameServerPack/HAD_SaleActivity/HAD_SaleActivity.des
+++ /dev/null
@@ -1 +0,0 @@
-AD 特惠活动
diff --git a/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList b/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList.des b/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList.des
deleted file mode 100644
index b7b9583..0000000
--- a/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList.des
+++ /dev/null
@@ -1 +0,0 @@
-AD 01 特惠活动信息 #tagGCTeHuiActivityInfoList
diff --git a/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList.h b/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList.h
deleted file mode 100644
index 83f4f3b..0000000
--- a/ServerPack/GameServerPack/HAD_SaleActivity/TeHuiActivityInfoList.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// AD 01 特惠活动信息 #tagGCTeHuiActivityInfoList
-
-struct    tagGCTeHuiActivityInfo
-{
-	tagHead		Head;
-	BYTE		ActivityType;	// 活动类型
-	DWORD		ActivityValue;	// 活动值
-	DWORD		StartDate;	// 开始时间time
-	DWORD		EndDate;		// 结束时间time
-};
-
-struct    tagGCTeHuiActivityInfoList
-
-{
-	tagHead		Head;
-	BYTE		ActivityCount;		//活动信息个数
-	tagGCTeHuiActivityInfo	ActivityInfoList[ActivityCount];	//活动信息列表
-};
diff --git a/ServerPack/GameServerPack/HB5_Bourse/AttentionAuctionItemInfo.h b/ServerPack/GameServerPack/HB5_Bourse/AttentionAuctionItemInfo.h
index 95924d7..bb16d6f 100644
--- a/ServerPack/GameServerPack/HB5_Bourse/AttentionAuctionItemInfo.h
+++ b/ServerPack/GameServerPack/HB5_Bourse/AttentionAuctionItemInfo.h
@@ -8,6 +8,7 @@
 	WORD		ItemCount;
 	char		AddTime[19];	//上架时间 yyyy-MM-dd hh:mm:ss
 	WORD		BidderPrice;	//竞拍玩家出价
+	char		BiddingTime[19];	//竞价时间 yyyy-MM-dd hh:mm:ss
 	WORD		UserDataLen;
 	char		UserData[UserDataLen];		//自定义数据
 };
diff --git a/ServerPack/GameServerPack/HB5_Bourse/AuctionItemInfo.h b/ServerPack/GameServerPack/HB5_Bourse/AuctionItemInfo.h
index 45c745b..51aeb51 100644
--- a/ServerPack/GameServerPack/HB5_Bourse/AuctionItemInfo.h
+++ b/ServerPack/GameServerPack/HB5_Bourse/AuctionItemInfo.h
@@ -8,6 +8,7 @@
 	WORD		ItemCount;
 	char		AddTime[19];	//上架时间 yyyy-MM-dd hh:mm:ss
 	WORD		BidderPrice;	//竞拍玩家出价
+	char		BiddingTime[19];	//竞价时间 yyyy-MM-dd hh:mm:ss
 	WORD		UserDataLen;
 	char		UserData[UserDataLen];		//自定义数据
 };
@@ -21,9 +22,10 @@
 	BYTE	ClassLV;	//过滤阶数,0为不限制
 	BYTE	SpecItemIDCount;	//指定物品ID个数
 	DWORD	SpecItemIDList[SpecItemIDCount];	//指定物品ID
-	WORD	FromNum;	//查询起始数 (从1开始)
+	char	FromItemGUID[40];		//从哪个物品开始查询
+	BYTE	QueryDir;		//查询方向,1-往后查,2-往前查,3-定位查询
 	BYTE	QueryCount;	//查询个数,0为全部
-	WORD	QueryTotalCount;	//查询条件实际总个数
+	WORD	QueryRemainlCount;	//查询条件对应查询方向剩余个数
 	BYTE		AuctionItemCount;		//返回拍品数量
 	tagGCAuctionItem	AuctionItemList[AuctionItemCount];	//返回拍品列表
 };
diff --git a/ServerPack/GameServerPack/HB5_Bourse/BiddingItemInfo.h b/ServerPack/GameServerPack/HB5_Bourse/BiddingItemInfo.h
index 276d802..5713cb3 100644
--- a/ServerPack/GameServerPack/HB5_Bourse/BiddingItemInfo.h
+++ b/ServerPack/GameServerPack/HB5_Bourse/BiddingItemInfo.h
@@ -9,6 +9,7 @@
 	char		AddTime[19];	//上架时间 yyyy-MM-dd hh:mm:ss
 	DWORD		BidderID;		//竞拍玩家ID,也就是当前最高竞价玩家ID
 	WORD		BidderPrice;	//竞拍玩家出价
+	char		BiddingTime[19];	//竞价时间 yyyy-MM-dd hh:mm:ss
 	WORD		UserDataLen;
 	char		UserData[UserDataLen];		//自定义数据
 };
diff --git a/ServerPack/GameServerPack/HB5_Bourse/FamilyAuctionItemInfo.h b/ServerPack/GameServerPack/HB5_Bourse/FamilyAuctionItemInfo.h
index cbc3df3..d5b6efc 100644
--- a/ServerPack/GameServerPack/HB5_Bourse/FamilyAuctionItemInfo.h
+++ b/ServerPack/GameServerPack/HB5_Bourse/FamilyAuctionItemInfo.h
@@ -8,6 +8,7 @@
 	WORD		ItemCount;
 	char		AddTime[19];	//上架时间 yyyy-MM-dd hh:mm:ss
 	WORD		BidderPrice;	//竞拍玩家出价
+	char		BiddingTime[19];	//竞价时间 yyyy-MM-dd hh:mm:ss
 	WORD		UserDataLen;
 	char		UserData[UserDataLen];		//自定义数据
 	WORD		FamilyPlayerIDLen;
diff --git a/ServerPack/GameServerPack/HB5_Bourse/PlayerAuctionItemInfo.h b/ServerPack/GameServerPack/HB5_Bourse/PlayerAuctionItemInfo.h
index 017c008..db97b91 100644
--- a/ServerPack/GameServerPack/HB5_Bourse/PlayerAuctionItemInfo.h
+++ b/ServerPack/GameServerPack/HB5_Bourse/PlayerAuctionItemInfo.h
@@ -8,6 +8,7 @@
 	WORD		ItemCount;
 	char		AddTime[19];	//上架时间 yyyy-MM-dd hh:mm:ss
 	WORD		BidderPrice;	//竞拍玩家出价
+	char		BiddingTime[19];	//竞价时间 yyyy-MM-dd hh:mm:ss
 	WORD		UserDataLen;
 	char		UserData[UserDataLen];		//自定义数据
 };
diff --git a/ServerPack/GameServerPack/HB5_Bourse/RefreshAuctionItemInfo.h b/ServerPack/GameServerPack/HB5_Bourse/RefreshAuctionItemInfo.h
index 8775fb5..d14d7dd 100644
--- a/ServerPack/GameServerPack/HB5_Bourse/RefreshAuctionItemInfo.h
+++ b/ServerPack/GameServerPack/HB5_Bourse/RefreshAuctionItemInfo.h
@@ -7,6 +7,7 @@
 	char		AddTime[19];	//上架时间
 	DWORD		BidderID;		//最高竞拍玩家ID,也就是当前最高竞价玩家ID	
 	DWORD		BidderPrice;	//最高竞拍价格
+	char		BiddingTime[19];	//竞价时间 yyyy-MM-dd hh:mm:ss
 };
 
 struct	tagGCRefreshAuctionItemInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo b/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo
similarity index 100%
rename from ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo
rename to ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.des b/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.des
new file mode 100644
index 0000000..5e8f9e8
--- /dev/null
+++ b/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.des
@@ -0,0 +1 @@
+A3 B1 装备部位星数信息 #tagMCEquipPartStarInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.h b/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.h
new file mode 100644
index 0000000..0fc0586
--- /dev/null
+++ b/ServerPack/MapServerPack/HA3_Function/EquipPartStarInfo.h
@@ -0,0 +1,14 @@
+// A3 B1 装备部位星数信息 #tagMCEquipPartStarInfo
+
+struct	tagMCEquipPartStar
+{
+                WORD		EquipPackIndex;
+	BYTE		Star;
+};
+
+struct	tagMCEquipPartStarInfo
+{
+	tagHead		Head;
+	BYTE		Count;		// 信息个数
+	tagMCEquipPartStar	InfoList[Count];	// 信息列表
+};
diff --git a/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo.des b/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo.des
deleted file mode 100644
index 72da7a0..0000000
--- a/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 09 通知玩家部位套装等级 #tagMCEquipPartSuiteLVInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo.h b/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo.h
deleted file mode 100644
index 164cd03..0000000
--- a/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// A3 09 通知玩家部位套装等级 #tagMCEquipPartSuiteLVInfo
-
-struct	tagMCEquipPartSuiteLV
-{		
-                BYTE		EquipIndex;
-	WORD		Len;	//长度
-	char		SuiteLVInfo[Len];	//{套装类型:等级}
-};
-
-struct	tagMCEquipPartSuiteLVInfo
-{
-	tagHead		Head;
-	BYTE		Count;		// 信息个数
-	tagMCEquipPartSuiteLV	InfoList[Count];	// 信息列表
-};
diff --git a/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo b/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo
similarity index 100%
rename from ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo
rename to ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo
Binary files differ
diff --git a/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.des b/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.des
new file mode 100644
index 0000000..caef356
--- /dev/null
+++ b/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.des
@@ -0,0 +1,2 @@
+A3 B3 装备部位强化信息 #tagMCEquipPartPlusInfo
+
diff --git a/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.h b/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.h
new file mode 100644
index 0000000..93a4fba
--- /dev/null
+++ b/ServerPack/MapServerPack/HA3_Function/MCEquipPartPlusInfo.h
@@ -0,0 +1,17 @@
+// A3 B3 装备部位强化信息 #tagMCEquipPartPlusInfo
+
+struct	tagMCEquipPartPlusLV
+{
+	BYTE		PackType;		
+                BYTE		EquipIndex;
+	WORD		EquipPartStarLV;
+	DWORD		Proficiency;
+                BYTE		EvolveLV;
+};
+
+struct	tagMCEquipPartPlusInfo
+{
+	tagHead		Head;
+	BYTE		Count;		// 信息个数
+	tagMCEquipPartPlusLV	InfoList[Count];	// 信息列表
+};
diff --git a/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo.des b/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo.des
deleted file mode 100644
index e7c3c22..0000000
--- a/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 B3 装备部位星级信息 #tagMCEquipPartStarLVInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo.h b/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo.h
deleted file mode 100644
index a191e7c..0000000
--- a/ServerPack/MapServerPack/HA3_Function/MCEquipPartStarLVInfo.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// A3 B3 装备部位星级信息 #tagMCEquipPartStarLVInfo
-
-struct	tagMCEquipPartStarLV
-{
-	BYTE		PackType;		
-                BYTE		EquipIndex;
-	WORD		EquipPartStarLV;
-	DWORD		Proficiency;
-};
-
-struct	tagMCEquipPartStarLVInfo
-{
-	tagHead		Head;
-	BYTE		Count;		// 信息个数
-	tagMCEquipPartStarLV	InfoList[Count];	// 信息列表
-};
diff --git a/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo b/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo.des b/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo.des
deleted file mode 100644
index 87159c0..0000000
--- a/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 53 法宝特权数据 #tagMCMWPrivilegeDataInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo.h b/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo.h
deleted file mode 100644
index e1a3211..0000000
--- a/ServerPack/MapServerPack/HA3_Function/MWPrivilegeDataInfo.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// A3 53 法宝特权数据 #tagMCMWPrivilegeDataInfo
-
-struct	tagMCMWPrivilegeData
-{
-	DWORD		PriID;		// 特权ID
-	BYTE		State;	//激活状态
-	DWORD		CurValue;		//当前总进度
-	DWORD		GotValue;		//已领取进度
-	BYTE		ItemAwardState;		//物品奖励是否已领取
-};
-
-struct	tagMCMWPrivilegeDataInfo
-{
-	tagHead		Head;
-	BYTE		Count;		// 信息个数
-	tagMCMWPrivilegeData	InfoList[Count];	// 信息列表
-};
diff --git a/ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo b/ServerPack/MapServerPack/HA3_Function/RealmExpInfo
similarity index 100%
copy from ServerPack/MapServerPack/HA3_Function/EquipPartSuiteLVInfo
copy to ServerPack/MapServerPack/HA3_Function/RealmExpInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/RealmExpInfo.des b/ServerPack/MapServerPack/HA3_Function/RealmExpInfo.des
new file mode 100644
index 0000000..05c84ad
--- /dev/null
+++ b/ServerPack/MapServerPack/HA3_Function/RealmExpInfo.des
@@ -0,0 +1 @@
+A3 27 境界修为池信息 #tagMCRealmExpInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/RealmExpInfo.h b/ServerPack/MapServerPack/HA3_Function/RealmExpInfo.h
new file mode 100644
index 0000000..cf68503
--- /dev/null
+++ b/ServerPack/MapServerPack/HA3_Function/RealmExpInfo.h
@@ -0,0 +1,9 @@
+// A3 27 境界修为池信息 #tagMCRealmExpInfo
+
+struct	tagMCRealmExpInfo
+{
+	tagHead		Head;
+	DWORD		BeginTime;	//开始计时时间
+	DWORD		CurExp;	//当前总经验
+	DWORD		CurExpPoint;	//当前总经验点
+};
diff --git a/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.des b/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.des
index 03565c7..502cf98 100644
--- a/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.des
+++ b/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.des
@@ -1 +1 @@
-A3 11 通知玩家境界渡劫是否开启 #tagMCSyncRealmFBIsOpen
+A3 11 通知玩家境界信息 #tagMCSyncRealmInfo
diff --git a/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.h b/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.h
index 854b75d..46e6947 100644
--- a/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.h
+++ b/ServerPack/MapServerPack/HA3_Function/SyncRealmFBIsOpen.h
@@ -1,11 +1,7 @@
-// A3 11 通知玩家境界渡劫是否开启 #tagMCSyncRealmFBIsOpen
+// A3 11 通知玩家境界信息 #tagMCSyncRealmInfo
 
-struct	tagMCSyncRealmFBIsOpen
+struct	tagMCSyncRealmInfo
 {
 	tagHead	Head;
-	BYTE	IsOpen;	//是否开启
-	WORD	SitAllTime;	//打坐总时间秒
-	DWORD	SitRemainTime;	//开始打坐前剩余时间秒
-	DWORD	SitStartTime;	//开始打坐时间
-	DWORD	LastEnterTime;	//上次进入渡劫副本时间
+	BYTE	IsPass;	//是否通关副本
 };
diff --git a/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState b/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState.des b/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState.des
deleted file mode 100644
index f98211e..0000000
--- a/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 34 天梯竞技场状态#tagMCHighLadderState
diff --git a/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState.h b/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState.h
deleted file mode 100644
index 7eec09c..0000000
--- a/ServerPack/MapServerPack/HA5_Family/MCQueryHighLadderState.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//A5 34 天梯竞技场状态#tagMCHighLadderState
-struct	tagMCHighLadderState
-{
-	tagHead		Head;
-	BYTE		Count;       	//已挑战次数
-	BYTE		MaxCount;	//最大次数
-	DWORD		CDTime;		//累计冷却时间
-	BYTE		IsRelCD;		//是否正在真实冷却状态
-	DWORD		Currency;	//积分
-};
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList b/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList.des b/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList.des
deleted file mode 100644
index a06309b..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 04 通知商店限购物品已购买次数信息 # tagMCShopItemBuyCntInfoList
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList.h b/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList.h
deleted file mode 100644
index 3529eb8..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopItemBuyCntInfoList.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// A8 04 通知商店限购物品已购买次数信息 # tagMCShopItemBuyCntInfoList
-
-
-struct    tagMCShopItemBuyCntInfo
-{
-	DWORD		ShopID;
-	WORD		ItemShopIndex;
-	DWORD		ItemID;
-	DWORD		BuyCnt; // 个人已购买数
-	DWORD		ServerBuyCnt; // 全服已购买数
-};
-
-struct    tagMCShopItemBuyCntInfoList
-
-{
-	tagHead		Head;
-	BYTE		Count; //通知个数
-	tagMCShopItemBuyCntInfo	BuyCntList[Count];
-};
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList b/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList.des b/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList.des
deleted file mode 100644
index 445bd54..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 03 通知自定义商店物品信息 #tagMCShopItemInfoList
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList.h b/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList.h
deleted file mode 100644
index 519f030..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopItemInfoList.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// A8 03 通知自定义商店物品信息 #tagMCShopItemInfoList
-
-struct    tagMCShopItemInfo
-{
-	DWORD		ShopID;
-	WORD		ItemShopIndex;
-	DWORD		DataSize;
-	char		ItemList[DataSize];	//物品列表[[物品ID,数量,是否绑定,是否定制]]
-	BYTE		PriceType;
-	DWORD		Price;
-	DWORD		OriginalPrice; // 原价
-	WORD		PlayerLVLimit; // 购买等级限制
-	BYTE		FamilyLVLimit; // 购买战盟等级限制
-	DWORD		MaxBuyCnt; // 个人限购数
-	DWORD		ServerMaxBuyCnt; // 全服限购数
-};
-
-struct    tagMCShopItemInfoList
-
-{
-	tagHead		Head;
-	BYTE		Count; //通知个数
-	tagMCShopItemInfo	ShopItemList[Count];
-};
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt b/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt.des b/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt.des
deleted file mode 100644
index 1ac6313..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 05 通知神秘商店刷新次数 #tagMCShopRefreshCnt
diff --git a/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt.h b/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt.h
deleted file mode 100644
index 99706e7..0000000
--- a/ServerPack/MapServerPack/HA8_Item/ShopRefreshCnt.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// A8 05 通知神秘商店刷新次数 #tagMCShopRefreshCnt
-
-struct	 tagMCShopRefreshCnt
-{
-	tagHead		Head;
-	DWORD		ShopID;	//商店ID
-	WORD		RefreshCnt;	//已手动刷新次数
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord b/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord.des b/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord.des
deleted file mode 100644
index 59776dd..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 03 升阶功能特惠奖励记录 #tagMCClassUPDayAwardRecordList
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord.h b/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord.h
deleted file mode 100644
index b854951..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/ClassUPDayAwardRecord.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// AA 03 升阶功能特惠奖励记录 #tagMCClassUPDayAwardRecordList
-
-struct    tagMCClassUPDayAwardRecord
-{
-	tagHead		Head;
-	BYTE		DayType;	 // 奖励日类型
-	DWORD		Record;	// 奖励记录
-};
-
-struct    tagMCClassUPDayAwardRecordList
-
-{
-	tagHead		Head;
-	BYTE		RecordCount;		//记录个数
-	tagMCClassUPDayAwardRecord	RecordInfoList[RecordCount];	//记录列表
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo.des b/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo.des
deleted file mode 100644
index e4c327a..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 06 消费奖励信息 #tagMCCostProfitInfo
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo.h b/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo.h
deleted file mode 100644
index 7d6a294..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// AA 06 消费奖励信息 #tagMCCostProfitInfo
-
-struct	tagMCCostProfitInfo
-{
-	tagHead		Head;
-	DWORD		ActionID;		 // 活动ID
-	DWORD		TotalCost;	 // 总消费
-	DWORD		AwardState;	// 奖励领取状态
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo b/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo.des b/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo.des
deleted file mode 100644
index 5e17ec3..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 07 消费排行特惠信息 #tagMCCostRankTeHuiInfo
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo.h b/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo.h
deleted file mode 100644
index e5703cc..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/CostRankTeHuiInfo.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// AA 07 消费排行特惠信息 #tagMCCostRankTeHuiInfo
-
-struct    tagMCCostRankTeHuiInfo
-{
-	tagHead		Head;
-	DWORD		ActionID;		 // 活动ID
-	DWORD		TotalCost;	 // 总累计消费钻石
-};
-
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo b/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo.des b/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo.des
deleted file mode 100644
index 8159399..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 05 充值排行特惠信息 #tagMCRechargeRankTeHuiInfo
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo.h b/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo.h
deleted file mode 100644
index 2cc7757..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeRankTeHuiInfo.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// AA 05 充值排行特惠信息 #tagMCRechargeRankTeHuiInfo
-
-
-struct    tagMCRechargeRankTeHuiInfo
-
-{
-	tagHead		Head;
-	DWORD		ActionID;		 // 活动ID
-	DWORD		TotalGold;	 // 总累计充值元宝
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList b/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList
+++ /dev/null
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList.des b/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList.des
deleted file mode 100644
index 341d78a..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 04 充值特惠信息 #tagMCRechargeTeHuiInfoList
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList.h b/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList.h
deleted file mode 100644
index 527b177..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/RechargeTeHuiInfoList.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// AA 04 充值特惠信息 #tagMCRechargeTeHuiInfoList
-
-struct    tagMCRechargeTeHuiInfo
-{
-	tagHead		Head;
-	BYTE		GotCnt;	 	// 已领取次数
-	BYTE		CanGetCnt;	// 当前可领取次数
-	DWORD		CurTotalGold;	// 当前规则累计充值元宝-仅针对累充规则
-};
-
-struct    tagMCRechargeTeHuiInfoList
-
-{
-	tagHead		Head;
-	DWORD		ActionID;		 // 活动ID
-	DWORD		TotalGold;	 // 总累计充值元宝
-	BYTE		InfoCnt;		 // 信息个数
-	tagMCRechargeTeHuiInfo	InfoList[InfoCnt];	// 信息列表
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo b/ServerPack/MapServerPack/HB1_Role/RolePointInfo
similarity index 100%
rename from ServerPack/MapServerPack/HAA_SaleActivity/CostProfitInfo
rename to ServerPack/MapServerPack/HB1_Role/RolePointInfo
diff --git a/ServerPack/MapServerPack/HB1_Role/RolePointInfo.des b/ServerPack/MapServerPack/HB1_Role/RolePointInfo.des
new file mode 100644
index 0000000..7393174
--- /dev/null
+++ b/ServerPack/MapServerPack/HB1_Role/RolePointInfo.des
@@ -0,0 +1 @@
+B1 07 玩家点数信息 #tagMCRolePointInfo
diff --git a/ServerPack/MapServerPack/HB1_Role/RolePointInfo.h b/ServerPack/MapServerPack/HB1_Role/RolePointInfo.h
new file mode 100644
index 0000000..d662d51
--- /dev/null
+++ b/ServerPack/MapServerPack/HB1_Role/RolePointInfo.h
@@ -0,0 +1,9 @@
+// B1 07 玩家点数信息 #tagMCRolePointInfo
+
+struct    tagMCRolePointInfo
+{
+	tagHead		 Head;
+	BYTE		PointAttrIDCount;	// 点类型个数
+	BYTE		PointAttrIDList[PointAttrIDCount];	// 点类型列表
+	WORD		PointValueList[PointAttrIDCount];	// 点类型对应已加自由点数列表
+};

--
Gitblit v1.8.0