282 查看他人-客户端 同步A523 A212封包，公会成员列表，公会聊天支持支持跨服

lcy

13 小时以前 24a23dcf2dfecb2c41722ad5d6f8c936bf7ccabe

282 查看他人-客户端 同步A523 A212封包，公会成员列表，公会聊天支持支持跨服

 Main/Core/NetworkPackage/ClientPack/CA2_Interaction/CA212_tagCMViewPlayerInfo.cs

@@ -5,7 +5,7 @@

public class CA212_tagCMViewPlayerInfo : GameNetPackBasic {
    public uint PlayerID;
    public byte EquipClassLV;    //大于0为查看指定境界阶装备信息,  0为查看默认信息
    public uint ServerID;    //玩家服务器ID，发0默认本服玩家

    public CA212_tagCMViewPlayerInfo () {
        combineCmd = (ushort)0x03FE;
@@ -14,7 +14,7 @@

    public override void WriteToBytes () {
        WriteBytes (PlayerID, NetDataType.DWORD);
        WriteBytes (EquipClassLV, NetDataType.BYTE);
        WriteBytes (ServerID, NetDataType.DWORD);
    }

}

 Main/Core/NetworkPackage/ServerPack/HA5_Family/HA523_tagMCFamilyViewList.cs

@@ -34,6 +34,7 @@
            TransBytes (out FamilyList[i].LeaderID, vBytes, NetDataType.DWORD);

            TransBytes (out FamilyList[i].LeaderNameLen, vBytes, NetDataType.BYTE);

            TransBytes (out FamilyList[i].LeaderName, vBytes, NetDataType.Chars, FamilyList[i].LeaderNameLen);

            TransBytes (out FamilyList[i].LeaderServerID, vBytes, NetDataType.DWORD);

            TransBytes (out FamilyList[i].FamilyLV, vBytes, NetDataType.BYTE);

            TransBytes (out FamilyList[i].JoinReview, vBytes, NetDataType.BYTE);

            TransBytes (out FamilyList[i].JoinLVMin, vBytes, NetDataType.WORD);

@@ -55,6 +56,7 @@
        public uint LeaderID;        //族长ID

        public byte LeaderNameLen;

        public string LeaderName;        //size = LeaderNameLen

        public uint LeaderServerID;        //族长服务器ID

        public byte FamilyLV;        //家族等级

        public byte JoinReview;        //成员加入是否需要审核，默认0自动加入

        public ushort JoinLVMin;        //限制最低可加入的玩家等级


 Main/System/Chat/ChatPlayerOtherCell.cs

@@ -42,6 +42,11 @@
            }
            m_PlayerName.text = Language.Get("Chat08", RichTextMsgReplaceConfig.GetRichReplace("FAMILY", fmlv), data.Name);
        }
        
        avatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)data.PlayerID, serverID: (int)data.ServerID, viewPlayerLineupType: (int)BattlePreSetType.Arena);
        });
    }

    public float GetHeight(string content, ArrayList list)

 Main/System/Guild/GuildManager.cs

@@ -666,6 +666,7 @@
        data.FamilyID = (int)view.FamilyID;

        data.FamilyName = view.FamilyName;

        data.LeaderID = (int)view.LeaderID;

        data.LeaderServerID = (int)view.LeaderServerID;

        data.LeaderName = view.LeaderName;

        data.FamilyLV = view.FamilyLV;

        data.JoinReview = view.JoinReview;


 Main/System/Guild/GuildMemberCell.cs

@@ -49,7 +49,7 @@

        avatarCell.AddListener(() =>
        {
            OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerID);
            OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerID, playerInfo.ServerID);
        });

        contribText.text = playerInfo.ContribDay + "/" + playerInfo.ContribTotal;

 Main/System/Guild/GuildPreviewWin.cs

@@ -29,6 +29,7 @@

    int guildID;
    int leaderID;
    int leaderServerID;
    protected override void InitComponent()
    {
        opearteBtn.AddListener(() =>
@@ -47,7 +48,7 @@

        leaderAvatar.AddListener(() =>
        {
            OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID);
            OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID);
        });
    }

@@ -70,7 +71,8 @@
        var guildInfo = GuildManager.Instance.guildsDict[guildID];
        if (guildInfo == null) return;
        leaderID = guildInfo.LeaderID;
        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, (int)ViewPlayerType.viewGuildLeader);
        leaderServerID = guildInfo.ServerID;
        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID, (int)ViewPlayerType.viewGuildLeader);

        var config = FamilyConfig.Get(guildInfo.FamilyLV);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);

 Main/System/Guild/PlayerFairyData.cs

@@ -216,6 +216,7 @@
    public long totalFightPower;

    public string Broadcast;

    public int LeaderID;    //族长玩家ID

    public int LeaderServerID;  //族长服务器ID

    public int MemberCount;

    public int lastChangeNameTick;




 Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs

@@ -49,8 +49,8 @@
        return viewPlayerData;
    }

    // 向服务端请求其他玩家数据
    public void ViewPlayerDetail(int playerId, int viewType = (int)ViewPlayerType.viewPlayerData, int viewBattlePreSetType = (int)BattlePreSetType.Story)
    // 向服务端请求其他玩家数据 serverID发0默认本服玩家
    public void ViewPlayerDetail(int playerId, int serverID, int viewType = (int)ViewPlayerType.viewPlayerData, int viewBattlePreSetType = (int)BattlePreSetType.Story)
    {
        // 自己不能查看自己的信息
        if (playerId == PlayerDatas.Instance.baseData.PlayerID)
@@ -58,11 +58,11 @@

        viewPlayerType = viewType;
        viewPreSetType = viewBattlePreSetType;
        ViewRoleParticulars(playerId);
        ViewRoleParticulars(playerId, serverID);
    }

    // 向服务端请求玩家数据
    void ViewRoleParticulars(int playerID)
    void ViewRoleParticulars(int playerID, int serverID)
    {
        if (playerID <= 0)
            return;
@@ -81,6 +81,7 @@

        CA212_tagCMViewPlayerInfo pak = new CA212_tagCMViewPlayerInfo();
        pak.PlayerID = (uint)playerID;
        pak.ServerID = (uint)serverID;
        GameNetSystem.Instance.SendInfo(pak);
    }
    public void OnRevRoleEquip(HA705_tagSCQueryPlayerCacheResult package)

 Main/System/PhantasmPavilion/AvatarCell.cs

@@ -247,7 +247,7 @@
            {

                return;

            }

            AvatarHelper.TryViewOtherPlayerInfo(avatarModel.playerID, (int)ViewPlayerType.viewPlayerData);

            AvatarHelper.TryViewOtherPlayerInfo(avatarModel.playerID);

        });

    }




 Main/System/PhantasmPavilion/AvatarHelper.cs

@@ -2,13 +2,13 @@


public static class AvatarHelper

{

    public static void TryViewOtherPlayerInfo(int _playerId, int viewType = (int)ViewPlayerType.viewPlayerData, int viewPlayerLineupType = (int)BattlePreSetType.Story)

    //serverID发0默认本服玩家

    public static void TryViewOtherPlayerInfo(int playerId, int serverID = 0, int viewType = (int)ViewPlayerType.viewPlayerData, int viewPlayerLineupType = (int)BattlePreSetType.Story)

    {

        if (_playerId == PlayerDatas.Instance.PlayerId || UIManager.Instance.IsOpened<OtherPlayerDetailWin>())

        if (playerId == PlayerDatas.Instance.PlayerId || UIManager.Instance.IsOpened<OtherPlayerDetailWin>())

            return;

        OtherPlayerDetailManager.Instance.ViewPlayerDetail(_playerId, viewType, viewPlayerLineupType);

        OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, serverID, viewType, viewPlayerLineupType);

    }



    public static AvatarModel GetAvatarModel(int playerId, int face, int facePic, int job = 0)

    {

        bool isMyself = playerId == PlayerDatas.Instance.PlayerId;


 Main/System/ViewNPC/ViewNPCManager.cs

@@ -67,7 +67,7 @@
            {
                case BattleConst.ArenaBattleField:
                    int playerId = (int)ArenaManager.Instance.atkPlayerId;
                    OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, (int)ViewPlayerType.viewArenaBattleEnemyHero, (int)BattlePreSetType.Arena);
                    OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, 0, (int)ViewPlayerType.viewArenaBattleEnemyHero, (int)BattlePreSetType.Arena);
                    break;
            }
            return;