From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式
---
Main/System/Main/MainWin.cs | 244 +++++++++++++++++++++++++++---------------------
1 files changed, 135 insertions(+), 109 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 1ceda2d..0828ab3 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -27,10 +27,9 @@
[SerializeField] UIEffectPlayer fightEffect;
[SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
- int index = 0;
-
- public bool isFirstOpen = true; //棣栨鎵撳紑
- public Text hammerText;
+ [SerializeField] Text hammerText;
+
+ bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
public static event Action TabChangeEvent;
protected override void InitComponent()
@@ -40,131 +39,68 @@
avatarCell.button.AddListener(() => { });
}
- public override void Refresh()
+ void Display()
{
UpdateCurrency();
UpdatePlayerInfo();
RefreshFightBtn();
- DisplayTopBar(index);
}
protected override void OnPreOpen()
{
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent += OnSkillCast;
- ChallengeTabWin.OnCloseChallengeTabWin += OnCloseChallengeTabWin;
- BattleManager.Instance.onBattleFieldCreate += OnBattleFieldCreate;
- BattleManager.Instance.onBattleFieldDestroy += OnBattleFieldDestroy;
base.OnPreOpen();
// 鍒锋柊UI
- Refresh();
+ Display();
}
protected override void OnPreClose()
{
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
- ChallengeTabWin.OnCloseChallengeTabWin -= OnCloseChallengeTabWin;
- BattleManager.Instance.onBattleFieldCreate -= OnBattleFieldCreate;
- BattleManager.Instance.onBattleFieldDestroy -= OnBattleFieldDestroy;
base.OnPreClose();
+ isForcePlayFightUIAnim = true;
}
- private void OnBattleFieldCreate(string guid, BattleField battleField)
+
+ void DisplayTopBar()
{
- Refresh();
+ topBar.SetActive(functionOrder == 0 || functionOrder == 2);
}
- private void OnBattleFieldDestroy(string guid, BattleField battleField)
- {
- Refresh();
- }
-
- private void OnCloseChallengeTabWin()
- {
- tabButtons[3].state = TitleBtnState.Normal;
- tabButtons[3].UpdateButtonState();
- }
-
- //澶栭儴璋冪敤鐐瑰嚮鍔熻兘
- public void ClickFunc(int functionOrder)
- {
- tabButtons[functionOrder].onClick.Invoke();
- }
-
- //鎭㈠鍔熻兘鎸夐挳鐘舵��
- public void RestoreFuncBtn()
- {
- tabButtons[functionOrder].SelectBtn();
- }
-
- public void DisplayTopBar(int index)
- {
- bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
- switch (index)
- {
- case 0:
- case 2:
- topBar.SetActive(true);
- break;
- case 1:
- case 4:
- topBar.SetActive(false);
- break;
- case 3:
- topBar.SetActive(!isOtherBattleInProgress);
- break;
- default:
- topBar.SetActive(true);
- break;
- }
- }
-
- protected override void SelectBottomTab(int index)
- {
- if (index == 3)
- {
- //鎸戞垬鐗规畩鏄剧ず閫昏緫
- UIManager.Instance.OpenWindow<ChallengeTabWin>();
- return;
- }
-
- TabChangeEvent?.Invoke();
-
- // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
- if (functionOrder == index && currentSubUI != null)
- {
- return;
- }
-
- ClickAnimation(index);
- // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
- functionOrder = index;
-
- // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
- CloseCurrentSubUI();
-
- // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
- OpenSubUIByTabIndex();
-
- }
-
+
//鎴樻枟鎸夐挳鍔ㄧ敾
void ClickAnimation(int index)
{
- if (isFirstOpen || (functionOrder != 0 && index == 0))
+ //寮哄埗鎾斁
+ 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);
- isFirstOpen = false;
}
- else if (functionOrder == 0 && index != 0)
+ else if (functionOrder <= 0 && index != 0)
{
+ //鍒囧嚭鎴樻枟鍦烘櫙
openCloseAnim.onComplete = () =>
{
openCloseAnim.SetEnabled(true);
@@ -223,24 +159,13 @@
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
}
+
+
/// <summary>
/// 搴曢儴鏍囩鎸夐挳鐐瑰嚮
/// </summary>
protected override void OnTabButtonClicked(int index)
{
- this.index = index;
- int funcId = 32;
- bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
- // 濡傛灉姝ｅ湪闈炰富绾挎垬鏂椾腑锛屾病婊¤冻瑙ｉ攣鏉′欢鍒欎笉鍏佽鍒囨崲
- if (isOtherBattleInProgress && !FuncOpen.Instance.IsFuncOpen(funcId))
- {
- string tip = FuncOpen.Instance.GetErrorTip(funcId);
- SysNotifyMgr.Instance.ShowTip("SwitchOutOfBattle", tip);
- tabButtons[functionOrder].SelectBtn();
- return;
- }
-
-
if (index == 0)
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
@@ -256,10 +181,40 @@
return;
}
- DisplayTopBar(index);
+
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>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
@@ -372,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();
@@ -388,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");
@@ -409,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
}
\ No newline at end of file
--
Gitblit v1.8.0