From 6f59d9967349d49d9331dc5e7634bc1ad8456f1d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 27 十一月 2019 17:13:51 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统(封包修改)

---
 ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList           |    0 
 ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.h          |   11 +++++
 ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h        |    8 ++++
 ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift        |    0 
 ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.h   |   24 ++++++++++++
 ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.des        |    1 
 ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h      |    8 ++++
 /dev/null                                                          |    8 ----
 ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift        |    0 
 ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h         |   24 ++++++++++++
 ServerPack/GameServerPack/HB0_Event/ClearAssist.h                  |    2 
 ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.h      |    9 ++++
 ServerPack/GameServerPack/HB0_Event/AssistInfoList.h               |   15 +++----
 ClientPack/ClientToGameServer/CB0_Event/CancelAssistBoss.h         |    2 
 ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des      |    1 
 ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des       |    1 
 ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des    |    1 
 ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.des    |    1 
 ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo            |    0 
 ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.des |    1 
 ClientPack/ClientToGameServer/CB0_Event/StartAssistBoss.h          |    2 
 ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview     |    0 
 ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK          |    0 
 23 files changed, 99 insertions(+), 20 deletions(-)

diff --git a/ClientPack/ClientToGameServer/CB0_Event/CancelAssistBoss.h b/ClientPack/ClientToGameServer/CB0_Event/CancelAssistBoss.h
index 96bd193..cbd1359 100644
--- a/ClientPack/ClientToGameServer/CB0_Event/CancelAssistBoss.h
+++ b/ClientPack/ClientToGameServer/CB0_Event/CancelAssistBoss.h
@@ -4,5 +4,5 @@
 
 {
 	tagHead		Head;
-	char		GUID[40];
+	char		AssistGUID[40];	//协助GUID
 };
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift.des b/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift.des
deleted file mode 100644
index 7b37c12..0000000
--- a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift.des
+++ /dev/null
@@ -1 +0,0 @@
-B0 15 领取协助感谢礼物 #tagCGGetAssistGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift.h b/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift.h
deleted file mode 100644
index 42abb1e..0000000
--- a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// B0 15 领取协助感谢礼物 #tagCGGetAssistGift
-
-struct    tagCGGetAssistGift
-
-{
-	tagHead		Head;
-	char		GUID[40];
-};
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift
similarity index 100%
rename from ClientPack/ClientToGameServer/CB0_Event/GetAssistGift
rename to ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des
new file mode 100644
index 0000000..f9f119c
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des
@@ -0,0 +1 @@
+B0 15 领取协助感谢礼盒 #tagCGGetAssistThanksGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h
new file mode 100644
index 0000000..307c053
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h
@@ -0,0 +1,8 @@
+// B0 15 领取协助感谢礼物 #tagCGGetAssistThanksGift
+
+struct    tagCGGetAssistThanksGift
+
+{
+	tagHead		Head;
+	char		GiftGUID[40];	//礼盒GUID
+};
diff --git a/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift b/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift
+++ /dev/null
diff --git a/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift.des b/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift.des
deleted file mode 100644
index c4a7702..0000000
--- a/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift.des
+++ /dev/null
@@ -1 +0,0 @@
-B0 14 发送协助感谢礼物 #tagCGSendAssistGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift.h b/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift.h
deleted file mode 100644
index e18460c..0000000
--- a/ClientPack/ClientToGameServer/CB0_Event/SendAssistGift.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// B0 14 发送协助感谢礼物 #tagCGSendAssistGift
-
-struct    tagCGSendAssistGift
-
-{
-	tagHead		Head;
-	char		GUID[40];
-};
diff --git a/ClientPack/ClientToGameServer/CB0_Event/StartAssistBoss.h b/ClientPack/ClientToGameServer/CB0_Event/StartAssistBoss.h
index 60472a2..ce2dd8b 100644
--- a/ClientPack/ClientToGameServer/CB0_Event/StartAssistBoss.h
+++ b/ClientPack/ClientToGameServer/CB0_Event/StartAssistBoss.h
@@ -4,5 +4,5 @@
 
 {
 	tagHead		Head;
-	char		GUID[40];
+	char		AssistGUID[40];	//协助GUID
 };
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift b/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift
similarity index 100%
copy from ClientPack/ClientToGameServer/CB0_Event/GetAssistGift
copy to ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.des b/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.des
new file mode 100644
index 0000000..9407a9a
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.des
@@ -0,0 +1 @@
+B0 14 使用协助感谢礼盒 #tagCGUseAssistThanksGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.h b/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.h
new file mode 100644
index 0000000..c4a7ead
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB0_Event/UseAssistThanksGift.h
@@ -0,0 +1,9 @@
+// B0 14 使用协助感谢礼盒 #tagCGUseAssistThanksGift
+
+struct    tagCGUseAssistThanksGift
+
+{
+	tagHead		Head;
+	DWORD		ItemID;
+	char		GiftGUID[40];	//预览时GUID不发,确认使用时需发送预览返回的GUID
+};
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistInfoList.h b/ServerPack/GameServerPack/HB0_Event/AssistInfoList.h
index 969acf7..651cb7a 100644
--- a/ServerPack/GameServerPack/HB0_Event/AssistInfoList.h
+++ b/ServerPack/GameServerPack/HB0_Event/AssistInfoList.h
@@ -2,19 +2,16 @@
 
 struct    tagGCAssistInfo
 {
-	char		GUID[40];
+	char		AssistGUID[40];	//协助GUID
 	char		PlayerName[33];
 	BYTE		Job;
 	WORD		LV;		//等级
 	BYTE		RealmLV;		//境界
-	BYTE		AssistType;	//协助类型 1-boss, 2-副本, 3-
-	DWORD		AssistValue1;	//协助参数1,由协助类型决定
-	DWORD		AssistValue2;	//协助参数2
-	DWORD		AssistValue3;	//协助参数3
-	DWORD		AssistValue4;	//协助参数4
-	DWORD		AssistValue5;	//协助参数5
-	WORD		AssistDataLen;
-	char		AssistData[AssistDataLen];	//其他自定义数据
+	DWORD		MapID;
+	DWORD		LineID;
+	DWORD		NPCID;
+	WORD		ExDataLen;
+	char		ExData[ExDataLen];	//其他自定义数据
 };
 
 struct    tagGCAssistInfoList
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift b/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo
similarity index 100%
copy from ClientPack/ClientToGameServer/CB0_Event/GetAssistGift
copy to ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.des b/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.des
new file mode 100644
index 0000000..ed34d82
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.des
@@ -0,0 +1 @@
+B0 03 协助中的目标玩家信息 #tagGCAssistTagPlayerInfo
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.h b/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.h
new file mode 100644
index 0000000..a130d9b
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/AssistTagPlayerInfo.h
@@ -0,0 +1,11 @@
+// B0 03 协助中的目标玩家信息 #tagGCAssistTagPlayerInfo
+
+struct    tagGCAssistTagPlayerInfo
+{
+	tagHead		Head;
+	DWORD		PlayerID;
+	char		PlayerName[33];
+	BYTE		Job;
+	WORD		LV;
+	BYTE		RealmLV;
+};
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList
similarity index 100%
copy from ClientPack/ClientToGameServer/CB0_Event/GetAssistGift
copy to ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des
new file mode 100644
index 0000000..4935aa8
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des
@@ -0,0 +1 @@
+B0 05 可领取的协助感谢礼盒 #tagGCAssistThanksGiftList
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h
new file mode 100644
index 0000000..ea996ac
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h
@@ -0,0 +1,24 @@
+// B0 05 可领取的协助感谢礼盒 #tagGCAssistThanksGiftList
+
+struct    tagGCAssistThanksGift
+{
+	char		GiftGUID[40];	//礼盒GUID
+	DWORD		ItemID;		//礼盒ID
+	DWORD		PlayerID;		//发起玩家ID
+	char		PlayerName[33];
+	BYTE		Job;
+	WORD		LV;
+	BYTE		RealmLV;		//境界
+	DWORD		MapID;
+	DWORD		LineID;
+	DWORD		NPCID;
+	WORD		ExDataLen;
+	char		ExData[ExDataLen];	//其他自定义数据
+};
+
+struct    tagGCAssistThanksGiftList
+{
+	tagHead		Head;
+	BYTE		GiftCount;
+	tagGCAssistThanksGift	ThanksGiftList[GiftCount];
+};
diff --git a/ServerPack/GameServerPack/HB0_Event/ClearAssist.h b/ServerPack/GameServerPack/HB0_Event/ClearAssist.h
index ea47a6b..949e87d 100644
--- a/ServerPack/GameServerPack/HB0_Event/ClearAssist.h
+++ b/ServerPack/GameServerPack/HB0_Event/ClearAssist.h
@@ -3,5 +3,5 @@
 struct    tagGCClearAssist
 {
 	tagHead		Head;
-	char		GUID[40];
+	char		AssistGUID[40];	//协助GUID
 };
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK
similarity index 100%
copy from ClientPack/ClientToGameServer/CB0_Event/GetAssistGift
copy to ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des
new file mode 100644
index 0000000..e6a8ec6
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des
@@ -0,0 +1 @@
+B0 06 领取协助感谢礼盒成功 #tagGCGetAssistThanksGiftOK
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h
new file mode 100644
index 0000000..239b1bb
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h
@@ -0,0 +1,8 @@
+// B0 06 领取协助感谢礼盒成功 #tagGCGetAssistThanksGiftOK
+
+struct    tagGCGetAssistThanksGiftOK
+
+{
+	tagHead		Head;
+	char		GiftGUID[40];	//礼盒GUID
+};
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistGift b/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview
similarity index 100%
copy from ClientPack/ClientToGameServer/CB0_Event/GetAssistGift
copy to ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview
diff --git a/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.des b/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.des
new file mode 100644
index 0000000..d8128d3
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.des
@@ -0,0 +1 @@
+B0 04 使用协助感谢礼盒预览 #tagGCUseAssistThanksGiftPreview
diff --git a/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.h b/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.h
new file mode 100644
index 0000000..8f400bc
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/UseAssistThanksGiftPreview.h
@@ -0,0 +1,24 @@
+// B0 04 使用协助感谢礼盒预览 #tagGCUseAssistThanksGiftPreview
+
+struct    tagGCAssistPlayerInfo
+{
+	DWORD		PlayerID;
+	char		PlayerName[33];
+	BYTE		Job;
+	WORD		LV;
+	BYTE		RealmLV;		//境界
+};
+
+struct    tagGCUseAssistThanksGiftPreview
+{
+	tagHead		Head;
+	char		GiftGUID[40];	//礼盒GUID
+	DWORD		ItemID;		//礼盒ID
+	DWORD		MapID;
+	DWORD		LineID;
+	DWORD		NPCID;
+	WORD		ExDataLen;
+	char		ExData[ExDataLen];	//其他自定义数据
+	BYTE		AssistPlayerCount;
+	tagGCAssistPlayerInfo	AssistPlayerList[AssistPlayerCount];	//协助玩家列表
+};

--
Gitblit v1.8.0