diff --git a/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab b/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab index c70fc26..0a730d7 100644 --- a/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab +++ b/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab @@ -281,7 +281,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6282136984140380436 RectTransform: m_ObjectHideFlags: 0 @@ -299,7 +299,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -400} + m_AnchoredPosition: {x: 0, y: -424} m_SizeDelta: {x: 337, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7829823306281179223 @@ -1260,7 +1260,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -48} + m_AnchoredPosition: {x: 0, y: 9} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3018677660354091625 @@ -1545,7 +1545,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -30.999996} + m_AnchoredPosition: {x: 0, y: 26.000004} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2708558453118498379 @@ -1680,7 +1680,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -6} + m_AnchoredPosition: {x: 0, y: 51} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6623162607416323668 diff --git a/Forest/Assets/Scenes/Build/Build_2.unity b/Forest/Assets/Scenes/Build/Build_2.unity index d67fdec..5a60d1f 100644 --- a/Forest/Assets/Scenes/Build/Build_2.unity +++ b/Forest/Assets/Scenes/Build/Build_2.unity @@ -613,7 +613,7 @@ GameObject: - component: {fileID: 158575877} - component: {fileID: 158575880} - component: {fileID: 158575879} - - component: {fileID: 158575878} + - component: {fileID: 158575882} m_Layer: 0 m_Name: BuildCamera m_TagString: MainCamera @@ -672,18 +672,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!114 &158575878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 158575876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fff49514adc6448d0a4cbea3ff37308b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &158575879 MonoBehaviour: m_ObjectHideFlags: 0 @@ -751,6 +739,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &158575882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158575876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7bd04ead9893ac94ca65cb68eeee61bf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &183664719 GameObject: m_ObjectHideFlags: 0 diff --git a/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs b/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs index 712058f..de0b802 100644 --- a/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs +++ b/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs @@ -37,8 +37,8 @@ public class UIUserAgreementController : UIWindow private void OnAgree() { CloseWindow(true); - if (LevelSelectManager.Instance.CurPassLevelIndex < 1 && !AppInfoManager.Instance.UpdateConfirm) - GuideMananger.Instance.StartGroupGuide(); + /*if (LevelSelectManager.Instance.CurPassLevelIndex < 1 && !AppInfoManager.Instance.UpdateConfirm) + GuideMananger.Instance.StartGroupGuide();*/ SettingManager.Instance.SetFirstLaunch(); BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree); } diff --git a/Forest/Assets/Scripts/Gameplay2/BuildManager.cs b/Forest/Assets/Scripts/Gameplay2/BuildManager.cs index 7136876..dfa8976 100644 --- a/Forest/Assets/Scripts/Gameplay2/BuildManager.cs +++ b/Forest/Assets/Scripts/Gameplay2/BuildManager.cs @@ -244,7 +244,7 @@ namespace Framework.Manager private BuildData _curBuildData; private bool _isInit; - private bool _isInGame; + public bool BuildInGame; public async UniTask LoadBuild(string buildID, int reachCondition) { @@ -269,6 +269,7 @@ namespace Framework.Manager } var buildData = await JsonHelper.LoadFromAddressable(buildConfig.BuildData); + await Init(buildData, true); await Addressables.LoadSceneAsync(buildConfig.Path).ToUniTask(); _userBuildInfo.CurBuildId = buildConfigId; @@ -294,7 +295,8 @@ namespace Framework.Manager { if (_isInit && !ChangeBuildSceneID) return; - _isInGame = inGame; + DebugUtil.LogError("当前建造ID:{0}", buildData.buildID); + BuildInGame = inGame; _curBuildData = buildData; _nodeInfos = new Dictionary(); _iconSprites = new Dictionary(); @@ -355,7 +357,7 @@ namespace Framework.Manager { try { - if (!_isInGame) + if (!BuildInGame) { StorageManager.Instance.Init(); _userBuildInfo = StorageManager.Instance.GetStorage(UserBuildSaveKey); @@ -627,7 +629,7 @@ namespace Framework.Manager /// public void PlaySound() { - if (_isInGame) + if (BuildInGame) AudioManager.Instance.PlaySound(AudioType.SOUND, "S_Btn", new UnityAudio(false)); } diff --git a/Forest/Assets/Scripts/Gameplay2/GameBuild/BuildEditor.cs b/Forest/Assets/Scripts/Gameplay2/GameBuild/BuildEditor.cs index 569714f..53e7132 100644 --- a/Forest/Assets/Scripts/Gameplay2/GameBuild/BuildEditor.cs +++ b/Forest/Assets/Scripts/Gameplay2/GameBuild/BuildEditor.cs @@ -41,7 +41,11 @@ namespace Framework.GameBuild private async void Init() { - await BuildManager.Instance.Init(BuildData); + if (!BuildManager.Instance.BuildInGame) + { + DebugUtil.LogWarning("Editor下运行了{0}", BuildData.buildID); + await BuildManager.Instance.Init(BuildData); + } } private void OnDestroy()