diff --git a/Assets/GameMain/Scripts/Base/SepCore.Base.asmdef b/Assets/GameMain/Scripts/Base/SepCore.Base.asmdef new file mode 100644 index 0000000..aac8980 --- /dev/null +++ b/Assets/GameMain/Scripts/Base/SepCore.Base.asmdef @@ -0,0 +1,16 @@ +{ + "name": "SepCore.Base", + "rootNamespace": "SepCore.Base", + "references": [ + "GUID:363c5eb08ff8e6a439b85e37b8c20d96" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/VampireLike.asmdef.meta b/Assets/GameMain/Scripts/Base/SepCore.Base.asmdef.meta similarity index 100% rename from Assets/GameMain/Scripts/VampireLike.asmdef.meta rename to Assets/GameMain/Scripts/Base/SepCore.Base.asmdef.meta diff --git a/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs b/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs index 7371ebc..915d6a9 100644 --- a/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs @@ -14,12 +14,6 @@ namespace CustomUtility return Text.Format("Assets/GameMain/DataTables/{0}.{1}", assetName, fromBytes ? "bytes" : "txt"); } - public static string GetDictionaryAsset(string assetName, bool fromBytes) - { - return Text.Format("Assets/GameMain/Localization/{0}/Dictionaries/{1}.{2}", - GameEntry.Localization.Language, assetName, fromBytes ? "bytes" : "xml"); - } - public static string GetFontAsset(string assetName) { return Text.Format("Assets/GameMain/Fonts/{0}.ttf", assetName); @@ -65,4 +59,4 @@ namespace CustomUtility return Text.Format("Assets/GameMain/UI/UISprites/Icons/{0}.png", assetName); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs deleted file mode 100644 index ba3213a..0000000 --- a/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs +++ /dev/null @@ -1,79 +0,0 @@ -using SepCore.Definition; -using GameFramework.Debugger; -using GameFramework.Localization; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace SepCore.Editor -{ - public class ChangeLanguageDebuggerWindow : IDebuggerWindow - { - private Vector2 m_ScrollPosition = Vector2.zero; - private bool m_NeedRestart = false; - - public void Initialize(params object[] args) - { - } - - public void Shutdown() - { - } - - public void OnEnter() - { - } - - public void OnLeave() - { - } - - public void OnUpdate(float elapseSeconds, float realElapseSeconds) - { - if (m_NeedRestart) - { - m_NeedRestart = false; - UnityGameFramework.Runtime.GameEntry.Shutdown(ShutdownType.Restart); - } - } - - public void OnDraw() - { - m_ScrollPosition = GUILayout.BeginScrollView(m_ScrollPosition); - { - DrawSectionChangeLanguage(); - } - GUILayout.EndScrollView(); - } - - private void DrawSectionChangeLanguage() - { - GUILayout.Label("Change Language"); - GUILayout.BeginHorizontal("box"); - { - if (GUILayout.Button("Chinese Simplified", GUILayout.Height(30))) - { - GameEntry.Localization.Language = Language.ChineseSimplified; - SaveLanguage(); - } - if (GUILayout.Button("Chinese Traditional", GUILayout.Height(30))) - { - GameEntry.Localization.Language = Language.ChineseTraditional; - SaveLanguage(); - } - if (GUILayout.Button("English", GUILayout.Height(30))) - { - GameEntry.Localization.Language = Language.English; - SaveLanguage(); - } - } - GUILayout.EndHorizontal(); - } - - private void SaveLanguage() - { - GameEntry.Setting.SetString(Constant.Setting.Language, GameEntry.Localization.Language.ToString()); - GameEntry.Setting.Save(); - m_NeedRestart = true; - } - } -} diff --git a/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs.meta b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs.meta deleted file mode 100644 index 5c0c046..0000000 --- a/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 278a7992e66d1ea4081597614f912f3d -timeCreated: 1528026148 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef b/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef index 1e3d413..30bbbca 100644 --- a/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef +++ b/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef @@ -2,11 +2,12 @@ "name": "SepCore.Editor", "rootNamespace": "SepCore.Editor", "references": [ - "GUID:47a82ffa13c291447ab895cd0bc251cd", - "GUID:363c5eb08ff8e6a439b85e37b8c20d96", "GUID:a2d8a19598eca814496b089021d08d60", - "GUID:6f6ea874d7669044095abb01ec4c2f8d", - "GUID:0e1d182005e0ae647ab3fa40f5492dbb" + "GUID:363c5eb08ff8e6a439b85e37b8c20d96", + "GUID:47a82ffa13c291447ab895cd0bc251cd", + "GUID:436e23dbdc31e7d4fb5c3f804548b2df", + "GUID:0e1d182005e0ae647ab3fa40f5492dbb", + "GUID:6f6ea874d7669044095abb01ec4c2f8d" ], "includePlatforms": [ "Editor" diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs index 9d11ae6..9d4f873 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs @@ -1,3 +1,5 @@ +using CustomUtility; +using SepCore.DataTable; using SepCore.Definition; using UnityEngine; @@ -7,19 +9,46 @@ namespace SepCore.UI { public string Title; public ItemRarity Rarity; - public string Type; public Sprite Icon; + public ItemType ItemType; public string Description; public int Price; + public GoodsItemContext() + { + Title = string.Empty; + Description = string.Empty; + Rarity = ItemRarity.White; + Price = 0; + Icon = null; + ItemType = ItemType.None; + } + public GoodsItemContext(GoodsItemRawData rawData) { - Title = rawData.Title; - Description = rawData.Description; Price = rawData.Price; Rarity = rawData.Rarity; - Type = rawData.Type; - Icon = rawData.Icon; + ItemType = rawData.ItemType; + if (ItemType == ItemType.None) + { + Description = string.Empty; + Icon = null; + Title = string.Empty; + } + else if (ItemType == ItemType.Weapon) + { + var weapon = (DRWeapon)rawData.DataRow; + Title = weapon.Title; + Description = ItemDescUtility.CreateWeaponDescription(weapon); + GameEntry.SpriteCache.GetSprite(weapon.IconAssetName, sprite => Icon = sprite); + } + else + { + var prop = (DRProp)rawData.DataRow; + Title = prop.Title; + Description = ItemDescUtility.CreatePropDescription(prop.Modifiers); + GameEntry.SpriteCache.GetSprite(prop.IconAssetName, sprite => Icon = sprite); + } } } } diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs index 5a47ad0..0188c23 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs @@ -1,3 +1,8 @@ +using System; +using System.Drawing; +using CustomUtility; +using Entity.EntityData; +using Entity.Weapon; using SepCore.Definition; using UnityEngine; @@ -8,11 +13,50 @@ namespace SepCore.UI public int Index; public string IconAssetName; public string Title; - public string TypeText; + public ItemType ItemType; public ItemRarity Rarity; public string Description; public int Price; - public bool IsWeapon; public Vector3 TargetPos; + + public DisplayItemInfoContext() + { + Index = -1; + IconAssetName = string.Empty; + Title = string.Empty; + ItemType = ItemType.None; + Rarity = ItemRarity.White; + Description = string.Empty; + Price = 0; + TargetPos = Vector3.zero; + } + + public DisplayItemInfoContext(DisplayItemInfoRawData rawData) + { + Index = rawData.Index; + ItemType = rawData.ItemType; + Rarity = rawData.Rarity; + Price = rawData.Price; + TargetPos = rawData.TargetPos; + if (ItemType == ItemType.None) + { + IconAssetName = string.Empty; + Title = string.Empty; + } + else if (ItemType == ItemType.Weapon) + { + var data = (WeaponData)rawData.Data; + IconAssetName = data.IconAssetName; + Title = data.Title; + Description = ItemDescUtility.CreateWeaponDescription(data); + } + else + { + var data = (PropItem)rawData.Data; + IconAssetName = data.IconAssetName; + Title = data.Title; + Description = ItemDescUtility.CreatePropDescription(data); + } + } } } diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs index b2f7a3c..2bb9728 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs @@ -43,18 +43,7 @@ namespace SepCore.UI return null; } - return new DisplayItemInfoContext - { - Index = rawData.Index, - IconAssetName = rawData.IconAssetName, - Title = rawData.Title, - Rarity = rawData.Rarity, - TypeText = rawData.TypeText, - Description = rawData.Description, - Price = rawData.Price, - IsWeapon = rawData.IsWeapon, - TargetPos = rawData.TargetPos - }; + return new DisplayItemInfoContext(rawData); } public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs index b51ab57..a7f6902 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs @@ -1,3 +1,4 @@ +using System; using SepCore.Event; using TMPro; using UnityEngine; @@ -32,6 +33,7 @@ namespace SepCore.UI [SerializeField] private float _screenEdgePadding = 0f; private DisplayItemInfoContext _context; + private Vector3 _targetPos; public void RefreshUI(DisplayItemInfoContext context) @@ -53,13 +55,13 @@ namespace SepCore.UI } if (_itemTitle != null) _itemTitle.text = _context.Title ?? string.Empty; - if (_itemTypeText != null) _itemTypeText.text = _context.TypeText ?? string.Empty; + if (_itemTypeText != null) _itemTypeText.text = BuildTypeText(_context.ItemType) ?? string.Empty; if (_itemDescription != null) _itemDescription.text = _context.Description ?? string.Empty; if (_itemPrice != null) _itemPrice.text = $"{_context.Price} "; if (_recycleButton != null) { - _recycleButton.gameObject.SetActive(_context.IsWeapon); + _recycleButton.gameObject.SetActive(_context.ItemType == ItemType.Weapon); } if (_iconArea != null) @@ -193,7 +195,7 @@ namespace SepCore.UI public void OnRecycleButtonClick() { - if (_context == null || !_context.IsWeapon) return; + if (_context == null || _context.ItemType != ItemType.Weapon) return; GameEntry.Event.Fire(this, ShopWeaponRecycleEventArgs.Create(_context.Index, _context.Price)); } @@ -201,5 +203,16 @@ namespace SepCore.UI { GameEntry.Event.Fire(this, DisplayItemInfoHideEventArgs.Create(true)); } + + private string BuildTypeText(ItemType type) + { + return type switch + { + ItemType.None => "error", + ItemType.Weapon => "武器", + ItemType.Prop => "道具", + _ => throw new ArgumentOutOfRangeException(nameof(type), type, null) + }; + } } } diff --git a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs index 4fc0a32..daff4aa 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs @@ -374,18 +374,14 @@ namespace SepCore.UI return false; } - var weaponData = weapon.WeaponData; rawData = new DisplayItemInfoRawData { TargetPos = targetPos, Index = index, - IconAssetName = weaponData.IconAssetName, - Title = weaponData.Title, - Rarity = weaponData.Rarity, - TypeText = "武器", - Description = ItemDescUtility.CreateWeaponDescription(weaponData), - Price = Mathf.FloorToInt(weaponData.Price * Context.WeaponRecycleRate), - IsWeapon = true + Data = weapon.WeaponData, + Rarity = weapon.WeaponData.Rarity, + ItemType = ItemType.Weapon, + Price = Mathf.FloorToInt(weapon.WeaponData.Price * Context.WeaponRecycleRate), }; return true; } @@ -417,13 +413,10 @@ namespace SepCore.UI { TargetPos = targetPos, Index = index, - IconAssetName = propItem.IconAssetName, - Title = propItem.Title, + Data = propItem, Rarity = propItem.Rarity, - TypeText = "道具", - Description = ItemDescUtility.CreatePropDescription(propItem), - Price = 0, - IsWeapon = false + ItemType = ItemType.Prop, + Price = 0 }; return true; } diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs b/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs index 3ca8597..1a2785e 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs @@ -1,3 +1,4 @@ +using System; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -22,7 +23,13 @@ namespace SepCore.UI { _iconArea.OnInit(data.Icon, data.Rarity); _titleText.text = data.Title; - _typeText.text = data.Type; + _typeText.text = data.ItemType switch + { + ItemType.None => "error", + ItemType.Weapon => "武器", + ItemType.Prop => "道具", + _ => throw new ArgumentOutOfRangeException() + }; _descriptionText.text = data.Description; _costText.text = $"{data.Price} "; } diff --git a/Assets/GameMain/Scripts/Presentation/SepCore.Presentation.asmdef b/Assets/GameMain/Scripts/Presentation/SepCore.Presentation.asmdef index e409606..55db5b2 100644 --- a/Assets/GameMain/Scripts/Presentation/SepCore.Presentation.asmdef +++ b/Assets/GameMain/Scripts/Presentation/SepCore.Presentation.asmdef @@ -3,9 +3,10 @@ "rootNamespace": "SepCore.UI", "references": [ "GUID:6055be8ebefd69e48b49212b09b47b2f", - "GUID:47a82ffa13c291447ab895cd0bc251cd", + "GUID:f51ebe6a0ceec4240a699833d6309b23", "GUID:363c5eb08ff8e6a439b85e37b8c20d96", - "GUID:f51ebe6a0ceec4240a699833d6309b23" + "GUID:47a82ffa13c291447ab895cd0bc251cd", + "GUID:436e23dbdc31e7d4fb5c3f804548b2df" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/GameMain/Scripts/Presentation/Utility.meta b/Assets/GameMain/Scripts/Presentation/Utility.meta new file mode 100644 index 0000000..3e861d7 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Utility.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77816bb3deec31c4ba8881acdd951fea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs b/Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs rename to Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs diff --git a/Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs.meta b/Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs.meta rename to Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs index efb3faf..d9e141a 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs @@ -92,9 +92,6 @@ namespace Procedure LoadDataTable(dataTableName); } - // Preload dictionaries - LoadDictionary("Default"); - // Preload fonts LoadFont("MainFont"); LoadTMPFont("MainTMPFont"); @@ -114,47 +111,42 @@ namespace Procedure GameEntry.DataTable.LoadDataTable(dataTableName, dataTableAssetName, this); } - private void LoadDictionary(string dictionaryName) - { - string dictionaryAssetName = AssetUtility.GetDictionaryAsset(dictionaryName, false); - _loadedFlag.Add(dictionaryAssetName, false); - GameEntry.Localization.ReadData(dictionaryAssetName, this); - } - private void LoadFont(string fontName) { _loadedFlag.Add(Utility.Text.Format("Font.{0}", fontName), false); - GameEntry.Resource.LoadAsset(AssetUtility.GetFontAsset(fontName), Constant.AssetPriority.FontAsset, new LoadAssetCallbacks( - (assetName, asset, duration, userData) => - { - _loadedFlag[Utility.Text.Format("Font.{0}", fontName)] = true; - UGuiForm.SetMainFont((Font)asset); - Log.Info("Load font '{0}' OK.", fontName); - }, - - (assetName, status, errorMessage, userData) => - { - Log.Error("Can not load font '{0}' from '{1}' with error message '{2}'.", fontName, assetName, errorMessage); - })); + GameEntry.Resource.LoadAsset(AssetUtility.GetFontAsset(fontName), Constant.AssetPriority.FontAsset, + new LoadAssetCallbacks( + (assetName, asset, duration, userData) => + { + _loadedFlag[Utility.Text.Format("Font.{0}", fontName)] = true; + UGuiForm.SetMainFont((Font)asset); + Log.Info("Load font '{0}' OK.", fontName); + }, + (assetName, status, errorMessage, userData) => + { + Log.Error("Can not load font '{0}' from '{1}' with error message '{2}'.", fontName, assetName, + errorMessage); + })); } private void LoadTMPFont(string fontName) { _loadedFlag.Add(Utility.Text.Format("Font.{0}", fontName), false); - GameEntry.Resource.LoadAsset(AssetUtility.GetTMPFontAsset(fontName), Constant.AssetPriority.FontAsset, new LoadAssetCallbacks( - (assetName, asset, duration, userData) => - { - _loadedFlag[Utility.Text.Format("Font.{0}", fontName)] = true; - UGuiForm.SetMainTMPFont((TMP_FontAsset)asset); - Log.Info("Load font '{0}' OK.", fontName); - }, - - (assetName, status, errorMessage, userData) => - { - Log.Error("Can not load font '{0}' from '{1}' with error message '{2}'.", fontName, assetName, errorMessage); - })); + GameEntry.Resource.LoadAsset(AssetUtility.GetTMPFontAsset(fontName), Constant.AssetPriority.FontAsset, + new LoadAssetCallbacks( + (assetName, asset, duration, userData) => + { + _loadedFlag[Utility.Text.Format("Font.{0}", fontName)] = true; + UGuiForm.SetMainTMPFont((TMP_FontAsset)asset); + Log.Info("Load font '{0}' OK.", fontName); + }, + (assetName, status, errorMessage, userData) => + { + Log.Error("Can not load font '{0}' from '{1}' with error message '{2}'.", fontName, assetName, + errorMessage); + })); } - + private void OnLoadConfigSuccess(object sender, GameEventArgs e) { LoadConfigSuccessEventArgs ne = (LoadConfigSuccessEventArgs)e; @@ -175,7 +167,8 @@ namespace Procedure return; } - Log.Error("Can not load config '{0}' from '{1}' with error message '{2}'.", ne.ConfigAssetName, ne.ConfigAssetName, ne.ErrorMessage); + Log.Error("Can not load config '{0}' from '{1}' with error message '{2}'.", ne.ConfigAssetName, + ne.ConfigAssetName, ne.ErrorMessage); } private void OnLoadDataTableSuccess(object sender, GameEventArgs e) @@ -198,7 +191,8 @@ namespace Procedure return; } - Log.Error("Can not load data table '{0}' from '{1}' with error message '{2}'.", ne.DataTableAssetName, ne.DataTableAssetName, ne.ErrorMessage); + Log.Error("Can not load data table '{0}' from '{1}' with error message '{2}'.", ne.DataTableAssetName, + ne.DataTableAssetName, ne.ErrorMessage); } private void OnLoadDictionarySuccess(object sender, GameEventArgs e) @@ -221,7 +215,8 @@ namespace Procedure return; } - Log.Error("Can not load dictionary '{0}' from '{1}' with error message '{2}'.", ne.DictionaryAssetName, ne.DictionaryAssetName, ne.ErrorMessage); + Log.Error("Can not load dictionary '{0}' from '{1}' with error message '{2}'.", ne.DictionaryAssetName, + ne.DictionaryAssetName, ne.ErrorMessage); } } } diff --git a/Assets/GameMain/Scripts/Procedure/SepCore.Procedure.asmdef b/Assets/GameMain/Scripts/Procedure/SepCore.Procedure.asmdef index 0d0989a..20884e3 100644 --- a/Assets/GameMain/Scripts/Procedure/SepCore.Procedure.asmdef +++ b/Assets/GameMain/Scripts/Procedure/SepCore.Procedure.asmdef @@ -2,11 +2,12 @@ "name": "SepCore.Procedure", "rootNamespace": "SepCore.Procedure", "references": [ + "GUID:6055be8ebefd69e48b49212b09b47b2f", + "GUID:f51ebe6a0ceec4240a699833d6309b23", "GUID:363c5eb08ff8e6a439b85e37b8c20d96", "GUID:47a82ffa13c291447ab895cd0bc251cd", - "GUID:0e1d182005e0ae647ab3fa40f5492dbb", - "GUID:6055be8ebefd69e48b49212b09b47b2f", - "GUID:f51ebe6a0ceec4240a699833d6309b23" + "GUID:436e23dbdc31e7d4fb5c3f804548b2df", + "GUID:0e1d182005e0ae647ab3fa40f5492dbb" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/GameMain/Scripts/Base/Entity.meta b/Assets/GameMain/Scripts/Runtime/Entity.meta similarity index 58% rename from Assets/GameMain/Scripts/Base/Entity.meta rename to Assets/GameMain/Scripts/Runtime/Entity.meta index 36c9fb3..b945078 100644 --- a/Assets/GameMain/Scripts/Base/Entity.meta +++ b/Assets/GameMain/Scripts/Runtime/Entity.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: f7c4b051e63f0c2418a55e8817bf4ba9 +guid: e185f5edf2aad9e47be7d8a4b4d04966 folderAsset: yes -timeCreated: 1528026151 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/AccessoryObjectData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/AccessoryObjectData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/AccessoryObjectData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/AccessoryObjectData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/CoinData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/CoinData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/CoinData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/CoinData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/EffectData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/EffectData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/EffectData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/EffectData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyData.cs similarity index 98% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyData.cs index d0ac94c..6920f43 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyData.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using SepCore.DataTable; using SepCore.Definition; using UnityEngine; +using UnityGameFramework.Runtime; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyProjectileData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyProjectileData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/EntityDataBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/EntityDataBase.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/EntityDataBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/EntityDataBase.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/ExpData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/ExpData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/ExpData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/ExpData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/PlayerData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/PlayerData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/PlayerData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/PlayerData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/TargetableObjectData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/TargetableObjectData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/TargetableObjectData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/TargetableObjectData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponHandgunData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponHandgunData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponKnifeData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponKnifeData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLanceData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLanceData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLanceData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLanceData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLightningData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLightningData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLightningData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponLightningData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponSlashData.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponSlashData.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponSlashData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityData/Weapon/WeaponSlashData.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta rename to Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs b/Assets/GameMain/Scripts/Runtime/PropItem.cs similarity index 96% rename from Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs rename to Assets/GameMain/Scripts/Runtime/PropItem.cs index 3b5ad4d..9fd0716 100644 --- a/Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs +++ b/Assets/GameMain/Scripts/Runtime/PropItem.cs @@ -1,6 +1,7 @@ using Components; +using Entity; +using Entity.EntityData; using SepCore.DataTable; -using SepCore.Definition; namespace SepCore.Definition { @@ -11,7 +12,7 @@ namespace SepCore.Definition public string IconAssetName { get; private set; } public ItemRarity Rarity { get; private set; } public StatModifier[] Modifiers => _modifiers; - + public PropItem(DRProp prop) { if (prop == null) return; @@ -53,4 +54,4 @@ namespace SepCore.Definition } } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs.meta b/Assets/GameMain/Scripts/Runtime/PropItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs.meta rename to Assets/GameMain/Scripts/Runtime/PropItem.cs.meta diff --git a/Assets/GameMain/Scripts/VampireLike.asmdef b/Assets/GameMain/Scripts/Runtime/SepCore.Runtime.asmdef similarity index 79% rename from Assets/GameMain/Scripts/VampireLike.asmdef rename to Assets/GameMain/Scripts/Runtime/SepCore.Runtime.asmdef index 123d699..18f3804 100644 --- a/Assets/GameMain/Scripts/VampireLike.asmdef +++ b/Assets/GameMain/Scripts/Runtime/SepCore.Runtime.asmdef @@ -1,16 +1,16 @@ { - "name": "VampireLike", - "rootNamespace": "", + "name": "SepCore.Runtime", + "rootNamespace": "SepCore.Runtime", "references": [ - "GUID:363c5eb08ff8e6a439b85e37b8c20d96", - "GUID:a2d8a19598eca814496b089021d08d60", - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:d8b63aba1907145bea998dd612889d6b", - "GUID:6055be8ebefd69e48b49212b09b47b2f", - "GUID:e0cd26848372d4e5c891c569017e11f1", "GUID:2665a8d13d1b3f18800f46e256720795", + "GUID:e0cd26848372d4e5c891c569017e11f1", + "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:363c5eb08ff8e6a439b85e37b8c20d96", + "GUID:d8b63aba1907145bea998dd612889d6b", + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:fca0f81bc71f1944887dd65f134c54a0", - "GUID:f51ebe6a0ceec4240a699833d6309b23" + "GUID:47a82ffa13c291447ab895cd0bc251cd" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/GameMain/Scripts/Runtime/SepCore.Runtime.asmdef.meta b/Assets/GameMain/Scripts/Runtime/SepCore.Runtime.asmdef.meta new file mode 100644 index 0000000..f19713d --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/SepCore.Runtime.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 436e23dbdc31e7d4fb5c3f804548b2df +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs index 58faa91..f7d4121 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs @@ -3,16 +3,20 @@ using UnityEngine; namespace SepCore.UI { + public enum ItemType + { + None, + Weapon, + Prop + } + public class DisplayItemInfoRawData { public int Index; - public string IconAssetName; - public string Title; - public string TypeText; + public object Data; + public ItemType ItemType; public ItemRarity Rarity; - public string Description; public int Price; - public bool IsWeapon; public Vector3 TargetPos; } } diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs index ea3e990..eb7ccbf 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs @@ -39,12 +39,9 @@ namespace SepCore.UI return new DisplayItemInfoRawData { - IconAssetName = weapon.WeaponData.IconAssetName, - Title = weapon.WeaponData.Title, - TypeText = "Weapon", - Description = ItemDescUtility.CreateWeaponDescription(weapon), + Data = weapon.WeaponData, + ItemType = ItemType.Weapon, Price = 0, - IsWeapon = true }; } @@ -62,12 +59,9 @@ namespace SepCore.UI return new DisplayItemInfoRawData { - IconAssetName = prop.IconAssetName, - Title = prop.Title, - TypeText = "Prop", - Description = ItemDescUtility.CreatePropDescription(prop), + Data = prop, + ItemType = ItemType.Prop, Price = 0, - IsWeapon = false }; } } diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs index 4c13e2b..e221347 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs @@ -1,15 +1,14 @@ using SepCore.Definition; using UnityEngine; +using UnityGameFramework.Runtime; namespace SepCore.UI { public class GoodsItemRawData { - public string Title; public ItemRarity Rarity; - public string Type; - public Sprite Icon; - public string Description; + public ItemType ItemType; public int Price; + public DataRowBase DataRow; } } diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs index 1be433b..000f786 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs @@ -182,36 +182,35 @@ namespace SepCore.UI DRProp drProp = _propDataTable.GetDataRow(drGoods.GoodsTypeId); if (drProp == null) { - Log.Warning($"ShopFormUseCase::BuildRandomGoodsItems: Missing DRProp, id = {drGoods.GoodsTypeId}"); + Log.Warning( + $"ShopFormUseCase::BuildRandomGoodsItems: Missing DRProp, id = {drGoods.GoodsTypeId}"); continue; } price = CalculateRandomizedPrice(drProp.Price, drProp.PriceRandomPercent); - goodsItem.Title = drProp.Title; - goodsItem.Type = "Prop"; + goodsItem.ItemType = ItemType.Prop; goodsItem.Rarity = drProp.Rarity; - GameEntry.SpriteCache.GetSprite(drProp.IconAssetName, sprite => goodsItem.Icon = sprite); - goodsItem.Description = ItemDescUtility.CreatePropDescription(drProp.Modifiers); + goodsItem.DataRow = drProp; } else if (drGoods.GoodsType == GoodsType.Weapon) { DRWeapon drWeapon = _weaponDataTable.GetDataRow(drGoods.GoodsTypeId); if (drWeapon == null) { - Log.Warning($"ShopFormUseCase::BuildRandomGoodsItems: Missing DRWeapon, id = {drGoods.GoodsTypeId}"); + Log.Warning( + $"ShopFormUseCase::BuildRandomGoodsItems: Missing DRWeapon, id = {drGoods.GoodsTypeId}"); continue; } price = CalculateRandomizedPrice(drWeapon.Price, drWeapon.PriceRandomPercent); - goodsItem.Title = drWeapon.Title; - goodsItem.Type = "Weapon"; + goodsItem.ItemType = ItemType.Weapon; goodsItem.Rarity = drWeapon.Rarity; - GameEntry.SpriteCache.GetSprite(drWeapon.IconAssetName, sprite => goodsItem.Icon = sprite); - goodsItem.Description = ItemDescUtility.CreateWeaponDescription(drWeapon); + goodsItem.DataRow = drWeapon; } else { - Log.Warning($"ShopFormUseCase::BuildRandomGoodsItems: Unsupported goods type = {drGoods.GoodsType}"); + Log.Warning( + $"ShopFormUseCase::BuildRandomGoodsItems: Unsupported goods type = {drGoods.GoodsType}"); continue; } diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/MenuForm.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/MenuForm.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/MenuRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/MenuForm/MenuRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/MenuRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/MenuForm/MenuRawData.cs diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/MenuRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/MenuForm/MenuRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/MenuRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/MenuForm/MenuRawData.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/Utility.meta b/Assets/GameMain/Scripts/Runtime/Utility.meta new file mode 100644 index 0000000..946219a --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Utility.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 022c5e621edaa7c4f8e7fdd5471fcca8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Base/Utility/AIUtility.cs b/Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/Utility/AIUtility.cs rename to Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs diff --git a/Assets/GameMain/Scripts/Base/Utility/AIUtility.cs.meta b/Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Utility/AIUtility.cs.meta rename to Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs.meta diff --git a/Assets/Tests/Simulation/EditMode/Simulation.EditModeTests.asmdef b/Assets/Tests/Simulation/EditMode/Simulation.EditModeTests.asmdef index eeb62c7..4644cad 100644 --- a/Assets/Tests/Simulation/EditMode/Simulation.EditModeTests.asmdef +++ b/Assets/Tests/Simulation/EditMode/Simulation.EditModeTests.asmdef @@ -5,7 +5,8 @@ "UnityGameFramework.Runtime", "UnityEngine.TestRunner", "UnityEditor.TestRunner", - "VampireLike" + "SepCore.Runtime", + "SepCore.Base" ], "includePlatforms": [ "Editor" @@ -23,4 +24,4 @@ ], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file diff --git a/Assets/Tests/Simulation/PlayMode/Simulation.PlayModeTests.asmdef b/Assets/Tests/Simulation/PlayMode/Simulation.PlayModeTests.asmdef index 9079655..85eefd6 100644 --- a/Assets/Tests/Simulation/PlayMode/Simulation.PlayModeTests.asmdef +++ b/Assets/Tests/Simulation/PlayMode/Simulation.PlayModeTests.asmdef @@ -5,7 +5,8 @@ "UnityGameFramework.Runtime", "UnityEngine.TestRunner", "UnityEditor.TestRunner", - "VampireLike" + "SepCore.Runtime", + "SepCore.Base" ], "includePlatforms": [], "excludePlatforms": [], @@ -21,4 +22,4 @@ ], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file