From 9840b222ed6507efdcfd41a267fac744a9ed0a5f Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Tue, 20 Aug 2024 16:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90Bug=E3=80=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Art/GameBuild/Prefab/UIMainBuild.prefab | 2 +- .../Art/GameBuild/Texture/BuildUI/Bar_Yes.png | Bin 7244 -> 8829 bytes .../Texture/BuildUI/Bar_Yes.png.meta | 2 +- .../Scripts/Framework/Guide/GuideMananger.cs | 2 +- .../Gameplay/Manager/LevelSelectManager.cs | 4 ++-- .../UI/EndPanel/UILosePanelController.cs | 10 ++++----- .../UI/EndPanel/UIWinPanelController.cs | 4 ++-- .../Scripts/Gameplay/UI/Level/CoinEffect.cs | 20 +++++++++++++++++- .../Assets/Scripts/Gameplay2/BuildManager.cs | 3 --- 9 files changed, 31 insertions(+), 16 deletions(-) diff --git a/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab b/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab index 3d386b3..723859a 100644 --- a/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab +++ b/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab @@ -903,7 +903,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e81fc769e698417b8c13280d690cd9f, type: 3} + m_Sprite: {fileID: 21300000, guid: 1852525e762024990811d841c56436c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Forest/Assets/Art/GameBuild/Texture/BuildUI/Bar_Yes.png b/Forest/Assets/Art/GameBuild/Texture/BuildUI/Bar_Yes.png index b61af711069ad2d9905aef637f322d30ef567780..26544da6f6c15d2449fa5c4b7dd0ec711dff6b35 100644 GIT binary patch literal 8829 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 A8vp00009a7bBm001r{ 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 a@c#jjZIZ$np1nK(0000, IInitable BuildManager.Instance.SetBuildUserInfo(_curGuideGroup); _curGuideGroup = nextGroup; IsGuiding = false; - LevelSelectManager.Instance.SaveNewPassLevel(PassLevelID); + LevelSelectManager.Instance.SaveNewPassLevel(PassLevelID, false); SetActiveGuideUI(false, true); } else diff --git a/Forest/Assets/Scripts/Gameplay/Manager/LevelSelectManager.cs b/Forest/Assets/Scripts/Gameplay/Manager/LevelSelectManager.cs index f7862b2..7c8ef4b 100644 --- a/Forest/Assets/Scripts/Gameplay/Manager/LevelSelectManager.cs +++ b/Forest/Assets/Scripts/Gameplay/Manager/LevelSelectManager.cs @@ -56,7 +56,7 @@ namespace Gameplay.Manager CurPassLevelIndex = int.Parse(CurPassLevel.Substring("level".Length)); } - public void SaveNewPassLevel(string levelID) + public void SaveNewPassLevel(string levelID, bool flyCoin = true) { if (GuideMananger.Instance.IsGuiding) { @@ -74,7 +74,7 @@ namespace Gameplay.Manager StorageManager.Instance.SyncForce = true; StorageManager.Instance.SyncRemoteForce = true; BIManager.Instance.TrackEvent(cfg.BI.Event.main_unlock_level, (id + 1).ToString()); - LevelManager.Instance.CanGfxCoin = true; + LevelManager.Instance.CanGfxCoin = flyCoin; } } diff --git a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs index 8172df2..c06f6bb 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs @@ -35,7 +35,7 @@ public class UILosePanelController : UIWindow private void BackToMainPanel() { - CloseWindow(); + CloseWindow(true); UIManager.Instance.CloseWindow(UIConstants.UILevelPanel, true); GameStateManager.Instance.ChangeState(new GameStateStart()); BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_back_home, BIManager.Reason.ClickOnLosePanel.ToString()); @@ -43,14 +43,14 @@ public class UILosePanelController : UIWindow private void TryAgain() { - CloseWindow(); + CloseWindow(true); GameStateManager.Instance.ChangeState(new LevelState(LevelManager.Instance.CurrentLevel.ID)); BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_retry, BIManager.Reason.ClickOnLosePanel.ToString()); } private void SkipLevel() { - CloseWindow(); + CloseWindow(true); BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_skip); EventManager.Instance.Send(EventManager.EventName.LevelGameWin); } @@ -60,10 +60,10 @@ public class UILosePanelController : UIWindow LevelManager.Instance.WatchADGetTime(() => { CloseWindow(); }, ADFailCallBack); } - private void ADFailCallBack() + private async void ADFailCallBack() { BIManager.Instance.TrackEventLevel(Event.level_ad_show_fail, "102"); BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "102"); - UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); + await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); } } \ No newline at end of file diff --git a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs index 2dba7e2..e9c4316 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs @@ -73,7 +73,7 @@ public class UIWinPanelController : UIWindow { BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_back_home, BIManager.Reason.ClickOnWinPanel.ToString()); - CloseWindow(); + CloseWindow(true); UIManager.Instance.CloseWindow(UIConstants.UILevelPanel, true); GameStateManager.Instance.ChangeState(new GameStateStart()); EventManager.Instance.Send(EventManager.EventName.StartBackToMain); @@ -91,7 +91,7 @@ public class UIWinPanelController : UIWindow private async void NextLevel() { - CloseWindow(); + CloseWindow(true); BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_next_level); UIManager.Instance.CloseWindow(UIConstants.UIPausePanel); var nextLevelID = LevelManager.Instance.CurrentLevel.GetLevelIndex() + 1; diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/CoinEffect.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/CoinEffect.cs index ed64d43..0e566c9 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/Level/CoinEffect.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/Level/CoinEffect.cs @@ -1,3 +1,4 @@ +using System; using UnityEngine; using DG.Tweening; using System.Collections; @@ -53,10 +54,27 @@ public class CoinEffect : MonoBehaviour private void Update() { - if (LevelManager.Instance.CanGfxCoin) + if (LevelManager.Instance.CanGfxCoin && !GuideMananger.Instance.IsGuiding) { + DestroyCoinsParent(); LevelManager.Instance.CanGfxCoin = false; CoinEffectShow(); } } + + private void DestroyCoinsParent() + { + if (targetPos) + { + foreach (Transform obj in targetPos) + { + Destroy(obj.gameObject); + } + } + } + + private void OnDestroy() + { + DestroyCoinsParent(); + } } \ No newline at end of file diff --git a/Forest/Assets/Scripts/Gameplay2/BuildManager.cs b/Forest/Assets/Scripts/Gameplay2/BuildManager.cs index 0d66fd2..00b9d65 100644 --- a/Forest/Assets/Scripts/Gameplay2/BuildManager.cs +++ b/Forest/Assets/Scripts/Gameplay2/BuildManager.cs @@ -287,7 +287,6 @@ namespace Framework.Manager if (string.IsNullOrEmpty(_userBuildInfo.CurBuildId)) { _userBuildInfo.CurBuildId = TableManager.Instance.Tables.BuildConfig.DataList[0].ID; - DebugUtil.LogError("无存盘信息, 读默认表:{0}", _userBuildInfo.CurBuildId); } } @@ -295,7 +294,6 @@ namespace Framework.Manager { if (_isInit && !ChangeBuildSceneID) return; - DebugUtil.LogError("当前建造ID:{0}", buildData.buildID); BuildInGame = inGame; _curBuildData = buildData; _nodeInfos = new Dictionary(); @@ -385,7 +383,6 @@ namespace Framework.Manager } _userBuildInfo.AllChooseNodeInfo[curBuildID].ChooseNodeInfo.TryAdd(nodeInfo.Key, ""); - DebugUtil.LogError("当前场景:{0},添加了信息节点:{1},选项:{2}", curBuildID, nodeInfo.Key, ""); } _curBuildInfo = _userBuildInfo.AllChooseNodeInfo[curBuildID];