PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into Android_release

Android_release
zhangaotian 2024-08-15 12:33:53 +08:00
parent b942468428 fd52c816fb
commit 0cb297dc9e
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Forest/Assets/Art/UI/Prefab/CoinBar.prefab
View File

@ -236,7 +236,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &490868100481984922 --- !u!224 &490868100481984922
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -328,7 +328,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 145.5363, y: 62.7726}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8790278160148953539 --- !u!222 &8790278160148953539
@ -423,7 +423,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0 m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1 m_useMaxVisibleDescender: 1
m_pageToDisplay: 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_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0

2
Forest/Assets/Art/UI/Prefab/UIStartMain.prefab
View File

@ -755,7 +755,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &2506899326898321492 --- !u!224 &2506899326898321492
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

5
Forest/Assets/Scripts/Framework/Manager/ShopManager.cs
View File

@ -38,8 +38,9 @@ namespace Gameplay.Manager
InitProducts(); InitProducts();
//_sdkHelper = SDKManager.Instance.GetSdkHelper(SDKManager.SdkName.IAP) as IBuyServices; //_sdkHelper = SDKManager.Instance.GetSdkHelper(SDKManager.SdkName.IAP) as IBuyServices;
//IAPManager.Instance.SetClientVerify(true); IAPManager.Instance.SetClientVerify(true);
//IAPManager.Instance.AddGoods(_consumableGoods.Keys.ToList(), _nonConsumableGoods.Keys.ToList(), OnRestorePurchase); IAPManager.Instance.AddGoods(_consumableGoods.Keys.ToList(), _nonConsumableGoods.Keys.ToList(),
OnRestorePurchase);
_init = true; _init = true;
} }

3
Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs
View File

@ -3,6 +3,7 @@ using Framework.BI;
using Framework.UI; using Framework.UI;
using UnityEngine.UI; using UnityEngine.UI;
using Framework.Event; using Framework.Event;
using Gameplay.Manager;
using Framework.Setting; using Framework.Setting;
using Framework.Constants; using Framework.Constants;
@ -36,6 +37,8 @@ public class UIUserAgreementController : UIWindow
private void OnAgree() private void OnAgree()
{ {
CloseWindow(true); CloseWindow(true);
if (LevelSelectManager.Instance.CurPassLevelIndex < 1)
GuideMananger.Instance.StartGroupGuide();
SettingManager.Instance.SetFirstLaunch(); SettingManager.Instance.SetFirstLaunch();
BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree); BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree);
} }

10
Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs
View File

@ -183,15 +183,9 @@ public class UIBuyGoodsController : UIWindow
} }
else else
{ {
await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_Coin", () => await UIManager.Instance.OpenWindow(UIConstants.UIShop);
{
CloseWindow();
LevelManager.Instance.IsPause = false;
});
/*await UIManager.Instance.OpenWindow(UIConstants.UIShop);
BIManager.Instance.TrackEvent(Event.open_shop, "InLevel"); BIManager.Instance.TrackEvent(Event.open_shop, "InLevel");
BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "InLevel");*/ BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "InLevel");
} }
} }
} }