From a0c5f80c6fdfe65a064eeca5e29e809da743a334 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 10 六月 2026 18:14:16 +0800
Subject: [PATCH] 588 公会攻防战 适配查看其他公会封包修改
---
Main/Core/NetworkPackage/ClientPack/CA6_Family/CA619_tagCSViewTagFamily.cs | 4 ++--
Main/System/Guild/GuildManager.cs | 14 +++++++-------
Main/System/Guild/GuildViewListCell.cs | 2 +-
Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs | 6 +++---
Main/Core/NetworkPackage/ServerPack/HA7_Interaction/HA705_tagSCQueryPlayerCacheResult.cs | 26 +++++++++++++-------------
Main/System/BillboardRank/GuildRankCell.cs | 2 +-
Main/Core/NetworkPackage/ServerPack/HA5_Family/HA519_tagSCTagFamilyInfo.cs | 2 --
Main/System/BillboardRank/GuildTop3Cell.cs | 2 +-
Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs | 2 +-
9 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/Main/Core/NetworkPackage/ClientPack/CA6_Family/CA619_tagCSViewTagFamily.cs b/Main/Core/NetworkPackage/ClientPack/CA6_Family/CA619_tagCSViewTagFamily.cs
index 3e19628..c44784f 100644
--- a/Main/Core/NetworkPackage/ClientPack/CA6_Family/CA619_tagCSViewTagFamily.cs
+++ b/Main/Core/NetworkPackage/ClientPack/CA6_Family/CA619_tagCSViewTagFamily.cs
@@ -5,7 +5,7 @@
public class CA619_tagCSViewTagFamily : GameNetPackBasic {
public uint FamilyID;
- public uint DataServerID; //鏁版嵁鎵�鍦ㄦ湇鍔″櫒ID
+ public uint FamilyServerID; //鍏細鍖烘湇ID
public CA619_tagCSViewTagFamily () {
combineCmd = (ushort)0x03FE;
@@ -14,7 +14,7 @@
public override void WriteToBytes () {
WriteBytes (FamilyID, NetDataType.DWORD);
- WriteBytes (DataServerID, NetDataType.DWORD);
+ WriteBytes (FamilyServerID, NetDataType.DWORD);
}
}
diff --git a/Main/Core/NetworkPackage/ServerPack/HA5_Family/HA519_tagSCTagFamilyInfo.cs b/Main/Core/NetworkPackage/ServerPack/HA5_Family/HA519_tagSCTagFamilyInfo.cs
index 4b5d780..a6ab2dd 100644
--- a/Main/Core/NetworkPackage/ServerPack/HA5_Family/HA519_tagSCTagFamilyInfo.cs
+++ b/Main/Core/NetworkPackage/ServerPack/HA5_Family/HA519_tagSCTagFamilyInfo.cs
@@ -21,7 +21,6 @@
public string Broadcast; //size = BroadcastLen
public byte MemberCount; //鎴愬憳浜烘暟
public tagSCTagFamilyInfoMem[] MemberList;
- public uint DataServerID; //鏁版嵁鎵�鍦ㄦ湇鍔″櫒ID
public HA519_tagSCTagFamilyInfo () {
_cmd = (ushort)0xA519;
@@ -61,7 +60,6 @@
TransBytes (out MemberList[i].FightPowerEx, vBytes, NetDataType.DWORD);
TransBytes (out MemberList[i].ServerID, vBytes, NetDataType.DWORD);
}
- TransBytes (out DataServerID, vBytes, NetDataType.DWORD);
}
public class tagSCTagFamilyInfoMem {
diff --git a/Main/Core/NetworkPackage/ServerPack/HA7_Interaction/HA705_tagSCQueryPlayerCacheResult.cs b/Main/Core/NetworkPackage/ServerPack/HA7_Interaction/HA705_tagSCQueryPlayerCacheResult.cs
index b3f4928..d0ca556 100644
--- a/Main/Core/NetworkPackage/ServerPack/HA7_Interaction/HA705_tagSCQueryPlayerCacheResult.cs
+++ b/Main/Core/NetworkPackage/ServerPack/HA7_Interaction/HA705_tagSCQueryPlayerCacheResult.cs
@@ -17,11 +17,11 @@
public uint ServerID;
public uint FightPower;
public uint FightPowerEx;
- public uint FamilyID;
- public string FamilyName;
- public uint FamilyEmblemID; //浠欑洘寰界珷ID
- public string FamilyEmblemWord; //寰界珷鏂囧瓧
- public uint FamilyDataServerID; //鍏細鏁版嵁鎵�鍦ㄦ湇鍔″櫒ID锛孉619鏌ョ湅鍏細鐢�
+ public uint FamilyID;
+ public string FamilyName;
+ public uint FamilyEmblemID; //浠欑洘寰界珷ID
+ public string FamilyEmblemWord; //寰界珷鏂囧瓧
+ public uint FamilyServerID; //鍏細鍖烘湇ID
public uint PlusDataSize;
public string PlusData; //鎵╁睍璁板綍
@@ -44,12 +44,12 @@
TransBytes (out FightPower, vBytes, NetDataType.DWORD);
TransBytes (out FightPowerEx, vBytes, NetDataType.DWORD);
TransBytes (out FamilyID, vBytes, NetDataType.DWORD);
- TransBytes (out FamilyName, vBytes, NetDataType.Chars, 33);
- TransBytes (out FamilyEmblemID, vBytes, NetDataType.DWORD);
- TransBytes (out FamilyEmblemWord, vBytes, NetDataType.Chars, 3);
- TransBytes (out FamilyDataServerID, vBytes, NetDataType.DWORD);
- TransBytes (out PlusDataSize, vBytes, NetDataType.DWORD);
- TransBytes (out PlusData, vBytes, NetDataType.Chars, PlusDataSize);
- }
+ TransBytes (out FamilyName, vBytes, NetDataType.Chars, 33);
+ TransBytes (out FamilyEmblemID, vBytes, NetDataType.DWORD);
+ TransBytes (out FamilyEmblemWord, vBytes, NetDataType.Chars, 3);
+ TransBytes (out FamilyServerID, vBytes, NetDataType.DWORD);
+ TransBytes (out PlusDataSize, vBytes, NetDataType.DWORD);
+ TransBytes (out PlusData, vBytes, NetDataType.Chars, PlusDataSize);
+ }
-}
\ No newline at end of file
+}
diff --git a/Main/System/BillboardRank/GuildRankCell.cs b/Main/System/BillboardRank/GuildRankCell.cs
index fd9f99e..a29cd0f 100644
--- a/Main/System/BillboardRank/GuildRankCell.cs
+++ b/Main/System/BillboardRank/GuildRankCell.cs
@@ -48,7 +48,7 @@
return;
}
- GuildManager.Instance.SendViewGuild(familyID, rankData.LeaderServerID);
+ GuildManager.Instance.SendViewGuild(familyID, rankData.ServerID);
});
}
}
diff --git a/Main/System/BillboardRank/GuildTop3Cell.cs b/Main/System/BillboardRank/GuildTop3Cell.cs
index a69689e..e0c5444 100644
--- a/Main/System/BillboardRank/GuildTop3Cell.cs
+++ b/Main/System/BillboardRank/GuildTop3Cell.cs
@@ -45,7 +45,7 @@
return;
}
- GuildManager.Instance.SendViewGuild(familyID, rankData.LeaderServerID);
+ GuildManager.Instance.SendViewGuild(familyID, rankData.ServerID);
});
}
}
diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index 8265ced..895412a 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -794,13 +794,13 @@
data.MemberCount = view.MemberCount;
}
- public void SendViewGuild(int fairyID, int serverID)
- {
- var pack = new CA619_tagCSViewTagFamily();
- pack.FamilyID = (uint)fairyID;
- pack.DataServerID = (uint)serverID;
- GameNetSystem.Instance.SendInfo(pack);
- }
+ public void SendViewGuild(int fairyID, int serverID)
+ {
+ var pack = new CA619_tagCSViewTagFamily();
+ pack.FamilyID = (uint)fairyID;
+ pack.FamilyServerID = (uint)serverID;
+ GameNetSystem.Instance.SendInfo(pack);
+ }
#endregion
#region 鐢宠鍒楄〃
diff --git a/Main/System/Guild/GuildViewListCell.cs b/Main/System/Guild/GuildViewListCell.cs
index 84f7df6..0129cdf 100644
--- a/Main/System/Guild/GuildViewListCell.cs
+++ b/Main/System/Guild/GuildViewListCell.cs
@@ -73,7 +73,7 @@
seeGuildBtn.AddListener(() =>
{
- GuildManager.Instance.SendViewGuild(guildInfo.FamilyID, guildInfo.LeaderServerID);
+ GuildManager.Instance.SendViewGuild(guildInfo.FamilyID, guildInfo.ServerID);
});
}
diff --git a/Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs b/Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs
index 4a15e9a..d5063ef 100644
--- a/Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs
+++ b/Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs
@@ -115,7 +115,7 @@
viewPlayerData.FamilyID = (int)package.FamilyID;
viewPlayerData.FamilyName = UIHelper.ServerStringTrim(package.FamilyName);
viewPlayerData.FamilyEmblemID = (int)package.FamilyEmblemID;
- viewPlayerData.FamilyDataServerID = (int)package.FamilyDataServerID;
+ viewPlayerData.FamilyServerID = (int)package.FamilyServerID;
viewPlayerData.FamilyEmblemWord = UIHelper.ServerStringTrim(package.FamilyEmblemWord);
@@ -409,7 +409,7 @@
public int ServerID;
public long FightPower;
public int FamilyID;
- public int FamilyDataServerID; //鍏細鏁版嵁鎵�鍦ㄦ湇鍔″櫒ID锛孉619鏌ョ湅鍏細鐢�
+ public int FamilyServerID; //鍏細鍖烘湇ID锛孉619鏌ョ湅鍏細鐢�
public string FamilyName;
public int FamilyEmblemID;
public string FamilyEmblemWord;
@@ -769,4 +769,4 @@
public OtherPlayerDetailManager.RolePlusData.HeroData heroData;
public List<OtherPlayerDetailManager.RolePlusData.HeroData> heroDatas;
public OtherPlayerDetailManager.RolePlusData.EquipData equip;
-}
\ No newline at end of file
+}
diff --git a/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs b/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs
index 8a0dd30..2bc3ad2 100644
--- a/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs
+++ b/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs
@@ -280,7 +280,7 @@
SysNotifyMgr.Instance.ShowTip("GuildTip01");
return;
}
- GuildManager.Instance.SendViewGuild(viewPlayerData.FamilyID, viewPlayerData.FamilyDataServerID);
+ GuildManager.Instance.SendViewGuild(viewPlayerData.FamilyID, viewPlayerData.FamilyServerID);
}
private void OnClickMM()
--
Gitblit v1.8.0