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 | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 5e187a7..cad55b9 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -27,7 +27,9 @@
[SerializeField] UIEffectPlayer fightEffect;
[SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
+ [SerializeField] Transform nextCantAttackMask;
[SerializeField] Text hammerText;
+ [SerializeField] Text multiFightText;
bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
@@ -35,7 +37,7 @@
protected override void InitComponent()
{
base.InitComponent();
-
+ avatarCell.redpoint.redpointId = MainRedDot.PhantasmPavilionRepoint;
avatarCell.button.SetListener(() =>
{
UIManager.Instance.OpenWindow<PlayerProfileWin>();
@@ -54,6 +56,9 @@
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
@@ -65,6 +70,10 @@
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;
}
@@ -79,6 +88,13 @@
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)
@@ -154,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;
}
}
@@ -179,6 +197,7 @@
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
{
+ fightEffect.Play();
//鎵嬪姩鑷姩涓�璧峰鐞�
AutoFightModel.Instance.StartFight();
}
@@ -293,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 &&
@@ -313,6 +333,7 @@
{
//闈炰富鍩庣晫闈�
fightOtherWinBG.SetActive(true);
+ multiFightText.text = "";
fightBG.SetActive(false);
if (BattleManager.Instance.storyBattleField != null &&
BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
@@ -326,13 +347,32 @@
}
}
+ 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(() =>
{
@@ -341,6 +381,7 @@
{
AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ nextCantAttackMask.localScale = Vector3.one;
}
});
fightHeroScale.SetStartState();
@@ -369,6 +410,17 @@
}
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)
@@ -435,15 +487,25 @@
{
if (functionOrder != -1)
{
- Debug.Log("RestoreSubUI functionOrder " + functionOrder);
- return;
+ if (currentSubUI != null && currentSubUI.IsActive())
+ {
+ //鐐瑰嚮鎸戞垬鏍囩鍙堝叧闂椂锛屼細瑙﹀彂 RestoreFuncBtn 閫犳垚
+ return;
+ }
}
+
+ if (functionOrder != -1)
+ {
+ //涓诲姩鐐瑰嚮鍔熻兘鏍忕殑鎯呭喌
+ lastWinOrder = functionOrder;
+ }
+
+ //lastWinOrder 鏄粯璁ゆ仮澶嶄娇鐢�
if (lastWinOrder == -1)
{
lastWinOrder = 0;
}
- Debug.Log("RestoreSubUI lastWinOrder " + lastWinOrder);
OnTabButtonClicked(lastWinOrder);
}
--
Gitblit v1.8.0