diff --git a/Assets/Scenes/TestScenes.meta b/Assets/Scenes/TestScenes.meta new file mode 100644 index 0000000..c575bf4 --- /dev/null +++ b/Assets/Scenes/TestScenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 739cb8634b1a29c4fa4f3c4210b1c5e5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Init.unity b/Assets/Scenes/TestScenes/Init.unity similarity index 100% rename from Assets/Scenes/Init.unity rename to Assets/Scenes/TestScenes/Init.unity diff --git a/Assets/Scenes/Init.unity.meta b/Assets/Scenes/TestScenes/Init.unity.meta similarity index 100% rename from Assets/Scenes/Init.unity.meta rename to Assets/Scenes/TestScenes/Init.unity.meta diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScenes/TestScene.unity similarity index 100% rename from Assets/Scenes/TestScene.unity rename to Assets/Scenes/TestScenes/TestScene.unity diff --git a/Assets/Scenes/TestScene.unity.meta b/Assets/Scenes/TestScenes/TestScene.unity.meta similarity index 100% rename from Assets/Scenes/TestScene.unity.meta rename to Assets/Scenes/TestScenes/TestScene.unity.meta diff --git a/Assets/Scenes/TestScene1.unity b/Assets/Scenes/TestScenes/TestScene1.unity similarity index 100% rename from Assets/Scenes/TestScene1.unity rename to Assets/Scenes/TestScenes/TestScene1.unity diff --git a/Assets/Scenes/TestScene1.unity.meta b/Assets/Scenes/TestScenes/TestScene1.unity.meta similarity index 100% rename from Assets/Scenes/TestScene1.unity.meta rename to Assets/Scenes/TestScenes/TestScene1.unity.meta diff --git a/Assets/Scripts/Bootstrap.cs b/Assets/Scripts/Bootstrap.cs index c686e26..472dd52 100644 --- a/Assets/Scripts/Bootstrap.cs +++ b/Assets/Scripts/Bootstrap.cs @@ -13,22 +13,23 @@ public class Bootstrap : SingletonMono protected override void Awake() { base.Awake(); - uiManager = new UIManager(); + uiManager = new UIManager(this); eventCenter = new EventCenter(); - scenesManager = new ScenesManager(); + scenesManager = new ScenesManager(this); DontDestroyOnLoad(gameObject); } private void Start() { - Debug.Log("按键S显示UI,按键H关闭UI,按键E控制物体变色"); - uiManager.ShowPanel(this, E_UI_Layer.System, (panel) => + Debug.Log("按键S显示UI,按键H关闭UI,按键E控制物体变色,按键V跳场景"); + uiManager.ShowPanel(E_UI_Layer.System, (panel) => { - eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); - scenesManager.LoadSceneAsyn(this, "TestScene", () => + ///1 为进度条速度 + eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 1f); + scenesManager.LoadSceneAsyn("TestScene", () => { Debug.Log("加载场景成功"); - eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); + eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 5f); }); }); @@ -40,7 +41,7 @@ public class Bootstrap : SingletonMono if (Input.GetKeyDown("s")) { Debug.Log("Input.GetKeyDown(\"u\")"); - uiManager.ShowPanel(this, E_UI_Layer.Bot, (panel) => + uiManager.ShowPanel( E_UI_Layer.Bot, (panel) => { panel.OnInit(); Debug.Log("UI_TestPanel显示成功"); diff --git a/Assets/Scripts/Project/ProjectBase/ScenesManager.cs b/Assets/Scripts/Project/ProjectBase/ScenesManager.cs index 26971ec..bc60c22 100644 --- a/Assets/Scripts/Project/ProjectBase/ScenesManager.cs +++ b/Assets/Scripts/Project/ProjectBase/ScenesManager.cs @@ -6,7 +6,11 @@ using UnityEngine.SceneManagement; public class ScenesManager { - public ScenesManager() { } + private MonoBehaviour _target; + public ScenesManager(MonoBehaviour target) + { + _target = target; + } /// /// 鍚屾鍔犺浇鍦烘櫙 /// @@ -25,10 +29,9 @@ public class ScenesManager /// 鍦烘櫙鍚嶇О /// 濮旀墭 /// 鍔犺浇鍦烘櫙鏂瑰紡 - public void LoadSceneAsyn(MonoBehaviour taget, string sceneName, UnityAction action = null, - LoadSceneMode loadSceneMode = LoadSceneMode.Single) + public void LoadSceneAsyn(string sceneName, UnityAction action = null) { - taget.StartCoroutine(ReallyLoadScene(sceneName, action)); + _target.StartCoroutine(ReallyLoadScene(sceneName, action)); } /// @@ -44,8 +47,8 @@ public class ScenesManager AsyncOperation ao = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); while (!ao.isDone) { + action?.Invoke(); yield return null; } - action?.Invoke(); } } \ No newline at end of file diff --git a/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs b/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs index 47b3b43..338fe7c 100644 --- a/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs +++ b/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs @@ -21,6 +21,7 @@ public class BasePanel : MonoBehaviour { FindChildrenControl