diff --git a/SSv5/Assets/Scenes/Main/Main.cs b/SSv5/Assets/Scenes/Main/Main.cs index c952924..55f5896 100644 --- a/SSv5/Assets/Scenes/Main/Main.cs +++ b/SSv5/Assets/Scenes/Main/Main.cs @@ -9,9 +9,9 @@ private void Start() { Application.targetFrameRate = 60; - ScreenManager.Set(new Color(0, 0, 0, 0.8f), "Screens", "Animations", "SceneLoading", "Loading"); + ScreenManager.Set(sceneLoadingName: "SceneLoading", loadingName: "Loading"); - ScreenManager.Load("Scene1", LoadSceneMode.Single, (scene1) => + ScreenManager.Load(sceneName: "Scene1", onSceneLoaded: (scene1) => { scene1.data = "Scene1"; }); diff --git a/SSv5/Assets/Scenes/Scene1/Scene1.cs b/SSv5/Assets/Scenes/Scene1/Scene1.cs index 99bef3e..658557d 100644 --- a/SSv5/Assets/Scenes/Scene1/Scene1.cs +++ b/SSv5/Assets/Scenes/Scene1/Scene1.cs @@ -14,7 +14,7 @@ private void Start() { label.text = data; - ScreenManager.Load("Scene2", LoadSceneMode.Additive, (scene2) => + ScreenManager.Load(sceneName: "Scene2", mode: LoadSceneMode.Additive, onSceneLoaded: (scene2) => { scene2.cube.localScale = new Vector3(2, 1, 1); }); @@ -29,7 +29,7 @@ public void OnScreen1ButtonTap() private void AddScreen1() { - ScreenManager.Add("Screen1", "RightShow", "RightHide", null, false, (screen) => { + ScreenManager.Add(screenName: "Screen1", showAnimation: ScreenAnimation.RightShow, hideAnimation: ScreenAnimation.RightHide, onScreenLoad: (screen) => { screen.label.text = "Screen1"; }); } diff --git a/SSv5/Assets/Scripts/Screen1.cs b/SSv5/Assets/Scripts/Screen1.cs index 139e332..99da852 100644 --- a/SSv5/Assets/Scripts/Screen1.cs +++ b/SSv5/Assets/Scripts/Screen1.cs @@ -16,21 +16,21 @@ public void OnKeyBack() public void OnAddScreen2ButtonTap() { - ScreenManager.Add("Screen2", "ScaleFadeShow", "ScaleFadeHide", "AnimationRoot", true, (screen) => { + ScreenManager.Add(screenName: "Screen2", animationObjectName: "AnimationRoot", useExistingScreen: true, onScreenLoad: (screen) => { screen.label.text = "Screen2"; }); } public void OnAddScreen2UntilNoScreenButtonTap() { - ScreenManager.Add("Screen2", "ScaleFadeShow", "ScaleFadeHide", "AnimationRoot", false, (screen) => { + ScreenManager.Add(screenName: "Screen2", animationObjectName: "AnimationRoot", onScreenLoad: (screen) => { screen.label.text = "Screen2"; }, waitUntilNoScreen: true); } public void OnAddScreen2UntilSpacePressedButtonTap() { - ScreenManager.Add("Screen2", "ScaleFadeShow", "ScaleFadeHide", "AnimationRoot", false, (screen) => { + ScreenManager.Add(screenName: "Screen2", animationObjectName: "AnimationRoot", onScreenLoad: (screen) => { screen.label.text = "Screen2"; pressedSpaceKey = false; }, addCondition: WaitSpaceKey); @@ -38,7 +38,7 @@ public void OnAddScreen2UntilSpacePressedButtonTap() public void OnAddScreen3AndDestroyMeButtonTap() { - ScreenManager.Add("Screen3", "ScaleFadeShow", "ScaleFadeHide", "AnimationRoot", false, (screen) => { + ScreenManager.Add(screenName: "Screen3", animationObjectName: "AnimationRoot", onScreenLoad: (screen) => { screen.label.text = "Screen3"; }, destroyTopScreen: true); } diff --git a/SSv5/Assets/Scripts/Screen2.cs b/SSv5/Assets/Scripts/Screen2.cs index dc3e76b..1c02003 100644 --- a/SSv5/Assets/Scripts/Screen2.cs +++ b/SSv5/Assets/Scripts/Screen2.cs @@ -10,7 +10,7 @@ public class Screen2 : MonoBehaviour, IKeyBack public void OnLoadScene1ButtonTap() { - ScreenManager.Load("Scene1", LoadSceneMode.Single, (scene1) => + ScreenManager.Load(sceneName: "Scene1", mode: LoadSceneMode.Single, onSceneLoaded: (scene1) => { scene1.data = "Scene1..."; }); @@ -27,7 +27,7 @@ public void OnCloseScreen1ButtonTap() if (screen1 != null) { - ScreenManager.Destroy(screen1); + ScreenManager.Destroy(screen: screen1); } } @@ -43,7 +43,7 @@ public void OnShowLoadingButtonTap() public void OnAddScreen1ButtonTap() { - ScreenManager.Add("Screen1", "RightShow", "RightHide", null, true, (screen) => { + ScreenManager.Add(screenName: "Screen1", showAnimation: ScreenAnimation.RightShow, hideAnimation: ScreenAnimation.RightHide, useExistingScreen: true, onScreenLoad: (screen) => { screen.label.text = "Screen1"; }); } diff --git a/SSv5/Assets/Scripts/Screen3.cs b/SSv5/Assets/Scripts/Screen3.cs index a140009..53305f4 100644 --- a/SSv5/Assets/Scripts/Screen3.cs +++ b/SSv5/Assets/Scripts/Screen3.cs @@ -10,6 +10,6 @@ public class Screen3 : MonoBehaviour, IKeyBack public void OnKeyBack() { - ScreenManager.Close(); + ScreenManager.Close(hideAnimation: ScreenAnimation.RightHide); } }