From 24a30298b0f30bbabbc1a44b88542106bd5e6178 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 05 六月 2026 10:08:03 +0800
Subject: [PATCH] 568 【GVG】公会攻城战-服务端(支持多台跨服服务器互通公会参与同一场攻城战;) 1. 新活动管理,支持跨服活动(以活动主体为准,各子功能模块由主活动配置决定,便于配置活动,减少多活动组合配置分散引起的配置复杂度) 2. 优化跨服上下线逻辑,支持多跨服服务器 3. 排行奖励模版增加公会会长、精英专属奖励 4. 查看缓存增加公会区服ID、通用记录表增加RecID2 5. 优化真实充值、任意充值与代币、现金礼券逻辑,支持跨服充值互助;优化充值商品兑换时机(完全登录成功处理)

---
 ClientPack/CC0_CrossRealm/FamilyGCZQuery.des                  |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.h         |    8 +-
 ClientPack/CC1_CrossRealm/FamilyGCZContribution.des           |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.h              |    4 
 ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.h                |   16 ++--
 ClientPack/CC1_CrossRealm/FamilyGCZSQ.des                     |    2 
 ClientPack/CC1_CrossRealm/FamilyGCZAtk.des                    |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.des       |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZBatReport.h                |   10 +-
 ServerPack/HC0_CrossRealm/FamilyGCZActInfo.h                  |   35 +++-----
 ClientPack/CC1_CrossRealm/FamilyGCZGuess.des                  |    2 
 ClientPack/CC1_CrossRealm/FamilyGCZGuess.h                    |    6 
 ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.des                 |    2 
 ClientPack/CC0_CrossRealm/FamilyGCZQuery.h                    |    8 +-
 ClientPack/CC1_CrossRealm/FamilyGCZAtk.h                      |    6 
 ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.des           |    2 
 ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.h                   |    8 +-
 ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.des             |    1 
 ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.h                 |   14 +-
 ServerPack/HC0_CrossRealm/FamilyGCZActInfo.des                |    2 
 ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.h               |    4 
 ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.des           |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.des               |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.des |    2 
 /dev/null                                                     |    8 --
 ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.h             |   16 ++--
 ServerPack/HC0_CrossRealm/FamilyGCZBatReport.des              |    2 
 ClientPack/CC1_CrossRealm/FamilyGCZContribution.h             |    4 
 ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo                 |    0 
 ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.des            |    2 
 ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.h   |    8 +-
 ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.h             |   14 +-
 ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.h               |   18 ++++
 ClientPack/CC1_CrossRealm/FamilyGCZSQ.h                       |    4 
 ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.des              |    2 
 ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.des             |    2 
 36 files changed, 115 insertions(+), 109 deletions(-)

diff --git a/ClientPack/CC0_CrossRealm/FamilyGCZQuery.des b/ClientPack/CC0_CrossRealm/FamilyGCZQuery.des
index 579bba1..6f8ea72 100644
--- a/ClientPack/CC0_CrossRealm/FamilyGCZQuery.des
+++ b/ClientPack/CC0_CrossRealm/FamilyGCZQuery.des
@@ -1 +1 @@
-C0 26 仙盟攻城战查询 #tagCGFamilyGCZQuery
+C0 26 公会攻城战查询 #tagCSFamilyGCZQuery
diff --git a/ClientPack/CC0_CrossRealm/FamilyGCZQuery.h b/ClientPack/CC0_CrossRealm/FamilyGCZQuery.h
index 58b93ee..feddce5 100644
--- a/ClientPack/CC0_CrossRealm/FamilyGCZQuery.h
+++ b/ClientPack/CC0_CrossRealm/FamilyGCZQuery.h
@@ -1,10 +1,10 @@
-// C0 26 仙盟攻城战查询 #tagCGFamilyGCZQuery
+// C0 26 公会攻城战查询 #tagCSFamilyGCZQuery
 
-struct	tagCGFamilyGCZQuery
+struct	tagCSFamilyGCZQuery
 {
 	tagHead		Head;
-	BYTE		QueryType;	//查询类型:1-成员捐献值;2-进入城池场景;3-退出城池场景;4-进入城池;5-退出城池;6-战报;7-分组仙盟成员伤害;
+	BYTE		QueryType;	//查询类型:1-成员捐献值;2-进入城池场景;3-退出城池场景;4-进入城池;5-退出城池;6-战报;7-分组公会成员伤害;
 	BYTE		BatType;		//指定战场类型,需要发送的查询类型: 2、4
 	BYTE		GroupNum;	//指定分组编号,需要发送的查询类型: 2、4
-	DWORD		FamilyID;		//指定仙盟ID或城池ID,查自己盟的可不发,需要发的类型:2、4、6、7
+	DWORD		FamilyID;		//指定公会ID或城池ID,查自己公会的可不发,需要发的类型:4、6、7
 };
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZAtk.des b/ClientPack/CC1_CrossRealm/FamilyGCZAtk.des
index d1d3b2f..74be3cf 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZAtk.des
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZAtk.des
@@ -1 +1 @@
-C1 25 仙盟攻城战攻击 #tagCMFamilyGCZAtk
+C1 25 公会攻城战攻击 #tagCSFamilyGCZAtk
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZAtk.h b/ClientPack/CC1_CrossRealm/FamilyGCZAtk.h
index 6476662..4fee530 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZAtk.h
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZAtk.h
@@ -1,9 +1,9 @@
-// C1 25 仙盟攻城战攻击 #tagCMFamilyGCZAtk
+// C1 25 公会攻城战攻击 #tagCSFamilyGCZAtk
 
-struct	tagCMFamilyGCZAtk
+struct	tagCSFamilyGCZAtk
 {
 	tagHead		Head;
 	BYTE		AtkType;		//攻击类型: 1-普通单攻;2-技能单攻;3-技能群攻;
-	DWORD		TagCityID;	//目标城池ID,一般是仙盟ID或者特殊城池ID如修罗城城池,普攻单攻需指定目标,群攻技能发0
+	DWORD		TagCityID;	//目标城池ID,一般是公会ID或者特殊城池ID如修罗城城池,普攻单攻需指定目标,群攻技能发0
 	DWORD		TagGuardID;	//目标守卫ID,一般是玩家ID或者特殊守卫ID如修罗城守卫,普攻单攻需指定目标,技能攻击发0
 };
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZContribution.des b/ClientPack/CC1_CrossRealm/FamilyGCZContribution.des
index 0929980..96209d6 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZContribution.des
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZContribution.des
@@ -1 +1 @@
-C1 24 仙盟攻城战捐献 #tagCMFamilyGCZContribution
+C1 24 公会攻城战捐献 #tagCSFamilyGCZContribution
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZContribution.h b/ClientPack/CC1_CrossRealm/FamilyGCZContribution.h
index 393a75e..a20895a 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZContribution.h
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZContribution.h
@@ -1,6 +1,6 @@
-// C1 24 仙盟攻城战捐献 #tagCMFamilyGCZContribution
+// C1 24 公会攻城战捐献 #tagCSFamilyGCZContribution
 
-struct	tagCMFamilyGCZContribution
+struct	tagCSFamilyGCZContribution
 {
 	tagHead		Head;
 	BYTE		ContributionType;		//捐献类型: 0-低级;1-高级
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZGuess.des b/ClientPack/CC1_CrossRealm/FamilyGCZGuess.des
index e81cde1..e059f1b 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZGuess.des
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZGuess.des
@@ -1 +1 @@
-C1 26 仙盟攻城战竞猜 #tagCMFamilyGCZGuess
+C1 26 公会攻城战竞猜 #tagCSFamilyGCZGuess
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZGuess.h b/ClientPack/CC1_CrossRealm/FamilyGCZGuess.h
index 7f997c8..b7ee9c5 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZGuess.h
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZGuess.h
@@ -1,8 +1,8 @@
-// C1 26 仙盟攻城战竞猜 #tagCMFamilyGCZGuess
+// C1 26 公会攻城战竞猜 #tagCSFamilyGCZGuess
 
-struct	tagCMFamilyGCZGuess
+struct	tagCSFamilyGCZGuess
 {
 	tagHead		Head;
 	BYTE		SelectCnt;
-	DWORD		SelectFamilyIDList[SelectCnt];	// 竞猜选择的仙盟ID排名顺序
+	DWORD		SelectFamilyIDList[SelectCnt];	// 竞猜选择的公会ID排名顺序
 };
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZSQ.des b/ClientPack/CC1_CrossRealm/FamilyGCZSQ.des
index 4db9616..65d9ad5 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZSQ.des
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZSQ.des
@@ -1 +1 @@
-C1 27 仙盟攻城战圣泉抽奖 #tagCMFamilyGCZSQ
+C1 27 公会攻城战圣泉抽奖 #tagCSFamilyGCZSQ
diff --git a/ClientPack/CC1_CrossRealm/FamilyGCZSQ.h b/ClientPack/CC1_CrossRealm/FamilyGCZSQ.h
index b54dc1c..5872b0e 100644
--- a/ClientPack/CC1_CrossRealm/FamilyGCZSQ.h
+++ b/ClientPack/CC1_CrossRealm/FamilyGCZSQ.h
@@ -1,6 +1,6 @@
-// C1 27 仙盟攻城战圣泉抽奖 #tagCMFamilyGCZSQ
+// C1 27 公会攻城战圣泉抽奖 #tagCSFamilyGCZSQ
 
-struct	tagCMFamilyGCZSQ
+struct	tagCSFamilyGCZSQ
 {
 	tagHead		Head;
 	BYTE		GridNum;	// 选中格子编号,1~n
diff --git a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo.des b/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo.des
deleted file mode 100644
index 077b0b8..0000000
--- a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 77 仙盟充值互助活动信息 #tagMCActFamilyCTGAssistInfo
diff --git a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo.h b/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo.h
deleted file mode 100644
index 137200f..0000000
--- a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// AA 77 仙盟充值互助活动信息 #tagMCActFamilyCTGAssistInfo
-
-struct    tagMCActFamilyCTGAssistItem
-{
-	DWORD		ItemID;
-	WORD		ItemCount;
-	BYTE		IsBind;
-};
-
-struct   tagMCActFamilyCTGAssistAward
-{
-	BYTE		NeedCTGPlayers;	//所需充值人数
-	BYTE		RecordIndex;	//对应领奖记录索引
-	BYTE		Count;
-	tagMCActFamilyCTGAssistItem	AwardItemList[Count];	// 奖励物品列表
-};
-
-struct    tagMCActFamilyCTGAssistInfo
-{
-	tagHead		Head;
-	BYTE		ActNum;		//活动编号
-	char		StartDate[10];	// 开始日期 y-m-d
-	char		EndtDate[10];	// 结束日期 y-m-d
-	BYTE		IsDayReset;	//是否每天重置
-	WORD		LimitLV;	// 限制等级
-	BYTE		AwardCount;	
-	tagMCActFamilyCTGAssistAward	AwardInfoList[AwardCount]; // 互助奖励列表
-	BYTE		CTGIDCount;
-	WORD		CTGIDList[CTGIDCount];	// CTGID列表;总购买次数前端自己统计,直接取CTGID对应的累计购买次数累加
-	WORD		ShopType;	// 开放商店类型
-};
diff --git a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo b/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo
+++ /dev/null
diff --git a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo.des b/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo.des
deleted file mode 100644
index 40be0da..0000000
--- a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 78 仙盟充值互助活动玩家信息 #tagMCActFamilyCTGAssistPlayerInfo
diff --git a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo.h b/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo.h
deleted file mode 100644
index 49e45ef..0000000
--- a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistPlayerInfo.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// AA 78 仙盟充值互助活动玩家信息 #tagMCActFamilyCTGAssistPlayerInfo
-
-struct    tagMCActFamilyCTGAssistPlayerInfo
-{
-	tagHead		Head;
-	BYTE		ActNum;		// 活动编号
-	DWORD		AwardRecord;	// 奖励记录,按奖励记录索引位运算判断是否已领取
-};
diff --git a/ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo b/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo
similarity index 100%
rename from ServerPack/HAA_SaleActivity/ActFamilyCTGAssistInfo
rename to ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.des b/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.des
new file mode 100644
index 0000000..171d2e6
--- /dev/null
+++ b/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.des
@@ -0,0 +1 @@
+C0 33 公会充值协助信息 #tagSCFamilyCTGAssistInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.h b/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.h
new file mode 100644
index 0000000..afd4a2c
--- /dev/null
+++ b/ServerPack/HC0_CrossRealm/FamilyCTGAssistInfo.h
@@ -0,0 +1,18 @@
+// C0 33 公会充值协助信息 #tagSCFamilyCTGAssistInfo
+
+struct    tagSCFamilyCTGAssistAward
+{
+	BYTE		NeedCTGCnt;	// 档位所需充值人数
+	BYTE		AwardPlayerCnt;
+	DWORD		AwardPlayerIDList[AwardPlayerCnt];	//已领奖玩家ID列表
+};
+
+struct    tagSCFamilyCTGAssistInfo
+{
+	tagHead		Head;
+	BYTE		ActFuncType;	// 活动功能类型,如2-攻城战;
+	BYTE		CTGPlayerCnt;
+	DWORD		CTGPlayerIDList[CTGPlayerCnt];	//已充值玩家ID列表,注:玩家ID可能已经不是公会成员,以活动锁定的名单为准
+	BYTE		AwardCnt;
+	tagSCFamilyCTGAssistAward		AwardInfoList[AwardCnt];	// 各奖励档位记录
+};
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.des
index 8281f8a..381bf8b 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.des
@@ -1 +1 @@
-C0 24 仙盟攻城战活动信息 #tagGCFamilyGCZActInfo
+C0 24 公会攻城战活动信息 #tagSCFamilyGCZActInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.h
index 8d1c9b1..e3589f3 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZActInfo.h
@@ -1,35 +1,30 @@
-// C0 24 仙盟攻城战活动信息 #tagGCFamilyGCZActInfo
+// C0 24 公会攻城战活动信息 #tagSCFamilyGCZActInfo
 
-struct    tagGCFamilyGCZActFamily
+struct    tagSCFamilyGCZActFamily
 {
 	DWORD		FamilyID;
-	char		Name[33];	//参与仙盟名字
-	BYTE		LV;		//仙盟等级
-	DWORD		ServerID;		//仙盟所属区服ID
+	char		Name[33];	//参与名字
+	BYTE		LV;		//公会等级
+	DWORD		ServerID;		//公会所属区服ID
 	DWORD		EmblemID;	//徽章ID
-	DWORD		FightPower;	//仙盟总战力,求余亿部分
-	DWORD		FightPowerEx;	//仙盟总战力,整除亿部分
-	DWORD		LeaderID;	//盟主ID
-	char		LeaderName[33];	//盟主名
+	char		EmblemWord[3];	//徽章文字
+	DWORD		FightPower;	//公会总战力,求余亿部分
+	DWORD		FightPowerEx;	//公会总战力,整除亿部分
+	DWORD		LeaderID;	//会长ID
+	char		LeaderName[33];	//会长名
 	DWORD		LeaderFace;
 	DWORD		LeaderFacePic;
 };
 
-struct    tagGCFamilyGCZActInfo
+struct    tagSCFamilyGCZActInfo
 {
 	tagHead		Head;
-	BYTE		ServerInfoLen;
-	char		ServerIDRangeInfo[ServerInfoLen];	//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
-	BYTE		ZoneID;		// 活动分区ID,公示期为0
+	DWORD		CrossServerID;	// 所属跨服服务器ID
+	DWORD		ZoneID;		// 所属分区,可能为0
 	DWORD		ActID;		// 活动ID,代表某一次活动的唯一ID,前端如果有活动相关的本地记录可以通过验证此ID变更进行重置
 	char		StartDate[10];	// 开始日期 y-m-d
 	char		EndtDate[10];	// 结束日期 y-m-d
-	BYTE		JoinFamilyCnt;	// 参与仙盟数
-	WORD		ActFlowID;	// 活动流程ID,对应H.活动时间流程表中的编号,前端根据跨服时间自行计算当前所处流程状态
-	WORD		GuessTemplateID;	// 竞猜奖励模版,对应H.活动竞猜表,前端自行读表展示
-	WORD		PersonalTemplateID;	// 个人伤害排行奖励模版,对应H.活动榜单奖励模版表,前端自行读表展示
-	WORD		FamilyTemplateID;	// 仙盟积分排行奖励模版,对应H.活动榜单奖励模版表,前端自行读表展示
-	DWORD		StateError;	// 活动流程状态是否异常,如果不为0代表活动已异常,前端自行决定是不显示活动还是活动页面做提示
+	WORD		CfgID;		// 活动时间表配置ID
 	BYTE		FamilyCount;
-	tagGCFamilyGCZActFamily		ActFamilyList[FamilyCount];		//本分区参与的仙盟名单
+	tagSCFamilyGCZActFamily		ActFamilyList[FamilyCount];		//本分区参与的公会名单
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.des
index d67d672..bc911ef 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.des
@@ -1 +1 @@
-C0 29 仙盟攻城战城池战斗信息 #tagGCFamilyGCZBatCityInfo
+C0 29 公会攻城战城池战斗信息 #tagSCFamilyGCZBatCityInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.h
index b0b680c..0995f44 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatCityInfo.h
@@ -1,6 +1,6 @@
-// C0 29 仙盟攻城战城池战斗信息 #tagGCFamilyGCZBatCityInfo
+// C0 29 公会攻城战城池战斗信息 #tagSCFamilyGCZBatCityInfo
 
-struct    tagGCFamilyGCZBatCityInfo
+struct    tagSCFamilyGCZBatCityInfo
 {
 	tagHead		Head;
 	DWORD		CityID;		//城池ID
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.des
index 115575e..9ec5549 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.des
@@ -1 +1 @@
-C0 25 仙盟攻城战轮次分组信息 #tagGCFamilyGCZBatGroupInfo
+C0 25 公会攻城战轮次分组信息 #tagSCFamilyGCZBatGroupInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.h
index 49ae14b..1dafcb9 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatGroupInfo.h
@@ -1,23 +1,23 @@
-// C0 25 仙盟攻城战轮次分组信息 #tagGCFamilyGCZBatGroupInfo
+// C0 25 公会攻城战轮次分组信息 #tagSCFamilyGCZBatGroupInfo
 
-struct    tagGCFamilyGCZBatGroup
+struct    tagSCFamilyGCZBatGroup
 {
 	BYTE		GroupNum;	// 分组编号,从1开始,对应A
 	BYTE		FamilyIDCnt;
-	DWORD		FamilyIDList[FamilyIDCnt];	// 仙盟ID列表,前端可以通过判断参与的仙盟ID是否在某个分组里面验证有没有战场参赛资格
+	DWORD		FamilyIDList[FamilyIDCnt];	// 公会ID列表,前端可以通过判断参与的公会ID是否在某个分组里面验证有没有战场参赛资格
 };
 
-struct    tagGCFamilyGCZBat
+struct    tagSCFamilyGCZBat
 {
 	BYTE		BatType;		// 战场类型 1-初级;2-中级;3-高级;
 	BYTE		GroupCnt;	// 分组数
-	tagGCFamilyGCZBatGroup	GroupList[GroupCnt];	// 分组列表
+	tagSCFamilyGCZBatGroup	GroupList[GroupCnt];	// 分组列表
 };
 
-struct    tagGCFamilyGCZBatGroupInfo
+struct    tagSCFamilyGCZBatGroupInfo
 {
 	tagHead		Head;
 	BYTE		RoundNum;	// 第x轮的分组,从1开始,没有在对应轮次战场分组里的视为没有该轮次的参赛资格
 	BYTE		BatTypeCnt;	// 战场类型数
-	tagGCFamilyGCZBat		BatList[BatTypeCnt];	//战场列表
+	tagSCFamilyGCZBat		BatList[BatTypeCnt];	//战场列表
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.des b/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.des
index 6a5bc51..48c5030 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.des
@@ -1 +1 @@
-C0 30 仙盟攻城战战斗战报 #tagGCFamilyGCZBatReport
+C0 30 公会攻城战战斗战报 #tagSCFamilyGCZBatReport
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.h b/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.h
index 7997d88..262d614 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatReport.h
@@ -1,18 +1,18 @@
-// C0 30 仙盟攻城战战斗战报 #tagGCFamilyGCZBatReport
+// C0 30 公会攻城战战斗战报 #tagSCFamilyGCZBatReport
 
-struct    tagGCFamilyGCZBatRepHurt
+struct    tagSCFamilyGCZBatRepHurt
 {
 	DWORD		TagFamilyID;	//目标仙盟ID
 	DWORD		HurtValue;	//输出伤害,求余亿部分
 	DWORD		HurtValueEx;	//输出伤害,整除亿部分
 };
 
-struct    tagGCFamilyGCZBatReport
+struct    tagSCFamilyGCZBatReport
 {
 	tagHead		Head;
 	DWORD		FamilyID;		// 战报仙盟ID
 	BYTE		DefRepCnt;
-	tagGCFamilyGCZBatRepHurt	DefRepList[DefRepCnt];	// 防守战报
+	tagSCFamilyGCZBatRepHurt	DefRepList[DefRepCnt];	// 防守战报
 	BYTE		AtkRepCnt;
-	tagGCFamilyGCZBatRepHurt	AtkRepList[AtkRepCnt];	// 进攻战报
+	tagSCFamilyGCZBatRepHurt	AtkRepList[AtkRepCnt];	// 进攻战报
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.des
index 0e2e24f..38fb7f7 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.des
@@ -1 +1 @@
-C0 28 仙盟攻城战城池场景信息 #tagGCFamilyGCZBatSceneInfo
+C0 28 公会攻城战城池场景信息 #tagSCFamilyGCZBatSceneInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.h
index c941b92..08420ed 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZBatSceneInfo.h
@@ -1,6 +1,6 @@
-// C0 28 仙盟攻城战城池场景信息 #tagGCFamilyGCZBatSceneInfo
+// C0 28 公会攻城战城池场景信息 #tagSCFamilyGCZBatSceneInfo
 
-struct    tagGCFamilyGCZBatScenePlayer
+struct    tagSCFamilyGCZBatScenePlayer
 {
 	DWORD		PlayerID;
 	char		Name[33];
@@ -9,14 +9,14 @@
 	DWORD		FacePic;
 };
 
-struct    tagGCFamilyGCZBatSceneHurt
+struct    tagSCFamilyGCZBatSceneHurt
 {
 	DWORD		CityID;		//被攻击的城池ID
 	DWORD		HurtValue;	//伤害飘血,求余亿部分
 	DWORD		HurtValueEx;	//伤害飘血,整除亿部分
 };
 
-struct    tagGCFamilyGCZBatSceneCity
+struct    tagSCFamilyGCZBatSceneCity
 {
 	DWORD		CityID;		//城池ID
 	BYTE		CityLV;		//城池等级
@@ -29,7 +29,7 @@
 	DWORD		LastAtkedTime;	//最后一次被攻击时间戳,可能为0
 };
 
-struct    tagGCFamilyGCZBatSceneInfo
+struct    tagSCFamilyGCZBatSceneInfo
 {
 	tagHead		Head;
 	BYTE		BatType;		// 战场类型 1-初级;2-中级;3-高级;
@@ -42,9 +42,9 @@
 	BYTE		AtkType;		// 攻击类型,有发起攻击的玩家时有效
 	BYTE		KillCnt;		// 本次攻击累计击杀数,有发起攻击的玩家时有效
 	BYTE		HurtCnt;
-	tagGCFamilyGCZBatSceneHurt	HurtList[HurtCnt];	//本次攻击伤血信息,有发起攻击的玩家时有效
+	tagSCFamilyGCZBatSceneHurt	HurtList[HurtCnt];	//本次攻击伤血信息,有发起攻击的玩家时有效
 	BYTE		CityCnt;
-	tagGCFamilyGCZBatSceneCity	CityList[CityCnt];	// 城池信息,仅通知变化的城池
+	tagSCFamilyGCZBatSceneCity	CityList[CityCnt];	// 城池信息,仅通知变化的城池
 	BYTE		PlayerCnt;
-	tagGCFamilyGCZBatScenePlayer	PlayerInfoList[PlayerCnt];	// 场景展示所需要用到的玩家信息,如第一玩家、使用技能玩家
+	tagSCFamilyGCZBatScenePlayer	PlayerInfoList[PlayerCnt];	// 场景展示所需要用到的玩家信息,如第一玩家、使用技能玩家
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.des
index af8a438..060395f 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.des
@@ -1 +1 @@
-C0 26 仙盟攻城战大本营信息 #tagGCFamilyGCZCampInfo
+C0 26 公会攻城战大本营信息 #tagSCFamilyGCZCampInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.h
index 7ccb7a5..9adf1a5 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZCampInfo.h
@@ -1,6 +1,6 @@
-// C0 26 仙盟攻城战大本营信息 #tagGCFamilyGCZCampInfo
+// C0 26 公会攻城战大本营信息 #tagSCFamilyGCZCampInfo
 
-struct    tagGCFamilyGCZCampMem
+struct    tagSCFamilyGCZCampMem
 {
 	DWORD		PlayerID;
 	char		Name[33];	//参与玩家名字
@@ -18,7 +18,7 @@
 	DWORD		TotalHurtEx;	//活动总伤害,整除亿部分
 };
 
-struct    tagGCFamilyGCZCampRound
+struct    tagSCFamilyGCZCampRound
 {
 	BYTE		RoundNum;	//轮次编号,从1开始
 	BYTE		BatType;		//所在战场类型
@@ -28,10 +28,10 @@
 	BYTE		UpdownState;	//本轮结算晋级降级状态:0-未处理,1-降级;2-保级;3-晋级,即本轮的晋降级状态决定下一轮的战场类型
 };
 
-struct    tagGCFamilyGCZCampInfo
+struct    tagSCFamilyGCZCampInfo
 {
 	tagHead		Head;
-	DWORD		FamilyID;		//所在活动仙盟ID,可能不是玩家当前的仙盟ID,活动以该ID为准
+	DWORD		FamilyID;		//所在活动公会ID,可能不是玩家当前的公会ID,活动以该ID为准
 	WORD		CampLV;		//大本营当前等级
 	DWORD		CampExp;	//大本营当前经验
 	WORD		CityLV;		//城池属性等级,开战后可能与当前大本营等级不一样
@@ -42,7 +42,7 @@
 	DWORD		HP;		//剩余生命,求余亿部分
 	DWORD		HPEx;		//剩余生命,整除亿部分
 	BYTE		RoundCnt;
-	tagGCFamilyGCZCampRound		RoundInfoList[RoundCnt];	//仙盟轮次汇总信息
+	tagSCFamilyGCZCampRound		RoundInfoList[RoundCnt];	//轮次汇总信息
 	BYTE		DefMemCnt;
-	tagGCFamilyGCZCampMem		DefMemList[DefMemCnt];	//防守成员列表,有同步则差异更新,没有在防守成员里的视为没有参与资格
+	tagSCFamilyGCZCampMem		DefMemList[DefMemCnt];	//防守成员列表,有同步则差异更新,没有在防守成员里的视为没有参与资格
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.des
index e86d559..3441910 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.des
@@ -1 +1 @@
-C0 27 仙盟攻城战成员贡献值信息 #tagGCFamilyGCZContributionInfo
+C0 27 公会攻城战成员贡献值信息 #tagSCFamilyGCZContributionInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.h
index 6edd4df..7e785be 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZContributionInfo.h
@@ -1,14 +1,14 @@
-// C0 27 仙盟攻城战成员贡献值信息 #tagGCFamilyGCZContributionInfo
+// C0 27 公会攻城战成员贡献值信息 #tagSCFamilyGCZContributionInfo
 
-struct    tagGCFamilyGCZContribution
+struct    tagSCFamilyGCZContribution
 {
 	DWORD		PlayerID;
 	DWORD		ContributionValue;	//贡献值
 };
 
-struct    tagGCFamilyGCZContributionInfo
+struct    tagSCFamilyGCZContributionInfo
 {
 	tagHead		Head;
 	BYTE		ContriCnt;
-	tagGCFamilyGCZContribution		ContriList[ContriCnt];	//成员贡献值列表
+	tagSCFamilyGCZContribution		ContriList[ContriCnt];	//成员贡献值列表
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.des
index c0dde2d..5bae61b 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.des
@@ -1 +1 @@
-C0 31 仙盟攻城战分组仙盟成员伤害明细 #tagGCFamilyGCZGroupFamilyMemHurtInfo
+C0 31 公会攻城战分组成员伤害 #tagSCFamilyGCZGroupFamilyMemHurtInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.h
index b422414..ae9146c 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZGroupFamilyMemHurtInfo.h
@@ -1,6 +1,6 @@
-// C0 31 仙盟攻城战分组仙盟成员伤害明细 #tagGCFamilyGCZGroupFamilyMemHurtInfo
+// C0 31 公会攻城战分组成员伤害 #tagSCFamilyGCZGroupFamilyMemHurtInfo
 
-struct    tagGCFamilyGCZGroupFamilyMemHurt
+struct    tagSCFamilyGCZGroupFamilyMemHurt
 {
 	DWORD		PlayerID;
 	char		Name[33];	//参与玩家名字
@@ -8,10 +8,10 @@
 	DWORD		HurtValueEx;	//伤害,整除亿部分
 };
 
-struct    tagGCFamilyGCZGroupFamilyMemHurtInfo
+struct    tagSCFamilyGCZGroupFamilyMemHurtInfo
 {
 	tagHead		Head;
 	DWORD		FamilyID;		//查看的目标仙盟ID
 	BYTE		HurtMemCnt;
-	tagGCFamilyGCZGroupFamilyMemHurt		HurtMemList[HurtMemCnt];	//成员伤害明细列表,只算城池被摧毁前的伤害,未排序,前端自己排序
+	tagSCFamilyGCZGroupFamilyMemHurt		HurtMemList[HurtMemCnt];	//成员伤害明细列表,只算城池被摧毁前的伤害,未排序,前端自己排序
 };
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.des b/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.des
index 89e1742..7b4b25f 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.des
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.des
@@ -1 +1 @@
-C0 32 仙盟攻城战竞猜名单信息 #tagGCFamilyGCZGuessInfo
+C0 32 公会攻城战竞猜名单信息 #tagSCFamilyGCZGuessInfo
diff --git a/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.h b/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.h
index dff55b9..7237681 100644
--- a/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.h
+++ b/ServerPack/HC0_CrossRealm/FamilyGCZGuessInfo.h
@@ -1,27 +1,27 @@
-// C0 32 仙盟攻城战竞猜名单信息 #tagGCFamilyGCZGuessInfo
+// C0 32 公会攻城战竞猜名单信息 #tagSCFamilyGCZGuessInfo
 
-struct    tagGCFamilyGCZGuessFamily
+struct    tagSCFamilyGCZGuessFamily
 {
-	DWORD		FamilyID;		//备选仙盟ID
+	DWORD		FamilyID;		//备选公会ID
 	WORD		GuessValue;	//竞猜热度值,玩家每次选择则加1,重复选择也算
 };
 
-struct    tagGCFamilyGCZGuessRight
+struct    tagSCFamilyGCZGuessRight
 {
 	BYTE		AwardID;		//奖励ID
 	WORD		RightPlayerCnt;	//猜中玩家个数
 };
 
-struct    tagGCFamilyGCZGuessInfo
+struct    tagSCFamilyGCZGuessInfo
 {
 	tagHead		Head;
 	DWORD		PlayerID;		//竞猜玩家ID,有玩家修改竞猜时会附带该信息,如果是自己ID,则更新自己的竞猜选项,否则无视
 	BYTE		SelectCnt;
-	DWORD		SelectFamilyIDList[SelectCnt];	//竞猜玩家选择的仙盟ID顺序
+	DWORD		SelectFamilyIDList[SelectCnt];	//竞猜玩家选择的公会ID顺序
 	BYTE		FinalCnt;
 	DWORD		FinalFamilyIDList[FinalCnt];		//最终排名顺序,仅活动排名出来后才有值
 	BYTE		RightCnt;
-	tagGCFamilyGCZGuessRight		RightInfoList[RightCnt];	//猜中个数明细列表
+	tagSCFamilyGCZGuessRight		RightInfoList[RightCnt];	//猜中个数明细列表
 	BYTE		FamilyCnt;
-	tagGCFamilyGCZGuessFamily		GuessFamilyList[FamilyCnt];	//备选仙盟名单列表
+	tagSCFamilyGCZGuessFamily		GuessFamilyList[FamilyCnt];	//备选公会名单列表
 };
diff --git a/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.des b/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.des
index 48964b4..02986d5 100644
--- a/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.des
+++ b/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.des
@@ -1 +1 @@
-C1 10 仙盟攻城战玩家信息 #tagMCFamilyGCZPlayerInfo
+C1 10 公会攻城战玩家信息 #tagSCFamilyGCZPlayerInfo
diff --git a/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.h b/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.h
index adfe2f4..1f4037b 100644
--- a/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.h
+++ b/ServerPack/HC1_CrossRealm/FamilyGCZPlayerInfo.h
@@ -1,6 +1,6 @@
-// C1 10 仙盟攻城战玩家信息 #tagMCFamilyGCZPlayerInfo
+// C1 10 公会攻城战玩家信息 #tagSCFamilyGCZPlayerInfo
 
-struct	tagMCFamilyGCZPlayerInfo
+struct	tagSCFamilyGCZPlayerInfo
 {
 	tagHead		Head;
 	BYTE		ContributionCnt;	// 轮次低级捐献已捐献次数,轮次变更时会重置
diff --git a/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.des b/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.des
index d925431..df13c44 100644
--- a/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.des
+++ b/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.des
@@ -1 +1 @@
-C1 11 仙盟攻城战圣泉信息 #tagMCFamilyGCZSQInfo
+C1 11 公会攻城战圣泉信息 #tagSCFamilyGCZSQInfo
diff --git a/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.h b/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.h
index 350fa1c..cf21768 100644
--- a/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.h
+++ b/ServerPack/HC1_CrossRealm/FamilyGCZSQInfo.h
@@ -1,16 +1,16 @@
-// C1 11 仙盟攻城战圣泉信息 #tagMCFamilyGCZSQInfo
+// C1 11 公会攻城战圣泉信息 #tagSCFamilyGCZSQInfo
 
-struct	tagMCFamilyGCZSQGrid
+struct	tagSCFamilyGCZSQGrid
 {
 	BYTE		GridNum;		// 格子编号,1~n	
 	DWORD		ItemID;		// 抽中的物品ID,20亿时为过关标记
 	WORD		ItemCount;	// 物品数量
 };
 
-struct	tagMCFamilyGCZSQInfo
+struct	tagSCFamilyGCZSQInfo
 {
 	tagHead		Head;
 	BYTE		SQLayer;		// 当前所在圣泉层,从1开始
 	BYTE		SQGirdCnt;
-	tagMCFamilyGCZSQGrid	SQGridList[SQGirdCnt];	//圣泉当前层已抽格子信息,仅同步全部或变更的格子,前端进行差异更新,层数变更时重置本地记录
+	tagSCFamilyGCZSQGrid	SQGridList[SQGirdCnt];	//圣泉当前层已抽格子信息,仅同步全部或变更的格子,前端进行差异更新,层数变更时重置本地记录
 };

--
Gitblit v1.8.0