588 公会攻防战 提交主干和分支11

lcy

2026-06-11 1618f5f0a18aff64ec092ad1c8478f2840057b63

588 公会攻防战 提交主干和分支11

1.激战期点防守预设弹提示 激战期不能修改防守预设
2.调整胜利调整显示星数样式
3.休战期才显示宝库箭头，宝库箭头更改颜色，黄金宝库蓝色，白银宝库红色

 Main/System/Guild/GuildBaseWin.cs

@@ -200,7 +200,7 @@
    /// </summary>
    void UpdateGuildBattleCountdown()
    {
        int state = GuildAtkDefBatManager.Instance.BatState;
        int state = GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState();
        bool show = state == 2 || state == 3;
        GuildBattleCountDownTime.SetActive(show);
        if (!show) return;

 Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs

@@ -46,6 +46,11 @@
        base.InitComponent();
        funPresetDefBtn.AddListener(() =>
        {
            if (GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState() == 3)
            {
                SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat7");
                return;
            }
            FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.GuildAtkDefBat);
        });
        funPresetAtkBtn.AddListener(() =>
@@ -223,7 +228,7 @@

    void ShowTop3()
    {
        atkCntImage.SetActive(GuildAtkDefBatManager.Instance.BatState == 3);
        atkCntImage.SetActive(GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState() == 3);
        var sortedMembers = GuildAtkDefBatManager.Instance.GetSortedFamilyMembers();

        int top3Count = Mathf.Min(top3NameText.Length, sortedMembers.Count);

 Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs

@@ -10,6 +10,8 @@
    [SerializeField] ButtonEx awardButton;
    [SerializeField] ButtonEx lastLineButton;
    [SerializeField] ButtonEx nextLineButton;
    [SerializeField] ImageEx lastLineImage;
    [SerializeField] ImageEx nextLineImage;
    [SerializeField] ImageEx timeImage;
    [SerializeField] TextEx timeText;
    [SerializeField] ScrollerController scroller;
@@ -167,8 +169,14 @@
        }
        scroller.Restart();

        lastLineButton.SetActive(currentTopRow > 0);
        nextLineButton.SetActive(currentTopRow < totalRows - MAX_ROWS);
        int displayState = manager.GetGuildBattleDisplayState();
        bool isTrucePeriod = displayState == 4 || displayState == 5;
        lastLineButton.SetActive(isTrucePeriod && currentTopRow > 0);
        nextLineButton.SetActive(isTrucePeriod && currentTopRow < totalRows - MAX_ROWS);
        
        string showStr = displayState == 4 ? "GuildAtkDefBatTreasureBlue" : "GuildAtkDefBatTreasureRed";
        lastLineImage.SetSprite(showStr);
        nextLineImage.SetSprite(showStr);
    }

    void OnRefreshCell(ScrollerDataType type, CellView cell)

 Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs

@@ -9,7 +9,7 @@
    [SerializeField] AvatarCell enemyAvatar;
    [SerializeField] TextEx myNameText;
    [SerializeField] TextEx enemyNameText;
    [SerializeField] RichText scoreText;
    [SerializeField] TextEx scoreText;
    [SerializeField] TextEx txtFuncName;
    [SerializeField] ScrollerController scroller;
    [SerializeField] ButtonEx detailBtn;
@@ -123,7 +123,7 @@
            // 显示增加的星数（星星图标 + 数值）
            scoreText.SetActive(true);
            int addStar = jsonData.ContainsKey("addStar") ? (int)jsonData["addStar"] : 0;
            scoreText.text = Language.Get("GuildAtkDefBat22", "GuildAtkDefBatBattleEx_img_47", addStar);
            scoreText.text = $"+{addStar}"; 
        }

        int funcId = (int)FuncOpenEnum.GuildAtkDefBat;