From 6cd3c00b0b1b0a76b690ad0d978ae265de43a371 Mon Sep 17 00:00:00 2001 From: chai <215380520@qq.com> Date: Tue, 13 Jun 2023 19:14:40 +0800 Subject: *misc --- WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs | 19 +++++ .../Assets/Scripts/Phase/GamePhase.cs.meta | 11 +++ .../Assets/Scripts/Phase/GamePhaseBase.cs | 35 ++++++++ .../Assets/Scripts/Phase/GamePhaseBase.cs.meta | 11 +++ .../Assets/Scripts/Phase/GamePhaseManager.cs | 95 +++++++++++++++++++++ .../Assets/Scripts/Phase/GamePhaseManager.cs.meta | 11 +++ .../Assets/Scripts/Phase/GamePhase_Battle.cs | 15 ++++ .../Assets/Scripts/Phase/GamePhase_Battle.cs.meta | 11 +++ .../Assets/Scripts/Phase/GamePhase_Dojo.cs | 51 ++++++++++++ .../Assets/Scripts/Phase/GamePhase_Dojo.cs.meta | 11 +++ .../Assets/Scripts/Phase/GamePhase_Launch.cs | 39 +++++++++ .../Assets/Scripts/Phase/GamePhase_Launch.cs.meta | 11 +++ .../Assets/Scripts/Phase/GamePhase_Main.cs | 18 ++++ .../Assets/Scripts/Phase/GamePhase_Main.cs.meta | 11 +++ .../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 --- .../Assets/Scripts/Tools/ChildLocator.cs | 96 ++++++++++++++++++++++ .../Assets/Scripts/Tools/ChildLocator.cs.meta | 11 +++ .../Scripts/UI/Panels/PanelEntries/PanelEntries.cs | 2 +- 31 files changed, 457 insertions(+), 350 deletions(-) create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Battle.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Battle.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Launch.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Launch.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Main.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Main.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs.meta delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs delete mode 100644 WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs.meta create mode 100644 WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs create mode 100644 WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs.meta (limited to 'WorldlineKeepers/Assets/Scripts') diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs new file mode 100644 index 0000000..fd12758 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase.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/GamePhase.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs.meta new file mode 100644 index 0000000..26696f8 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3354f74823c957545919ce2ee26955ca +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs new file mode 100644 index 0000000..ddad500 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.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.AsyncLoadPhase(target); + } + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs.meta new file mode 100644 index 0000000..8fd6b14 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae7c01c4716e3d044ae7614b794621d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs new file mode 100644 index 0000000..bb63732 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.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[] phases = new int[(int)EGamePhase.Num]; + private EGamePhase prevPhase = EGamePhase.Launch; + private EGamePhase curPhase = EGamePhase.Launch; + + public void OnAwake() + { + SetupGamePhases(); + + } + + private void SetupGamePhases() + { + m_Statemachine = new AsyncStatemachine(); + + phases[(int)EGamePhase.Launch] = m_Statemachine.RegisterState(new GamePhase_Launch()); + phases[(int)EGamePhase.Main] = m_Statemachine.RegisterState(new GamePhase_Main()); + phases[(int)EGamePhase.Battle] = m_Statemachine.RegisterState(new GamePhase_Battle()); + phases[(int)EGamePhase.Dojo] = m_Statemachine.RegisterState(new GamePhase_Dojo()); + + m_Statemachine.Start(phases[(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 AsyncLoadPhase(EGamePhase phase, bool forceLoad = false, AsyncStatemachine.LoadStateComplete loadStateComplete = null) + { + int curRunPhase = m_Statemachine.GetCurStateID(); + if (!forceLoad && curRunPhase == phases[(int)phase]) + { + if (null != loadStateComplete) + { + loadStateComplete(); + } + return; + } + + //LogHelper.LogEditorError("==> PhaseChange:" + curPhase + " --> " + (EGamePhase)phase); + + prevPhase = curPhase; + curPhase = phase; + m_Statemachine.GotoState(phases[(int)phase], false, forceLoad, loadStateComplete); + } + + public EGamePhase GetCurPhase() + { + return curPhase; + } + + public EGamePhase GetPrevPhase() + { + return prevPhase; + } + + } + +} diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs.meta new file mode 100644 index 0000000..5362aae --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhaseManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0a301d589b1561b4992640f89bb36326 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Battle.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Battle.cs new file mode 100644 index 0000000..9cb86e3 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_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/GamePhase_Battle.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Battle.cs.meta new file mode 100644 index 0000000..2fb4c80 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Battle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ca12b5cd06d61b46b0818a7f0dd509a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs new file mode 100644 index 0000000..2b7acd7 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_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/GamePhase_Dojo.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs.meta new file mode 100644 index 0000000..7696aeb --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b34c3f536ca90641a06139dfd3750c6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Launch.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Launch.cs new file mode 100644 index 0000000..2f5abe0 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_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/GamePhase_Launch.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Launch.cs.meta new file mode 100644 index 0000000..bda1403 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Launch.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9977d480dc2050649b94f8b5361b4e53 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Main.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Main.cs new file mode 100644 index 0000000..8b8b321 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_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/GamePhase_Main.cs.meta b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Main.cs.meta new file mode 100644 index 0000000..4396690 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Main.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d779d373139838f48b3d55f18397b398 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStageBase.cs deleted file mode 100644 index a285d68..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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 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 deleted file mode 100644 index 15a5c56..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Phase/GameStageManager.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStageManager.cs deleted file mode 100644 index d2edf01..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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 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 deleted file mode 100644 index 0ce1cb9..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Phase/GameStage_Battle.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs deleted file mode 100644 index 9cb86e3..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Battle.cs +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 9104992..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Phase/GameStage_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Dojo.cs deleted file mode 100644 index 2b7acd7..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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 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 deleted file mode 100644 index d4e25cf..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Phase/GameStage_Launch.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Launch.cs deleted file mode 100644 index 2f5abe0..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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 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 deleted file mode 100644 index aa30aaa..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Phase/GameStage_Main.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs deleted file mode 100644 index 8b8b321..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/GameStage_Main.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 5add0f2..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Phase/GameStages.cs b/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs deleted file mode 100644 index fd12758..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/GameStages.cs +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index ea2c442..0000000 --- a/WorldlineKeepers/Assets/Scripts/Phase/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/Tools/ChildLocator.cs b/WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs new file mode 100644 index 0000000..bc550ac --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs @@ -0,0 +1,96 @@ +using System; +using UnityEngine; + +[DisallowMultipleComponent] +public class ChildLocator : MonoBehaviour +{ + [Serializable] + private struct NameTransformPair + { + public string name; + + public Transform transform; + } + + [SerializeField] + private NameTransformPair[] transformPairs = Array.Empty(); + + public int Count => transformPairs.Length; + + public int FindChildIndex(string childName) + { + for (int i = 0; i < transformPairs.Length; i++) + { + if (childName == transformPairs[i].name) + { + return i; + } + } + return -1; + } + + public int FindChildIndex(Transform childTransform) + { + for (int i = 0; i < transformPairs.Length; i++) + { + if ((object)childTransform == transformPairs[i].transform) + { + return i; + } + } + return -1; + } + + public string FindChildName(int childIndex) + { + if ((uint)childIndex < transformPairs.Length) + { + return transformPairs[childIndex].name; + } + return null; + } + + public Transform FindChild(string childName) + { + return FindChild(FindChildIndex(childName)); + } + + public GameObject FindChildGameObject(int childIndex) + { + Transform transform = FindChild(childIndex); + if (!transform) + { + return null; + } + return transform.gameObject; + } + + public GameObject FindChildGameObject(string childName) + { + return FindChildGameObject(FindChildIndex(childName)); + } + + public Transform FindChild(int childIndex) + { + if ((uint)childIndex < transformPairs.Length) + { + return transformPairs[childIndex].transform; + } + return null; + } + + public T FindChildComponent(string childName) + { + return FindChildComponent(FindChildIndex(childName)); + } + + public T FindChildComponent(int childIndex) + { + Transform transform = FindChild(childIndex); + if (!transform) + { + return default(T); + } + return transform.GetComponent(); + } +} diff --git a/WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs.meta b/WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs.meta new file mode 100644 index 0000000..cb7b5a6 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Tools/ChildLocator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c368a27551e7eb042a9e8cbb0735be81 +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 12bf678..8c44777 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() { - GamePhaseManager.Instance.AsyncLoadStage(EGamePhase.Dojo); + GamePhaseManager.Instance.AsyncLoadPhase(EGamePhase.Dojo); } -- cgit v1.1-26-g67d0