diff options
Diffstat (limited to 'WorldlineKeepers/Assets/Scripts')
24 files changed, 114 insertions, 40 deletions
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 /// <summary> /// 场景要素的metadata /// </summary> - 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 /// <summary> /// 关卡元数据 /// </summary> - public class StageMetadata + public class SceneMetadata { - public StageDesc desc; + public SceneDesc desc; public List<string> tests; @@ -36,4 +36,3 @@ namespace WK.Data } } - diff --git a/WorldlineKeepers/Assets/Scripts/Stages.meta b/WorldlineKeepers/Assets/Scripts/Phase.meta index c9ff25f..c9ff25f 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs index 183310e..a285d68 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs @@ -7,9 +7,9 @@ using UnityEngine.UI; namespace WK { - public class GameStageBase : AsyncStatemachine.State + public class GamePhaseBase : AsyncStatemachine.State { - protected GameStageManager owner = GameStageManager.Instance; + protected GamePhaseManager owner = GamePhaseManager.Instance; public override IEnumerator<float> OnStart() { @@ -25,7 +25,7 @@ namespace WK { } - protected void GotoStage(EGameStage target) + protected void GotoStage(EGamePhase target) { owner.AsyncLoadStage(target); } diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta index 15a5c56..15a5c56 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs index d19a06d..d2edf01 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs @@ -11,29 +11,29 @@ namespace WK /// <summary> /// 游戏最上层的状态机 /// </summary> - public sealed class GameStageManager : Singleton<GameStageManager>, ISubsystem + public sealed class GamePhaseManager : Singleton<GamePhaseManager>, ISubsystem { private AsyncStatemachine m_Statemachine; - private int[] stages = new int[(int)EGameStage.Num]; - private EGameStage prevStage = EGameStage.Launch; - private EGameStage curStage = EGameStage.Launch; + private int[] stages = new int[(int)EGamePhase.Num]; + private EGamePhase prevStage = EGamePhase.Launch; + private EGamePhase curStage = EGamePhase.Launch; public void OnAwake() { - SetupGameStages(); + SetupGamePhases(); } - private void SetupGameStages() + private void SetupGamePhases() { 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()); + 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)EGameStage.Launch]); + m_Statemachine.Start(stages[(int)EGamePhase.Launch]); } public void OnStart() @@ -61,7 +61,7 @@ namespace WK { } - public void AsyncLoadStage(EGameStage stage, bool forceLoad = false, AsyncStatemachine.LoadStateComplete loadStateComplete = null) + public void AsyncLoadStage(EGamePhase stage, bool forceLoad = false, AsyncStatemachine.LoadStateComplete loadStateComplete = null) { int curRunStage = m_Statemachine.GetCurStateID(); if (!forceLoad && curRunStage == stages[(int)stage]) @@ -73,19 +73,19 @@ namespace WK return; } - //LogHelper.LogEditorError("==> StageChange:" + curStage + " --> " + (EGameStage)stage); + //LogHelper.LogEditorError("==> StageChange:" + curStage + " --> " + (EGamePhase)stage); prevStage = curStage; curStage = stage; m_Statemachine.GotoState(stages[(int)stage], false, forceLoad, loadStateComplete); } - public EGameStage GetCurStage() + public EGamePhase GetCurStage() { return curStage; } - public EGameStage GetPrevStage() + public EGamePhase GetPrevStage() { return prevStage; } diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta index 0ce1cb9..0ce1cb9 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs index 08a4efc..9cb86e3 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace WK { - public class GameStage_Battle : GameStageBase + public class GamePhase_Battle : GamePhaseBase { diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta index 9104992..9104992 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Battle.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs index 2c8094b..2b7acd7 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs @@ -10,7 +10,7 @@ namespace WK /// <summary> /// 训练道场 /// </summary> - public class GameStage_Dojo : GameStageBase + public class GamePhase_Dojo : GamePhaseBase { public override IEnumerator<float> OnStart() @@ -20,19 +20,19 @@ namespace WK { yield return 0f; } - StageMetadata stage = new StageMetadata(); + SceneMetadata stage = new SceneMetadata(); stage.tests = new List<string>() { "asdas","asdasd","asdsd" }; - stage.desc = new StageDesc(); + 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<StageMetadata>(json); + var s = JsonMapper.ToObject<SceneMetadata>(json); Debug.Log(s.pos); } diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta index d4e25cf..d4e25cf 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs index 2956dca..2f5abe0 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs @@ -9,7 +9,7 @@ using WK.Data; namespace WK { - public class GameStage_Launch : GameStageBase + public class GamePhase_Launch : GamePhaseBase { CoroutineHandle m_CoLoadData; @@ -30,7 +30,7 @@ namespace WK { if (!m_CoLoadData.IsRunning) { - //GotoStage(EGameStage.Dojo); + //GotoStage(EGamePhase.Dojo); } } diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta index aa30aaa..aa30aaa 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs index 54ec304..8b8b321 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs @@ -8,7 +8,7 @@ namespace WK /// <summary> /// 主界面 /// </summary> - public class GameStage_Main : GameStageBase + public class GamePhase_Main : GamePhaseBase { diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta index 5add0f2..5add0f2 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs index 28ba28f..fd12758 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace WK { - public enum EGameStage + public enum EGamePhase { Launch = 0, // splash screen //Login = 1, // diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta index ea2c442..ea2c442 100644 --- a/WorldlineKeepers/Assets/Scripts/Stages/GameStages.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta 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 +{ + + /// <summary> + /// 场景内的实体 + /// </summary> + 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/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); } |