588 公会攻防战 适配

lcy

2026-06-10 bb0cc1ef463ab4ee8c0e9584531161727d17d615

588 公会攻防战 适配

# Conflicts:
#	Main/Config/ConfigManager.cs
#	Main/Main.cs
#	Main/System/Battle/BattleFieldFactory.cs

 Main/System/Battle/BattleField/GuildAtkDefBatField.cs

@@ -20,10 +20,10 @@

    }

    public override async UniTask Init(int MapID, int FuncLineID, JsonData _extendData,
    public override void Init(int MapID, int FuncLineID, JsonData _extendData,
        List<TeamBase> _redTeamList, List<TeamBase> _blueTeamList, byte turnMax)
    {
        await base.Init(MapID, FuncLineID, extendData, _redTeamList, _blueTeamList, turnMax);
        base.Init(MapID, FuncLineID, extendData, _redTeamList, _blueTeamList, turnMax);

        chapter = FuncLineID / 10000;
        wave = MapID == 1 ? FuncLineID % 100 : 1;//第几波怪
@@ -79,7 +79,7 @@
        if (UIManager.Instance.IsOpened<GuildAtkDefBatBattleWin>())
        {
            UIManager.Instance.CloseWindow<GuildAtkDefBatBattleWin>();
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatBattlePanelWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatBattlePanelWin>();
        }
    }

@@ -109,7 +109,7 @@
        GuildAtkDefBatBattleWin fsBattleWin = UIManager.Instance.GetUI<GuildAtkDefBatBattleWin>();// as FullScreenBattleWin;
        if (null == fsBattleWin)
        {
            fsBattleWin = await UIManager.Instance.OpenWindowAsync<GuildAtkDefBatBattleWin>();
            fsBattleWin = UIManager.Instance.OpenWindow<GuildAtkDefBatBattleWin>();
        }
        fsBattleWin.SetBattleField(this);
        if (UIManager.Instance.IsOpened<GuildAtkDefBatBattlePanelWin>())

 Main/System/Battle/BattleFieldFactory.cs

@@ -38,15 +38,12 @@
            case 32000:
                battleField = new QYBattleField(guid);
                break;
<<<<<<< HEAD
=======
            case 100:
                battleField = new ArenaBattleField(guid);
                break;
            case 33000:
                battleField = new GuildAtkDefBatField(guid);
                break;
>>>>>>> 0afbb8c1 (588 公会攻防战)
            default:
                break;
        }

 Main/System/Battle/GuildAtkDefBatBattleWin.cs

@@ -74,7 +74,7 @@
        }
        else
        {
            UIManager.Instance.OpenWindowAsync<MainWin>().Forget();
            UIManager.Instance.OpenWindow<MainWin>();
        }

        if (isClickSkip)
@@ -210,13 +210,10 @@
        txtEnemyLV.text = Language.Get("Arena22", enemyMem.LV);
        txtEnemyName.text = UIHelper.ServerStringTrim(enemyMem.Name);
        txtEnemyFightPonit.text = UIHelper.ReplaceLargeArtNum(GetFightPonit(enemyTeam));
        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)enemyMem.PlayerID, (int)enemyMem.Face, (int)enemyMem.FacePic)).Forget();
        enemyAvatarCell.SetOnLoaded(() =>
        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)enemyMem.PlayerID, (int)enemyMem.Face, (int)enemyMem.FacePic));
        enemyAvatarCell.SetListener(() =>
        {
            enemyAvatarCell.SetListener(() =>
            {
                AvatarHelper.TryViewOtherPlayerInfo((int)enemyMem.PlayerID, (int)enemyMem.ServerID, viewPlayerLineupType: (int)BattlePreSetType.GuildAtkDefBat);
            });
            AvatarHelper.TryViewOtherPlayerInfo((int)enemyMem.PlayerID, (int)enemyMem.ServerID, viewPlayerLineupType: (int)BattlePreSetType.GuildAtkDefBat);
        });
        var team = GetTeamHeroList(enemyTeam);
        enemyCountry.RefreshOnTeamCountry(team, true);
@@ -225,7 +222,7 @@
        txtMyName.text = PlayerDatas.Instance.baseData.PlayerName;
        long myFightPower = GetFightPonit(myTeam);
        txtMyFightPonit.text = UIHelper.ReplaceLargeArtNum(myFightPower);
        myAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID, PlayerDatas.Instance.baseData.face, PlayerDatas.Instance.baseData.facePic)).Forget();
        myAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID, PlayerDatas.Instance.baseData.face, PlayerDatas.Instance.baseData.facePic));
        team = GetTeamHeroList(myTeam);
        myCountry.RefreshOnTeamCountry(team, true);


 Main/System/Guild/GuildBaseWin.cs

@@ -82,7 +82,7 @@
        {
            if (!GuildAtkDefBatManager.Instance.IsOpen(true))
                return;
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatWin>();
        });
        InitHawker();
        talkBtn.AddListener(OnClickTalkButton);

 Main/System/GuildAtkDefBat/GuildAtkDefBatAwardPreviewCell.cs

@@ -8,6 +8,6 @@
    public void SetItemData(int itemId, int count)
    {
        itemCell.Init(new ItemCellModel(itemId, true, count));
        itemCell.SetClickListener(() => { ItemTipUtility.Show(itemId); });
        itemCell.button.SetListener(() => { ItemTipUtility.Show(itemId); });
    }
}

 Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelItem.cs

@@ -54,7 +54,7 @@
            // 设置坐骑和角色模型
            int horseSkinID = HorseManager.Instance.GetOtherPlayerHorseSkinID((int)mem.EquipShowSwitch);
            int heroSkinID = ResolveHeroSkinID((int)mem.ModelMark, (int)mem.Job);
            horseModel.Create(horseSkinID, heroSkinID, 0.8f).Forget();
            horseModel.Create(horseSkinID, heroSkinID, 0.8f);
        }

        // uIEffectPlayer：完全击败显示，未完全击败隐藏（与horseModel相反）
@@ -64,7 +64,7 @@
        wallRect.SetActive(showWall);

        // 官职与称号
        officialTitleCell.InitUI(mem.RealmLV, (int)mem.TitleID).Forget();
        officialTitleCell.InitUI(mem.RealmLV, (int)mem.TitleID);

        // 名字颜色与描边
        if (isMy)

 Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs

@@ -54,11 +54,11 @@
        });
        recordBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatRecordWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatRecordWin>();
        });
        rankButton.SetListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatRankWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatRankWin>();
        });

        // 己方公会徽章点击 - 自己的公会
@@ -339,7 +339,7 @@
        if (!UIManager.Instance.IsOpened<GuildPreviewWin>())
        {
            GuildPreviewWin.SetShowOpearteBtn(false);
            UIManager.Instance.OpenWindowAsync<GuildPreviewWin>(familyID).Forget();
            UIManager.Instance.OpenWindow<GuildPreviewWin>(familyID);
        }
    }
}

 Main/System/GuildAtkDefBat/GuildAtkDefBatChallengeWin.cs

@@ -19,7 +19,7 @@
    public static void Open(HA525_tagSCFamilyAtkDefBatInfo.tagSCFamilyAtkDefBatMem mem)
    {
        s_TargetMem = mem;
        UIManager.Instance.OpenWindowAsync<GuildAtkDefBatChallengeWin>().Forget();
        UIManager.Instance.OpenWindow<GuildAtkDefBatChallengeWin>();
    }

    protected override void InitComponent()
@@ -52,14 +52,14 @@

    private void Display()
    {
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)targetMem.PlayerID, (int)targetMem.Face, (int)targetMem.FacePic, targetMem.Job)).Forget();
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)targetMem.PlayerID, (int)targetMem.Face, (int)targetMem.FacePic, targetMem.Job));
        avatarCell.SetListener(OnClickViewDetails);

        officialTitle.InitUI(targetMem.RealmLV, (int)targetMem.TitleID).Forget();
        officialTitle.InitUI(targetMem.RealmLV, (int)targetMem.TitleID);
        horseModel.Create(
            HorseManager.Instance.GetOtherPlayerHorseSkinID((int)targetMem.EquipShowSwitch),
            ResolveHeroSkinID((int)targetMem.ModelMark, targetMem.Job),
            0.8f).Forget();
            0.8f);

        playerNameText.text = UIHelper.ServerStringTrim(targetMem.Name);
        fightPowerText.text = UIHelper.ReplaceLargeArtNum(GuildAtkDefBatManager.CalcTotalFightPower(targetMem.FightPower, targetMem.FightPowerEx));

 Main/System/GuildAtkDefBat/GuildAtkDefBatChangeMemberCell.cs

@@ -26,14 +26,14 @@
        m_MemberData = mem;

        // 头像
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)mem.PlayerID, (int)mem.Face, (int)mem.FacePic, mem.Job)).Forget();
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)mem.PlayerID, (int)mem.Face, (int)mem.FacePic, mem.Job));
        avatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)mem.PlayerID, (int)mem.ServerID, viewPlayerLineupType: (int)BattlePreSetType.GuildAtkDefBat);
        });

        // 官职称号
        officialTitle.InitUI(mem.RealmLV, (int)mem.TitleID).Forget();
        officialTitle.InitUI(mem.RealmLV, (int)mem.TitleID);

        // 名字
        playerNameText.text = UIHelper.ServerStringTrim(mem.Name);

 Main/System/GuildAtkDefBat/GuildAtkDefBatChangeMemberWin.cs

@@ -17,7 +17,7 @@
    public static void Open(HA525_tagSCFamilyAtkDefBatInfo.tagSCFamilyAtkDefBatMem sourceMember)
    {
        s_SourceMember = sourceMember;
        UIManager.Instance.OpenWindowAsync<GuildAtkDefBatChangeMemberWin>().Forget();
        UIManager.Instance.OpenWindow<GuildAtkDefBatChangeMemberWin>();
    }

    protected override void InitComponent()

 Main/System/GuildAtkDefBat/GuildAtkDefBatFailWin.cs

@@ -62,11 +62,11 @@

        int myFace = myMem != null ? (int)myMem.Face : PlayerDatas.Instance.baseData.face;
        int myFacePic = myMem != null ? (int)myMem.FacePic : PlayerDatas.Instance.baseData.facePic;
        myAvatar.InitUI(AvatarHelper.GetAvatarModel((int)myPlayerID, myFace, myFacePic)).Forget();
        myAvatar.InitUI(AvatarHelper.GetAvatarModel((int)myPlayerID, myFace, myFacePic));

        int enemyFace = enemyMem != null ? (int)enemyMem.Face : 0;
        int enemyFacePic = enemyMem != null ? (int)enemyMem.FacePic : 0;
        enemyAvatar.InitUI(AvatarHelper.GetAvatarModel((int)tagID, enemyFace, enemyFacePic)).Forget();
        enemyAvatar.InitUI(AvatarHelper.GetAvatarModel((int)tagID, enemyFace, enemyFacePic));
        enemyAvatar.SetListener(() =>
        {
            int serverID = enemyMem != null ? (int)enemyMem.ServerID : 0;

 Main/System/GuildAtkDefBat/GuildAtkDefBatManager.cs

@@ -974,7 +974,7 @@
            }
        }

        UIManager.Instance.OpenWindowAsync<GuildAtkDefBatVictoryWin>().Forget();
        UIManager.Instance.OpenWindow<GuildAtkDefBatVictoryWin>();
    }



 Main/System/GuildAtkDefBat/GuildAtkDefBatPlayerShowCell.cs

@@ -12,7 +12,7 @@
        model.SetActive(!isDeath);
        deathRect.SetActive(isDeath);
        if (!isDeath)
            model.Create(horseSkinID, heroSkinID, 0.8f).Forget();
            model.Create(horseSkinID, heroSkinID, 0.8f);

        clickButton.SetListener(() =>
        {

 Main/System/GuildAtkDefBat/GuildAtkDefBatPlayerTop3Cell.cs

@@ -23,7 +23,7 @@
        }

        officialTitleCell.SetActive(true);
        officialTitleCell.InitUI((int)data.RealmLV, (int)data.TitleID).Forget();
        officialTitleCell.InitUI((int)data.RealmLV, (int)data.TitleID);

        starCnt.text = data.Star.ToString(); // 星数直接显示数字
        rankValueText.text = Language.Get("GuildAtkDefBat36", data.BatCnt); // 战斗次数
@@ -33,7 +33,7 @@
        model.SetActive(true);
        int heroSkinID = ResolveHeroSkinID((int)data.ModelMark, (int)data.Job);
        int horseSkinID = HorseManager.Instance.GetOtherPlayerHorseSkinID((int)data.EquipShowSwitch);
        model.Create(horseSkinID, heroSkinID, rank == 1 ? 1f : 0.8f).Forget();
        model.Create(horseSkinID, heroSkinID, rank == 1 ? 1f : 0.8f);

        queryPlayerBtn.SetListener(() =>
        {

 Main/System/GuildAtkDefBat/GuildAtkDefBatRankCell.cs

@@ -45,9 +45,9 @@
        nameText.text = data.Name;

        officialTitleCell.SetActive(true);
        officialTitleCell.InitUI((int)data.RealmLV, (int)data.TitleID).Forget();
        officialTitleCell.InitUI((int)data.RealmLV, (int)data.TitleID);
        avatarCell.SetActive(true);
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)data.PlayerID, (int)data.Face, (int)data.FacePic)).Forget();
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)data.PlayerID, (int)data.Face, (int)data.FacePic));
        avatarCell.SetListener(() =>
        {
            AvatarHelper.TryViewOtherPlayerInfo((int)curPlayerId, curServerId, viewPlayerLineupType: (int)BattlePreSetType.GuildAtkDefBat);

 Main/System/GuildAtkDefBat/GuildAtkDefBatRecordCell.cs

@@ -130,10 +130,10 @@
        if (isMySide)
        {
            myOfficialTitle.SetActive(true);
            myOfficialTitle.InitUI(playerInfo.fmLV, playerInfo.titleID).Forget();
            myOfficialTitle.InitUI(playerInfo.fmLV, playerInfo.titleID);

            myAvatarCell.SetActive(true);
            myAvatarCell.InitUI(AvatarHelper.GetAvatarModel(playerId, playerInfo.face, playerInfo.facePic)).Forget();
            myAvatarCell.InitUI(AvatarHelper.GetAvatarModel(playerId, playerInfo.face, playerInfo.facePic));
            myAvatarCell.SetListener(() =>
            {
                AvatarHelper.TryViewOtherPlayerInfo(playerId, playerInfo.serverID, viewPlayerLineupType: (int)BattlePreSetType.GuildAtkDefBat);
@@ -145,10 +145,10 @@
        else
        {
            enemyOfficialTitle.SetActive(true);
            enemyOfficialTitle.InitUI(playerInfo.fmLV, playerInfo.titleID).Forget();
            enemyOfficialTitle.InitUI(playerInfo.fmLV, playerInfo.titleID);

            enemyAvatarCell.SetActive(true);
            enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel(playerId, playerInfo.face, playerInfo.facePic)).Forget();
            enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel(playerId, playerInfo.face, playerInfo.facePic));
            enemyAvatarCell.SetListener(() =>
            {
                AvatarHelper.TryViewOtherPlayerInfo(playerId, playerInfo.serverID, viewPlayerLineupType: (int)BattlePreSetType.GuildAtkDefBat);

 Main/System/GuildAtkDefBat/GuildAtkDefBatRecordWin.cs

@@ -85,7 +85,7 @@
        if (!UIManager.Instance.IsOpened<GuildPreviewWin>())
        {
            GuildPreviewWin.SetShowOpearteBtn(false);
            UIManager.Instance.OpenWindowAsync<GuildPreviewWin>(familyID).Forget();
            UIManager.Instance.OpenWindow<GuildPreviewWin>(familyID);
        }
    }


 Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs

@@ -35,7 +35,7 @@

        awardButton.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatAwardPreviewWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatAwardPreviewWin>();
        });

        lastLineButton.AddListener(() =>

 Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs

@@ -100,11 +100,11 @@

        int myFace = myMem != null ? (int)myMem.Face : PlayerDatas.Instance.baseData.face;
        int myFacePic = myMem != null ? (int)myMem.FacePic : PlayerDatas.Instance.baseData.facePic;
        myAvatar.InitUI(AvatarHelper.GetAvatarModel((int)myPlayerID, myFace, myFacePic)).Forget();
        myAvatar.InitUI(AvatarHelper.GetAvatarModel((int)myPlayerID, myFace, myFacePic));

        int enemyFace = enemyMem != null ? (int)enemyMem.Face : 0;
        int enemyFacePic = enemyMem != null ? (int)enemyMem.FacePic : 0;
        enemyAvatar.InitUI(AvatarHelper.GetAvatarModel((int)tagID, enemyFace, enemyFacePic)).Forget();
        enemyAvatar.InitUI(AvatarHelper.GetAvatarModel((int)tagID, enemyFace, enemyFacePic));
        enemyAvatar.SetListener(() =>
        {
            int serverID = enemyMem != null ? (int)enemyMem.ServerID : 0;

 Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs

@@ -47,19 +47,19 @@
        backButton.AddListener(CloseWindow);
        rankButton.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatRankWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatRankWin>();
        });
        recordButton.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatRecordWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatRecordWin>();
        });
        shopButton.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatShopWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatShopWin>();
        });
        treasureButton.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatTreasureWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatTreasureWin>();
        });
        goButton.AddListener(async () =>
        {
@@ -70,7 +70,7 @@
                GuildAtkDefBatBattleWin battleWin;
                if (!UIManager.Instance.IsOpened<GuildAtkDefBatBattleWin>())
                {
                    battleWin = await UIManager.Instance.OpenWindowAsync<GuildAtkDefBatBattleWin>();
                    battleWin = UIManager.Instance.OpenWindow<GuildAtkDefBatBattleWin>();
                }
                else
                {
@@ -95,7 +95,7 @@
                SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat1");
                return;
            }
            UIManager.Instance.OpenWindowAsync<GuildAtkDefBatBattlePanelWin>().Forget();
            UIManager.Instance.OpenWindow<GuildAtkDefBatBattlePanelWin>();
        });

        // 己方公会徽章点击 - 自己的公会
@@ -156,7 +156,7 @@
        if (!UIManager.Instance.IsOpened<GuildPreviewWin>())
        {
            GuildPreviewWin.SetShowOpearteBtn(false);
            UIManager.Instance.OpenWindowAsync<GuildPreviewWin>(familyID).Forget();
            UIManager.Instance.OpenWindow<GuildPreviewWin>(familyID);
        }
    }


 Main/System/Settlement/BattleSettlementManager.cs

@@ -84,11 +84,11 @@
            case BattleConst.GuildAtkDefBatField:
                if (isWin)
                {
                    UIManager.Instance.OpenWindowAsync<GuildAtkDefBatVictoryWin>().Forget();
                    UIManager.Instance.OpenWindow<GuildAtkDefBatVictoryWin>();
                }
                else
                {
                    UIManager.Instance.OpenWindowAsync<GuildAtkDefBatFailWin>().Forget();
                    UIManager.Instance.OpenWindow<GuildAtkDefBatFailWin>();
                }
                break;
            case BattleConst.BoneBattleField: