From eb27e5fd31f73b998a4bbd85511a31e40b8c61b7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 十一月 2025 17:03:47 +0800
Subject: [PATCH] 0312 关闭游戏内日志
---
Main/System/Main/MainWin.cs | 247 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 206 insertions(+), 41 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index f7efbb8..e6a335c 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -22,21 +23,27 @@
[SerializeField] Image restImg; //浼戞伅鐘舵��
[SerializeField] GameObject fightGo; //鎴樻枟鐘舵��
[SerializeField] Image fightHeroImg; //鎴樻枟鏄剧ず鑻遍泟
+ [SerializeField] ScaleTween fightHeroScale; //鎴樻枟鏄剧ず鑻遍泟缂╂斁
[SerializeField] UIEffectPlayer fightEffect;
+ [SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
+ [SerializeField] Text hammerText;
+ [SerializeField] Text multiFightText;
+ bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
- public Text hammerText;
-
+ 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>();
+ });
}
- public override void Refresh()
+ void Display()
{
UpdateCurrency();
UpdatePlayerInfo();
@@ -47,45 +54,79 @@
{
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent += OnSkillCast;
+ RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
base.OnPreOpen();
// 鍒锋柊UI
- Refresh();
+ Display();
}
protected override void OnPreClose()
{
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
+ RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
base.OnPreClose();
+ isForcePlayFightUIAnim = true;
}
-
- protected override void SelectBottomTab(int index)
+ private void OnUpdateRenameResultEvent()
{
- if (index == 3)
- {
- //鎸戞垬鐗规畩鏄剧ず閫昏緫
- return;
- }
-
- topBar.SetActive(index == 0 || index == 2);
- // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
- if (functionOrder == index && currentSubUI != null)
- {
- return;
- }
-
- // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
- functionOrder = index;
-
- // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
- CloseCurrentSubUI();
-
- // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
- OpenSubUIByTabIndex();
+ 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 (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>
@@ -123,7 +164,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;
}
}
@@ -136,6 +179,8 @@
{
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
}
+
+
/// <summary>
/// 搴曢儴鏍囩鎸夐挳鐐瑰嚮
@@ -150,9 +195,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>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
@@ -178,18 +261,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:
@@ -223,7 +303,9 @@
{
//涓诲煄鐣岄潰
fightOtherWinBG.SetActive(false);
+ fightOtherWinWarnImg.SetActive(false);
fightBG.SetActive(true);
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
if (BattleManager.Instance.storyBattleField != null &&
@@ -244,6 +326,7 @@
{
//闈炰富鍩庣晫闈�
fightOtherWinBG.SetActive(true);
+ multiFightText.text = "";
fightBG.SetActive(false);
if (BattleManager.Instance.storyBattleField != null &&
BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
@@ -258,31 +341,48 @@
}
+
void RefreshFightIng(bool isfighting = false)
{
if (isfighting)
{
fightEffect.Play();
cdTween.SetStartState();
- cdTween.Play(()=>
- {
- AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
- fightHeroImg.SetSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon);
+ cdTween.Play(() =>
+ {
+ 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();
}
else
{
fightEffect.Stop();
cdTween.Stop();
cdTween.SetEndState();
+ fightHeroScale.Stop();
}
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.SetSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon);
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
}
void OnSkillCast(bool isfighting)
@@ -300,4 +400,69 @@
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)
+ {
+ if (currentSubUI != null && currentSubUI.IsActive())
+ {
+ // RestoreFuncBtn 閫犳垚
+ return;
+ }
+ }
+ if (lastWinOrder == -1)
+ {
+ lastWinOrder = 0;
+ }
+
+ OnTabButtonClicked(lastWinOrder);
+ }
+
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.8.0