diff options
39 files changed, 227 insertions, 49 deletions
diff --git a/Documents/小体量塔防想法.xlsx b/Documents/小体量塔防想法.xlsx Binary files differindex bdf0532..e0a9fc6 100644 --- a/Documents/小体量塔防想法.xlsx +++ b/Documents/小体量塔防想法.xlsx diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Common/Common.cs b/RogueKnights/RogueKnights/Assets/Scripts/Common/Common.cs index f4ad5e4..1b683ab 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Common/Common.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Common/Common.cs @@ -13,7 +13,7 @@ using UnityEngine; using System.Collections; -namespace RogueKnights +namespace RK { [System.Serializable] public struct IntVector2 diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonParse.cs b/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonParse.cs index 8d38d7f..b050db9 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonParse.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonParse.cs @@ -15,7 +15,7 @@ using System.Collections; using System; using LitJson; -namespace RogueKnights +namespace RK { public class CommonParse { diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs b/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs index b36d60d..ef6b3b4 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs @@ -1,5 +1,5 @@ using UnityEngine; -using RogueKnights; +using RK; public abstract class SingletonMB<T> : MonoBehaviour where T : class { diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/Command.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/Command.cs index 1041564..801bb8a 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/Command.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/Command.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { public abstract class Command diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/CommandGroup.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/CommandGroup.cs index ad11fb8..8a6336d 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/CommandGroup.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Commands/CommandGroup.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.AI; using UnityEngine.UIElements; -namespace RogueKnights +namespace RK { //http://warmcat.org/chai/blog/?p=2343 diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/FlagManager.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/FlagManager.cs index 7f6416a..890d267 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/FlagManager.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/FlagManager.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/GameObjectPool.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/GameObjectPool.cs index 044035e..affb05a 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/GameObjectPool.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/GameObjectPool.cs @@ -1,7 +1,7 @@ using UnityEngine; -using RogueKnights; +using RK; -namespace RogueKnights +namespace RK { public class GameObjectPool : System.IDisposable, UnityObjectPool<GameObject>.IPooledInstanceInitializer { diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/GlobalEventManager.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/GlobalEventManager.cs index c4cea9b..e31b1d4 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/GlobalEventManager.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/GlobalEventManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UIElements; -namespace RogueKnights +namespace RK { /// <summary> /// ָߵȫ¼ diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationCenter.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationCenter.cs index 3d1068f..8e9a3c8 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationCenter.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationCenter.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { public sealed class NotificationCenter : Singleton<NotificationCenter> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationExtensions.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationExtensions.cs index beeb37b..77d520e 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationExtensions.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/NotificationExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/ScopedNotification.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/ScopedNotification.cs index acb728b..e57b3d4 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/ScopedNotification.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Notification/ScopedNotification.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/ObjectPool.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/ObjectPool.cs index 7364b65..7ae8607 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/ObjectPool.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/ObjectPool.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -namespace RogueKnights +namespace RK { class ObjectPool<T> where T : new() { diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Recycle.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Recycle.cs index 7478e44..1056ba7 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Recycle.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Recycle.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/ScopedEvent.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/ScopedEvent.cs index e4d9783..1e86084 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/ScopedEvent.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/ScopedEvent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.AI; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/AsyncStatemachine.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/AsyncStatemachine.cs index 983d2e5..48d74a8 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/AsyncStatemachine.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/AsyncStatemachine.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using MovementEffects; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/BasicStatemachine.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/BasicStatemachine.cs index b3c0360..4619513 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/BasicStatemachine.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/BasicStatemachine.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace RogueKnights +namespace RK { /// <summary> /// һ״̬ diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/LiteStatemachine.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/LiteStatemachine.cs index 55dbe73..852a376 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/LiteStatemachine.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/Statemachine/LiteStatemachine.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Action.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Action.cs index 50ea018..7fed88c 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Action.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Action.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { public abstract class Action diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalActiveTrigger.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalActiveTrigger.cs index 6875cf9..37b4ff6 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalActiveTrigger.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalActiveTrigger.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalPassiveTrigger.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalPassiveTrigger.cs index f777843..2185cde 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalPassiveTrigger.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/GlobalPassiveTrigger.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Trigger.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Trigger.cs index 4137c4f..98a231b 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Trigger.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/TriggerSystem/Trigger.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { /// <summary> diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/UniqueStringMap.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/UniqueStringMap.cs index 9b2f9ac..4941209 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/UniqueStringMap.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/UniqueStringMap.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights.Tools +namespace RK.Tools { public class UniqueStringMap diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/UnityObjectPool.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/UnityObjectPool.cs index f60e7fe..cc590c2 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/UnityObjectPool.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/UnityObjectPool.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { public class UnityObjectPool<T> : System.IDisposable where T : UnityEngine.Object diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI.meta b/RogueKnights/RogueKnights/Assets/Scripts/UI.meta new file mode 100644 index 0000000..99df51e --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1257944e3d1523746ab1ebd2e54a3c64 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/Common.meta b/RogueKnights/RogueKnights/Assets/Scripts/UI/Common.meta new file mode 100644 index 0000000..1aceab7 --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ec05a319daee4d4ea7817a3affe4b3a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel.meta b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel.meta new file mode 100644 index 0000000..0551a38 --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 441be30797611344385d698f0465d879 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelBase.cs b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelBase.cs new file mode 100644 index 0000000..14917f9 --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelBase.cs @@ -0,0 +1,79 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RK.UI +{ + + public abstract class PanelParams + { + } + + public class PanelBase<T> : MonoBehaviour where T : class + { + + #region Singleton + protected static T m_Instance; + + public static T Instance + { + get { return m_Instance; } + set + { + if (m_Instance != null) + { + throw new System.ApplicationException("An instance was created duplicate!"); + } + + m_Instance = value; + } + } + + protected virtual void Awake() + { + //if (null != m_Instance) + //{ + // LogHelper.LogError(StringUtil.Concat("Exception: Duplicated Instance!! type is ", typeof(T).ToString(), ", plz send this error msg to hanjun!")); + //} + + m_Instance = gameObject.GetComponent<T>(); + } + + /// <summary> + /// CN: ΪͬһGameObject˶Manager࣬OnDestroyԼĵΪnull + /// </summary> + protected virtual void OnDestroy() + { + //m_Instance = null; + DoWhenOnDestroy(); + } + + protected virtual void DoWhenOnDestroy() + { + + } + + public void ReleaseInstance() + { + if (m_Instance != null) + { + UnityEngine.Object.Destroy(this.gameObject); + //m_Instance = null; + } + else + { + LogHelper.LogError("m_Instance is already null!! type is " + typeof(T).ToString()); + } + } + #endregion + + public void Open(PanelParams param) + { + OnOpen(param); + } + + protected virtual void OnOpen(PanelParams param) { } + + } + +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelBase.cs.meta b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelBase.cs.meta new file mode 100644 index 0000000..950f55f --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b8c04fb1b91b46a4c900470e772e410f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelInGameMain.cs b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelInGameMain.cs new file mode 100644 index 0000000..6cba7b4 --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelInGameMain.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RK.UI +{ + + + public class PanelInGameMain : PanelBase<PanelInGameMain> + { + + public class Param : PanelParams + { + } + + + protected override void OnOpen(PanelParams param) + { + + } + + + } + +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelInGameMain.cs.meta b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelInGameMain.cs.meta new file mode 100644 index 0000000..2a1fe9b --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/Panel/PanelInGameMain.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f28721bba3c79b44f8ee3a9130852857 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/UIManager.cs b/RogueKnights/RogueKnights/Assets/Scripts/UI/UIManager.cs new file mode 100644 index 0000000..901a0fb --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/UIManager.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RK.UI +{ + + public class UIManager : Singleton<UIManager> + { + + public static void OpenPanel() + { + } + + } + +}
\ No newline at end of file diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/UIManager.cs.meta b/RogueKnights/RogueKnights/Assets/Scripts/UI/UIManager.cs.meta new file mode 100644 index 0000000..bf24352 --- /dev/null +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/UIManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e1f2442987f42f540a08e75dd08441a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/AsyncUtils.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/AsyncUtils.cs index 8ce501f..0f665dc 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/AsyncUtils.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/AsyncUtils.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using MovementEffects; -namespace RogueKnights +namespace RK { public static class AsyncUtils { diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs index 1d682b1..feea456 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using UnityEngine; -namespace RogueKnights +namespace RK { } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs index adb9fae..7a26423 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs @@ -4,7 +4,7 @@ using System.Security.Cryptography; using System.Text; using UnityEngine; -namespace RogueKnights.Utils +namespace RK.Utils { public class StringUtils diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/TransformUtils.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/TransformUtils.cs index 92ecb30..4b93eb5 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/TransformUtils.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/TransformUtils.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace RogueKnights +namespace RK { public static class TransformUtils diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs index c805a86..8e9e94a 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs @@ -414,35 +414,35 @@ namespace LitJson } if (inst_type == typeof(UnityEngine.Vector4)) { - return RogueKnights.CommonParse.ParseVector4(reader.Value.ToString()); + return RK.CommonParse.ParseVector4(reader.Value.ToString()); } if (inst_type == typeof(UnityEngine.Vector3)) { - return RogueKnights.CommonParse.ParseVector3(reader.Value.ToString()); + return RK.CommonParse.ParseVector3(reader.Value.ToString()); } if (inst_type == typeof(UnityEngine.Vector2)) { - return RogueKnights.CommonParse.ParseVector2(reader.Value.ToString()); + return RK.CommonParse.ParseVector2(reader.Value.ToString()); } - if (inst_type == typeof(RogueKnights.IntVector4)) + if (inst_type == typeof(RK.IntVector4)) { - return RogueKnights.CommonParse.ParseIntVector4(reader.Value.ToString()); + return RK.CommonParse.ParseIntVector4(reader.Value.ToString()); } - if (inst_type == typeof(RogueKnights.IntVector3)) + if (inst_type == typeof(RK.IntVector3)) { - return RogueKnights.CommonParse.ParseIntVector3(reader.Value.ToString()); + return RK.CommonParse.ParseIntVector3(reader.Value.ToString()); } - if (inst_type == typeof(RogueKnights.IntVector2)) + if (inst_type == typeof(RK.IntVector2)) { - return RogueKnights.CommonParse.ParseIntVector2(reader.Value.ToString()); + return RK.CommonParse.ParseIntVector2(reader.Value.ToString()); } if (inst_type == typeof(UnityEngine.Color)) { - return RogueKnights.CommonParse.ParseColor(reader.Value.ToString()); + return RK.CommonParse.ParseColor(reader.Value.ToString()); } if (inst_type == typeof(UnityEngine.Color32)) { - return RogueKnights.CommonParse.ParseColor32(reader.Value.ToString()); + return RK.CommonParse.ParseColor32(reader.Value.ToString()); } //========================================== @@ -560,7 +560,7 @@ namespace LitJson object keyObj = property; if (t_data.GenericKeyType == typeof(int)) { - keyObj = RogueKnights.CommonParse.ParseInt(property); + keyObj = RK.CommonParse.ParseInt(property); } ((IDictionary) instance).Add ( @@ -827,21 +827,21 @@ namespace LitJson writer.Write((UnityEngine.Vector2)obj); return; } - if (obj is RogueKnights.IntVector4) + if (obj is RK.IntVector4) { - writer.Write((RogueKnights.IntVector4)obj); + writer.Write((RK.IntVector4)obj); return; } - if (obj is RogueKnights.IntVector3) + if (obj is RK.IntVector3) { - writer.Write((RogueKnights.IntVector3)obj); + writer.Write((RK.IntVector3)obj); return; } - if (obj is RogueKnights.IntVector2) + if (obj is RK.IntVector2) { - writer.Write((RogueKnights.IntVector2)obj); + writer.Write((RK.IntVector2)obj); return; } diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonWriter.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonWriter.cs index 2c93d51..10be621 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonWriter.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonWriter.cs @@ -340,7 +340,7 @@ namespace LitJson context.ExpectingValue = false; } - //public void Write(RogueKnights.IntVector4 v4) + //public void Write(RK.IntVector4 v4) //{ // DoValidation(Condition.Value); // PutNewline(); @@ -353,7 +353,7 @@ namespace LitJson // context.ExpectingValue = false; //} - //public void Write(RogueKnights.IntVector3 v3) + //public void Write(RK.IntVector3 v3) //{ // DoValidation(Condition.Value); // PutNewline(); @@ -366,7 +366,7 @@ namespace LitJson // context.ExpectingValue = false; //} - //public void Write(RogueKnights.IntVector2 v2) + //public void Write(RK.IntVector2 v2) //{ // DoValidation(Condition.Value); // PutNewline(); |