From e8049efa4a0b462b04e3087402c8485c70432de9 Mon Sep 17 00:00:00 2001 From: chai <215380520@qq.com> Date: Mon, 12 Jun 2023 18:17:03 +0800 Subject: * misc --- .../Assets/Scripts/Application/ApplicationMain.cs | 14 ++-- .../Scripts/Battle/Metadata/StageMetadata.cs | 9 +- WorldlineKeepers/Assets/Scripts/Phase.meta | 8 ++ .../Assets/Scripts/Phase/GameStageBase.cs | 35 ++++++++ .../Assets/Scripts/Phase/GameStageBase.cs.meta | 11 +++ .../Assets/Scripts/Phase/GameStageManager.cs | 95 ++++++++++++++++++++++ .../Assets/Scripts/Phase/GameStageManager.cs.meta | 11 +++ .../Assets/Scripts/Phase/GameStage_Battle.cs | 15 ++++ .../Assets/Scripts/Phase/GameStage_Battle.cs.meta | 11 +++ .../Assets/Scripts/Phase/GameStage_Dojo.cs | 51 ++++++++++++ .../Assets/Scripts/Phase/GameStage_Dojo.cs.meta | 11 +++ .../Assets/Scripts/Phase/GameStage_Launch.cs | 39 +++++++++ .../Assets/Scripts/Phase/GameStage_Launch.cs.meta | 11 +++ .../Assets/Scripts/Phase/GameStage_Main.cs | 18 ++++ .../Assets/Scripts/Phase/GameStage_Main.cs.meta | 11 +++ .../Assets/Scripts/Phase/GameStages.cs | 19 +++++ .../Assets/Scripts/Phase/GameStages.cs.meta | 11 +++ WorldlineKeepers/Assets/Scripts/Stage.meta | 8 ++ WorldlineKeepers/Assets/Scripts/Stage/Entites.meta | 8 ++ .../Scripts/Stage/Entites/StageEntityBase.cs | 20 +++++ .../Scripts/Stage/Entites/StageEntityBase.cs.meta | 11 +++ .../Stage/Entites/StageEntity_Background.cs | 17 ++++ .../Stage/Entites/StageEntity_Background.cs.meta | 11 +++ WorldlineKeepers/Assets/Scripts/Stages.meta | 8 -- .../Assets/Scripts/Stages/GameStageBase.cs | 35 -------- .../Assets/Scripts/Stages/GameStageBase.cs.meta | 11 --- .../Assets/Scripts/Stages/GameStageManager.cs | 95 ---------------------- .../Assets/Scripts/Stages/GameStageManager.cs.meta | 11 --- .../Assets/Scripts/Stages/GameStage_Battle.cs | 15 ---- .../Assets/Scripts/Stages/GameStage_Battle.cs.meta | 11 --- .../Assets/Scripts/Stages/GameStage_Dojo.cs | 51 ------------ .../Assets/Scripts/Stages/GameStage_Dojo.cs.meta | 11 --- .../Assets/Scripts/Stages/GameStage_Launch.cs | 39 --------- .../Assets/Scripts/Stages/GameStage_Launch.cs.meta | 11 --- .../Assets/Scripts/Stages/GameStage_Main.cs | 18 ---- .../Assets/Scripts/Stages/GameStage_Main.cs.meta | 11 --- .../Assets/Scripts/Stages/GameStages.cs | 19 ----- .../Assets/Scripts/Stages/GameStages.cs.meta | 11 --- .../Scripts/UI/Panels/PanelEntries/PanelEntries.cs | 2 +- 39 files changed, 444 insertions(+), 370 deletions(-) create mode 100644 WorldlineKeepers/Assets/Scripts/Phase.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Stage.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Stage/Entites.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs.meta (limited to 'WorldlineKeepers/Assets/Scripts') diff --git a/WorldlineKeepers/Assets/Scripts/Application/ApplicationMain.cs b/WorldlineKeepers/Assets/Scripts/Application/ApplicationMain.cs index 214a785..3d0477f 100644 --- a/WorldlineKeepers/Assets/Scripts/Application/ApplicationMain.cs +++ b/WorldlineKeepers/Assets/Scripts/Application/ApplicationMain.cs @@ -26,7 +26,7 @@ namespace WK { onAwakeHandler?.Invoke(); - GameStageManager.Instance.OnAwake(); + GamePhaseManager.Instance.OnAwake(); } @@ -35,7 +35,7 @@ namespace WK onStartHandler?.Invoke(); - GameStageManager.Instance.OnStart(); + GamePhaseManager.Instance.OnStart(); } @@ -43,14 +43,14 @@ namespace WK { onUpdateHandler?.Invoke(); - GameStageManager.Instance.OnUpdate(); + GamePhaseManager.Instance.OnUpdate(); } public void OnFixedUpdate() { onFixedUpdateHandler?.Invoke(); - GameStageManager.Instance.OnFixedUpdate(); + GamePhaseManager.Instance.OnFixedUpdate(); } @@ -58,21 +58,21 @@ namespace WK { onDestroyHandler?.Invoke(); - GameStageManager.Instance.OnDestroy(); + GamePhaseManager.Instance.OnDestroy(); } public void OnApplicationQuit() { onApplicationQuitHandler?.Invoke(); - GameStageManager.Instance.OnApplicationQuit(); + GamePhaseManager.Instance.OnApplicationQuit(); } public void OnApplicationPause() { onApplicationPauseHandler?.Invoke(); - GameStageManager.Instance.OnApplicationPause(); + GamePhaseManager.Instance.OnApplicationPause(); } } diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs index 1fc5c2a..80fa371 100644 --- a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs +++ b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs @@ -9,12 +9,12 @@ namespace WK.Data /// /// 场景要素的metadata /// - public abstract class StageEntityMetadatas + public abstract class StageEntityMetadata { public string entityId; // 用来引用场景中的对象 } - public class StageDesc + public class SceneDesc { public string name; public string desc; @@ -23,9 +23,9 @@ namespace WK.Data /// /// 关卡元数据 /// - public class StageMetadata + public class SceneMetadata { - public StageDesc desc; + public SceneDesc desc; public List tests; @@ -36,4 +36,3 @@ namespace WK.Data } } - diff --git a/WorldlineKeepers/Assets/Scripts/Phase.meta b/WorldlineKeepers/Assets/Scripts/Phase.meta new file mode 100644 index 0000000..c9ff25f --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc0534a6527c55d4cb2b2e876775be80 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs new file mode 100644 index 0000000..a285d68 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs @@ -0,0 +1,35 @@ +using Microsoft.Unity.VisualStudio.Editor; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace WK +{ + + public class GamePhaseBase : AsyncStatemachine.State + { + protected GamePhaseManager owner = GamePhaseManager.Instance; + + public override IEnumerator OnStart() + { + yield break; + } + + public override IEnumerator OnEnd() + { + yield break; + } + + public override void OnUpdate(float deltaTime) + { + } + + protected void GotoStage(EGamePhase target) + { + owner.AsyncLoadStage(target); + } + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta new file mode 100644 index 0000000..15a5c56 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 432eadb305e58da4897534478987c4da +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs new file mode 100644 index 0000000..d2edf01 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs @@ -0,0 +1,95 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEditorInternal; +using UnityEngine; +using WK.Tools; + +namespace WK +{ + + /// + /// 游戏最上层的状态机 + /// + public sealed class GamePhaseManager : Singleton, ISubsystem + { + private AsyncStatemachine m_Statemachine; + private int[] stages = new int[(int)EGamePhase.Num]; + private EGamePhase prevStage = EGamePhase.Launch; + private EGamePhase curStage = EGamePhase.Launch; + + public void OnAwake() + { + SetupGamePhases(); + + } + + private void SetupGamePhases() + { + m_Statemachine = new AsyncStatemachine(); + + stages[(int)EGamePhase.Launch] = m_Statemachine.RegisterState(new GamePhase_Launch()); + stages[(int)EGamePhase.Main] = m_Statemachine.RegisterState(new GamePhase_Main()); + stages[(int)EGamePhase.Battle] = m_Statemachine.RegisterState(new GamePhase_Battle()); + stages[(int)EGamePhase.Dojo] = m_Statemachine.RegisterState(new GamePhase_Dojo()); + + m_Statemachine.Start(stages[(int)EGamePhase.Launch]); + } + + public void OnStart() + { + } + + public void OnUpdate() + { + m_Statemachine.Update(Time.deltaTime); + } + + public void OnFixedUpdate() + { + } + + public void OnDestroy() + { + } + + public void OnApplicationPause() + { + } + + public void OnApplicationQuit() + { + } + + public void AsyncLoadStage(EGamePhase stage, bool forceLoad = false, AsyncStatemachine.LoadStateComplete loadStateComplete = null) + { + int curRunStage = m_Statemachine.GetCurStateID(); + if (!forceLoad && curRunStage == stages[(int)stage]) + { + if (null != loadStateComplete) + { + loadStateComplete(); + } + return; + } + + //LogHelper.LogEditorError("==> StageChange:" + curStage + " --> " + (EGamePhase)stage); + + prevStage = curStage; + curStage = stage; + m_Statemachine.GotoState(stages[(int)stage], false, forceLoad, loadStateComplete); + } + + public EGamePhase GetCurStage() + { + return curStage; + } + + public EGamePhase GetPrevStage() + { + return prevStage; + } + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta new file mode 100644 index 0000000..0ce1cb9 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4b7f17be1928ff849ba0d7d28ca8e87d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs new file mode 100644 index 0000000..9cb86e3 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace WK +{ + + public class GamePhase_Battle : GamePhaseBase + { + + + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta new file mode 100644 index 0000000..9104992 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad0f7465a835f2942ab4a37df3a827b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs new file mode 100644 index 0000000..2b7acd7 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs @@ -0,0 +1,51 @@ +using LitJson; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using WK.Data; + +namespace WK +{ + + /// + /// 训练道场 + /// + public class GamePhase_Dojo : GamePhaseBase + { + + public override IEnumerator OnStart() + { + GameSceneManager.Instance.LoadScene(StaticDefine.Scene_Dojo); + while(!GameSceneManager.Instance.sceneOpt.isDone) + { + yield return 0f; + } + SceneMetadata stage = new SceneMetadata(); + stage.tests = new List() + { + "asdas","asdasd","asdsd" + }; + stage.desc = new SceneDesc(); + stage.desc.name = "namestage"; + stage.desc.desc = "descddd"; + stage.pos = new Vector3(1, 2, 3); + stage.count = 233; + string json = JsonMapper.ToJson(stage); + LogHelper.Log(json); + var s = JsonMapper.ToObject(json); + Debug.Log(s.pos); + } + + public override IEnumerator OnEnd() + { + yield break; + } + + public override void OnUpdate(float deltaTime) + { + + } + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta new file mode 100644 index 0000000..d4e25cf --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 30c90d11e59fd3f42b4568e275bb3fbe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs new file mode 100644 index 0000000..2f5abe0 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs @@ -0,0 +1,39 @@ +using MovementEffects; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using Unity.VisualScripting; +using UnityEngine; +using WK.Data; + +namespace WK +{ + + public class GamePhase_Launch : GamePhaseBase + { + + CoroutineHandle m_CoLoadData; + + public override IEnumerator OnStart() + { + m_CoLoadData = DataManager.Instance.AsyncLoadAll(); + + yield break; + } + + public override IEnumerator OnEnd() + { + yield break; + } + + public override void OnUpdate(float deltaTime) + { + if (!m_CoLoadData.IsRunning) + { + //GotoStage(EGamePhase.Dojo); + } + } + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta new file mode 100644 index 0000000..aa30aaa --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 140927b1845ec1846814b71c4e114ad8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs new file mode 100644 index 0000000..8b8b321 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace WK +{ + + /// + /// 主界面 + /// + public class GamePhase_Main : GamePhaseBase + { + + + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta new file mode 100644 index 0000000..5add0f2 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 102ce3dadc4654b44838f17cf9415384 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs new file mode 100644 index 0000000..fd12758 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace WK +{ + + public enum EGamePhase + { + Launch = 0, // splash screen + //Login = 1, // + Main = 2, // 主界面 + Battle = 3, // 战斗场景 + Dojo = 4, // 训练道场 + + Num + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta new file mode 100644 index 0000000..ea2c442 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a4b80a072bd95b643a7c2295281f3174 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage.meta b/WorldlineKeepers/Assets/Scripts/Stage.meta new file mode 100644 index 0000000..d87e43b --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e480b863f682674a89f0bb5cfe45b91 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites.meta new file mode 100644 index 0000000..b92ff86 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a244d1e81c8837d4eb79e2442329e32b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs new file mode 100644 index 0000000..7924840 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace WK +{ + + /// + /// 场景内的实体 + /// + public abstract class StageEntityBase : MonoBehaviour + { + + public abstract void OnSerialize(); + + public abstract void OnDeserialize(); + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs.meta new file mode 100644 index 0000000..49b0ba1 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ace9588245de07741b43a27c1f706c03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs new file mode 100644 index 0000000..53c2081 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using WK; + +public class StageEntity_Background : StageEntityBase +{ + public override void OnDeserialize() + { + throw new System.NotImplementedException(); + } + + public override void OnSerialize() + { + throw new System.NotImplementedException(); + } +} diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs.meta new file mode 100644 index 0000000..5a97cab --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 05552b78771909c47a18c55d680151c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages.meta b/WorldlineKeepers/Assets/Scripts/Stages.meta deleted file mode 100644 index c9ff25f..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dc0534a6527c55d4cb2b2e876775be80 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs deleted file mode 100644 index 183310e..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Microsoft.Unity.VisualStudio.Editor; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -namespace WK -{ - - public class GameStageBase : AsyncStatemachine.State - { - protected GameStageManager owner = GameStageManager.Instance; - - public override IEnumerator OnStart() - { - yield break; - } - - public override IEnumerator OnEnd() - { - yield break; - } - - public override void OnUpdate(float deltaTime) - { - } - - protected void GotoStage(EGameStage target) - { - owner.AsyncLoadStage(target); - } - - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs.meta deleted file mode 100644 index 15a5c56..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 432eadb305e58da4897534478987c4da -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs deleted file mode 100644 index d19a06d..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Unity.VisualScripting; -using UnityEditorInternal; -using UnityEngine; -using WK.Tools; - -namespace WK -{ - - /// - /// 游戏最上层的状态机 - /// - public sealed class GameStageManager : Singleton, ISubsystem - { - private AsyncStatemachine m_Statemachine; - private int[] stages = new int[(int)EGameStage.Num]; - private EGameStage prevStage = EGameStage.Launch; - private EGameStage curStage = EGameStage.Launch; - - public void OnAwake() - { - SetupGameStages(); - - } - - private void SetupGameStages() - { - m_Statemachine = new AsyncStatemachine(); - - stages[(int)EGameStage.Launch] = m_Statemachine.RegisterState(new GameStage_Launch()); - stages[(int)EGameStage.Main] = m_Statemachine.RegisterState(new GameStage_Main()); - stages[(int)EGameStage.Battle] = m_Statemachine.RegisterState(new GameStage_Battle()); - stages[(int)EGameStage.Dojo] = m_Statemachine.RegisterState(new GameStage_Dojo()); - - m_Statemachine.Start(stages[(int)EGameStage.Launch]); - } - - public void OnStart() - { - } - - public void OnUpdate() - { - m_Statemachine.Update(Time.deltaTime); - } - - public void OnFixedUpdate() - { - } - - public void OnDestroy() - { - } - - public void OnApplicationPause() - { - } - - public void OnApplicationQuit() - { - } - - public void AsyncLoadStage(EGameStage stage, bool forceLoad = false, AsyncStatemachine.LoadStateComplete loadStateComplete = null) - { - int curRunStage = m_Statemachine.GetCurStateID(); - if (!forceLoad && curRunStage == stages[(int)stage]) - { - if (null != loadStateComplete) - { - loadStateComplete(); - } - return; - } - - //LogHelper.LogEditorError("==> StageChange:" + curStage + " --> " + (EGameStage)stage); - - prevStage = curStage; - curStage = stage; - m_Statemachine.GotoState(stages[(int)stage], false, forceLoad, loadStateComplete); - } - - public EGameStage GetCurStage() - { - return curStage; - } - - public EGameStage GetPrevStage() - { - return prevStage; - } - - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs.meta deleted file mode 100644 index 0ce1cb9..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4b7f17be1928ff849ba0d7d28ca8e87d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs deleted file mode 100644 index 08a4efc..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace WK -{ - - public class GameStage_Battle : GameStageBase - { - - - - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs.meta deleted file mode 100644 index 9104992..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad0f7465a835f2942ab4a37df3a827b4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs deleted file mode 100644 index 2c8094b..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs +++ /dev/null @@ -1,51 +0,0 @@ -using LitJson; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using WK.Data; - -namespace WK -{ - - /// - /// 训练道场 - /// - public class GameStage_Dojo : GameStageBase - { - - public override IEnumerator OnStart() - { - GameSceneManager.Instance.LoadScene(StaticDefine.Scene_Dojo); - while(!GameSceneManager.Instance.sceneOpt.isDone) - { - yield return 0f; - } - StageMetadata stage = new StageMetadata(); - stage.tests = new List() - { - "asdas","asdasd","asdsd" - }; - stage.desc = new StageDesc(); - stage.desc.name = "namestage"; - stage.desc.desc = "descddd"; - stage.pos = new Vector3(1, 2, 3); - stage.count = 233; - string json = JsonMapper.ToJson(stage); - LogHelper.Log(json); - var s = JsonMapper.ToObject(json); - Debug.Log(s.pos); - } - - public override IEnumerator OnEnd() - { - yield break; - } - - public override void OnUpdate(float deltaTime) - { - - } - - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs.meta deleted file mode 100644 index d4e25cf..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 30c90d11e59fd3f42b4568e275bb3fbe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs deleted file mode 100644 index 2956dca..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs +++ /dev/null @@ -1,39 +0,0 @@ -using MovementEffects; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using Unity.VisualScripting; -using UnityEngine; -using WK.Data; - -namespace WK -{ - - public class GameStage_Launch : GameStageBase - { - - CoroutineHandle m_CoLoadData; - - public override IEnumerator OnStart() - { - m_CoLoadData = DataManager.Instance.AsyncLoadAll(); - - yield break; - } - - public override IEnumerator OnEnd() - { - yield break; - } - - public override void OnUpdate(float deltaTime) - { - if (!m_CoLoadData.IsRunning) - { - //GotoStage(EGameStage.Dojo); - } - } - - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs.meta deleted file mode 100644 index aa30aaa..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 140927b1845ec1846814b71c4e114ad8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs deleted file mode 100644 index 54ec304..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace WK -{ - - /// - /// 主界面 - /// - public class GameStage_Main : GameStageBase - { - - - - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs.meta deleted file mode 100644 index 5add0f2..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 102ce3dadc4654b44838f17cf9415384 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs deleted file mode 100644 index 28ba28f..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace WK -{ - - public enum EGameStage - { - Launch = 0, // splash screen - //Login = 1, // - Main = 2, // 主界面 - Battle = 3, // 战斗场景 - Dojo = 4, // 训练道场 - - Num - } - -} diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs.meta b/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs.meta deleted file mode 100644 index ea2c442..0000000 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a4b80a072bd95b643a7c2295281f3174 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs index 24522aa..12bf678 100644 --- a/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs +++ b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs @@ -19,7 +19,7 @@ namespace WK.UI private void OnClickDojo() { - GameStageManager.Instance.AsyncLoadStage(EGameStage.Dojo); + GamePhaseManager.Instance.AsyncLoadStage(EGamePhase.Dojo); } -- cgit v1.1-26-g67d0