Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

2026-01-06 0d8a95ee4ec66c17ba9c60c8671d6d6e58f4d202

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

 Main/System/Arena/ArenaBattleFailWin.cs

@@ -73,7 +73,7 @@
        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)tagPlayerID, (int)enemyFace, (int)enemyFacePic));
        enemyAvatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)tagPlayerID, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
            AvatarHelper.TryViewOtherPlayerInfo((int)tagPlayerID, viewPlayerLineupType: (int)TeamType.ArenaDefense);
        });

        txtMyName.text = PlayerDatas.Instance.baseData.PlayerName;

 Main/System/Arena/ArenaBattleVictoryWin.cs

@@ -67,7 +67,7 @@
        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)tagPlayerID, (int)enemyFace, (int)enemyFacePic));
        enemyAvatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)tagPlayerID, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
            AvatarHelper.TryViewOtherPlayerInfo((int)tagPlayerID, viewPlayerLineupType: (int)TeamType.ArenaDefense);
        });

        txtMyName.text = PlayerDatas.Instance.baseData.PlayerName;

 Main/System/Arena/ArenaChallengeCell.cs

@@ -35,7 +35,7 @@
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)arenaMatchInfo.PlayerID, (int)arenaMatchInfo.Face, (int)arenaMatchInfo.FacePic));
        avatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)arenaMatchInfo.PlayerID, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
            AvatarHelper.TryViewOtherPlayerInfo((int)arenaMatchInfo.PlayerID, viewPlayerLineupType: (int)TeamType.ArenaDefense);
        });

        txtName.text = UIHelper.ServerStringTrim(arenaMatchInfo.PlayerName);

 Main/System/Arena/ArenaPlayerRankCell.cs

@@ -53,7 +53,7 @@
            avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)rankData.id, (int)rankData.value3, (int)rankData.value4));
            avatarCell.SetListener(() =>
            {
                AvatarHelper.TryViewOtherPlayerInfo((int)rankData.id, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
                AvatarHelper.TryViewOtherPlayerInfo((int)rankData.id, viewPlayerLineupType: (int)TeamType.ArenaDefense);
            });
            nameText.text = rankData.name1;
            rankValueText.text = string.Format(valueFormat, UIHelper.ReplaceLargeNum(rankData.cmpValue));
@@ -64,7 +64,7 @@
        {
            queryPlayerBtn.AddListener(() =>
            {
                AvatarHelper.TryViewOtherPlayerInfo(viewPlayerId, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
                AvatarHelper.TryViewOtherPlayerInfo(viewPlayerId, viewPlayerLineupType: (int)TeamType.ArenaDefense);
            });
        }
    }

 Main/System/Arena/ArenaPlayerTop3Cell.cs

@@ -27,7 +27,7 @@
        model.Create(HorseManager.Instance.GetOtherPlayerHorseSkinID((int)rankData.value6), (int)rankData.value5, 1);
        queryPlayerBtn.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)rankData.id, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
            AvatarHelper.TryViewOtherPlayerInfo((int)rankData.id, viewPlayerLineupType: (int)TeamType.ArenaDefense);
        });
    }


 Main/System/Arena/ArenaRecordCell.cs

@@ -67,7 +67,7 @@
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)arenaGameRec.Value3, (int)arenaGameRec.Value5, (int)arenaGameRec.Value6));
        avatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)arenaGameRec.Value3, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
            AvatarHelper.TryViewOtherPlayerInfo((int)arenaGameRec.Value3, viewPlayerLineupType: (int)TeamType.ArenaDefense);
        });
        txtName.text = arenaGameRec.Name;
        txtFightPoint.text = UIHelper.ReplaceLargeArtNum(arenaGameRec.FightPower);

 Main/System/Battle/ArenaBattleWin.cs

@@ -190,7 +190,7 @@
        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)info.PlayerID, (int)info.Face, (int)info.FacePic));
        enemyAvatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)info.PlayerID, viewPlayerLineupType: (int)ViewPlayerLineupType.ArenaDef);
            AvatarHelper.TryViewOtherPlayerInfo((int)info.PlayerID, viewPlayerLineupType: (int)TeamType.ArenaDefense);
        });
        var team = GetTeamHeroList(enemyTeam);
        enemyCountry.RefreshOnTeamCountry(team, true);

 Main/System/OtherPlayerDetail/OtherPlayerDetailManager.cs

@@ -51,7 +51,7 @@


    // 向服务端请求其他玩家数据
    public void ViewPlayerDetail(int _playerId, int viewType = (int)ViewPlayerType.viewPlayerData, int viewPlayerLineupType = (int)ViewPlayerLineupType.Story)
    public void ViewPlayerDetail(int _playerId, int viewType = (int)ViewPlayerType.viewPlayerData, int viewPlayerLineupType = (int)TeamType.Story)
    {
        if (_playerId == PlayerDatas.Instance.baseData.PlayerID)
        {

 Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs

@@ -64,7 +64,7 @@
        var heroList = manager.GetHeroDataSortList(playerID, viewPlayerLineupType);
        if (heroList.IsNullOrEmpty())
        {
            heroList = manager.GetHeroDataSortList(playerID, (int)ViewPlayerLineupType.Story);
            heroList = manager.GetHeroDataSortList(playerID, (int)TeamType.Story);
        }
        DisplayCard(heroList);


 Main/System/PhantasmPavilion/AvatarCell.cs

@@ -145,7 +145,6 @@
            return m_redpoint;

        }

    }

    public ViewPlayerLineupType lineupEnum = ViewPlayerLineupType.Story;

    GameObject prefab;

    AvatarModel avatarModel;

    PhantasmPavilionManager manager { get { return PhantasmPavilionManager.Instance; } }

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

                return;

            }

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

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

        });

    }




 Main/System/PhantasmPavilion/AvatarHelper.cs

@@ -2,7 +2,7 @@


public static class AvatarHelper

{

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

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

    {

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

            return;


 Main/Utility/EnumHelper.cs

@@ -1845,11 +1845,3 @@
    viewGuildLeader = 1,  //查看玩家的公会族长信息

}

//查询其他玩家数据 展示的阵容
public enum ViewPlayerLineupType
{
    Story = 1,      //主线
    ArenaAtk = 2,   //竞技场进攻
    ArenaDef = 3,   //竞技场防守
}