130 战斗修改回合样式

lcy

7 天以前 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4

 Main/System/Main/MainWin.cs

@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -24,20 +25,21 @@
    [SerializeField] Image fightHeroImg; //战斗显示英雄
    [SerializeField] ScaleTween fightHeroScale; //战斗显示英雄缩放
    [SerializeField] UIEffectPlayer fightEffect;
    [SerializeField] UIEffectPlayer openCloseAnim;
    [SerializeField] FillTween cdTween;
    [SerializeField] Text hammerText;
    
    bool isForcePlayFightUIAnim = true; //强制播放战斗锤子框动画


    public Text hammerText;

    public static event Action TabChangeEvent;
    protected override void InitComponent()
    {
        base.InitComponent();

        avatarCell.button.AddListener(() => { });

    }

    public override void Refresh()
    void Display()
    {
        UpdateCurrency();
        UpdatePlayerInfo();
@@ -51,7 +53,7 @@
        base.OnPreOpen();

        // 刷新UI
        Refresh();
        Display();
    }

    protected override void OnPreClose()
@@ -59,34 +61,53 @@
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
        base.OnPreClose();
        isForcePlayFightUIAnim = true;
    }


    protected override void SelectBottomTab(int index)
    void DisplayTopBar()
    {
        if (index == 3)
        {
            //挑战特殊显示逻辑
            return;
        }

        topBar.SetActive(index == 0 || index == 2);
        // 如果点击当前已选中的标签，不做处理
        if (functionOrder == index && currentSubUI != null)
        {
            return;
        }

        // 更新当前选中的标签索引
        functionOrder = index;

        // 关闭当前打开的子界面
        CloseCurrentSubUI();

        // 根据选中的标签打开对应的界面
        OpenSubUIByTabIndex();
        topBar.SetActive(functionOrder == 0 || functionOrder == 2);
    }

  
    //战斗按钮动画
    void ClickAnimation(int index)
    {
        //强制播放
        if (isForcePlayFightUIAnim)
        {
            openCloseAnim.onComplete = () =>
            {
                openCloseAnim.SetEnabled(true);
            };
            openCloseAnim.PlayByArrIndex(index == 0 ? 1 : 0);

            isForcePlayFightUIAnim = false;
            return;
        }

        //切换显示
        if (functionOrder != 0 && index == 0)
        {
            //切回战斗场景
            openCloseAnim.onComplete = () =>
            {
                openCloseAnim.SetEnabled(true);
            };
            openCloseAnim.PlayByArrIndex(1);

        }
        else if (functionOrder <= 0 && index != 0)
        {
            //切出战斗场景
            openCloseAnim.onComplete = () =>
            {
                openCloseAnim.SetEnabled(true);
            };
            openCloseAnim.PlayByArrIndex(0);
        }
    }


    /// <summary>
@@ -138,6 +159,8 @@
        hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
    }



    /// <summary>
    /// 底部标签按钮点击
    /// </summary>
@@ -151,9 +174,47 @@
                AutoFightModel.Instance.StartFight();
            }
        }
        else if (index == 4 && !PlayerDatas.Instance.fairyData.HasFairy)
        {
            //未加入公会不切换标签，打开申请界面
            UIManager.Instance.OpenWindow<GuildJoinWin>();
            return;
        }


        SelectBottomTab(index);
    }

    protected override void SelectBottomTab(int index)
    {
        if (index == 3)
        {
            //挑战特殊显示逻辑
            UIManager.Instance.OpenWindow<ChallengeTabWin>();
            return;
        }

        // 如果点击当前已选中的标签，不做处理
        if (functionOrder == index && currentSubUI != null)
        {
            return;
        }
        

        ClickAnimation(index);
        // 更新当前选中的标签索引
        functionOrder = index;
        TabChangeEvent?.Invoke();

        DisplayTopBar();

        // 关闭当前打开的子界面
        CloseCurrentSubUI();

        // 根据选中的标签打开对应的界面
        OpenSubUIByTabIndex();

    }

    /// <summary>
    /// 根据标签索引打开对应的子界面
@@ -179,18 +240,15 @@
                    battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
                }
                currentSubUI = UIManager.Instance.OpenWindow<HomeWin>();
                Debug.Log("打开主城界面");
                break;
            case 1:
                currentSubUI = UIManager.Instance.OpenWindow<AffairBaseWin>();
                Debug.Log("打开内政界面");
                break;
            case 2:
                currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);
                Debug.Log("打开武将界面");
                break;
            // case 3:
            //     // currentSubUI = UIManager.Instance.OpenUI<QuestUI>();
            //     挑战界面不跳转
            //     Debug.Log("打开挑战界面");
            //     break;
            case 4:
@@ -224,6 +282,7 @@
        {
            //主城界面
            fightOtherWinBG.SetActive(false);
            fightOtherWinWarnImg.SetActive(false);
            fightBG.SetActive(true);


@@ -259,6 +318,7 @@
    }



    void RefreshFightIng(bool isfighting = false)
    {
        if (isfighting)
@@ -267,8 +327,12 @@
            cdTween.SetStartState();
            cdTween.Play(() =>
            {
                AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
                fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
                var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
                if (tmpHero != null)
                {
                    AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
                    fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
                }
            });
            fightHeroScale.SetStartState();
            fightHeroScale.Play();
@@ -283,7 +347,16 @@

        if (AutoFightModel.Instance.fightingHeroSkinID == 0)
        {
            AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
            var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
            if (tmpHero != null)
            {
                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
            }
            else
            {
                Debug.LogError("没有找到下一个攻击武将");
                return;
            }
        }

        fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
@@ -304,4 +377,62 @@
            RefreshFightBtn();
        }
    }

    #region 外部调用
    //外部调用点击功能
    public void ClickFunc(int functionOrder)
    {
        tabButtons[functionOrder].SelectBtn();
        tabButtons[functionOrder].onClick.Invoke();
    }


    //恢复功能按钮状态
    public void RestoreFuncBtn()
    {
        if (functionOrder == -1)
        {
            if (lastWinOrder == -1)
            {
                functionOrder = 0;
            }
            else
            {
                functionOrder = lastWinOrder;
            }
        }


        tabButtons[functionOrder].SelectBtn();
    }

    // 外部关闭子界面
    int lastWinOrder = -1;
    public void CloseSubUI()
    {
        if (currentSubUI != null)
        {
            lastWinOrder = functionOrder;
            currentSubUI.CloseWindow();
            currentSubUI = null;
            functionOrder = -1;
            isForcePlayFightUIAnim = true;
            DisplayTopBar();
        }
    }

    // 外部恢复子界面
    public void RestoreSubUI()
    {
        if (functionOrder != -1)
            return;
        if (lastWinOrder == -1)
        {
            lastWinOrder = 0;
        }
        OnTabButtonClicked(lastWinOrder);
    }

    
    #endregion
}