From d5d2d5fc2cdfd1fa357a73c335f4e45ee5180084 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Thu, 8 Aug 2024 20:00:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=BE=E7=BD=AE=E3=80=91=E8=AF=84?= =?UTF-8?q?=E5=88=86=E5=AD=98=E7=9B=98=E6=94=BE=E5=85=A5=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Framework/Camera/CameraAdapter.cs | 5 ++-- .../Framework/Camera/CameraController.cs | 5 ++-- .../Framework/Constants/Constants.Level.cs | 18 +-------------- .../Framework/Constants/Constants.Normal.cs | 23 +++++++++++++++++++ .../Constants.Normal.cs.meta} | 0 .../Scripts/Framework/GlobalConstants.cs | 8 ------- .../Scripts/Framework/Manager/BuildManager.cs | 7 ++++-- .../Framework/Setting/SettingManager.cs | 20 +++++++++++++--- .../GameStartLoadingExecutor.cs | 6 ++--- .../Scripts/Gameplay/Manager/LevelManager.cs | 4 ++-- .../UI/Level/UILevelSelectController.cs | 15 ++++++------ .../Gameplay/UI/Other/UIScoreController.cs | 3 ++- .../UI/StartPanel/UISettingPanelController.cs | 4 ++-- 13 files changed, 68 insertions(+), 50 deletions(-) create mode 100644 Forest/Assets/Scripts/Framework/Constants/Constants.Normal.cs rename Forest/Assets/Scripts/Framework/{GlobalConstants.cs.meta => Constants/Constants.Normal.cs.meta} (100%) delete mode 100644 Forest/Assets/Scripts/Framework/GlobalConstants.cs diff --git a/Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs b/Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs index 2830e83..0463921 100644 --- a/Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs +++ b/Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs @@ -1,3 +1,4 @@ +using Framework.Constants; using UnityEngine; public class CameraAdapter : MonoBehaviour @@ -8,7 +9,7 @@ public class CameraAdapter : MonoBehaviour { _camera = transform.GetComponent(); var size = _camera.orthographicSize; - _camera.orthographicSize = size * GlobalConstants.DesignResolutionWidth / - GlobalConstants.DesignResolutionHeight * Screen.height / Screen.width; + _camera.orthographicSize = size * NormalConstants.DesignResolutionWidth / + NormalConstants.DesignResolutionHeight * Screen.height / Screen.width; } } \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/Camera/CameraController.cs b/Forest/Assets/Scripts/Framework/Camera/CameraController.cs index 1676b52..b209dda 100644 --- a/Forest/Assets/Scripts/Framework/Camera/CameraController.cs +++ b/Forest/Assets/Scripts/Framework/Camera/CameraController.cs @@ -1,3 +1,4 @@ +using Framework.Constants; using UnityEngine; using UnityEngine.InputSystem; @@ -35,7 +36,7 @@ public class CameraController : MonoBehaviour { _camera = transform.GetComponent(); var size = _camera.orthographicSize; - _camera.orthographicSize = size * GlobalConstants.DesignResolutionWidth / - GlobalConstants.DesignResolutionHeight * Screen.height / Screen.width; + _camera.orthographicSize = size * NormalConstants.DesignResolutionWidth / + NormalConstants.DesignResolutionHeight * Screen.height / Screen.width; } } \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs b/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs index 9d59359..1840e59 100644 --- a/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs +++ b/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs @@ -9,23 +9,7 @@ namespace Framework.Constants public const int PropPrice = 100; public const int TimePropPrice = 50; - //多语言 - public const string Chinese = "简体中文"; - public const string English = "English"; - - //BI事件 - public const string FteLevelSuccess = "fte_level_success_{0}"; - public const string FteLevelEnter = "fte_level_enter_{0}"; - - //评分弹窗相关 - public const string PopUpNumber = "PopUpNumber"; - public const string PopUpToScore = "ToScore"; - public const int PopUpLimitNumber = 8; - public const int LevelRateIndex = 4; - - /// - /// 关卡选择 一页数量 - /// + // 关卡选择 一页的数量 public const int LevelSelectCount = 15; //通关奖励 diff --git a/Forest/Assets/Scripts/Framework/Constants/Constants.Normal.cs b/Forest/Assets/Scripts/Framework/Constants/Constants.Normal.cs new file mode 100644 index 0000000..52f22ec --- /dev/null +++ b/Forest/Assets/Scripts/Framework/Constants/Constants.Normal.cs @@ -0,0 +1,23 @@ +namespace Framework.Constants +{ + public static class NormalConstants + { + public const float DesignResolutionWidth = 1080; + public const float DesignResolutionHeight = 1920; + + public const string UserBuildSaveKey = "UserBuildInfo"; + public const string DefaultBuildID = "Build_1"; + + //多语言 + public const string Chinese = "简体中文"; + public const string English = "English"; + + //BI事件 + public const string FteLevelSuccess = "fte_level_success_{0}"; + public const string FteLevelEnter = "fte_level_enter_{0}"; + + //评分弹窗相关 + public const int PopUpLimitNumber = 8; + public const int LevelRateIndex = 4; + } +} \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/GlobalConstants.cs.meta b/Forest/Assets/Scripts/Framework/Constants/Constants.Normal.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Framework/GlobalConstants.cs.meta rename to Forest/Assets/Scripts/Framework/Constants/Constants.Normal.cs.meta diff --git a/Forest/Assets/Scripts/Framework/GlobalConstants.cs b/Forest/Assets/Scripts/Framework/GlobalConstants.cs deleted file mode 100644 index 51fa809..0000000 --- a/Forest/Assets/Scripts/Framework/GlobalConstants.cs +++ /dev/null @@ -1,8 +0,0 @@ -public static class GlobalConstants -{ - public const float DesignResolutionWidth = 1080; - public const float DesignResolutionHeight = 1920; - - public const string UserBuildSaveKey = "UserBuildInfo"; - public const string DefaultBuildID = "Build_1"; -} \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs b/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs index f13ce02..2383441 100644 --- a/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs @@ -3,6 +3,7 @@ using PhxhSDK; using UnityEngine; using System.Linq; using LC.Newtonsoft.Json; +using Framework.Constants; using Sirenix.OdinInspector; using Cysharp.Threading.Tasks; using System.Collections.Generic; @@ -120,7 +121,7 @@ namespace Framework.Manager public class UserBuildInfo { public int GuideGroup; - public string BuildData = GlobalConstants.DefaultBuildID; + public string BuildData = NormalConstants.DefaultBuildID; public Dictionary ChooseNodeInfo; public UserBuildInfo() @@ -138,6 +139,8 @@ namespace Framework.Manager public class BuildManager { + public const string UserBuildSaveKey = "UserBuildInfo"; + public const string DefaultBuildID = "Build_1"; private const string NodeName = "Node{0}"; private const string OptionName = "Option{0}"; @@ -263,7 +266,7 @@ namespace Framework.Manager { StorageManager.Instance.Init(); _userBuildInfo = - StorageManager.Instance.GetStorage(GlobalConstants.UserBuildSaveKey); + StorageManager.Instance.GetStorage(UserBuildSaveKey); if (_userBuildInfo == null) { var buildId = _curBuildData.buildID; diff --git a/Forest/Assets/Scripts/Framework/Setting/SettingManager.cs b/Forest/Assets/Scripts/Framework/Setting/SettingManager.cs index 469bc8e..6559fe7 100644 --- a/Forest/Assets/Scripts/Framework/Setting/SettingManager.cs +++ b/Forest/Assets/Scripts/Framework/Setting/SettingManager.cs @@ -11,8 +11,9 @@ namespace Framework.Setting public float SoundVolume = 1f; public string Language; - public bool FirstLaunch = true; + public int RateUsNumber = 0; + public bool RateUs = false; } public class SettingManager : Singlenton @@ -20,6 +21,12 @@ namespace Framework.Setting private const string SettingKey = "SettingKey"; private SettingData _settingData; + public SettingData CurSettingData + { + get => _settingData; + private set => _settingData = value; + } + public void Init() { _settingData = StorageManager.Instance.GetStorage(SettingKey); @@ -62,9 +69,16 @@ namespace Framework.Setting SaveSetting(); } - public bool IsFirstLaunch() + public void SetRateUsPopNumber() { - return _settingData.FirstLaunch; + _settingData.RateUsNumber++; + SaveSetting(); + } + + public void SetRateUs() + { + _settingData.RateUs = true; + SaveSetting(); } private void SaveSetting() diff --git a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs index 23d4595..2226d7b 100644 --- a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs +++ b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs @@ -55,11 +55,11 @@ namespace Gameplay.LoadingExecutor /// private async UniTask InitBuildScene() { - var buildInfo = StorageManager.Instance.GetStorage(GlobalConstants.UserBuildSaveKey); + var buildInfo = StorageManager.Instance.GetStorage(NormalConstants.UserBuildSaveKey); buildInfo ??= new UserBuildInfo(); if (string.IsNullOrEmpty(buildInfo.BuildData)) { - buildInfo.BuildData = GlobalConstants.DefaultBuildID; + buildInfo.BuildData = NormalConstants.DefaultBuildID; } //判断是否开启新手引导 @@ -111,7 +111,7 @@ namespace Gameplay.LoadingExecutor await UIManager.Instance.OpenWindow(UIConstants.UILogin); #endif - if (SettingManager.Instance.IsFirstLaunch()) + if (SettingManager.Instance.CurSettingData.FirstLaunch) { await UIManager.Instance.OpenWindow(UIConstants.UIUserAgreement); } diff --git a/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs b/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs index 527d294..a8a85c0 100644 --- a/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs +++ b/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs @@ -145,7 +145,7 @@ namespace Gameplay.Manager public void ReportEnterLevel() { - BIManager.Instance.TrackStringEventOnce(string.Format(LevelConstants.FteLevelEnter, + BIManager.Instance.TrackStringEventOnce(string.Format(NormalConstants.FteLevelEnter, CurrentLevel.GetLevelIndex())); } @@ -275,7 +275,7 @@ namespace Gameplay.Manager private void ReportPassLevel() { - BIManager.Instance.TrackStringEventOnce(string.Format(LevelConstants.FteLevelSuccess, + BIManager.Instance.TrackStringEventOnce(string.Format(NormalConstants.FteLevelSuccess, CurrentLevel.GetLevelIndex())); } diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectController.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectController.cs index 0064cf6..a98eddd 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectController.cs @@ -3,6 +3,7 @@ using UnityEngine.UIElements; using Framework.Constants; using Gameplay.Manager; using Framework.Event; +using Framework.Setting; using UnityEngine.UI; using Framework.UI; using UnityEngine; @@ -81,7 +82,7 @@ public class UILevelSelectController : UIWindow _scrollRect.normalizedPosition = new Vector2(_scrollRect.normalizedPosition.x, 1f - targetPosition); } - private void InitData() + private async void InitData() { LevelSelectManager.Instance.UpdateLevelInfo(); _list = new UIList(_levelObj, "Viewport/Content/LevelPanel", @@ -90,18 +91,16 @@ public class UILevelSelectController : UIWindow _list.SetDatas(_levelDatas); //评分弹窗显示 - if (!UnityEngine.PlayerPrefs.HasKey(LevelConstants.PopUpToScore) && - LevelSelectManager.Instance.CurPassLevelIndex >= LevelConstants.LevelRateIndex) + if (!SettingManager.Instance.CurSettingData.RateUs && + LevelSelectManager.Instance.CurPassLevelIndex >= NormalConstants.LevelRateIndex) { - var popUpNumber = UnityEngine.PlayerPrefs.GetInt(LevelConstants.PopUpNumber, 0); - if (popUpNumber > LevelConstants.PopUpLimitNumber) + if (SettingManager.Instance.CurSettingData.RateUsNumber > NormalConstants.PopUpLimitNumber) { - UIManager.Instance.OpenWindow(UIConstants.UIScore); - UnityEngine.PlayerPrefs.SetInt(LevelConstants.PopUpNumber, 0); + await UIManager.Instance.OpenWindow(UIConstants.UIScore); } else { - UnityEngine.PlayerPrefs.SetInt(LevelConstants.PopUpNumber, popUpNumber + 1); + SettingManager.Instance.SetRateUsPopNumber(); } } } diff --git a/Forest/Assets/Scripts/Gameplay/UI/Other/UIScoreController.cs b/Forest/Assets/Scripts/Gameplay/UI/Other/UIScoreController.cs index 88472ed..0a77669 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/Other/UIScoreController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/Other/UIScoreController.cs @@ -1,4 +1,5 @@ using Framework.Constants; +using Framework.Setting; using Framework.Event; using Framework.UI; using UnityEngine; @@ -20,7 +21,7 @@ public class UIScoreController : UIWindow { var url = Application.platform == RuntimePlatform.Android ? PathConstants.ScoreUrlAndroid : PathConstants.ScoreUrlIOS; Application.OpenURL(url); - UnityEngine.PlayerPrefs.SetInt(LevelConstants.PopUpToScore, 1); + SettingManager.Instance.SetRateUs(); CloseWindow(); } diff --git a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UISettingPanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UISettingPanelController.cs index 3fc0770..af558ca 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UISettingPanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UISettingPanelController.cs @@ -50,8 +50,8 @@ public class UISettingPanelController : UIWindow _lanDropdown = GameObject.Find("BG_SettingPanel/Language/Dropdown_Lan").GetComponent(); _lanDropdown.onValueChanged.AddListener(ChangLanguage); - _lanDropdown.options.Add(new TMP_Dropdown.OptionData(LevelConstants.Chinese)); - _lanDropdown.options.Add(new TMP_Dropdown.OptionData(LevelConstants.English)); + _lanDropdown.options.Add(new TMP_Dropdown.OptionData(NormalConstants.Chinese)); + _lanDropdown.options.Add(new TMP_Dropdown.OptionData(NormalConstants.English)); _lanDropdown.value = StringManager.CurLanguage == StringManager.LanguageType.CN ? 0 : 1; InitUI();