From 21358acd74718b13417b112b5ed1cbf74d93d695 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 十二月 2019 14:51:47 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统（修改感谢礼盒相关封包）
---
/dev/null | 8 --------
ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.des | 1 +
ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des | 2 +-
ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount | 0
ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.des | 1 +
ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview | 0
ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.h | 20 ++++++++++++++++++++
ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h | 4 ++--
ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.h | 8 ++++++++
9 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des
index f9f119c..cbd9826 100644
--- a/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des
+++ b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.des
@@ -1 +1 @@
-B0 15 领取协助感谢礼盒 #tagCGGetAssistThanksGift
+B0 15 接收协助感谢礼物 #tagCGGetAssistThanksGift
diff --git a/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h
index 307c053..9817148 100644
--- a/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h
+++ b/ClientPack/ClientToGameServer/CB0_Event/GetAssistThanksGift.h
@@ -1,8 +1,8 @@
-// B0 15 领取协助感谢礼物 #tagCGGetAssistThanksGift
+// B0 15 接收协助感谢礼物 #tagCGGetAssistThanksGift
struct tagCGGetAssistThanksGift
{
tagHead Head;
- char GiftGUID[40]; //礼盒GUID
+ char GiftGUID[40]; //预览时GUID不发，确认领取时需发送预览返回的GUID，无额外奖励不需要再次发送
};
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des
deleted file mode 100644
index 4935aa8..0000000
--- a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.des
+++ /dev/null
@@ -1 +0,0 @@
-B0 05 可领取的协助感谢礼盒 #tagGCAssistThanksGiftList
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h b/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h
deleted file mode 100644
index ea996ac..0000000
--- a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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/AssistThanksGiftList b/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount
similarity index 100%
rename from ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList
rename to ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount
diff --git a/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.des b/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.des
new file mode 100644
index 0000000..54e97a7
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.des
@@ -0,0 +1 @@
+B0 06 可接收协助感谢礼物个数 #tagGCCanGetAssistThanksGiftCount
diff --git a/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.h b/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.h
new file mode 100644
index 0000000..7213d66
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/CanGetAssistThanksGiftCount.h
@@ -0,0 +1,8 @@
+// B0 06 可接收协助感谢礼物个数 #tagGCCanGetAssistThanksGiftCount
+
+struct tagGCCanGetAssistThanksGiftCount
+
+{
+ tagHead Head;
+ BYTE CanGetCount;
+};
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK
+++ /dev/null
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des
deleted file mode 100644
index e6a8ec6..0000000
--- a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.des
+++ /dev/null
@@ -1 +0,0 @@
-B0 06 领取协助感谢礼盒成功 #tagGCGetAssistThanksGiftOK
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h
deleted file mode 100644
index 239b1bb..0000000
--- a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftOK.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// B0 06 领取协助感谢礼盒成功 #tagGCGetAssistThanksGiftOK
-
-struct tagGCGetAssistThanksGiftOK
-
-{
- tagHead Head;
- char GiftGUID[40]; //礼盒GUID
-};
diff --git a/ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview
similarity index 100%
copy from ServerPack/GameServerPack/HB0_Event/AssistThanksGiftList
copy to ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.des b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.des
new file mode 100644
index 0000000..5539278
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.des
@@ -0,0 +1 @@
+B0 05 接收协助感谢礼物预览 #tagGCGetAssistThanksGiftPreview
diff --git a/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.h b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.h
new file mode 100644
index 0000000..10a9109
--- /dev/null
+++ b/ServerPack/GameServerPack/HB0_Event/GetAssistThanksGiftPreview.h
@@ -0,0 +1,20 @@
+// B0 05 接收协助感谢礼物预览 #tagGCGetAssistThanksGiftPreview
+
+struct tagGCGetAssistThanksGiftPreview
+{
+ tagHead Head;
+ 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]; //其他自定义数据
+ char TimeStr[19]; //协助时间yyyy-MM-dd hh:mm:ss
+ BYTE ExtraAward; //是否有额外奖励
+};
--
Gitblit v1.8.0