From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Main/MainWin.cs | 346 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 283 insertions(+), 63 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 6c3c56d..fdbee9e 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -1,6 +1,7 @@
-using System;
+锘縰sing System;
using System.Collections;
using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.UI;
@@ -27,18 +28,31 @@
[SerializeField] UIEffectPlayer fightEffect;
[SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
+ [SerializeField] Transform nextCantAttackMask;
+ [SerializeField] Text hammerText;
+ [SerializeField] Text multiFightText;
- public bool isFirstOpen = true; //棣栨鎵撳紑
- public Text hammerText;
+ [SerializeField] Transform gameTip; //10杩�
+ [SerializeField] Transform mgTip;
+ bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
+
+ public static event Action TabChangeEvent;
protected override void InitComponent()
{
base.InitComponent();
-
- avatarCell.button.AddListener(() => { });
+ InGameDownLoad.Instance.OnPlayerLoginOk().Forget();
+ avatarCell.SetOnLoaded(() =>
+ {
+ avatarCell.redpoint.redpointId = MainRedDot.PhantasmPavilionRepoint;
+ avatarCell.SetListener(() =>
+ {
+ UIManager.Instance.OpenWindowAsync<PlayerProfileWin>().Forget();
+ });
+ });
}
- public override void Refresh()
+ void Display()
{
UpdateCurrency();
UpdatePlayerInfo();
@@ -49,81 +63,124 @@
{
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent += OnSkillCast;
- ChallengeTabWin.OnCloseChallengeTabWin += OnCloseChallengeTabWin;
+ RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
+ GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
+ RedpointCenter.Instance.redpointValueChangeEvent += OnRedpointValueChangeEvent;
+ var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
+ gameTip.SetActive(false);
+ if (xbInfo != null && xbInfo.treasureCount < GeneralDefine.herocall10TipLimit)
+ {
+ GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
+ }
+ EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
base.OnPreOpen();
+ mgTip.SetActive(false);
// 鍒锋柊UI
- Refresh();
+ Display();
+
+ var temp = Debug.unityLogger.logEnabled;
+ Debug.unityLogger.logEnabled = true;
+ Debug.LogError("MainWin OnPreOpen 浜� 鐗规畩鏍囪瘑");
+ Debug.unityLogger.logEnabled = temp;
}
protected override void OnPreClose()
{
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
- ChallengeTabWin.OnCloseChallengeTabWin -= OnCloseChallengeTabWin;
+ RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+ GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
+ GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
+ EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
+ RedpointCenter.Instance.redpointValueChangeEvent -= OnRedpointValueChangeEvent;
+
base.OnPreClose();
+ isForcePlayFightUIAnim = true;
}
- private void OnCloseChallengeTabWin()
+ private void OnUpdateRenameResultEvent()
{
- tabButtons[3].state = TitleBtnState.Normal;
- tabButtons[3].UpdateButtonState();
+ Display();
}
- //澶栭儴璋冪敤鐐瑰嚮鍔熻兘
- public void ClickFunc(int functionOrder)
+ void OnRedpointValueChangeEvent(int id)
{
- tabButtons[functionOrder].onClick.Invoke();
- }
-
- //鎭㈠鍔熻兘鎸夐挳鐘舵��
- public void RestoreFuncBtn()
- {
- tabButtons[functionOrder].SelectBtn();
- }
-
- protected override void SelectBottomTab(int index)
- {
- if (index == 3)
+ if (id == (MainRedDot.RedPoint_Mingge * 10 + 4))
{
- //鎸戞垬鐗规畩鏄剧ず閫昏緫
- UIManager.Instance.OpenWindow<ChallengeTabWin>();
- return;
+ mgTip.SetActive(MinggeManager.Instance.redpointAuto.state != RedPointState.None);
+ }
+ }
+
+
+ //鐢ㄤ簬10杩炴彁绀猴紝娌℃湁10杩炰細鍙栨秷鏃堕棿浜嬩欢濮旀墭
+ void OnFiveSecondEvent()
+ {
+ if (HappyXBModel.Instance.bestXB10Red.state != RedPointState.None)
+ {
+ gameTip.SetActive(true);
+ }
+ else
+ {
+ gameTip.SetActive(false);
+ var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
+ if (xbInfo != null && xbInfo.treasureCount >= GeneralDefine.herocall10TipLimit)
+ {
+ GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
+ }
}
- topBar.SetActive(index == 0 || index == 2);
- // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
- if (functionOrder == index && currentSubUI != null)
+ }
+
+ void DisplayTopBar()
+ {
+ topBar.SetActive(functionOrder == 0 || functionOrder == 2);
+ }
+
+ void OnCloseWindow(UIBase _ui)
+ {
+ if (_ui.name == "AutoFightWin")
{
- return;
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
}
-
- ClickAnimation(index);
- // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
- functionOrder = index;
-
- // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
- CloseCurrentSubUI();
-
- // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
- OpenSubUIByTabIndex();
+ if (_ui.name == "MinggeWin")
+ {
+ mgTip.SetActive(false);
+ }
}
//鎴樻枟鎸夐挳鍔ㄧ敾
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);
@@ -141,12 +198,12 @@
// 浠庣帺瀹舵暟鎹腑鑾峰彇淇℃伅骞舵洿鏂癠I
avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
PlayerDatas.Instance.baseData.face,
- PlayerDatas.Instance.baseData.facePic));
+ PlayerDatas.Instance.baseData.facePic)).Forget();
playerNameText.text = PlayerDatas.Instance.baseData.PlayerName;
powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
- officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID).Forget();
}
void PlayerDataRefresh(PlayerDataType type)
@@ -157,18 +214,20 @@
powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
break;
case PlayerDataType.RealmLevel:
- officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID).Forget();
break;
case PlayerDataType.Face:
case PlayerDataType.FacePic:
- avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
+ avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
PlayerDatas.Instance.baseData.face,
- PlayerDatas.Instance.baseData.facePic));
+ PlayerDatas.Instance.baseData.facePic)).Forget();
break;
case PlayerDataType.default26:
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
break;
-
+ case PlayerDataType.ExAttr3:
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID).Forget();
+ break;
}
}
@@ -182,6 +241,8 @@
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
}
+
+
/// <summary>
/// 搴曢儴鏍囩鎸夐挳鐐瑰嚮
/// </summary>
@@ -191,6 +252,7 @@
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
{
+ fightEffect.Play();
//鎵嬪姩鑷姩涓�璧峰鐞�
AutoFightModel.Instance.StartFight();
}
@@ -198,7 +260,7 @@
else if (index == 4 && !PlayerDatas.Instance.fairyData.HasFairy)
{
//鏈姞鍏ュ叕浼氫笉鍒囨崲鏍囩锛屾墦寮�鐢宠鐣岄潰
- UIManager.Instance.OpenWindow<GuildJoinWin>();
+ UIManager.Instance.OpenWindowAsync<GuildJoinWin>().Forget();
return;
}
@@ -206,11 +268,41 @@
SelectBottomTab(index);
}
+ protected override void SelectBottomTab(int index)
+ {
+ if (index == 3)
+ {
+ //鎸戞垬鐗规畩鏄剧ず閫昏緫
+ UIManager.Instance.OpenWindowAsync<ChallengeTabWin>().Forget();
+ return;
+ }
+
+ // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
+ if (functionOrder == index && currentSubUI != null)
+ {
+ return;
+ }
+
+
+ ClickAnimation(index);
+ // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
+ functionOrder = index;
+ TabChangeEvent?.Invoke();
+
+ DisplayTopBar();
+
+ // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
+ CloseCurrentSubUI();
+
+ // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
+ OpenSubUIByTabIndex();
+
+ }
/// <summary>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
/// </summary>
- protected override void OpenSubUIByTabIndex()
+ protected override async void OpenSubUIByTabIndex()
{
Debug.Log("鎵撳紑瀛愮晫闈� : " + functionOrder);
@@ -222,7 +314,7 @@
// 鎵撳紑涓婚〉鐣岄潰
if (!UIManager.Instance.IsOpened<BattleWin>())
{
- BattleWin battleWin = UIManager.Instance.OpenWindow<BattleWin>();
+ BattleWin battleWin = await UIManager.Instance.OpenWindowAsync<BattleWin>();
battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
}
else
@@ -230,20 +322,27 @@
BattleWin battleWin = UIManager.Instance.GetUI<BattleWin>();
battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
}
- currentSubUI = UIManager.Instance.OpenWindow<HomeWin>();
+ currentSubUI = await UIManager.Instance.OpenWindowAsync<HomeWin>();
break;
case 1:
- currentSubUI = UIManager.Instance.OpenWindow<AffairBaseWin>();
+ currentSubUI = await UIManager.Instance.OpenWindowAsync<AffairBaseWin>();
break;
case 2:
- currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);
+ if (gameTip.gameObject.activeSelf)
+ {
+ if (!NewBieCenter.Instance.inGuiding)
+ {
+ HappyXBModel.Instance.startTenCallGuide = true;
+ }
+ }
+ currentSubUI = await UIManager.Instance.OpenWindowAsync<HeroBaseWin>(0);
break;
// case 3:
// 鎸戞垬鐣岄潰涓嶈烦杞�
// Debug.Log("鎵撳紑鎸戞垬鐣岄潰");
// break;
case 4:
- currentSubUI = UIManager.Instance.OpenWindow<GuildBaseWin>();
+ currentSubUI = await UIManager.Instance.OpenWindowAsync<GuildBaseWin>();
break;
default:
Debug.LogWarning("鏈煡鐨勬爣绛剧储寮�: " + functionOrder);
@@ -275,6 +374,7 @@
fightOtherWinBG.SetActive(false);
fightOtherWinWarnImg.SetActive(false);
fightBG.SetActive(true);
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
if (BattleManager.Instance.storyBattleField != null &&
@@ -295,6 +395,7 @@
{
//闈炰富鍩庣晫闈�
fightOtherWinBG.SetActive(true);
+ multiFightText.text = "";
fightBG.SetActive(false);
if (BattleManager.Instance.storyBattleField != null &&
BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
@@ -308,18 +409,44 @@
}
}
+ void OnBattleStart(string guid)
+ {
+ if (string.IsNullOrEmpty(guid))
+ {
+ var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.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(BattlePreSetType.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();
@@ -334,10 +461,30 @@
if (AutoFightModel.Instance.fightingHeroSkinID == 0)
{
- AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
+ var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.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 != null && BattleManager.Instance.storyBattleField.IsCanRequestFight())
+ {
+ nextCantAttackMask.localScale = Vector3.zero;
+ }
+ }
}
void OnSkillCast(bool isfighting)
@@ -355,4 +502,77 @@
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 (functionOrder != -1)
+ {
+ //涓诲姩鐐瑰嚮鍔熻兘鏍忕殑鎯呭喌
+ lastWinOrder = functionOrder;
+ }
+
+ //lastWinOrder 鏄粯璁ゆ仮澶嶄娇鐢�
+ if (lastWinOrder == -1)
+ {
+ lastWinOrder = 0;
+ }
+
+ OnTabButtonClicked(lastWinOrder);
+ }
+
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.8.0