From 2181e4206648b3f993275189d4dbbd1852efcfb4 Mon Sep 17 00:00:00 2001 From: Foldcc_b1 Date: Thu, 24 Oct 2024 22:16:39 +0800 Subject: [PATCH] update core --- .../Art/Texture2D/角色/敌人/img_zhuizhu.png | Bin 5809 -> 8800 bytes .../HomeScene.prefab} | 484 +- .../HomeScene.prefab.meta} | 0 Assets/GameRes/GamePool/enemy_A.prefab | 530 +- Assets/GameRes/Scenes/InitScene.unity | 12433 +--------------- Assets/Scripts/Game/RoomManager.cs | 4 - .../Art/GaussBlur/Global_GaussBlurEffect.mat | 2 +- .../System/StateSystem/State/StateHome.cs | 34 +- Assets/Scripts/Views/HomePanel.cs | 26 +- 9 files changed, 1042 insertions(+), 12471 deletions(-) rename Assets/GameRes/{AutoSource/Part/Part_Home.prefab => AlwaysRes/HomeScene.prefab} (94%) rename Assets/GameRes/{AutoSource/Part/Part_Home.prefab.meta => AlwaysRes/HomeScene.prefab.meta} (100%) diff --git a/Assets/Art/Texture2D/角色/敌人/img_zhuizhu.png b/Assets/Art/Texture2D/角色/敌人/img_zhuizhu.png index f533327b8a07445ec85fb01f738278a14f01e6c3..213757fbfeaa8f11f154c63aef89d6945cf8ce48 100644 GIT binary patch delta 6108 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 this._gameFsm.CurrentState; @@ -77,9 +76,6 @@ namespace Game { } #endif - if (HasGaming) - { - } } diff --git a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat index 89a4f48..eebe720 100644 --- a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat +++ b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat @@ -46,7 +46,7 @@ Material: m_Ints: [] m_Floats: - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003 - - _blurOffset: 0.064 + - _blurOffset: 0.059033036 m_Colors: [] m_BuildTextureStacks: [] --- !u!114 &268278646524644520 diff --git a/Assets/Scripts/System/StateSystem/State/StateHome.cs b/Assets/Scripts/System/StateSystem/State/StateHome.cs index 52a4607..3abfd58 100644 --- a/Assets/Scripts/System/StateSystem/State/StateHome.cs +++ b/Assets/Scripts/System/StateSystem/State/StateHome.cs @@ -1,14 +1,18 @@ using System; using System.StateSystem; +using Framework.Asset; using Framework.Audio; using Framework.FSMLite; using Framework.Timer; using Framework.UI; +using IcecreamView; using StateSystem.Loader; using UnityEngine; +using UnityEngine.Playables; using UnityEngine.SceneManagement; using Views; using AudioType = Framework.Audio.AudioType; +using Object = UnityEngine.Object; namespace StateSystem.State { @@ -16,47 +20,29 @@ namespace StateSystem.State { private SceneLoader _loader; - public int _lastCatLevel = -1; //记录上一次的猫的等级，用于判断是否升级 + public int _lastCatLevel = -1; //记录上一次的猫的等级，用于判断是否升级 + private GameObject homeScene; protected override async void OnEnter (params object[] args) { - AudioManager.Instance.PlayBGM (BgmAudio.LobbyBgm); GameUpdateMgr.Instance.AddUpdater (DoUpdate); - // var activeScene = SceneManager.GetActiveScene (); - // if (activeScene.name != SceneName.MainScene.ToString ()) - // { - // Debug.Log ("进入Home，开始加载场景：" + SceneName.MainScene.ToString ()); - // this._loader = new SceneLoader (SceneName.MainScene); - // this._loader.BeginLoad (OnLoading, OnActived); - // } - // else - // { - // OnActived (); - // } OnActived (); } - private void OnLoading (float obj) - { - Debug.Log ("加载进度: " + obj); - if (obj >= 1) - { - // Debug.Log("加载完成"); - this._loader.Active (); - } - } - private void OnActived () { - UIManager.Instance.OpenView (UIPanel.HomePanel); + var homePart = AssetManager.Instance.LoadAlwaysAsset ("HomeScene.prefab"); + homeScene = Object.Instantiate (homePart); + UIManager.Instance.OpenView (UIPanel.HomePanel , new IC_ViewData (this.homeScene.GetComponent ())); UIManager.Instance.CloseLoading (null); } protected override void OnExit () { + GameObject.Destroy (this.homeScene.gameObject); GameUpdateMgr.Instance.RemoveUpdater (DoUpdate); // this._loader.Kill (); } diff --git a/Assets/Scripts/Views/HomePanel.cs b/Assets/Scripts/Views/HomePanel.cs index 89fb2db..e43cb72 100644 --- a/Assets/Scripts/Views/HomePanel.cs +++ b/Assets/Scripts/Views/HomePanel.cs @@ -1,11 +1,14 @@ using System.Collections.Generic; using System.StateSystem; using Framework.UI; +using Game; +using Game.Component; using UnityEngine; using UnityEngine.UI; using IcecreamView; using Script.Core.Utils.Extend; using StateSystem; +using UnityEngine.Playables; namespace Views{ @@ -14,12 +17,14 @@ namespace Views{ public Button _toGame; public Button _settingGame; public Button _aboutGame; - - + + private PlayableDirector _playableDirector; public override void OnOpenView(IC_ViewData parameters) { - + this._playableDirector = parameters.GetValue(); + MapContent.Instance.Pathfinder.Scan (); + MapContent.Instance.IsActiveGame = true; } public override void OnCloseView() @@ -62,15 +67,24 @@ namespace Views{ private void OnClickToGame() { - // UIManager.Instance.OpenView (UIPanel.SuccessPanel); - // return; + this._toGame.gameObject.SetActive(false); + this._aboutGame.gameObject.SetActive(false); + this._settingGame.gameObject.SetActive(false); + this._playableDirector.stopped += ToGaming; + this._playableDirector.initialTime = 0; + this._playableDirector.Play (); + } + + + private void ToGaming (PlayableDirector playableDirector) + { UIManager.Instance.OpenLoading (() => { this.ViewConnector.CloseView (); GameStateManager.Instance.OpenState (GameGlobalState.GameRoom); }); } - + private void OnClickSettingGame() { UIManager.Instance.OpenView (UIPanel.SettingPanel);