From d0627343ad3c632191d8650e4aed795f9523dc89 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Thu, 15 Aug 2024 12:04:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"=E3=80=90=E5=95=86=E5=93=81?= =?UTF-8?q?=E3=80=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ce908d7b12043b401dd47fbf3879a823621fab10. --- Forest/Assets/Scripts/Framework/Manager/ShopManager.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Forest/Assets/Scripts/Framework/Manager/ShopManager.cs b/Forest/Assets/Scripts/Framework/Manager/ShopManager.cs index e9e1080..139a72c 100644 --- a/Forest/Assets/Scripts/Framework/Manager/ShopManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/ShopManager.cs @@ -38,8 +38,9 @@ namespace Gameplay.Manager InitProducts(); //_sdkHelper = SDKManager.Instance.GetSdkHelper(SDKManager.SdkName.IAP) as IBuyServices; - //IAPManager.Instance.SetClientVerify(true); - //IAPManager.Instance.AddGoods(_consumableGoods.Keys.ToList(), _nonConsumableGoods.Keys.ToList(), OnRestorePurchase); + IAPManager.Instance.SetClientVerify(true); + IAPManager.Instance.AddGoods(_consumableGoods.Keys.ToList(), _nonConsumableGoods.Keys.ToList(), + OnRestorePurchase); _init = true; } From 1ffc102479e6f50255575278b9983f813fdf18ae Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Thu, 15 Aug 2024 12:04:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E3=80=90=E5=95=86=E5=BA=97?= =?UTF-8?q?=E3=80=91=E5=85=B3=E9=97=AD=E8=B4=AD=E4=B9=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6cd54c950cbbd6f039084afb0df94244586e87a1. --- Forest/Assets/Art/UI/Prefab/CoinBar.prefab | 6 +++--- Forest/Assets/Art/UI/Prefab/UIStartMain.prefab | 2 +- .../Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs | 10 ++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Forest/Assets/Art/UI/Prefab/CoinBar.prefab b/Forest/Assets/Art/UI/Prefab/CoinBar.prefab index 2cc8ec2..8a2f97e 100644 --- a/Forest/Assets/Art/UI/Prefab/CoinBar.prefab +++ b/Forest/Assets/Art/UI/Prefab/CoinBar.prefab @@ -236,7 +236,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &490868100481984922 RectTransform: m_ObjectHideFlags: 0 @@ -328,7 +328,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 168.3, y: 0.000018746} + m_AnchoredPosition: {x: 141.97205, y: 0.4258} m_SizeDelta: {x: 145.5363, y: 62.7726} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8790278160148953539 @@ -423,7 +423,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -21.967468, y: 0, z: -25.482178, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab index 83e1cd3..d22c18f 100644 --- a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab @@ -755,7 +755,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2506899326898321492 RectTransform: m_ObjectHideFlags: 0 diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs index 7e1185b..3206f4a 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs @@ -183,15 +183,9 @@ public class UIBuyGoodsController : UIWindow } else { - await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_Coin", () => - { - CloseWindow(); - LevelManager.Instance.IsPause = false; - }); - - /*await UIManager.Instance.OpenWindow(UIConstants.UIShop); + await UIManager.Instance.OpenWindow(UIConstants.UIShop); BIManager.Instance.TrackEvent(Event.open_shop, "InLevel"); - BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "InLevel");*/ + BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "InLevel"); } } } \ No newline at end of file From fd52c816fb7c59eae123048d5618187e2928dff5 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Thu, 15 Aug 2024 12:18:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90Bug=E3=80=91=E6=96=B0=E6=89=8B?= =?UTF-8?q?=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Framework/UI/Other/UIUserAgreementController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs b/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs index 4667186..16d2ba8 100644 --- a/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs +++ b/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs @@ -3,6 +3,7 @@ using Framework.BI; using Framework.UI; using UnityEngine.UI; using Framework.Event; +using Gameplay.Manager; using Framework.Setting; using Framework.Constants; @@ -36,6 +37,8 @@ public class UIUserAgreementController : UIWindow private void OnAgree() { CloseWindow(true); + if (LevelSelectManager.Instance.CurPassLevelIndex < 1) + GuideMananger.Instance.StartGroupGuide(); SettingManager.Instance.SetFirstLaunch(); BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree); }