From 5dfa5f212b6d035fc850b0409c0c2958b29881b4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 十一月 2021 15:06:44 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统（赠送礼物版优化 封包修改）
---
ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.des | 1
ClientPack/ClientToMapServer/B3 社交/SendGifts | 0
ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.des | 1
ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.h | 19 +++++++++
ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery | 0
ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.des | 1
ClientPack/ClientToMapServer/B3 社交/SendGifts.des | 1
ServerPack/MapServerPack/B3 社交/CoupleInfo.h | 1
/dev/null | 8 ----
ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo | 0
ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.des | 1
ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples | 0
ServerPack/GameServerPack/HB3_PlayerSocial/tagGCGroupPlayers.h | 5 +-
ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.des | 1
ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.h | 15 +++++++
ServerPack/GameServerPack/HB3_PlayerSocial/tagGCFriendInfo.h | 1
ClientPack/ClientToMapServer/B3 社交/SendGifts.h | 10 +++++
ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList | 0
ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList | 0
ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.h | 9 ++++
ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.h | 9 ++++
ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.h | 18 +++++++++
22 files changed, 89 insertions(+), 12 deletions(-)
diff --git "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers" b/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery
similarity index 100%
copy from "ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers"
copy to ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery
diff --git a/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.des b/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.des
new file mode 100644
index 0000000..249fba0
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.des
@@ -0,0 +1 @@
+B3 09 魅力贡献榜查看 #tagCGCharmOfferBillboardQuery
diff --git a/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.h b/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.h
new file mode 100644
index 0000000..354fb04
--- /dev/null
+++ b/ClientPack/ClientToGameServer/CB3_PlayerSocial/CharmOfferBillboardQuery.h
@@ -0,0 +1,9 @@
+// B3 09 魅力贡献榜查看 #tagCGCharmOfferBillboardQuery
+
+struct tagCGCharmOfferBillboardQuery
+{
+ tagHead Head;
+ DWORD PlayerID; // 魅力玩家ID
+ BYTE QueryType; // 查看类型： 1-总榜，2-周榜，3-日榜
+ BYTE QueryCount; // 查看名次数量，最大255
+};
diff --git "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers.des" "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers.des"
deleted file mode 100644
index d0cfc77..0000000
--- "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers.des"
+++ /dev/null
@@ -1 +0,0 @@
-B3 10 送花 #tagCMSendFlowers
diff --git "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers.h" "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers.h"
deleted file mode 100644
index cab637d..0000000
--- "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers.h"
+++ /dev/null
@@ -1,8 +0,0 @@
-// B3 10 送花 #tagCMSendFlowers
-
-struct tagCMSendFlowers
-{
- tagHead Head;
- DWORD TagPlayerID; // 目标玩家ID
- DWORD FlowerCount; // 赠送花数量
-};
diff --git "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers" "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts"
similarity index 100%
rename from "ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendFlowers"
rename to "ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts"
diff --git "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts.des" "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts.des"
new file mode 100644
index 0000000..5f9ac44
--- /dev/null
+++ "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts.des"
@@ -0,0 +1 @@
+B3 10 送礼物 #tagCMSendGifts
diff --git "a/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts.h" "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts.h"
new file mode 100644
index 0000000..2477ec5
--- /dev/null
+++ "b/ClientPack/ClientToMapServer/B3 \347\244\276\344\272\244/SendGifts.h"
@@ -0,0 +1,10 @@
+// B3 10 送礼物 #tagCMSendGifts
+
+struct tagCMSendGifts
+{
+ tagHead Head;
+ DWORD TagPlayerID; // 目标玩家ID
+ WORD GiftNum; // 赠送礼物编号
+ DWORD GiftCount; // 赠送礼物数量
+ BYTE IsAutoBuy; // 是否自动购买
+};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK b/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList
similarity index 100%
rename from ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK
rename to ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.des b/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.des
new file mode 100644
index 0000000..b476f1e
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.des
@@ -0,0 +1 @@
+B3 19 魅力贡献榜 #tagGCCharmOfferBillboardDataList
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.h b/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.h
new file mode 100644
index 0000000..9f4c04d
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/CharmOfferBillboardDataList.h
@@ -0,0 +1,19 @@
+// B3 19 魅力贡献榜 #tagGCCharmOfferBillboardDataList
+
+struct tagGCCharmOfferBillboardData
+{
+ DWORD OrderIndex; //名次索引，0代表第一名
+ DWORD PlayerID; // 玩家ID - 贡献者
+ BYTE NameLen;
+ char PlayerName[NameLen];
+ DWORD CharmValue; //贡献魅力值
+};
+
+struct tagGCCharmOfferBillboardDataList
+{
+ tagHead Head;
+ DWORD PlayerID; // 魅力玩家ID
+ BYTE QueryType; // 查看类型： 1-总榜，2-周榜，3-日榜
+ BYTE DataCount;
+ tagGCCharmOfferBillboardData OfferBillboardDataList[DataCount];
+};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK b/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo
similarity index 100%
copy from ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK
copy to ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.des b/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.des
new file mode 100644
index 0000000..bfc7fc9
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.des
@@ -0,0 +1 @@
+B3 25 玩家魅力值信息 #tagGCPlayerCharmValueInfo
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.h b/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.h
new file mode 100644
index 0000000..1fbd79e
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/PlayerCharmValueInfo.h
@@ -0,0 +1,9 @@
+// B3 25 玩家魅力值信息 #tagGCPlayerCharmValueInfo
+
+struct tagGCPlayerCharmValueInfo
+{
+ tagHead Head;
+ DWORD CharmValueTotal; //当前魅力值 - 总
+ DWORD CharmValueWeek; //当前魅力值 - 周
+ DWORD CharmValueDay; //当前魅力值 - 日
+};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK.des b/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK.des
deleted file mode 100644
index 5830bbc..0000000
--- a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK.des
+++ /dev/null
@@ -1 +0,0 @@
-B3 20 送花成功通知 #tagGCSendFlowersOK
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK.h b/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK.h
deleted file mode 100644
index 83b873b..0000000
--- a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// B3 20 送花成功通知 #tagGCSendFlowersOK
-
-struct tagGCSendFlowersOK
-{
- tagHead Head;
- BYTE NameLen; // 赠送方玩家名
- char Name[NameLen]; //size = SrcNameLen
- DWORD PlayerID; // 赠送方玩家ID
- DWORD FlowerCount; // 赠送花数量
-};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK b/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList
similarity index 100%
copy from ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK
copy to ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.des b/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.des
new file mode 100644
index 0000000..fc129c8
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.des
@@ -0,0 +1 @@
+B3 20 送礼物成功通知 #tagGCSendGiftsOKList
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.h b/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.h
new file mode 100644
index 0000000..a68d29b
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/SendGiftsOKList.h
@@ -0,0 +1,18 @@
+// B3 20 送礼物成功通知 #tagGCSendGiftsOKList
+
+struct tagGCSendGiftsOK
+{
+ BYTE NameLen;
+ char Name[NameLen]; // 赠送方玩家名
+ DWORD PlayerID; // 赠送方玩家ID
+ WORD GiftNum; // 赠送礼物编号
+ DWORD GiftCount; // 赠送礼物数量
+ DWORD SendTime; // 赠送时间戳
+};
+
+struct tagGCSendGiftsOKList
+{
+ tagHead Head;
+ WORD Count;
+ tagGCSendGiftsOK SendGiftsOKList[Count];
+};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK b/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples
similarity index 100%
copy from ServerPack/GameServerPack/HB3_PlayerSocial/SendFlowersOK
copy to ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.des b/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.des
new file mode 100644
index 0000000..b657016
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.des
@@ -0,0 +1 @@
+B3 14 社交人群伴侣信息 #tagGCSocialCouples
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.h b/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.h
new file mode 100644
index 0000000..a998cc5
--- /dev/null
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/SocialCouples.h
@@ -0,0 +1,15 @@
+// B3 14 社交人群伴侣信息 #tagGCSocialCouples
+
+struct tagGCSocialCouple
+{
+ DWORD PlayerID;
+ DWORD CoupleID; //伴侣ID
+};
+
+
+struct tagGCSocialCouples
+{
+ tagHead Head;
+ WORD Count;
+ tagGCSocialCouple Player[Count]; //size = Count
+};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCFriendInfo.h b/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCFriendInfo.h
index f4b4f2f..4a62637 100644
--- a/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCFriendInfo.h
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCFriendInfo.h
@@ -8,7 +8,6 @@
WORD LV; //等级
WORD RealmLV; //境界
BYTE OnlineType; //0不在线 1在线 2脱机在线
- DWORD CoupleID; //伴侣ID
};
diff --git a/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCGroupPlayers.h b/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCGroupPlayers.h
index e6f157f..03503fc 100644
--- a/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCGroupPlayers.h
+++ b/ServerPack/GameServerPack/HB3_PlayerSocial/tagGCGroupPlayers.h
@@ -3,15 +3,14 @@
struct tagGCGroupPlayer
{
DWORD PlayerID;
- DWORD SortValue;
- DWORD Intimacy; //亲密度 - 好友组才有值
+ DWORD SortValue; // 亲密组时为亲密度
};
struct tagGCGroupPlayers
{
tagHead Head;
- BYTE GroupType; // 分组 1 最近联系人 2 好友 3 仇人 4 黑名单
+ BYTE GroupType; // 分组 1 最近联系人 2 好友 3 仇人 4 黑名单 5亲密组
WORD Count;
tagGCGroupPlayer Players[Count]; //size = Count
};
diff --git "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo" "b/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo"
deleted file mode 100644
index e69de29..0000000
--- "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo"
+++ /dev/null
diff --git "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo.des" "b/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo.des"
deleted file mode 100644
index d6a1f59..0000000
--- "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo.des"
+++ /dev/null
@@ -1 +0,0 @@
-B3 25 魅力值信息 #tagMCCharmInfo
diff --git "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo.h" "b/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo.h"
deleted file mode 100644
index bffb785..0000000
--- "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CharmInfo.h"
+++ /dev/null
@@ -1,8 +0,0 @@
-// B3 25 魅力值信息 #tagMCCharmInfo
-
-struct tagMCCharmInfo
-{
- tagHead Head;
- DWORD CharmTotal; // 魅力值 - 总
- DWORD CharmToday; // 魅力值 - 今日
-};
diff --git "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CoupleInfo.h" "b/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CoupleInfo.h"
index 07f98f3..32ec04f 100644
--- "a/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CoupleInfo.h"
+++ "b/ServerPack/MapServerPack/B3 \347\244\276\344\272\244/CoupleInfo.h"
@@ -7,4 +7,5 @@
DWORD NewMarryTime; // 新婚时间戳， 秒，计算结婚天数按该时间计算
DWORD MarryTime; // 最近一次提亲成功时间戳， 秒，计算可离婚时间按该时间计算
DWORD BridePriceState; // 聘礼状态，按二进制位存储是否已购买
+ DWORD MarryBreakReqTime; // 最近一次请求和离时间戳， 秒
};
--
Gitblit v1.8.0