From 49ef601771ac1fe640702a34791a06448e849f2c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 十月 2025 20:43:21 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（徽章旗帜、旗号；捐献；公会加经验、加贡献度；搜索支持公会编号；）
---
ClientPack/CA6_Family/ChangeFamilyEmblem.h | 1 +
/dev/null | 16 ----------------
ServerPack/HA5_Family/FamilyViewList.h | 1 +
ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h | 1 +
ServerPack/HA5_Family/RoleFamilyInfo.h | 5 ++++-
ServerPack/HA5_Family/DonateCntInfo.des | 1 +
ServerPack/HA5_Family/DonateCntInfo.h | 8 ++++++++
ClientPack/CA6_Family/CreateFamily.h | 1 +
ServerPack/HA5_Family/DonateCntInfo | 0
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ClientPack/CA6_Family/ChangeFamilyEmblem.h b/ClientPack/CA6_Family/ChangeFamilyEmblem.h
index feb373d..9c5ab08 100644
--- a/ClientPack/CA6_Family/ChangeFamilyEmblem.h
+++ b/ClientPack/CA6_Family/ChangeFamilyEmblem.h
@@ -4,4 +4,5 @@
{
tagHead Head;
BYTE EmblemID; // 更换的徽章ID
+ char EmblemWord[3]; // 徽章文字
};
diff --git a/ClientPack/CA6_Family/CreateFamily.h b/ClientPack/CA6_Family/CreateFamily.h
index 67063c4..556e1f5 100644
--- a/ClientPack/CA6_Family/CreateFamily.h
+++ b/ClientPack/CA6_Family/CreateFamily.h
@@ -5,4 +5,5 @@
tagHead Head;
char Name[33];
WORD EmblemID; //选择徽章ID，解锁仙盟等级为1级的均为可选ID
+ char EmblemWord[3]; //徽章文字
};
diff --git a/ClientPack/CA6_Family/FamilyActivityExchange b/ClientPack/CA6_Family/FamilyActivityExchange
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/CA6_Family/FamilyActivityExchange
+++ /dev/null
diff --git a/ClientPack/CA6_Family/FamilyActivityExchange.des b/ClientPack/CA6_Family/FamilyActivityExchange.des
deleted file mode 100644
index 7d9fd3f..0000000
--- a/ClientPack/CA6_Family/FamilyActivityExchange.des
+++ /dev/null
@@ -1 +0,0 @@
-A6 06 家族兑换活跃令 #tagCMFamilyActivityExchange
diff --git a/ClientPack/CA6_Family/FamilyActivityExchange.h b/ClientPack/CA6_Family/FamilyActivityExchange.h
deleted file mode 100644
index dd8f121..0000000
--- a/ClientPack/CA6_Family/FamilyActivityExchange.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// A6 06 家族兑换活跃令 #tagCMFamilyActivityExchange
-
-struct tagCMFamilyActivityExchange
-{
- tagHead Head;
- BYTE Count; //材料所在背包索引的数量
- WORD IndexList[Count]; //材料所在背包索引列表
- DWORD ItemIDList[Count]; //材料所在背包物品ID列表
-};
diff --git a/ClientPack/CA6_Family/FamilyAffairOP b/ClientPack/CA6_Family/FamilyAffairOP
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/CA6_Family/FamilyAffairOP
+++ /dev/null
diff --git a/ClientPack/CA6_Family/FamilyAffairOP.des b/ClientPack/CA6_Family/FamilyAffairOP.des
deleted file mode 100644
index b3d6c12..0000000
--- a/ClientPack/CA6_Family/FamilyAffairOP.des
+++ /dev/null
@@ -1 +0,0 @@
-A6 13 家族事务操作 #tagCMFamilyAffairOP
diff --git a/ClientPack/CA6_Family/FamilyAffairOP.h b/ClientPack/CA6_Family/FamilyAffairOP.h
deleted file mode 100644
index 71ee6df..0000000
--- a/ClientPack/CA6_Family/FamilyAffairOP.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// A6 13 家族事务操作 #tagCMFamilyAffairOP
-
-struct tagCMFamilyAffairOP
-{
- tagHead Head;
- BYTE OPType; // 操作类型：1-刷新事务；2-开始事务；3-领取事务奖励；
- WORD AffairID; // 事务ID，可选
-};
diff --git a/ClientPack/CA6_Family/TechLVUP b/ClientPack/CA6_Family/TechLVUP
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/CA6_Family/TechLVUP
+++ /dev/null
diff --git a/ClientPack/CA6_Family/TechLVUP.des b/ClientPack/CA6_Family/TechLVUP.des
deleted file mode 100644
index 5cb828d..0000000
--- a/ClientPack/CA6_Family/TechLVUP.des
+++ /dev/null
@@ -1 +0,0 @@
-A6 07 自身家族科技等级提升 #tagCMFamilyTechLVUP
diff --git a/ClientPack/CA6_Family/TechLVUP.h b/ClientPack/CA6_Family/TechLVUP.h
deleted file mode 100644
index 4b636dd..0000000
--- a/ClientPack/CA6_Family/TechLVUP.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// A6 07 自身家族科技等级提升 #tagCMFamilyTechLVUP
-
-struct tagCMFamilyTechLVUP
-{
- tagHead Head;
- DWORD TechID; // 科技ID
-};
diff --git a/ServerPack/HA3_Function/FamilyActivityInfo b/ServerPack/HA3_Function/FamilyActivityInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA3_Function/FamilyActivityInfo
+++ /dev/null
diff --git a/ServerPack/HA3_Function/FamilyActivityInfo.des b/ServerPack/HA3_Function/FamilyActivityInfo.des
deleted file mode 100644
index 2974092..0000000
--- a/ServerPack/HA3_Function/FamilyActivityInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 16 仙盟活跃信息通知 #tagMCFamilyActivityInfo
diff --git a/ServerPack/HA3_Function/FamilyActivityInfo.h b/ServerPack/HA3_Function/FamilyActivityInfo.h
deleted file mode 100644
index 4bd8476..0000000
--- a/ServerPack/HA3_Function/FamilyActivityInfo.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// A3 16 仙盟活跃信息通知 #tagMCFamilyActivityInfo
-
-struct tagMCFamilyActionCnt
-{
- BYTE ActionID; // ID
- WORD FinishCnt; // 已完成次数
-};
-
-struct tagMCFamilyActivityInfo
-{
- tagHead Head;
- DWORD AwardRecord; // 领奖情况记录
- BYTE Count; // 个数
- tagMCFamilyActionCnt InfoList[Count]; // 活动信息
-};
diff --git a/ServerPack/HA5_Family/PlayerTechInfo b/ServerPack/HA5_Family/DonateCntInfo
similarity index 100%
rename from ServerPack/HA5_Family/PlayerTechInfo
rename to ServerPack/HA5_Family/DonateCntInfo
diff --git a/ServerPack/HA5_Family/DonateCntInfo.des b/ServerPack/HA5_Family/DonateCntInfo.des
new file mode 100644
index 0000000..90ab209
--- /dev/null
+++ b/ServerPack/HA5_Family/DonateCntInfo.des
@@ -0,0 +1 @@
+A5 02 捐献次数信息 #tagSCDonateCntInfo
diff --git a/ServerPack/HA5_Family/DonateCntInfo.h b/ServerPack/HA5_Family/DonateCntInfo.h
new file mode 100644
index 0000000..4dd3e14
--- /dev/null
+++ b/ServerPack/HA5_Family/DonateCntInfo.h
@@ -0,0 +1,8 @@
+// A5 02 捐献次数信息 #tagSCDonateCntInfo
+
+struct tagSCDonateCntInfo
+{
+ tagHead Head;
+ BYTE Count;
+ BYTE DonateCntList[Count]; // 今日已捐献次数列表 [捐献类型1次数, ...]
+};
diff --git a/ServerPack/HA5_Family/FamilyActivityExchangeResult b/ServerPack/HA5_Family/FamilyActivityExchangeResult
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA5_Family/FamilyActivityExchangeResult
+++ /dev/null
diff --git a/ServerPack/HA5_Family/FamilyActivityExchangeResult.des b/ServerPack/HA5_Family/FamilyActivityExchangeResult.des
deleted file mode 100644
index bd3ab37..0000000
--- a/ServerPack/HA5_Family/FamilyActivityExchangeResult.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 02 家族活跃令兑换结果 #tagMCFamilyActivityExchangeResult
diff --git a/ServerPack/HA5_Family/FamilyActivityExchangeResult.h b/ServerPack/HA5_Family/FamilyActivityExchangeResult.h
deleted file mode 100644
index 4ccf431..0000000
--- a/ServerPack/HA5_Family/FamilyActivityExchangeResult.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// A5 02 家族活跃令兑换结果 #tagMCFamilyActivityExchangeResult
-
-struct tagMCFamilyActivityExchangeResult
-{
- tagHead Head;
- DWORD Point; // 活跃令
-};
diff --git a/ServerPack/HA5_Family/FamilyAffairInfo b/ServerPack/HA5_Family/FamilyAffairInfo
deleted file mode 100644
index ca61c43..0000000
--- a/ServerPack/HA5_Family/FamilyAffairInfo
+++ /dev/null
Binary files differ
diff --git a/ServerPack/HA5_Family/FamilyAffairInfo.des b/ServerPack/HA5_Family/FamilyAffairInfo.des
deleted file mode 100644
index b339cc9..0000000
--- a/ServerPack/HA5_Family/FamilyAffairInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 08 家族事务信息 #tagMCFamilyAffairInfo
diff --git a/ServerPack/HA5_Family/FamilyAffairInfo.h b/ServerPack/HA5_Family/FamilyAffairInfo.h
deleted file mode 100644
index 115e9cf..0000000
--- a/ServerPack/HA5_Family/FamilyAffairInfo.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// A5 08 家族事务信息 #tagMCFamilyAffairInfo
-
-struct tagMCFamilyAffair
-{
- WORD AffairID; // 事务ID
- BYTE Star; // 星级
- BYTE State; // 状态：0-无；1-进行中；2-已完成
- WORD RemainDuration; // 剩余时长，秒，有剩余时间代表进行中
-};
-
-struct tagMCFamilyAffairInfo
-{
- tagHead Head;
- BYTE RefreshFreeCount; // 今日已免费刷新次数
- BYTE Count;
- tagMCFamilyAffair AffairInfoList[Count]; // 事务列表
-};
diff --git a/ServerPack/HA5_Family/FamilyViewList.h b/ServerPack/HA5_Family/FamilyViewList.h
index d435ad9..7913e5e 100644
--- a/ServerPack/HA5_Family/FamilyViewList.h
+++ b/ServerPack/HA5_Family/FamilyViewList.h
@@ -13,6 +13,7 @@
WORD JoinLVMin; //限制最低可加入的玩家等级
DWORD ServerID; //区服ID
DWORD EmblemID; //徽章ID
+ char EmblemWord[3]; //徽章文字
DWORD FightPower; //总战力，求余亿部分
DWORD FightPowerEx; //总战力，整除亿部分
BYTE MemberCount; //成员人数
diff --git a/ServerPack/HA5_Family/PlayerTechInfo.des b/ServerPack/HA5_Family/PlayerTechInfo.des
deleted file mode 100644
index e638ae5..0000000
--- a/ServerPack/HA5_Family/PlayerTechInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A5 04 玩家战盟科技等级 #tagMCPlayerTechInfo
diff --git a/ServerPack/HA5_Family/PlayerTechInfo.h b/ServerPack/HA5_Family/PlayerTechInfo.h
deleted file mode 100644
index 6b376f8..0000000
--- a/ServerPack/HA5_Family/PlayerTechInfo.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// A5 04 玩家战盟科技等级 #tagMCPlayerTechInfo
-
-struct tagMCPlayerTech
-{
- WORD TechID; // 科技ID
- WORD TechLV; // 特技等级
-};
-
-struct tagMCPlayerTechInfo
-
-{
- tagHead Head;
- BYTE TechCnt; // 科技个数
- tagMCPlayerTech TechInfoList[TechCnt]; // 科技信息列表
-};
-
diff --git a/ServerPack/HA5_Family/RoleFamilyInfo.h b/ServerPack/HA5_Family/RoleFamilyInfo.h
index 0a7e337..0642fa2 100644
--- a/ServerPack/HA5_Family/RoleFamilyInfo.h
+++ b/ServerPack/HA5_Family/RoleFamilyInfo.h
@@ -16,7 +16,9 @@
DWORD FightPowerEx; //战力，整除亿部分
DWORD ServerID; //所属区服ID
DWORD ContribTotal; //总贡献度
- DWORD ContribWeek; //周贡献度
+ DWORD ContribDay; //日贡献度
+ DWORD DonateCntTotal; //总捐献次数
+ BYTE DonateCntDay; //日捐献次数
DWORD OffTime; // 0-在线; >0-/离线时间戳
};
@@ -31,6 +33,7 @@
WORD JoinLVMin; //限制最低可加入的玩家等级
DWORD ServerID; //区服ID，创建时以族长的区服ID赋值
DWORD EmblemID; //徽章ID
+ char EmblemWord[3]; //徽章文字
DWORD FightPower; //总战力，求余亿部分
DWORD FightPowerEx; //总战力，整除亿部分
WORD BroadcastLen; //公告
diff --git a/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h b/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h
index 55458a6..a5384cf 100644
--- a/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h
+++ b/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h
@@ -18,6 +18,7 @@
DWORD FamilyID;
char FamilyName[33];
DWORD FamilyEmblemID; //仙盟徽章ID
+ char FamilyEmblemWord[3]; //徽章文字
DWORD PlusDataSize;
char PlusData[PlusDataSize]; //扩展记录
};
--
Gitblit v1.8.0