From 89343a7a0909e5244a3b69c4db1294de4536243b Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期一, 15 十二月 2025 18:15:22 +0800
Subject: [PATCH] 262 幻境阁系统-客户端 新增仅适用武将解锁的头像和形象的红点移除规则
---
Main/System/Main/MainWin.cs | 155 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 139 insertions(+), 16 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 2af0c40..cad55b9 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -27,16 +27,21 @@
[SerializeField] UIEffectPlayer fightEffect;
[SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
+ [SerializeField] Transform nextCantAttackMask;
[SerializeField] Text hammerText;
-
- bool isFirstOpen = true; //棣栨鎵撳紑
+ [SerializeField] Text multiFightText;
+
+ bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
public static event Action TabChangeEvent;
protected override void InitComponent()
{
base.InitComponent();
-
- avatarCell.button.AddListener(() => { });
+ avatarCell.redpoint.redpointId = MainRedDot.PhantasmPavilionRepoint;
+ avatarCell.button.SetListener(() =>
+ {
+ UIManager.Instance.OpenWindow<PlayerProfileWin>();
+ });
}
void Display()
@@ -50,6 +55,10 @@
{
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent += OnSkillCast;
+ RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
+ GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
+ EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
base.OnPreOpen();
// 鍒锋柊UI
@@ -60,31 +69,63 @@
{
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
+ RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+ GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
+ EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
+
base.OnPreClose();
+ isForcePlayFightUIAnim = true;
}
+ private void OnUpdateRenameResultEvent()
+ {
+ Display();
+ }
void DisplayTopBar()
{
topBar.SetActive(functionOrder == 0 || functionOrder == 2);
}
-
+ void OnCloseWindow(UIBase _ui)
+ {
+ if (_ui.name == "AutoFightWin")
+ {
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
+ }
+ }
+
//鎴樻枟鎸夐挳鍔ㄧ敾
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);
@@ -129,7 +170,9 @@
case PlayerDataType.default26:
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
break;
-
+ case PlayerDataType.ExAttr3:
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
+ break;
}
}
@@ -154,6 +197,7 @@
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
{
+ fightEffect.Play();
//鎵嬪姩鑷姩涓�璧峰鐞�
AutoFightModel.Instance.StartFight();
}
@@ -183,12 +227,12 @@
{
return;
}
-
- TabChangeEvent?.Invoke();
+
ClickAnimation(index);
// 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
functionOrder = index;
+ TabChangeEvent?.Invoke();
DisplayTopBar();
@@ -268,6 +312,7 @@
fightOtherWinBG.SetActive(false);
fightOtherWinWarnImg.SetActive(false);
fightBG.SetActive(true);
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
if (BattleManager.Instance.storyBattleField != null &&
@@ -288,6 +333,7 @@
{
//闈炰富鍩庣晫闈�
fightOtherWinBG.SetActive(true);
+ multiFightText.text = "";
fightBG.SetActive(false);
if (BattleManager.Instance.storyBattleField != null &&
BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
@@ -301,18 +347,42 @@
}
}
+ void OnBattleStart(string guid)
+ {
+ if (string.IsNullOrEmpty(guid))
+ {
+ var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero("");
+ if (tmpHero != null)
+ {
+ AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
+ }
+ else
+ {
+ Debug.LogError("娌℃湁鎵惧埌涓嬩竴涓敾鍑绘灏�");
+ return;
+ }
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ }
+ }
void RefreshFightIng(bool isfighting = false)
{
if (isfighting)
{
- fightEffect.Play();
+ if (!fightEffect.isPlaying)
+ fightEffect.Play();
+ nextCantAttackMask.localScale = Vector3.zero;
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");
+ nextCantAttackMask.localScale = Vector3.one;
+ }
});
fightHeroScale.SetStartState();
fightHeroScale.Play();
@@ -327,10 +397,30 @@
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");
+ }
+
+ void OnMSEvent()
+ {
+ if (nextCantAttackMask.localScale == Vector3.one)
+ {
+ if (BattleManager.Instance.storyBattleField.IsCanRequestFight())
+ {
+ nextCantAttackMask.localScale = Vector3.zero;
+ }
+ }
}
void OnSkillCast(bool isfighting)
@@ -353,6 +443,7 @@
//澶栭儴璋冪敤鐐瑰嚮鍔熻兘
public void ClickFunc(int functionOrder)
{
+ tabButtons[functionOrder].SelectBtn();
tabButtons[functionOrder].onClick.Invoke();
}
@@ -360,6 +451,19 @@
//鎭㈠鍔熻兘鎸夐挳鐘舵��
public void RestoreFuncBtn()
{
+ if (functionOrder == -1)
+ {
+ if (lastWinOrder == -1)
+ {
+ functionOrder = 0;
+ }
+ else
+ {
+ functionOrder = lastWinOrder;
+ }
+ }
+
+
tabButtons[functionOrder].SelectBtn();
}
@@ -373,19 +477,38 @@
currentSubUI.CloseWindow();
currentSubUI = null;
functionOrder = -1;
+ isForcePlayFightUIAnim = true;
+ DisplayTopBar();
}
}
// 澶栭儴鎭㈠瀛愮晫闈�
public void RestoreSubUI()
{
+ if (functionOrder != -1)
+ {
+ if (currentSubUI != null && currentSubUI.IsActive())
+ {
+ //鐐瑰嚮鎸戞垬鏍囩鍙堝叧闂椂锛屼細瑙﹀彂 RestoreFuncBtn 閫犳垚
+ return;
+ }
+ }
+
+ if (functionOrder != -1)
+ {
+ //涓诲姩鐐瑰嚮鍔熻兘鏍忕殑鎯呭喌
+ lastWinOrder = functionOrder;
+ }
+
+ //lastWinOrder 鏄粯璁ゆ仮澶嶄娇鐢�
if (lastWinOrder == -1)
{
lastWinOrder = 0;
}
+
OnTabButtonClicked(lastWinOrder);
}
-
+
#endregion
}
\ No newline at end of file
--
Gitblit v1.8.0