diff --git a/Assets/GameMain/Configs/ResourceBuilder.xml b/Assets/GameMain/Configs/ResourceBuilder.xml index fb32177..8c08148 100644 --- a/Assets/GameMain/Configs/ResourceBuilder.xml +++ b/Assets/GameMain/Configs/ResourceBuilder.xml @@ -3,7 +3,7 @@ 1 - 1 + 33 1 UnityGameFramework.Runtime.DefaultCompressionHelper False diff --git a/Assets/GameMain/Scripts/Base.meta b/Assets/GameMain/Scripts/Base.meta index b1937fd..175a91c 100644 --- a/Assets/GameMain/Scripts/Base.meta +++ b/Assets/GameMain/Scripts/Base.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: edd16bf2e418bec43bc774c7fc6c60d6 +guid: 5ed0f22b675178e488a2cc585b6f78cb folderAsset: yes -timeCreated: 1528026145 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GameMain/Scripts/DataTable.meta b/Assets/GameMain/Scripts/Base/DataTable.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable.meta rename to Assets/GameMain/Scripts/Base/DataTable.meta diff --git a/Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs b/Assets/GameMain/Scripts/Base/DataTable/BinaryReaderExtension.cs similarity index 84% rename from Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs rename to Assets/GameMain/Scripts/Base/DataTable/BinaryReaderExtension.cs index 585d668..edf3917 100644 --- a/Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/BinaryReaderExtension.cs @@ -1,15 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using System; +using System; using System.IO; using UnityEngine; -namespace DataTable +namespace SepCore.DataTable { public static class BinaryReaderExtension { diff --git a/Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/BinaryReaderExtension.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/BinaryReaderExtension.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRBullet.cs b/Assets/GameMain/Scripts/Base/DataTable/DRBullet.cs similarity index 97% rename from Assets/GameMain/Scripts/DataTable/DRBullet.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRBullet.cs index 7c28a39..0575a4c 100644 --- a/Assets/GameMain/Scripts/DataTable/DRBullet.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRBullet.cs @@ -1,6 +1,6 @@ using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// Bullet config table. diff --git a/Assets/GameMain/Scripts/DataTable/DRBullet.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRBullet.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRBullet.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRBullet.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DREnemy.cs b/Assets/GameMain/Scripts/Base/DataTable/DREnemy.cs similarity index 99% rename from Assets/GameMain/Scripts/DataTable/DREnemy.cs rename to Assets/GameMain/Scripts/Base/DataTable/DREnemy.cs index 9b363d5..7e99a7b 100644 --- a/Assets/GameMain/Scripts/DataTable/DREnemy.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DREnemy.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public class DREnemy : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DREnemy.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DREnemy.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DREnemy.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DREnemy.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DREntity.cs b/Assets/GameMain/Scripts/Base/DataTable/DREntity.cs similarity index 78% rename from Assets/GameMain/Scripts/DataTable/DREntity.cs rename to Assets/GameMain/Scripts/Base/DataTable/DREntity.cs index ddf817e..73cb233 100644 --- a/Assets/GameMain/Scripts/DataTable/DREntity.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DREntity.cs @@ -1,18 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.576 -//------------------------------------------------------------ - -using System.IO; +using System.IO; using System.Text; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 实体表。 @@ -71,4 +61,4 @@ namespace DataTable { } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DREntity.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DREntity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DREntity.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DREntity.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRGoods.cs b/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs similarity index 94% rename from Assets/GameMain/Scripts/DataTable/DRGoods.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs index b756d57..c2bd17e 100644 --- a/Assets/GameMain/Scripts/DataTable/DRGoods.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs @@ -1,8 +1,8 @@ -using Definition.Enum; +using SepCore.Definition; using CustomUtility; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public class DRGoods : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRGoods.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRGoods.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRLevel.cs b/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs similarity index 98% rename from Assets/GameMain/Scripts/DataTable/DRLevel.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs index 313b550..e7369da 100644 --- a/Assets/GameMain/Scripts/DataTable/DRLevel.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs @@ -1,9 +1,9 @@ using System; using CustomUtility; -using Definition.Enum; +using SepCore.Definition; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public class DRLevel : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRLevel.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRLevel.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelRarity.cs b/Assets/GameMain/Scripts/Base/DataTable/DRLevelRarity.cs similarity index 97% rename from Assets/GameMain/Scripts/DataTable/DRLevelRarity.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRLevelRarity.cs index 90e7e97..1da0178 100644 --- a/Assets/GameMain/Scripts/DataTable/DRLevelRarity.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRLevelRarity.cs @@ -1,6 +1,6 @@ using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public class DRLevelRarity : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelRarity.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRLevelRarity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRLevelRarity.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRLevelRarity.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs b/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs similarity index 93% rename from Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs index fc13db0..c0e9e25 100644 --- a/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs @@ -1,10 +1,9 @@ -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Newtonsoft.Json; using CustomUtility; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public class DRLevelUpReward : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRMusic.cs b/Assets/GameMain/Scripts/Base/DataTable/DRMusic.cs similarity index 75% rename from Assets/GameMain/Scripts/DataTable/DRMusic.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRMusic.cs index a9b5baa..405e97a 100644 --- a/Assets/GameMain/Scripts/DataTable/DRMusic.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRMusic.cs @@ -1,22 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.591 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Text; -using UnityEngine; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 音乐配置表。 @@ -75,4 +61,4 @@ namespace DataTable { } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DRMusic.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRMusic.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRMusic.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRMusic.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRProp.cs b/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs similarity index 94% rename from Assets/GameMain/Scripts/DataTable/DRProp.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRProp.cs index 8acbf83..6d168da 100644 --- a/Assets/GameMain/Scripts/DataTable/DRProp.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs @@ -1,10 +1,9 @@ -using Definition.DataStruct; +using SepCore.Definition; using Newtonsoft.Json; using CustomUtility; using UnityGameFramework.Runtime; -using Definition.Enum; -namespace DataTable +namespace SepCore.DataTable { public class DRProp : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRProp.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRProp.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRProp.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRRole.cs b/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs similarity index 98% rename from Assets/GameMain/Scripts/DataTable/DRRole.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRRole.cs index cd2ff19..a9ae37c 100644 --- a/Assets/GameMain/Scripts/DataTable/DRRole.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs @@ -2,13 +2,12 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using GameFramework; using StarForce; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public class DRRole : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRRole.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRRole.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRRole.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRScene.cs b/Assets/GameMain/Scripts/Base/DataTable/DRScene.cs similarity index 80% rename from Assets/GameMain/Scripts/DataTable/DRScene.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRScene.cs index 3376c04..1f43df3 100644 --- a/Assets/GameMain/Scripts/DataTable/DRScene.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRScene.cs @@ -1,18 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.610 -//------------------------------------------------------------ - -using System.IO; +using System.IO; using System.Text; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 场景配置表。 @@ -78,4 +68,4 @@ namespace DataTable { } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DRScene.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRScene.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRScene.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRScene.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRSound.cs b/Assets/GameMain/Scripts/Base/DataTable/DRSound.cs similarity index 84% rename from Assets/GameMain/Scripts/DataTable/DRSound.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRSound.cs index 5e999cd..681bfba 100644 --- a/Assets/GameMain/Scripts/DataTable/DRSound.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRSound.cs @@ -1,22 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.625 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Text; -using UnityEngine; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 声音配置表。 @@ -110,4 +96,4 @@ namespace DataTable { } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DRSound.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRSound.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRSound.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRSound.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRUIForm.cs b/Assets/GameMain/Scripts/Base/DataTable/DRUIForm.cs similarity index 81% rename from Assets/GameMain/Scripts/DataTable/DRUIForm.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRUIForm.cs index 80dc89d..3b4f6e7 100644 --- a/Assets/GameMain/Scripts/DataTable/DRUIForm.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRUIForm.cs @@ -1,22 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.652 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Text; -using UnityEngine; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 界面配置表。 @@ -96,4 +82,4 @@ namespace DataTable { } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DRUIForm.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRUIForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRUIForm.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRUIForm.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRUISound.cs b/Assets/GameMain/Scripts/Base/DataTable/DRUISound.cs similarity index 79% rename from Assets/GameMain/Scripts/DataTable/DRUISound.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRUISound.cs index 2c9557a..ee24f6a 100644 --- a/Assets/GameMain/Scripts/DataTable/DRUISound.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRUISound.cs @@ -1,22 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.666 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Text; -using UnityEngine; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 声音配置表。 @@ -89,4 +75,4 @@ namespace DataTable { } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DRUISound.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRUISound.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRUISound.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRUISound.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRWeapon.cs b/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs similarity index 98% rename from Assets/GameMain/Scripts/DataTable/DRWeapon.cs rename to Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs index b2346c1..621b438 100644 --- a/Assets/GameMain/Scripts/DataTable/DRWeapon.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using GameFramework; using CustomUtility; using Newtonsoft.Json.Linq; -using UnityEngine; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { /// /// 武器表。 diff --git a/Assets/GameMain/Scripts/DataTable/DRWeapon.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRWeapon.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs b/Assets/GameMain/Scripts/Base/DataTable/DataTableExtension.cs similarity index 89% rename from Assets/GameMain/Scripts/DataTable/DataTableExtension.cs rename to Assets/GameMain/Scripts/Base/DataTable/DataTableExtension.cs index e5c348c..659fea3 100644 --- a/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DataTableExtension.cs @@ -1,21 +1,14 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using GameFramework.DataTable; +using GameFramework.DataTable; using System; -using Definition; +using SepCore.Definition; using UnityEngine; using UnityGameFramework.Runtime; -namespace DataTable +namespace SepCore.DataTable { public static class DataTableExtension { - private const string DataRowClassPrefixName = "DataTable.DR"; + private const string DataRowClassPrefixName = "SepCore.DataTable.DR"; internal static readonly char[] DataSplitSeparators = new char[] { '\t' }; internal static readonly char[] DataTrimSeparators = new char[] { '\"' }; @@ -101,4 +94,4 @@ namespace DataTable return dataTableComponent.GetDataTable().GetDataRow(id); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs.meta b/Assets/GameMain/Scripts/Base/DataTable/DataTableExtension.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DataTableExtension.cs.meta rename to Assets/GameMain/Scripts/Base/DataTable/DataTableExtension.cs.meta diff --git a/Assets/GameMain/Scripts/Definition.meta b/Assets/GameMain/Scripts/Base/Definition.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition.meta rename to Assets/GameMain/Scripts/Base/Definition.meta diff --git a/Assets/GameMain/Scripts/Definition/Constant.meta b/Assets/GameMain/Scripts/Base/Definition/Constant.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Constant.meta rename to Assets/GameMain/Scripts/Base/Definition/Constant.meta diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.AssetPriority.cs b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.AssetPriority.cs similarity index 97% rename from Assets/GameMain/Scripts/Definition/Constant/Constant.AssetPriority.cs rename to Assets/GameMain/Scripts/Base/Definition/Constant/Constant.AssetPriority.cs index 6c863b6..1450cb5 100644 --- a/Assets/GameMain/Scripts/Definition/Constant/Constant.AssetPriority.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.AssetPriority.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition +namespace SepCore.Definition { public static partial class Constant { diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.AssetPriority.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.AssetPriority.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Constant/Constant.AssetPriority.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Constant/Constant.AssetPriority.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.Layer.cs b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Layer.cs similarity index 97% rename from Assets/GameMain/Scripts/Definition/Constant/Constant.Layer.cs rename to Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Layer.cs index 3f89d5b..8698f46 100644 --- a/Assets/GameMain/Scripts/Definition/Constant/Constant.Layer.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Layer.cs @@ -7,7 +7,7 @@ using UnityEngine; -namespace Definition +namespace SepCore.Definition { public static partial class Constant { diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.Layer.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Layer.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Constant/Constant.Layer.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Layer.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Setting.cs similarity index 97% rename from Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs rename to Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Setting.cs index 1595633..0286ae9 100644 --- a/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Setting.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition +namespace SepCore.Definition { public static partial class Constant { diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Setting.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Constant/Constant.Setting.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/BuildInfo.cs similarity index 96% rename from Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/BuildInfo.cs index 4b4b639..3601bb3 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/BuildInfo.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition.DataStruct +namespace SepCore.Definition { public class BuildInfo { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct/BuildInfo.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/BuildInfo.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/ImpactData.cs similarity index 94% rename from Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/ImpactData.cs index 2145c8b..1eac60c 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/ImpactData.cs @@ -6,9 +6,9 @@ //------------------------------------------------------------ using System.Runtime.InteropServices; -using Definition.Enum; +using SepCore.Definition; -namespace Definition.DataStruct +namespace SepCore.Definition { [StructLayout(LayoutKind.Auto)] public struct ImpactData diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct/ImpactData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/ImpactData.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs similarity index 94% rename from Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs index 848ae40..3b5ad4d 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs @@ -1,8 +1,8 @@ using Components; -using DataTable; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; -namespace Definition.DataStruct +namespace SepCore.Definition { public class PropItem { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/PropItem.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/StatModifier.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs similarity index 97% rename from Assets/GameMain/Scripts/Definition/DataStruct/StatModifier.cs rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs index f32996f..662f130 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/StatModifier.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs @@ -1,9 +1,9 @@ using System; -using Definition.Enum; +using SepCore.Definition; using CustomUtility; using UnityGameFramework.Runtime; -namespace Definition.DataStruct +namespace SepCore.Definition { public class StatModifier { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/StatModifier.cs.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct/StatModifier.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/StatProperty.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatProperty.cs similarity index 91% rename from Assets/GameMain/Scripts/Definition/DataStruct/StatProperty.cs rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/StatProperty.cs index 86b8dc5..4f8fddf 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/StatProperty.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatProperty.cs @@ -1,4 +1,4 @@ -namespace Definition.DataStruct +namespace SepCore.Definition { public class StatProperty { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/StatProperty.cs.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatProperty.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct/StatProperty.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/StatProperty.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/VersionInfo.cs similarity index 97% rename from Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/VersionInfo.cs index 3bbb374..e567855 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/VersionInfo.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition.DataStruct +namespace SepCore.Definition { public class VersionInfo { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs.meta b/Assets/GameMain/Scripts/Base/Definition/DataStruct/VersionInfo.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/DataStruct/VersionInfo.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum.meta b/Assets/GameMain/Scripts/Base/Definition/Enum.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/BulletType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/BulletType.cs similarity index 76% rename from Assets/GameMain/Scripts/Definition/Enum/BulletType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/BulletType.cs index dd9d5c0..fdb0b29 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/BulletType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/BulletType.cs @@ -1,4 +1,4 @@ -namespace Definition.Enum +namespace SepCore.Definition { public enum BulletType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/BulletType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/BulletType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/BulletType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/BulletType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/CampType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/CampType.cs similarity index 97% rename from Assets/GameMain/Scripts/Definition/Enum/CampType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/CampType.cs index 4f11a14..9c8bb6f 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/CampType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/CampType.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition.Enum +namespace SepCore.Definition { /// /// 阵营类型。 diff --git a/Assets/GameMain/Scripts/Definition/Enum/CampType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/CampType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/CampType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/CampType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/EnemyType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/EnemyType.cs similarity index 79% rename from Assets/GameMain/Scripts/Definition/Enum/EnemyType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/EnemyType.cs index 178aa38..97c9597 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/EnemyType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/EnemyType.cs @@ -1,4 +1,4 @@ -namespace Definition.Enum +namespace SepCore.Definition { public enum EnemyType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/EnemyType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/EnemyType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/EnemyType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/EnemyType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/GoodsType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/GoodsType.cs similarity index 74% rename from Assets/GameMain/Scripts/Definition/Enum/GoodsType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/GoodsType.cs index 01e26a7..61d4e7f 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/GoodsType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/GoodsType.cs @@ -1,4 +1,4 @@ -namespace Definition.Enum +namespace SepCore.Definition { public enum GoodsType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/GoodsType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/GoodsType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/GoodsType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/GoodsType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/ItemRarity.cs similarity index 81% rename from Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/ItemRarity.cs index b2c956f..cf4104a 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/ItemRarity.cs @@ -1,4 +1,4 @@ -namespace Definition.Enum +namespace SepCore.Definition { public enum ItemRarity { diff --git a/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/ItemRarity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/ItemRarity.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/RelationType.cs similarity index 96% rename from Assets/GameMain/Scripts/Definition/Enum/RelationType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/RelationType.cs index 5cc60d2..16c9525 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/RelationType.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition.Enum +namespace SepCore.Definition { /// /// 关系类型。 diff --git a/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/RelationType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/RelationType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/RelationType.cs.meta diff --git a/Assets/GameMain/Scripts/Scene/SceneId.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/SceneId.cs similarity index 83% rename from Assets/GameMain/Scripts/Scene/SceneId.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/SceneId.cs index 3432e36..178a8e2 100644 --- a/Assets/GameMain/Scripts/Scene/SceneId.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/SceneId.cs @@ -1,4 +1,4 @@ -namespace Scene +namespace SepCore.Definition { public enum SceneId : byte { diff --git a/Assets/GameMain/Scripts/Scene/SceneId.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/SceneId.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Scene/SceneId.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/SceneId.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/StatType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/StatType.cs similarity index 90% rename from Assets/GameMain/Scripts/Definition/Enum/StatType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/StatType.cs index b1e5961..921a994 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/StatType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/StatType.cs @@ -1,4 +1,4 @@ -namespace Definition.Enum +namespace SepCore.Definition { public enum StatType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/StatType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/StatType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/StatType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/StatType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs similarity index 98% rename from Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs index 369f906..1003b46 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Definition.Enum +namespace SepCore.Definition { /// /// 界面编号。 diff --git a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/WeaponType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/WeaponType.cs similarity index 87% rename from Assets/GameMain/Scripts/Definition/Enum/WeaponType.cs rename to Assets/GameMain/Scripts/Base/Definition/Enum/WeaponType.cs index cddd437..d0e59a0 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/WeaponType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/WeaponType.cs @@ -1,4 +1,4 @@ -namespace Definition.Enum +namespace SepCore.Definition { public enum WeaponType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/WeaponType.cs.meta b/Assets/GameMain/Scripts/Base/Definition/Enum/WeaponType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Definition/Enum/WeaponType.cs.meta rename to Assets/GameMain/Scripts/Base/Definition/Enum/WeaponType.cs.meta diff --git a/Assets/GameMain/Scripts/Entity.meta b/Assets/GameMain/Scripts/Base/Entity.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity.meta rename to Assets/GameMain/Scripts/Base/Entity.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/AccessoryObjectData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs similarity index 97% rename from Assets/GameMain/Scripts/Entity/EntityData/AccessoryObjectData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs index d5ef467..75143d3 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/AccessoryObjectData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs @@ -6,7 +6,7 @@ //------------------------------------------------------------ using System; -using Definition.Enum; +using SepCore.Definition; using StarForce; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityData/AccessoryObjectData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/AccessoryObjectData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/CoinData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/CoinData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityData/CoinData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/CoinData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/EffectData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/EffectData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityData/EffectData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/EffectData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Enemy.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Enemy.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs similarity index 97% rename from Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs index 490eb8c..d0ac94c 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using DataTable; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using UnityEngine; namespace Entity.EntityData diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs similarity index 96% rename from Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs index 317ba53..caf4cc3 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs @@ -1,5 +1,5 @@ using System; -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace Entity.EntityData diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/EntityDataBase.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/EntityDataBase.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityData/EntityDataBase.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/EntityDataBase.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/ExpData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/ExpData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityData/ExpData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/ExpData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/PlayerData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs similarity index 87% rename from Assets/GameMain/Scripts/Entity/EntityData/PlayerData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs index 4e21221..d114df4 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/PlayerData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs @@ -1,6 +1,6 @@ using System; -using DataTable; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Entity/EntityData/PlayerData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/PlayerData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/TargetableObjectData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs similarity index 97% rename from Assets/GameMain/Scripts/Entity/EntityData/TargetableObjectData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs index bc5334b..071d3fb 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/TargetableObjectData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs @@ -6,7 +6,7 @@ //------------------------------------------------------------ using System; -using Definition.Enum; +using SepCore.Definition; using StarForce; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityData/TargetableObjectData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/TargetableObjectData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs similarity index 97% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs index 4483584..8a5e400 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using DataTable; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using GameFramework; namespace Entity.EntityData diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponHandgunData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs similarity index 94% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponHandgunData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs index c47c6ee..9f83cb9 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponHandgunData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs @@ -1,5 +1,5 @@ using System; -using Definition.Enum; +using SepCore.Definition; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponKnifeData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs similarity index 95% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponKnifeData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs index 4fcf4bf..582f0f3 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponKnifeData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs @@ -1,5 +1,5 @@ using System; -using Definition.Enum; +using SepCore.Definition; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLanceData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs similarity index 98% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLanceData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs index b3183c1..937a5cf 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLanceData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs @@ -1,5 +1,5 @@ using System; -using Definition.Enum; +using SepCore.Definition; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLanceData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLanceData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs similarity index 95% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs index abe5a03..4052f94 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs @@ -1,5 +1,5 @@ using System; -using Definition.Enum; +using SepCore.Definition; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponSlashData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs similarity index 95% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponSlashData.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs index f500788..128e0fd 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponSlashData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs @@ -1,5 +1,5 @@ using System; -using Definition.Enum; +using SepCore.Definition; namespace Entity.EntityData { diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponSlashData.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponSlashData.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityExtension.cs b/Assets/GameMain/Scripts/Base/Entity/EntityExtension.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityExtension.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityExtension.cs index 265e965..e936e0c 100644 --- a/Assets/GameMain/Scripts/Entity/EntityExtension.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityExtension.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Definition; +using SepCore.Definition; using Entity.EntityData; using UnityGameFramework.Runtime; -using DataTable; +using SepCore.DataTable; using CustomUtility; namespace Entity diff --git a/Assets/GameMain/Scripts/Entity/EntityExtension.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityExtension.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityExtension.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityExtension.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/CoinEntity.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/CoinEntity.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/CoinEntity.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/CoinEntity.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/CoinEntity.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Effect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Effect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Effect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Effect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Effect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyBase.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs similarity index 90% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyBase.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs index 86c9e9d..5cf78d1 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyBase.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs @@ -1,4 +1,4 @@ -using Definition.DataStruct; +using SepCore.Definition; using Entity; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyBase.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyBase.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyBase.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyProjectile.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs similarity index 98% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyProjectile.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs index f3711e1..4f0f701 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyProjectile.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs @@ -1,5 +1,4 @@ -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity.EntityData; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/EnemyProjectile.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/MeleeEnemy.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/MeleeEnemy.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs index 9812a2a..d05c656 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/MeleeEnemy.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs @@ -1,7 +1,6 @@ using Components; using CustomUtility; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity.EntityData; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/MeleeEnemy.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/RemoteEnemy.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/RemoteEnemy.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs index 479c223..c6769d9 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/RemoteEnemy.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs @@ -1,7 +1,6 @@ using Components; using CustomUtility; -using Definition; -using Definition.DataStruct; +using SepCore.Definition; using Entity.EntityData; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Enemy/RemoteEnemy.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/EntityBase.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/EntityBase.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/EntityBase.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/EntityBase.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/EntityBase.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/ExpEntity.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/ExpEntity.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/ExpEntity.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/ExpEntity.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/ExpEntity.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs index 331cbd5..9b3a28f 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using Components; using CustomEvent; -using DataTable; -using Definition.DataStruct; +using SepCore.DataTable; +using SepCore.Definition; using Entity.EntityData; using GameFramework.Event; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/TargetableObject.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs similarity index 98% rename from Assets/GameMain/Scripts/Entity/EntityLogic/TargetableObject.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs index 83d71b3..ba0be15 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/TargetableObject.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs @@ -6,7 +6,7 @@ //------------------------------------------------------------ using Components; -using Definition.DataStruct; +using SepCore.Definition; using Entity.EntityData; using CustomUtility; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/TargetableObject.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/TargetableObject.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/TargetableObject.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs similarity index 98% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs index 1277ffe..ced3d90 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Components; -using Definition.Enum; +using SepCore.Definition; using CustomUtility; namespace Entity.Weapon diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs index 0f67bd6..2e31515 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Components; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity.EntityData; using GameFramework; using CustomUtility; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponBase.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs index 22bd47d..01449a8 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs @@ -1,5 +1,4 @@ -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity.EntityData; using CustomUtility; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs index 6458605..192c941 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using CustomUtility; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using DG.Tweening; using Entity.EntityData; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs index ddf076f..ded1556 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using Components; using CustomUtility; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using DG.Tweening; using Entity.EntityData; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs index 746a343..fc71bda 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using CustomUtility; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using DG.Tweening; using Entity.EntityData; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs.meta diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs similarity index 99% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs index 53c0d35..ade5929 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using DG.Tweening; using Entity.EntityData; using CustomUtility; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta rename to Assets/GameMain/Scripts/Base/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs.meta diff --git a/Assets/GameMain/Scripts/Event.meta b/Assets/GameMain/Scripts/Base/Event.meta similarity index 100% rename from Assets/GameMain/Scripts/Event.meta rename to Assets/GameMain/Scripts/Base/Event.meta diff --git a/Assets/GameMain/Scripts/Event/Combat.meta b/Assets/GameMain/Scripts/Base/Event/Combat.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Combat.meta rename to Assets/GameMain/Scripts/Base/Event/Combat.meta diff --git a/Assets/GameMain/Scripts/Event/Combat/ProjectileHitPresentationEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Combat/ProjectileHitPresentationEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Combat/ProjectileHitPresentationEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Combat/ProjectileHitPresentationEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/DisplayItemInfoHideEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/DisplayItemInfoHideEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/DisplayItemInfoHideEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/DisplayItemInfoHideEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/DisplayItemInfoLockEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/DisplayItemInfoLockEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/DisplayItemInfoLockEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/DisplayItemInfoLockEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/LevelProcessEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelProcessEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/LevelProcessEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelProcessEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/LevelUp.meta b/Assets/GameMain/Scripts/Base/Event/LevelUp.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelUp.meta rename to Assets/GameMain/Scripts/Base/Event/LevelUp.meta diff --git a/Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu.meta b/Assets/GameMain/Scripts/Base/Event/Menu.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu.meta rename to Assets/GameMain/Scripts/Base/Event/Menu.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Player.meta b/Assets/GameMain/Scripts/Base/Event/Player.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Player.meta rename to Assets/GameMain/Scripts/Base/Event/Player.meta diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerCoinChangeEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerCoinChangeEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerCoinChangeEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerCoinChangeEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerExpChangeEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerExpChangeEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerExpChangeEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerExpChangeEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerHealthChangeEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerHealthChangeEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerHealthChangeEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerHealthChangeEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerLevelUpEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerLevelUpEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Player/PlayerLevelUpEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Player/PlayerLevelUpEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/RefreshEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/RefreshEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/RefreshEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/RefreshEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Shop.meta b/Assets/GameMain/Scripts/Base/Event/Shop.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop.meta rename to Assets/GameMain/Scripts/Base/Event/Shop.meta diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopContinueEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopContinueEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopContinueEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopContinueEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopPurchaseEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopPurchaseEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopPurchaseEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopPurchaseEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopWeaponRecycleEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopWeaponRecycleEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopWeaponRecycleEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopWeaponRecycleEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Utility.meta b/Assets/GameMain/Scripts/Base/Utility.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility.meta rename to Assets/GameMain/Scripts/Base/Utility.meta diff --git a/Assets/GameMain/Scripts/Utility/AIUtility.cs b/Assets/GameMain/Scripts/Base/Utility/AIUtility.cs similarity index 99% rename from Assets/GameMain/Scripts/Utility/AIUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/AIUtility.cs index c118872..8aa8df8 100644 --- a/Assets/GameMain/Scripts/Utility/AIUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/AIUtility.cs @@ -8,8 +8,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity; using Entity.Weapon; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Utility/AIUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/AIUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/AIUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/AIUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/AssetUtility.cs b/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs similarity index 100% rename from Assets/GameMain/Scripts/Utility/AssetUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs diff --git a/Assets/GameMain/Scripts/Utility/AssetUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/AssetUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/EnumUtility.cs b/Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs similarity index 100% rename from Assets/GameMain/Scripts/Utility/EnumUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs diff --git a/Assets/GameMain/Scripts/Utility/EnumUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/EnumUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs b/Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs similarity index 98% rename from Assets/GameMain/Scripts/Utility/ItemDescUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs index 3a416ea..0eea2c2 100644 --- a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text; -using DataTable; -using Definition.DataStruct; +using SepCore.DataTable; +using SepCore.Definition; using Entity.EntityData; using Entity.Weapon; using System; diff --git a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/ItemDescUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/ItemDescUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/JsonNetUtility.cs b/Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs similarity index 100% rename from Assets/GameMain/Scripts/Utility/JsonNetUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs diff --git a/Assets/GameMain/Scripts/Utility/JsonNetUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/JsonNetUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/RarityUtility.cs b/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs similarity index 98% rename from Assets/GameMain/Scripts/Utility/RarityUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs index 962929f..d183948 100644 --- a/Assets/GameMain/Scripts/Utility/RarityUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs @@ -1,5 +1,5 @@ -using DataTable; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using GameFramework.DataTable; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Utility/RarityUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/RarityUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/WebUtility.cs b/Assets/GameMain/Scripts/Base/Utility/WebUtility.cs similarity index 100% rename from Assets/GameMain/Scripts/Utility/WebUtility.cs rename to Assets/GameMain/Scripts/Base/Utility/WebUtility.cs diff --git a/Assets/GameMain/Scripts/Utility/WebUtility.cs.meta b/Assets/GameMain/Scripts/Base/Utility/WebUtility.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Utility/WebUtility.cs.meta rename to Assets/GameMain/Scripts/Base/Utility/WebUtility.cs.meta diff --git a/Assets/GameMain/Scripts/Editor/AutoRefreshToggle.cs b/Assets/GameMain/Scripts/Editor/AutoRefreshToggle.cs new file mode 100644 index 0000000..6928492 --- /dev/null +++ b/Assets/GameMain/Scripts/Editor/AutoRefreshToggle.cs @@ -0,0 +1,26 @@ +using UnityEditor; + +namespace SepCore.Editor +{ + public static class AutoRefreshToggle + { + private const string MenuPrefix = "Tools/Auto Refresh/"; + + [MenuItem(MenuPrefix + "Disable Auto Refresh &c", false, 1)] + public static void DisableAutoRefresh() + { + AssetDatabase.DisallowAutoRefresh(); + EditorApplication.LockReloadAssemblies(); + EditorUtility.DisplayDialog("Auto Refresh", "Auto refresh and assembly reload locked.", "OK"); + } + + [MenuItem(MenuPrefix + "Enable Auto Refresh &v", false, 2)] + public static void EnableAutoRefresh() + { + AssetDatabase.AllowAutoRefresh(); + EditorApplication.UnlockReloadAssemblies(); + AssetDatabase.Refresh(); + EditorUtility.DisplayDialog("Auto Refresh", "Auto refresh and assembly reload enabled. Compiling now...", "OK"); + } + } +} diff --git a/Assets/GameMain/Scripts/Scene/ScrollableBackground.cs.meta b/Assets/GameMain/Scripts/Editor/AutoRefreshToggle.cs.meta similarity index 69% rename from Assets/GameMain/Scripts/Scene/ScrollableBackground.cs.meta rename to Assets/GameMain/Scripts/Editor/AutoRefreshToggle.cs.meta index d866ab9..b890e94 100644 --- a/Assets/GameMain/Scripts/Scene/ScrollableBackground.cs.meta +++ b/Assets/GameMain/Scripts/Editor/AutoRefreshToggle.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 2712544bc58b0e44aa9df7e58e01e5c5 -timeCreated: 1528026159 -licenseType: Pro +guid: 4d7640161aee71a4babe3604ff15a257 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs similarity index 98% rename from Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs rename to Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs index b1632bb..5ec354d 100644 --- a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs +++ b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using Definition; +using SepCore.Definition; using GameFramework.Debugger; using GameFramework.Localization; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs.meta b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs.meta rename to Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs.meta diff --git a/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs b/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs index e6f6210..bcb76cc 100644 --- a/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs +++ b/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs @@ -2,8 +2,8 @@ using System; using System.Linq; using CustomComponent; -using DataTable; -using Definition.DataStruct; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using CustomUtility; using Procedure; diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller.meta b/Assets/GameMain/Scripts/Presentation.meta similarity index 77% rename from Assets/GameMain/Scripts/UI/GameScene/Controller.meta rename to Assets/GameMain/Scripts/Presentation.meta index db5f445..e9fe0de 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller.meta +++ b/Assets/GameMain/Scripts/Presentation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d69a94fcc50f4c4ca1dc45e4338560e +guid: aa567cf3c18d97d43bee96585785c483 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData.meta b/Assets/GameMain/Scripts/Presentation/Common.meta similarity index 77% rename from Assets/GameMain/Scripts/UI/GameScene/RawData.meta rename to Assets/GameMain/Scripts/Presentation/Common.meta index dfe9b44..b20b5bb 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/RawData.meta +++ b/Assets/GameMain/Scripts/Presentation/Common.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac5b4f32ba8b93e4f93b94bc402245bd +guid: 58e094ce046a9bd4fa6efb22497af70f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase.meta b/Assets/GameMain/Scripts/Presentation/Common/AboutForm.meta similarity index 77% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase.meta rename to Assets/GameMain/Scripts/Presentation/Common/AboutForm.meta index 6f51431..b63f8f1 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/UseCase.meta +++ b/Assets/GameMain/Scripts/Presentation/Common/AboutForm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 134aefa2f7839e641b5824d665cbb8ef +guid: 3de11b75970e21e47961778ef728a4cb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameMain/Scripts/UI/AboutForm.cs b/Assets/GameMain/Scripts/Presentation/Common/AboutForm/AboutForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/AboutForm.cs rename to Assets/GameMain/Scripts/Presentation/Common/AboutForm/AboutForm.cs diff --git a/Assets/GameMain/Scripts/UI/AboutForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/AboutForm/AboutForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/AboutForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/AboutForm/AboutForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General/Context.meta b/Assets/GameMain/Scripts/Presentation/Common/Context.meta similarity index 77% rename from Assets/GameMain/Scripts/UI/General/Context.meta rename to Assets/GameMain/Scripts/Presentation/Common/Context.meta index 4349b39..a1725e4 100644 --- a/Assets/GameMain/Scripts/UI/General/Context.meta +++ b/Assets/GameMain/Scripts/Presentation/Common/Context.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96db679da2f373f40aed4ad29967aede +guid: 2b9ea0ac3213e6b4da166ad0aebc8ad4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs b/Assets/GameMain/Scripts/Presentation/Common/Context/RoleItemContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Common/Context/RoleItemContext.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/Context/RoleItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/Context/RoleItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs b/Assets/GameMain/Scripts/Presentation/Common/Context/RolePropertyAreaContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs rename to Assets/GameMain/Scripts/Presentation/Common/Context/RolePropertyAreaContext.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/Context/RolePropertyAreaContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/Context/RolePropertyAreaContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Common/DialogForm.meta b/Assets/GameMain/Scripts/Presentation/Common/DialogForm.meta new file mode 100644 index 0000000..f38c3d7 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Common/DialogForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45aad4db21a495446bd48194e1b3b45d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/View/DialogForm.cs b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/General/View/DialogForm.cs rename to Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogForm.cs diff --git a/Assets/GameMain/Scripts/UI/General/View/DialogForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/General/View/DialogForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormContext.cs diff --git a/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormController.cs similarity index 98% rename from Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs rename to Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormController.cs index 7114f95..61d6d8a 100644 --- a/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormController.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityGameFramework.Runtime; namespace UI diff --git a/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/DialogForm/DialogFormController.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General/View.meta b/Assets/GameMain/Scripts/Presentation/Common/View.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/General/View.meta rename to Assets/GameMain/Scripts/Presentation/Common/View.meta diff --git a/Assets/GameMain/Scripts/UI/General/View/IconArea.cs b/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs similarity index 97% rename from Assets/GameMain/Scripts/UI/General/View/IconArea.cs rename to Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs index cb1c8d9..916fa90 100644 --- a/Assets/GameMain/Scripts/UI/General/View/IconArea.cs +++ b/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/GameMain/Scripts/UI/General/View/IconArea.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/General/View/IconArea.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs b/Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs rename to Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs b/Assets/GameMain/Scripts/Presentation/Common/View/RolePropertyArea.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs rename to Assets/GameMain/Scripts/Presentation/Common/View/RolePropertyArea.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/View/RolePropertyArea.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/View/RolePropertyArea.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs b/Assets/GameMain/Scripts/Presentation/Common/View/UpdateResourceForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs rename to Assets/GameMain/Scripts/Presentation/Common/View/UpdateResourceForm.cs diff --git a/Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/View/UpdateResourceForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Common/View/UpdateResourceForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene.meta b/Assets/GameMain/Scripts/Presentation/Main.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene.meta rename to Assets/GameMain/Scripts/Presentation/Main.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context.meta b/Assets/GameMain/Scripts/Presentation/Main/Context.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context.meta rename to Assets/GameMain/Scripts/Presentation/Main/Context.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs similarity index 86% rename from Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs index cfd8b55..c3bcc92 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; namespace UI { diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs similarity index 91% rename from Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs index c8ea3cf..cf8de06 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace UI diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs similarity index 91% rename from Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs index ae1583e..7c5f244 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace UI diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm.meta new file mode 100644 index 0000000..45afc20 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fba1ddc3747c38488ae739d08785dd1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormContext.cs similarity index 93% rename from Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormContext.cs index 4e97fab..bcf232e 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormContext.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace UI diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs index 47019ee..9122299 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs @@ -1,5 +1,5 @@ using CustomEvent; -using Definition.Enum; +using SepCore.Definition; using GameFramework.Event; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/HudForm.meta b/Assets/GameMain/Scripts/Presentation/Main/HudForm.meta new file mode 100644 index 0000000..ec3df17 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Main/HudForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d21ab27094da2548a00119313150780 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs rename to Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormContext.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormController.cs similarity index 97% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs rename to Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormController.cs index a746551..2004976 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormController.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityGameFramework.Runtime; namespace UI diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/HudForm/HudFormController.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm.meta b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm.meta new file mode 100644 index 0000000..aee5d67 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c65843511cb3d6e43af724cbde56bb83 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs rename to Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormContext.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs rename to Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs index 495a029..f5648bf 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using CustomEvent; -using Definition.Enum; +using SepCore.Definition; using CustomUtility; using GameFramework.Event; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/ShopForm.meta b/Assets/GameMain/Scripts/Presentation/Main/ShopForm.meta new file mode 100644 index 0000000..581cac9 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Main/ShopForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d6a681c3d133314c869b07c7d94856e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs rename to Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormContext.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs rename to Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs index 97924b3..be26a73 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using CustomEvent; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using CustomUtility; using Entity.Weapon; using GameFramework.Event; @@ -541,4 +540,4 @@ namespace UI #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View.meta b/Assets/GameMain/Scripts/Presentation/Main/View.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View.meta rename to Assets/GameMain/Scripts/Presentation/Main/View.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs rename to Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs rename to Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs rename to Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs b/Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs rename to Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs b/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs rename to Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Menu.meta b/Assets/GameMain/Scripts/Presentation/Menu.meta new file mode 100644 index 0000000..ab1c9a3 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Menu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab1a14acd5f3dd049aa5b97c52cc821a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm.meta b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm.meta new file mode 100644 index 0000000..8844d04 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77da285af8f83814084722c2bbda3198 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs rename to Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormContext.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs rename to Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs index 8c55efe..74d292d 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs @@ -1,5 +1,5 @@ using CustomEvent; -using Definition.Enum; +using SepCore.Definition; using GameFramework.Event; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SettingForm.meta b/Assets/GameMain/Scripts/Presentation/Menu/SettingForm.meta new file mode 100644 index 0000000..0598146 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Menu/SettingForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f719ae636cc2724b94a834ae2407353 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/SettingForm/SettingForm.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs rename to Assets/GameMain/Scripts/Presentation/Menu/SettingForm/SettingForm.cs index b977625..8dc93de 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SettingForm/SettingForm.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using Definition; +using SepCore.Definition; using GameFramework.Localization; using StarForce; using UnityEngine; diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/SettingForm/SettingForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/SettingForm/SettingForm.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm.meta b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm.meta new file mode 100644 index 0000000..1b1207b --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88a351268ca28c14fb18659fe3d042d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs rename to Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs rename to Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormContext.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs rename to Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs index 34d1da0..4690382 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs @@ -1,5 +1,5 @@ using CustomEvent; -using Definition.Enum; +using SepCore.Definition; using GameFramework.Event; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs.meta b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs.meta diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs index 393439b..c1beab7 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs @@ -5,11 +5,10 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using DataTable; -using Definition; +using SepCore.DataTable; +using SepCore.Definition; using GameFramework.DataTable; using GameFramework.Event; -using Scene; using StarForce; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs index e596069..374d324 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs @@ -1,16 +1,7 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using GameFramework; using GameFramework.Event; using GameFramework.Resource; -using StarForce; using UI; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs index b828cbc..99730a1 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs @@ -7,7 +7,7 @@ using GameFramework.Localization; using System; -using Definition; +using SepCore.Definition; using StarForce; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs index 21de9d6..7382d3a 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs @@ -9,9 +9,8 @@ using GameFramework; using GameFramework.Event; using GameFramework.Resource; using System.Collections.Generic; -using DataTable; -using Definition; -using Scene; +using SepCore.DataTable; +using SepCore.Definition; using CustomUtility; using TMPro; using UI; diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs index 2b7c39a..4eea85e 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; using System.Collections.Generic; -using Definition.Enum; +using SepCore.Definition; using StarForce; using UI; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs index 2e3f13b..124d87a 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs @@ -1,7 +1,7 @@ using System; using CustomComponent; using CustomEvent; -using DataTable; +using SepCore.DataTable; using Entity; using GameFramework.Fsm; using GameFramework.Procedure; diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs index 521b758..ab570b6 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using GameFramework.Fsm; using GameFramework.Procedure; using UI; diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs index 59cd95b..8cc3170 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using GameFramework.Fsm; using GameFramework.Procedure; using UI; diff --git a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs index 12efc78..2f2671e 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using DataTable; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using Entity.EntityData; using GameFramework.Event; diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs b/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs index 23a557e..f010070 100644 --- a/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs +++ b/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs @@ -1,8 +1,6 @@ -using Definition.Enum; -using Scene; +using SepCore.Definition; using UI; using UnityEngine; -using UnityEngine.Rendering; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; @@ -58,4 +56,4 @@ namespace Procedure #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime.meta b/Assets/GameMain/Scripts/Runtime.meta new file mode 100644 index 0000000..9a1bc2e --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b7667682f1226645a2ac5f553405cf1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI.meta b/Assets/GameMain/Scripts/Runtime/Base.meta similarity index 67% rename from Assets/GameMain/Scripts/UI.meta rename to Assets/GameMain/Scripts/Runtime/Base.meta index 8ea1b65..b1937fd 100644 --- a/Assets/GameMain/Scripts/UI.meta +++ b/Assets/GameMain/Scripts/Runtime/Base.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 5aa568bd1f2753a46afdf823c50eb582 +guid: edd16bf2e418bec43bc774c7fc6c60d6 folderAsset: yes -timeCreated: 1528026160 +timeCreated: 1528026145 licenseType: Pro DefaultImporter: userData: diff --git a/Assets/GameMain/Scripts/Base/GameEntry.Builtin.cs b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Builtin.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/GameEntry.Builtin.cs rename to Assets/GameMain/Scripts/Runtime/Base/GameEntry.Builtin.cs diff --git a/Assets/GameMain/Scripts/Base/GameEntry.Builtin.cs.meta b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Builtin.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/GameEntry.Builtin.cs.meta rename to Assets/GameMain/Scripts/Runtime/Base/GameEntry.Builtin.cs.meta diff --git a/Assets/GameMain/Scripts/Base/GameEntry.Custom.cs b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/GameEntry.Custom.cs rename to Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs diff --git a/Assets/GameMain/Scripts/Base/GameEntry.Custom.cs.meta b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/GameEntry.Custom.cs.meta rename to Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs.meta diff --git a/Assets/GameMain/Scripts/Base/GameEntry.cs b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.cs similarity index 100% rename from Assets/GameMain/Scripts/Base/GameEntry.cs rename to Assets/GameMain/Scripts/Runtime/Base/GameEntry.cs diff --git a/Assets/GameMain/Scripts/Base/GameEntry.cs.meta b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/GameEntry.cs.meta rename to Assets/GameMain/Scripts/Runtime/Base/GameEntry.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent.meta new file mode 100644 index 0000000..b27c6d8 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e9af22513f1eed428b9f3fac6320543 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Localization.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization.meta similarity index 100% rename from Assets/GameMain/Scripts/Localization.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization.meta diff --git a/Assets/GameMain/Scripts/Localization/XmlLocalizationHelper.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs similarity index 100% rename from Assets/GameMain/Scripts/Localization/XmlLocalizationHelper.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs diff --git a/Assets/GameMain/Scripts/Localization/XmlLocalizationHelper.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Localization/XmlLocalizationHelper.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs.meta diff --git a/Assets/GameMain/Scripts/Network.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network.meta similarity index 100% rename from Assets/GameMain/Scripts/Network.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network.meta diff --git a/Assets/GameMain/Scripts/Network/CSPacketBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/CSPacketBase.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs diff --git a/Assets/GameMain/Scripts/Network/CSPacketBase.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/CSPacketBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs.meta diff --git a/Assets/GameMain/Scripts/Network/CSPacketHeader.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/CSPacketHeader.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs diff --git a/Assets/GameMain/Scripts/Network/CSPacketHeader.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/CSPacketHeader.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs.meta diff --git a/Assets/GameMain/Scripts/Network/NetworkChannelHelper.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/NetworkChannelHelper.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs diff --git a/Assets/GameMain/Scripts/Network/NetworkChannelHelper.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/NetworkChannelHelper.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs.meta diff --git a/Assets/GameMain/Scripts/Network/Packet.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/Packet.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet.meta diff --git a/Assets/GameMain/Scripts/Network/Packet/CSHeartBeat.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/Packet/CSHeartBeat.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs diff --git a/Assets/GameMain/Scripts/Network/Packet/CSHeartBeat.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/Packet/CSHeartBeat.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs.meta diff --git a/Assets/GameMain/Scripts/Network/Packet/SCHeartBeat.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/Packet/SCHeartBeat.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs diff --git a/Assets/GameMain/Scripts/Network/Packet/SCHeartBeat.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/Packet/SCHeartBeat.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs.meta diff --git a/Assets/GameMain/Scripts/Network/PacketBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketBase.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs diff --git a/Assets/GameMain/Scripts/Network/PacketBase.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs.meta diff --git a/Assets/GameMain/Scripts/Network/PacketHandler.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHandler.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler.meta diff --git a/Assets/GameMain/Scripts/Network/PacketHandler/SCHeartBeatHandler.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHandler/SCHeartBeatHandler.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs diff --git a/Assets/GameMain/Scripts/Network/PacketHandler/SCHeartBeatHandler.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHandler/SCHeartBeatHandler.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs.meta diff --git a/Assets/GameMain/Scripts/Network/PacketHandlerBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHandlerBase.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs diff --git a/Assets/GameMain/Scripts/Network/PacketHandlerBase.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHandlerBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs.meta diff --git a/Assets/GameMain/Scripts/Network/PacketHeaderBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHeaderBase.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs diff --git a/Assets/GameMain/Scripts/Network/PacketHeaderBase.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketHeaderBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs.meta diff --git a/Assets/GameMain/Scripts/Network/PacketType.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketType.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs diff --git a/Assets/GameMain/Scripts/Network/PacketType.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/PacketType.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs.meta diff --git a/Assets/GameMain/Scripts/Network/SCPacketBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/SCPacketBase.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs diff --git a/Assets/GameMain/Scripts/Network/SCPacketBase.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/SCPacketBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs.meta diff --git a/Assets/GameMain/Scripts/Network/SCPacketHeader.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs similarity index 100% rename from Assets/GameMain/Scripts/Network/SCPacketHeader.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs diff --git a/Assets/GameMain/Scripts/Network/SCPacketHeader.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Network/SCPacketHeader.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs.meta diff --git a/Assets/GameMain/Scripts/Components.meta b/Assets/GameMain/Scripts/Runtime/Components.meta similarity index 100% rename from Assets/GameMain/Scripts/Components.meta rename to Assets/GameMain/Scripts/Runtime/Components.meta diff --git a/Assets/GameMain/Scripts/Components/AbsorbComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/Components/AbsorbComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs index 6c6bc7b..707c20e 100644 --- a/Assets/GameMain/Scripts/Components/AbsorbComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs @@ -1,6 +1,5 @@ using System; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Components/AbsorbComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/AbsorbComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Components/AttackComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/Components/AttackComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs diff --git a/Assets/GameMain/Scripts/Components/AttackComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/AttackComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Components/BackpackComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/Components/BackpackComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs index f953b42..2a5a27c 100644 --- a/Assets/GameMain/Scripts/Components/BackpackComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Definition.DataStruct; +using SepCore.Definition; using Entity.Weapon; using Entity; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Components/BackpackComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/BackpackComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Components/HealthComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/Components/HealthComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs index 5aad635..d5e431f 100644 --- a/Assets/GameMain/Scripts/Components/HealthComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs @@ -1,7 +1,6 @@ using System; using CustomEvent; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace Components diff --git a/Assets/GameMain/Scripts/Components/HealthComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/HealthComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Components/InputComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/Components/InputComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs diff --git a/Assets/GameMain/Scripts/Components/InputComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/InputComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Components/MovementComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/Components/MovementComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs index 8b92390..a9601e3 100644 --- a/Assets/GameMain/Scripts/Components/MovementComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs @@ -1,7 +1,5 @@ using System; -using CustomUtility; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity; using Simulation; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Components/MovementComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/MovementComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Components/StatComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/Components/StatComponent.cs rename to Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs index f6716eb..7397be9 100644 --- a/Assets/GameMain/Scripts/Components/StatComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace Components @@ -100,4 +99,4 @@ namespace Components } } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Components/StatComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Components/StatComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/BuiltinData.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/BuiltinData.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs index f31cc7c..3557784 100644 --- a/Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using Definition.DataStruct; +using SepCore.Definition; using GameFramework; using StarForce; using UI; diff --git a/Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItem.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItem.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItem.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItem.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItemObject.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItemObject.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs diff --git a/Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItemObject.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DamageText/DamageTextItemObject.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/DebugPanel.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DebugPanel.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs similarity index 99% rename from Assets/GameMain/Scripts/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs index 05bff40..1fdc9c9 100644 --- a/Assets/GameMain/Scripts/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs @@ -3,8 +3,8 @@ using System; using System.Linq; using Components; using CustomEvent; -using DataTable; -using Definition.DataStruct; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using CustomUtility; using Procedure; diff --git a/Assets/GameMain/Scripts/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/EnemyManager.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/EnemyManager.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs similarity index 99% rename from Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs index 02bf272..1cdc02f 100644 --- a/Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using DataTable; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using Entity.EntityData; using GameFramework.Event; diff --git a/Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs diff --git a/Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/EntityBinding.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/EntityBinding.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs diff --git a/Assets/GameMain/Scripts/Simulation/EntityBinding.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/EntityBinding.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionHitEventData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionHitEventData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionHitEventData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionHitEventData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionRequestData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionRequestData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionRequestData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/AreaCollisionRequestData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/CollisionCandidateData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/CollisionCandidateData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/CollisionCandidateData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/CollisionCandidateData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/CollisionQueryData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/CollisionQueryData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/CollisionQueryData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/CollisionQueryData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobInputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobInputData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobInputData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobInputData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobOutputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobOutputData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobOutputData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemyJobOutputData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemyMovementBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemyMovementBurstJob.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemyMovementBurstJob.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemyMovementBurstJob.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemySeparationBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemySeparationBurstJob.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/EnemySeparationBurstJob.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/EnemySeparationBurstJob.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobInputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobInputData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobInputData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobInputData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobOutputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobOutputData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobOutputData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileJobOutputData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileMovementBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileMovementBurstJob.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileMovementBurstJob.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/ProjectileMovementBurstJob.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs diff --git a/Assets/GameMain/Scripts/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs similarity index 99% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs index 5f36e50..6ebdf15 100644 --- a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs @@ -1,5 +1,5 @@ using CustomEvent; -using Definition.DataStruct; +using SepCore.Definition; using Entity; using Entity.Weapon; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionRequests.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionRequests.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionRequests.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionRequests.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionResolve.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs similarity index 99% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionResolve.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs index 065d9e8..74e6923 100644 --- a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionResolve.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs @@ -1,8 +1,7 @@ using Components; using CustomDebugger; using CustomUtility; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.Definition; using Entity; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionResolve.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.CollisionResolve.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.EnemyJobs.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.EnemyJobs.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.EnemyJobs.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.EnemyJobs.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs diff --git a/Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Presentation.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation.meta diff --git a/Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.HitPresentation.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.HitPresentation.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs diff --git a/Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.HitPresentation.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.HitPresentation.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.Presentation.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.Presentation.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs diff --git a/Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.Presentation.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.Presentation.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.TransformSync.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.TransformSync.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs diff --git a/Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.TransformSync.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/Presentation/SimulationWorld.TransformSync.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimData.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimData/EnemySimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData/EnemySimData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimData/EnemySimData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData/EnemySimData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimData/PickupSimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData/PickupSimData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimData/PickupSimData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData/PickupSimData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimData/ProjectileSimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData/ProjectileSimData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimData/ProjectileSimData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimData/ProjectileSimData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationTickContext.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationTickContext.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationTickContext.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationTickContext.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.EntitySync.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.EntitySync.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.EntitySync.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.EntitySync.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.EntityToSimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.EntityToSimData.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.EntityToSimData.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.EntityToSimData.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.PlayerMovement.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.PlayerMovement.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.PlayerMovement.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.PlayerMovement.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.RuntimeModules.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.RuntimeModules.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.RuntimeModules.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.RuntimeModules.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.SimEntityState.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.SimEntityState.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.SimEntityState.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.SimEntityState.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs.meta diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs diff --git a/Assets/GameMain/Scripts/Simulation/SimulationWorld.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Simulation/SimulationWorld.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs.meta diff --git a/Assets/GameMain/Scripts/Sound/SoundExtension.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/SoundExtension.cs similarity index 99% rename from Assets/GameMain/Scripts/Sound/SoundExtension.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/SoundExtension.cs index 72ca4db..90139ff 100644 --- a/Assets/GameMain/Scripts/Sound/SoundExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/SoundExtension.cs @@ -5,8 +5,8 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using DataTable; -using Definition; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using GameFramework; using GameFramework.DataTable; diff --git a/Assets/GameMain/Scripts/Sound/SoundExtension.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/SoundExtension.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Sound/SoundExtension.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/SoundExtension.cs.meta diff --git a/Assets/GameMain/Scripts/SpriteCache.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache.meta similarity index 100% rename from Assets/GameMain/Scripts/SpriteCache.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache.meta diff --git a/Assets/GameMain/Scripts/SpriteCache/SpriteCacheComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs similarity index 98% rename from Assets/GameMain/Scripts/SpriteCache/SpriteCacheComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs index acfd5ca..fddccf4 100644 --- a/Assets/GameMain/Scripts/SpriteCache/SpriteCacheComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Definition; +using SepCore.Definition; using GameFramework.Resource; using CustomUtility; using UnityEngine; diff --git a/Assets/GameMain/Scripts/SpriteCache/SpriteCacheComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/SpriteCache/SpriteCacheComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs similarity index 99% rename from Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs rename to Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs index 721289c..0301501 100644 --- a/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Definition.Enum; +using SepCore.Definition; using UnityGameFramework.Runtime; using UI; diff --git a/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs.meta rename to Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs.meta diff --git a/Assets/GameMain/Scripts/Debugger.meta b/Assets/GameMain/Scripts/Runtime/Debugger.meta similarity index 100% rename from Assets/GameMain/Scripts/Debugger.meta rename to Assets/GameMain/Scripts/Runtime/Debugger.meta diff --git a/Assets/GameMain/Scripts/Debugger/ProfilerMarker.cs b/Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs similarity index 100% rename from Assets/GameMain/Scripts/Debugger/ProfilerMarker.cs rename to Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs diff --git a/Assets/GameMain/Scripts/Debugger/ProfilerMarker.cs.meta b/Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Debugger/ProfilerMarker.cs.meta rename to Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs.meta diff --git a/Assets/GameMain/Scripts/PlayerInputActions.cs b/Assets/GameMain/Scripts/Runtime/PlayerInputActions.cs similarity index 100% rename from Assets/GameMain/Scripts/PlayerInputActions.cs rename to Assets/GameMain/Scripts/Runtime/PlayerInputActions.cs diff --git a/Assets/GameMain/Scripts/PlayerInputActions.cs.meta b/Assets/GameMain/Scripts/Runtime/PlayerInputActions.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/PlayerInputActions.cs.meta rename to Assets/GameMain/Scripts/Runtime/PlayerInputActions.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase.meta b/Assets/GameMain/Scripts/Runtime/UIBase.meta new file mode 100644 index 0000000..0bb7869 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe9add7a19c30d14ebcd9a907e7e7f64 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/Base.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base.meta similarity index 77% rename from Assets/GameMain/Scripts/UI/Base.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base.meta index 69073d6..ccaf3b1 100644 --- a/Assets/GameMain/Scripts/UI/Base.meta +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6cf6edb3e93c9814dbeb37df22394fed +guid: 00bdd73e7a7b66b479fcea9dafb6f312 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/IUIFormController.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs diff --git a/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/IUIFormController.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIUseCase.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIUseCase.cs diff --git a/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIUseCase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIUseCase.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UGuiForm.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UGuiForm.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs diff --git a/Assets/GameMain/Scripts/UI/Base/UGuiForm.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UGuiForm.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiGroupHelper.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiGroupHelper.cs diff --git a/Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiGroupHelper.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiGroupHelper.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIContext.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIContext.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIContext.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIContext.cs diff --git a/Assets/GameMain/Scripts/UI/Base/UIContext.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIContext.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIExtension.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIExtension.cs similarity index 93% rename from Assets/GameMain/Scripts/UI/Base/UIExtension.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIExtension.cs index 24145f3..fb829af 100644 --- a/Assets/GameMain/Scripts/UI/Base/UIExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIExtension.cs @@ -1,17 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using GameFramework.DataTable; +using GameFramework.DataTable; using GameFramework.UI; using System.Collections; -using DataTable; -using Definition; -using Definition.Enum; -using Procedure; +using SepCore.DataTable; +using SepCore.Definition; using CustomUtility; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/GameMain/Scripts/UI/Base/UIExtension.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIExtension.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIExtension.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIExtension.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerBase.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerBase.cs diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerBase.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerCommonBase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/Base/UIFormControllerCommonBase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs index e6a4cf5..6641fcd 100644 --- a/Assets/GameMain/Scripts/UI/Base/UIFormControllerCommonBase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using GameFramework.Event; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerCommonBase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIFormControllerCommonBase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerTemplate.cs similarity index 97% rename from Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerTemplate.cs index 9187364..a035ca7 100644 --- a/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerTemplate.cs @@ -1,4 +1,4 @@ -using Definition.Enum; +using SepCore.Definition; using UnityGameFramework.Runtime; namespace UI diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerTemplate.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerTemplate.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormTemplate.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormTemplate.cs diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormTemplate.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormTemplate.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Common.meta new file mode 100644 index 0000000..5c106e7 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b80dd4adb0a8e148abc7c52a2e23b42 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/CommonButton.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/CommonButton.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs diff --git a/Assets/GameMain/Scripts/UI/CommonButton.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/CommonButton.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm.meta new file mode 100644 index 0000000..a6dbee3 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72f6a6b2649f7294daf538a63839678e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogFormRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogFormRawData.cs diff --git a/Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main.meta new file mode 100644 index 0000000..f732a78 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c41ec32ecc913a3479f29daf48e3da04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm.meta new file mode 100644 index 0000000..100ef20 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e71c46052b43081479b67b14e2e449d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormRawData.cs similarity index 94% rename from Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormRawData.cs index 8c86955..1625b09 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormRawData.cs @@ -1,6 +1,6 @@ using System.Collections; using System.Collections.Generic; -using Definition.Enum; +using SepCore.Definition; using UnityEngine; namespace UI diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormUseCase.cs similarity index 98% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormUseCase.cs index aab409c..1a8cfbe 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormUseCase.cs @@ -1,4 +1,4 @@ -using Definition.DataStruct; +using SepCore.Definition; using Entity; using CustomUtility; using Entity.Weapon; diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormUseCase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfoForm/DisplayItemInfoFormUseCase.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/HudForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/HudForm.meta new file mode 100644 index 0000000..2263c74 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/HudForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3d54de71bcad264da3c1ca92ff54e4f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm.meta new file mode 100644 index 0000000..72844bc --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30e2cee5e6a424c42a01db1b7e582a8a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormRawData.cs similarity index 87% rename from Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormRawData.cs index dc48291..c375201 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormRawData.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using DataTable; +using SepCore.DataTable; namespace UI { diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormUseCase.cs similarity index 98% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormUseCase.cs index ed5ca3b..e609a64 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormUseCase.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using DataTable; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using Procedure; using UnityEngine; diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormUseCase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUpForm/LevelUpFormUseCase.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm.meta new file mode 100644 index 0000000..aa765f2 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3ed3acef12ff8d40935205a69fb63ca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormRawData.cs similarity index 93% rename from Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormRawData.cs index 3b2dc25..6d8c4ab 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormRawData.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Definition.DataStruct; +using SepCore.Definition; using Entity.Weapon; namespace UI diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormUseCase.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormUseCase.cs index 32d6ac8..4f76664 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormUseCase.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using DataTable; -using Definition.DataStruct; -using Definition.Enum; +using SepCore.DataTable; +using SepCore.Definition; using Entity; using Entity.EntityData; using CustomUtility; diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormUseCase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/ShopForm/ShopFormUseCase.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu.meta new file mode 100644 index 0000000..7508d05 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Menu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f228612923ff51343a4dab06ce4c1f92 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm.meta new file mode 100644 index 0000000..03c397d --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb6dcefdb25c4eb4e98cb364ac73a7c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormRawData.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormUseCase.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormUseCase.cs index 1558b52..7f5fd67 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormUseCase.cs @@ -1,5 +1,5 @@ using System.Text; -using DataTable; +using SepCore.DataTable; using GameFramework.DataTable; using Procedure; using UnityEngine; diff --git a/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormUseCase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleFormUseCase.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SettingForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SettingForm.meta new file mode 100644 index 0000000..c833997 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SettingForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35c8961f073eae8479506bdec8b745f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm.meta new file mode 100644 index 0000000..1d627be --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e4010de30b33144fa20400058edfeba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/StartMenuFormRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/StartMenuFormRawData.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/StartMenuFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/StartMenuFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/Scene.meta b/Assets/GameMain/Scripts/Scene.meta deleted file mode 100644 index 5bf3759..0000000 --- a/Assets/GameMain/Scripts/Scene.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2ff69ece58f4d3f4e8cf9a40f813e745 -folderAsset: yes -timeCreated: 1528026159 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Scene/HideByBoundary.cs b/Assets/GameMain/Scripts/Scene/HideByBoundary.cs deleted file mode 100644 index ef2bec8..0000000 --- a/Assets/GameMain/Scripts/Scene/HideByBoundary.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using Entity; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace StarForce -{ - public class HideByBoundary : MonoBehaviour - { - private void OnTriggerExit(Collider other) - { - GameObject go = other.gameObject; - EntityBase entity = go.GetComponent(); - if (entity == null) - { - Log.Warning("Unknown GameObject '{0}', you must use entity only.", go.name); - Destroy(go); - return; - } - - GameEntry.Entity.HideEntity(entity); - } - } -} diff --git a/Assets/GameMain/Scripts/Scene/HideByBoundary.cs.meta b/Assets/GameMain/Scripts/Scene/HideByBoundary.cs.meta deleted file mode 100644 index 1872b3e..0000000 --- a/Assets/GameMain/Scripts/Scene/HideByBoundary.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 649621152579e224a955822793b63aca -timeCreated: 1528026159 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Scene/ScrollableBackground.cs b/Assets/GameMain/Scripts/Scene/ScrollableBackground.cs deleted file mode 100644 index e3e1643..0000000 --- a/Assets/GameMain/Scripts/Scene/ScrollableBackground.cs +++ /dev/null @@ -1,68 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using UnityEngine; - -namespace StarForce -{ - public class ScrollableBackground : MonoBehaviour - { - [SerializeField] - private float m_ScrollSpeed = -0.25f; - - [SerializeField] - private float m_TileSize = 30f; - - [SerializeField] - private BoxCollider m_VisibleBoundary = null; - - [SerializeField] - private BoxCollider m_PlayerMoveBoundary = null; - - [SerializeField] - private BoxCollider m_EnemySpawnBoundary = null; - - private Transform m_CachedTransform = null; - private Vector3 m_StartPosition = Vector3.zero; - - private void Start() - { - m_CachedTransform = transform; - m_StartPosition = m_CachedTransform.position; - } - - private void Update() - { - float newPosition = Mathf.Repeat(Time.time * m_ScrollSpeed, m_TileSize); - m_CachedTransform.position = m_StartPosition + Vector3.forward * newPosition; - } - - public BoxCollider VisibleBoundary - { - get - { - return m_VisibleBoundary; - } - } - - public BoxCollider PlayerMoveBoundary - { - get - { - return m_PlayerMoveBoundary; - } - } - - public BoxCollider EnemySpawnBoundary - { - get - { - return m_EnemySpawnBoundary; - } - } - } -} diff --git a/Assets/GameMain/Scripts/Sound.meta b/Assets/GameMain/Scripts/Sound.meta deleted file mode 100644 index afc8ed5..0000000 --- a/Assets/GameMain/Scripts/Sound.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 7711a5b2487374145a58d50ca351612b -folderAsset: yes -timeCreated: 1528026160 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General.meta b/Assets/GameMain/Scripts/UI/General.meta deleted file mode 100644 index b919e05..0000000 --- a/Assets/GameMain/Scripts/UI/General.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 85f5f27b7946745469a9e6d5e6316048 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/Controller.meta b/Assets/GameMain/Scripts/UI/General/Controller.meta deleted file mode 100644 index 4c97736..0000000 --- a/Assets/GameMain/Scripts/UI/General/Controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eab5a115034214041b5647a33d64c224 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/RawData.meta b/Assets/GameMain/Scripts/UI/General/RawData.meta deleted file mode 100644 index 444add4..0000000 --- a/Assets/GameMain/Scripts/UI/General/RawData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 90a3026e140b55f47b670f4a786f7070 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene.meta b/Assets/GameMain/Scripts/UI/MenuScene.meta deleted file mode 100644 index 06aa47b..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2241cff158a1fd944a80b77bf6e6debd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context.meta b/Assets/GameMain/Scripts/UI/MenuScene/Context.meta deleted file mode 100644 index c4559e6..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/Context.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e3e1fd66709232c439fe452b81dffab6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller.meta b/Assets/GameMain/Scripts/UI/MenuScene/Controller.meta deleted file mode 100644 index 009dee5..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/Controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 70ae7a701eac84b4eb4ec27bf2ada3c1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData.meta b/Assets/GameMain/Scripts/UI/MenuScene/RawData.meta deleted file mode 100644 index 31d063c..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/RawData.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 614e7dc72ab04ce8aaa7e750088f12d6 -timeCreated: 1771144270 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/UseCase.meta b/Assets/GameMain/Scripts/UI/MenuScene/UseCase.meta deleted file mode 100644 index ded1c8d..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/UseCase.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ceb1fe7ab4fa37d4ca15992227229df6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View.meta b/Assets/GameMain/Scripts/UI/MenuScene/View.meta deleted file mode 100644 index debcda7..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/View.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 424c12088ffa5fc43bdf642094e15ae4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Utility/EnemySeperator.meta b/Assets/GameMain/Scripts/Utility/EnemySeperator.meta deleted file mode 100644 index a93739b..0000000 --- a/Assets/GameMain/Scripts/Utility/EnemySeperator.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ab0211bce76618a4b9bd9bd8d2a95fb6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/UIModule.meta b/Assets/Plugins/UIModule.meta new file mode 100644 index 0000000..0e056a0 --- /dev/null +++ b/Assets/Plugins/UIModule.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a14acd1a7cab53742bedb7cb53817cba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/UIModule/docs.meta b/Assets/Plugins/UIModule/docs.meta new file mode 100644 index 0000000..593a49f --- /dev/null +++ b/Assets/Plugins/UIModule/docs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7bac844b7e89c04c940ad4c471ab8f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/UIModule/docs/UI-5层架构设计规范.md b/Assets/Plugins/UIModule/docs/UI-5层架构设计规范.md new file mode 100644 index 0000000..43b1454 --- /dev/null +++ b/Assets/Plugins/UIModule/docs/UI-5层架构设计规范.md @@ -0,0 +1,427 @@ +# UI 五层架构设计规范（UseCase / RawData / Controller / Context / View） + +## 1. 文档目标 + +本文定义一套可长期复用的 UI 分层设计方案，用于约束 UI 模块的职责边界、依赖方向、通信方式和测试策略。 + +- 本文描述的是规范，不是对某个项目现状的总结 +- 项目内目录或基类只作为落地示例，不改变本文的抽象约束 +- 本文重点约束 UIForm 级模块；子组件（`Item`、`Area` 等）可只实现 `Context + View` +- Unity GameFramework 的底层细节不在本文展开，本文只约束项目内 UI 代码组织 + +补充说明（插件化落地）： + +- 本规范通过 `Assets/Plugins/UIModule/` 以**可选插件**方式落地 +- 插件无独立程序集，通过 `.asmref` 融入原项目各程序集： + - `SepCore.Base.UIModule.asmref`：`Base/` → `SepCore.Base` + - `SepCore.Runtime.UIModule.asmref`：`Runtime/` → `SepCore.Runtime` + - `SepCore.Presentation.UIModule.asmref`：`UI/` → `SepCore.Presentation` +- `Runtime/` 内 `SepCore.UI` 命名空间放置基础抽象、UseCase、RawData；`SepCore.CustomComponent` 放置 `UIRouterComponent` +- `UI/` 内 `SepCore.UIModule` 命名空间放置 Controller / Context / View +- 不启用插件时，项目可继续使用原有基座 UI 路线 +- 启用插件时，必须通过 `UIRouterComponent` 统一管理 `Controller / UseCase` +- 通过 `UIRouterComponent` 打开的 UIForm 必须配置对应 Controller，缺少绑定视为接入错误，不回退到原始 UI 打开路径 +- 当前插件对外 UI 生命周期接口为 async-first：`OpenUIAsync / CloseUIAsync` + +## 2. 核心原则 + +### 2.1 单向数据职责 + +UI 的职责链路固定为： + +```text +外部流程 + -> Controller + -> UseCase + -> RawData / Result + -> BuildContext + -> View + +View + --(UI 专用事件)--> Controller +``` + +说明： + +- `UseCase` 只负责业务规则、状态推进和纯业务数据生成 +- `Controller` 是 UI 编排中心，也是唯一允许构建 `Context` 的层 +- `View` 只负责渲染和抛出交互，不直接处理业务状态 + +### 2.2 严格分离业务数据与展示数据 + +- `RawData` 默认是业务传输模型，不承载展示模型。 +- 轻量 UI 可携带回调委托，但回调只允许由 Controller 注册和触发，不得进入 Context / View。 +- `Context` 是纯展示数据，不进入 `UseCase` +- `UseCase` 不能返回 `Context` +- `View` 只能消费 `Context` + +### 2.3 Controller 是 UI 唯一外部入口 + +对于 UIForm 级模块，外部流程只能通过 `Controller` 驱动 UI： + +- 异步打开 UI +- 异步关闭 UI +- 绑定 `UseCase` +- 刷新 UI +- 响应 UI 专用事件 + +`View` 不作为外部流程的直接依赖对象。 + +## 3. 五层职责定义 + +### 3.1 UseCase 层 + +职责：封装 UI 对应的业务用例，负责业务规则、状态推进、校验和纯业务结果输出。 + +约束： + +- 实现 `IUIUseCase` +- 命名：`XXXFormUseCase` +- 对外提供语义化方法，例如 `CreateInitialModel`、`TryRefresh`、`Select`、`Confirm` +- 返回值只能是 `RawData` 或纯业务结果对象，例如 `XXXResult`、`XXXActionResult` +- 不依赖 `Context`、`View`、`UGuiForm`、`MonoBehaviour` 等 UI 类型 +- 不负责 UI 资源加载、文本拼装、颜色选择、图标转换等展示处理 +- 不发布 UI 专用事件 + +适用场景： + +- UI 会读写领域状态 +- UI 存在明确业务规则、条件分支、校验或状态推进 +- UI 的交互结果需要被测试和复用 + +### 3.2 RawData 层 + +职责：承载 `UseCase -> Controller` 的纯业务传输模型。 + +约束： + +- 命名：`XXXFormRawData` +- 只描述业务数据，不包含 UI 展示行为 +- 可以包含领域对象、配置对象、标识符、枚举、数值和纯数据集合 +- **轻量场景下可携带回调委托**，由 Controller 在构建 Context 前完成注册 +- 不允许依赖 `Context`、`View`、`Sprite`、`TMP_Text` 等展示相关类型 +- 不允许直接使用 `XXXItemContext`、`XXXFormContext` 作为字段类型 + +说明： + +- `RawData` 的目标是表达“业务上发生了什么” +- `Context` 的目标是表达“界面应该怎么显示” +- `RawData` 可以携带行为（如回调），`Context` 只承载展示数据，不允许携带回调 + +### 3.3 Controller 层 + +职责：UI 编排层，负责连接外部流程、`UseCase`、`View`，并统一管理 UI 生命周期与展示状态。 + +约束： + +- 对启用 `UIRouterComponent` 管理的 UIForm，必须存在可实例化的 Controller 绑定；未绑定时 Router 应直接失败并输出 Error，不允许 fallback 到 `GameEntry.UI.OpenUIForm(...)` +- 命名：`XXXFormController` +- 可基于 `UIFormControllerBase` 实现 +- 通过 `BindUseCase(IUIUseCase)` 注入用例并做类型校验 +- 当前对外入口为 `OpenUIAsync(object userData = null, float timeout = 30f)` 与 `CloseUIAsync(...)` +- `OpenUIAsync` 只允许外部传入 `RawData` 或可转换为 `RawData` 的参数，不接受外部传入 `Context` +- 当 `userData == null` 且 UI 绑定了 UseCase 时，Controller 应通过 UseCase 构造初始 RawData，再转换为 Context +- 当 `userData == null` 且 UI 没有 UseCase 时，Controller 可按 UI 类型决定构造默认 RawData / 默认 Context，或返回失败并输出 warning +- 负责 `RawData / Result -> Context` 的转换，常见形式为 `BuildContext` +- 负责事件订阅与解除订阅，且必须成对出现 +- 负责全量刷新与局部刷新策略 +- 在同类 UI 可能多实例时，负责通过 `sender`、`serialId` 或其他等价标识限制事件只作用于当前 UI 实例 +- **推荐子类显式组织业务时序**：参数校验、Context 构造、临时状态缓存、关闭后续动作等都直接写在具体 Controller 中；基类只提供共用开关窗机制，不隐藏子类业务时机 + +允许职责： + +- 将业务数据转换为展示友好的文本、图标、颜色、列表状态 +- 在必要时查询本地化、资源映射或展示适配逻辑 + +禁止职责： + +- 在 `Controller` 中堆叠大段领域业务规则 +- 绕过 `Context` 直接把业务对象塞给 `View` +- 直接修改其他 UI 的内部 `View` + +### 3.4 Context 层 + +职责：承载“可直接驱动 UI 展示”的上下文数据。 + +约束： + +- 继承 `UIContext` +- 命名：`XXXFormContext`、`XXXItemContext`、`XXXAreaContext` +- 只能由 `Controller` 构建和更新 +- 字段以展示友好为目标，例如标题、描述、图标、颜色、状态、列表、按钮文案 +- **不允许携带回调委托或行为**，交互行为由 Controller 注册，View 通过 UI 专用事件通知 Controller +- 允许组合子 `Context` +- 不进入 `UseCase` + +说明： + +- `Context` 可以包含展示层需要的最终数据 +- `Context` 可以是“已格式化”的显示数据 +- 但这些数据必须由 `Controller` 负责准备，而不是 `UseCase` + +### 3.5 View 层 + +职责：纯表现层，负责控件绑定、渲染刷新、动画触发和交互事件抛出。 + +约束： + +- Form 类继承 `UGuiForm`，子组件通常继承 `MonoBehaviour` +- 命名：`XXXForm`、`XXXItem`、`XXXArea` +- 提供打开、关闭、刷新入口： + - `UGuiForm`：`OnOpen(object userData)`、`OnClose(bool isShutdown, object userData)`、`RefreshUI(Context)` + - `MonoBehaviour` 子组件：可统一设计为 `OnOpen(Context)`、`OnClose()`、`RefreshUI(Context)` +- 只消费 `Context` +- 用户交互通过 UI 专用事件通知 `Controller` +- 不承载业务规则、流程推进、数据筛选和领域状态修改 +- 不订阅全局业务事件 + +允许职责： + +- 本地控件显隐 +- 动画播放 +- 一次性的纯视觉状态缓存 + +禁止职责： + +- 直接调用 `UseCase` +- 直接修改领域状态 +- 订阅或处理全局业务事件 +- 将自己作为业务逻辑的入口 + +## 4. UI 类型分级 + +### 4.1 标准五层 UI + +组成：`UseCase + RawData + Controller + Context + View` + +适用条件： + +- UI 需要读写领域状态 +- UI 存在明确业务规则或分支 +- UI 交互会改变游戏流程、角色状态、背包、战斗结果等业务对象 +- UI 行为需要被自动化测试覆盖 + +默认规则： + +- 新增业务型 UI，优先使用完整五层 + +### 4.2 轻量 UI + +组成：`Controller + Context + View` + +说明： + +- `UseCase` 对轻量 UI 不强制 +- `RawData` 也不是强制层，可按需要补充 +- 轻量 UI 仍然必须通过 `Controller` 驱动，不能让 `View` 直接承担外部入口 + +适用条件： + +- 只承担展示、导航、确认、提示等轻量职责 +- 没有独立的业务规则或状态推进 +- 只需要把已有参数转换成界面展示 + +升级规则： + +- 一旦轻量 UI 开始承载业务规则、校验或状态推进，应升级为标准五层 UI + +## 5. 依赖方向约束 + +允许依赖： + +- `UseCase -> 领域对象 / 纯业务服务 / RawData / Result` +- `Controller -> UseCase + RawData + Result + Context + View + UI 专用事件` +- `Context -> 子 Context / 纯展示值对象` +- `View -> Context + UI 专用事件` + +禁止依赖： + +- `UseCase -> Context / View / Unity 具体展示组件` +- `RawData / Result -> Context / View` +- `Context -> View / UseCase` +- `View -> UseCase` +- `View -> 全局业务事件` +- `View -> 领域状态修改` + +### 5.1 插件化分层建议 + +建议分层如下： + +- `SepCore.Base`：UI 专用事件（`SepCore.Event`） +- `SepCore.Runtime`：基座与业务流程层，同时融入插件 `Runtime/` 中的基础抽象、UseCase、RawData 与 `UIRouterComponent` +- `SepCore.Presentation`：Controller、Context、View（`SepCore.UIModule`） +- Editor：`UIModule.Editor`，代码命名空间当前为 `SepCore.UIModule.Editor` + +插件目录与程序集映射： + +- `Base/` → `SepCore.Base` +- `Runtime/` → `SepCore.Runtime` +- `UI/` → `SepCore.Presentation` + +建议依赖方向： + +```text +SepCore.Base（UI 专用事件） + ↑ +SepCore.Runtime（基础抽象 + UseCase + RawData + Router） + ↑ +SepCore.Presentation（Controller + Context + View） +``` + +约束： + +- `SepCore.Base` / `SepCore.Runtime` 不反向依赖 Presentation 层 +- UI 专用事件虽在 `SepCore.Event` 命名空间，但语义上仍归属对应 UI 模块，禁止被业务模块复用 +- 业务流程层通过插件入口（如 Router）调用五层 UI 能力 +- 插件内无独立程序集，通过 `.asmref` 文件融入原项目编译 + +## 6. 事件通信规范 + +### 6.1 UI 与 Controller 的通信方式 + +`View` 与 `Controller` 的通信通过当前 UI 模块专用事件完成。 + +约束： + +- UI 专用事件只服务于当前 UI 模块 +- 这些事件不是业务公共事件 +- 业务模块、流程模块、领域模块不应复用这些事件 +- UI 专用事件可统一放在 `SepCore.Event` 命名空间下，但事件语义仍归属对应 UI 模块，禁止被业务模块复用 +- 如果底层使用全局事件总线实现，也只能把它当作“传输通道”，不能把事件语义扩散成全局契约 + +### 6.2 事件边界 + +- `View -> Controller`：使用 UI 专用事件 +- `Controller -> View`：通过刷新 `Context` 或调用 `View` 的渲染接口 +- `Controller -> UseCase`：直接方法调用 +- `UseCase -> Controller`：通过返回 `RawData / Result`，不通过 UI 事件反推界面 +- `外部流程 -> Controller`：只传入 `RawData` 或可转换为 `RawData` 的参数，不传入 `Context` + +### 6.3 事件安全要求 + +- 同类 UI 可同时存在时，事件必须只作用于当前窗体实例；可通过 `sender`、`serialId` 或其他等价标识实现 +- UI 专用事件命名应体现模块归属，避免语义过宽 +- 同一 UI 可以按需要使用“多个精细事件”或“单一事件 + 子类型/按钮编号”的方式建模；例如当前 Dialog 使用 `DialogEventArgs + ButtonId` + +## 7. 标准交互流程 + +### 7.1 有 UseCase 的标准流程 + +```text +Procedure / GameState + -> BindUseCase + -> await OpenUIAsync(rawData or null) + +Controller + -> 如果外部传入 RawData：直接使用该 RawData + -> 如果外部未传入 RawData：UseCase.BuildRawData() / CreateInitialModel() + -> BuildContext(rawData) + -> View.RefreshUI(context) + +View + --(UI 专用事件)--> Controller + +Controller + -> UseCase.Action(...) + -> Result / RawData + -> BuildContext / PartialRefresh + -> View.RefreshUI(...) +``` + +说明： + +- 外部流程不传入 `Context` +- `Context` 只在 Presentation 层内由 Controller 构建 +- `OpenUIAsync(null)` 对有 UseCase 的 UI 是合法入口，表示由 UseCase 构造初始 RawData + +### 7.2 无 UseCase 的轻量流程 + +```text +外部流程 + -> await OpenUIAsync(rawData) + +Controller + -> BuildContext(rawData) + -> View.RefreshUI(context) + +View + --(UI 专用事件)--> Controller + +Controller + -> 处理轻量逻辑或路由动作 + -> 更新 Context / 打开其他 UI / 关闭当前 UI +``` + +说明： + +- 轻量 UI 如果没有默认数据来源，`OpenUIAsync(null)` 可以失败并输出 warning +- Dialog 这类提示型 UI 属于必须由外部传入 RawData 的轻量 UI +- 即使是轻量 UI，外部也不传入 `Context`，Context 仍由 Controller 构建 + +### 7.3 关闭流程 + +1. 外部流程或 `Controller` 调用 `CloseUIAsync(...)` +2. `Controller` 解除事件订阅 +3. `Controller` 清理本次交互缓存，例如回调、临时 `UserData` 和局部状态 +4. `View.OnClose` 清理本地视觉状态 +5. 下次打开时重新按 `Context` 初始化 + +## 8. 目录与命名规范 + +目录示例以插件目录为例（`Assets/Plugins/UIModule`）。 + +- 插件 `Base/Event//`：UI 专用事件（命名空间 `SepCore.Event`） +- 插件 `Runtime/Base/`：五层 UI 基础抽象（命名空间 `SepCore.UI`） +- 插件 `Runtime//`：UseCase、RawData（命名空间 `SepCore.UI`） +- 插件 `Runtime/` 根目录：`UIRouterComponent`（命名空间 `SepCore.CustomComponent`） +- 插件 `UI//`：Controller、Context、View（命名空间 `SepCore.UIModule`） +- 五层同名前缀保持一致，例如 `ShopForm*`、`LevelUpForm*` +- 子组件上下文命名：`RoleItemContext`、`RewardItemContext`、`DisplayAreaContext` +- 结果对象命名：`XXXResult`、`XXXActionResult` +- 轻量 UI 可以省略 `UseCase` 和 `RawData`，但不省略 `Controller`、`Context`、`View` + +## 9. 测试规范 + +### 9.1 自动化测试范围 + +如果一个 UI 具备 `UseCase`，并且需要补自动化测试，则统一使用 EditMode 测试。 + +优先覆盖： + +- 初始化模型生成 +- 业务分支与校验 +- 用户动作对应的结果对象 +- 边界条件和非法输入 + +### 9.2 Controller / View 的验证策略 + +`Controller` 和 `View` 以人工验收为主，重点验证： + +- 首次打开 +- 交互刷新 +- 局部刷新 +- 关闭重开 +- 非法参数或空数据输入时的表现 + +## 10. 落地检查清单 + +新增 UI 时，至少检查以下事项： + +1. 先判断该 UI 属于标准五层还是轻量 UI +2. 使用 `UIRouterComponent` 管理的 UIForm 必须配置可实例化的 Controller 绑定 +3. 如果存在业务规则或状态推进，必须引入 `UseCase` +4. 外部打开 UI 时只传入 `RawData` 或可转换为 `RawData` 的参数，不传入 `Context` +5. `OpenUIAsync(null)` 对有 UseCase 的 UI 应通过 UseCase 构造初始 RawData +6. `RawData` 中不得出现 `Context` 类型 +7. `Context` 只能在 `Controller` 中构建 +8. `View` 不得订阅全局业务事件 +9. `View` 的交互只能通过 UI 专用事件上报 +10. `Controller` 必须成对管理事件订阅与解除订阅 +11. `Controller` 必须在关闭时清理本次交互缓存 +12. 有 `UseCase` 且需要补自动化测试时，测试写入 EditMode + +## 11. 非目标说明 + +- 本文不讨论历史实现，也不为历史写法背书 +- 本文不要求所有 UI 必须强制引入 `UseCase` +- 本文不展开底层 UI 框架或事件系统实现细节 diff --git a/Assets/Plugins/UIModule/docs/UI-5层架构设计规范.md.meta b/Assets/Plugins/UIModule/docs/UI-5层架构设计规范.md.meta new file mode 100644 index 0000000..be74e22 --- /dev/null +++ b/Assets/Plugins/UIModule/docs/UI-5层架构设计规范.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4995b75eba7756d40939282a00f7c04a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/UIModule/docs/UIModule-使用说明.md b/Assets/Plugins/UIModule/docs/UIModule-使用说明.md new file mode 100644 index 0000000..ced358a --- /dev/null +++ b/Assets/Plugins/UIModule/docs/UIModule-使用说明.md @@ -0,0 +1,220 @@ +# UIModule 使用说明（可选插件） + +## 1. 定位 + +`UIModule` 是基于 UGF 的可选 UI 插件，通过 `.asmref` 融入现有项目程序集： + +- `Base/` → `SepCore.Base` +- `Runtime/` → `SepCore.Runtime` +- `UI/` → `SepCore.Presentation` + +插件本身没有独立运行时程序集；基础抽象、事件、Controller、View 会并入宿主程序集编译。 +不启用插件时，项目仍可继续使用原有 UI 路线。 + +--- + +## 2. 接入步骤 + +1. 确保以下 `.asmref` 已存在于插件目录： + - `SepCore.Base.UIModule.asmref` + - `SepCore.Runtime.UIModule.asmref` + - `SepCore.Presentation.UIModule.asmref` +2. 将 `Assets/Plugins/UIModule/Prefab/DialogForm.prefab` 复制到： + - `Assets/GameMain/UI/UIForms` +3. 处理原有 Dialog 资源（任选其一）： + - 重命名旧 `DialogForm` 资源，或 + - 确认无引用后删除旧 `DialogForm` 资源 +4. 在 `Launcher` 场景的 `Customs` 下创建对象并挂载 `UIRouterComponent` + +--- + +## 3. UIRouter 配置 + +`UIRouterComponent` 通过 Inspector 配置 `UIFormType -> Controller` 映射： + +- `UI Form Type` +- `Controller Type` + +编辑器会扫描所有实现 `IUIFormController` 的**可实例化类型**（非抽象、非接口、非开放泛型）。 +运行时 `Awake()` 会自动注册配置项。 + +当前 Router 对外接口： + +- `BindUIUseCase(UIFormType uiFormType, IUIUseCase useCase)` +- `OpenUIAsync(UIFormType uiFormType, object userData = null, float timeout = 30f)` +- `CloseUIAsync(UIFormType uiFormType, object userData = null, float timeout = 30f)` + +说明： + +- 缺少 Controller 绑定时会输出 `Error` 并直接失败 +- 不会 fallback 到原始 `GameEntry.UI.OpenUIForm(...)` +- 重新注册同一 `UIFormType` 时，旧 Controller 会异步关闭并被新配置覆盖 + +--- + +## 4. 当前运行时结构 + +### 4.1 基础抽象 + +`IUIFormController` 当前是 **async-first** 接口： + +```csharp +UniTask OpenUIAsync(object userData = null, float timeout = 30f); +UniTask CloseUIAsync(object userData = null, float timeout = 30f); +void BindUseCase(IUIUseCase useCase); +``` + +`UIFormControllerBase` 当前只提供**薄机制层**能力： + +- `OpenFormAsync(TContext context, float timeout = 30f)` +- `CloseFormAsync(object userData = null, float timeout = 30f)` + +它负责： + +- 调用 `GameEntry.UI.OpenUIFormAsync(...) / CloseUIFormAsync(...)` +- 维护 `_context / _form / _formSerialId` +- 在打开后调用 `RefreshUI` +- 在打开 / 关闭时订阅与解除 `SubscribeCustomEvents()` + +它**不负责**： + +- 解析 `userData` +- 构造 `Context` +- 缓存业务回调 +- 安排子类的业务时序 + +这些流程由具体 Controller 显式实现。 + +### 4.2 UGF 异步适配 + +插件的 async 行为并没有改 UGF 底层事件机制，而是通过以下适配层桥接： + +- `AsyncTaskHelper` +- `UIAsyncExtension` + +其中 `UIAsyncExtension` 目前已支持： + +- `OpenUIFormAsync(string uiFormAssetName, string uiGroupName, ...)` +- `OpenUIFormAsync(int uiFormId, object userData = null, float timeout = 30f)` +- `CloseUIFormAsync(int serialId, object userData = null, float timeout = 30f)` + +--- + +## 5. Controller 实现约定 + +当前推荐写法是： + +1. 子类自己在 `OpenUIAsync(...)` 里： + - 校验 `userData` + - 构造 `RawData / Context` + - 缓存本次交互需要的临时状态 + - `await OpenFormAsync(...)` +2. 子类自己在 `CloseUIAsync(...)` 里： + - 清理本次交互缓存 + - `await CloseFormAsync(...)` +3. 基类只提供共用开关窗机制，不隐藏业务时序 + +也就是说，实现 Controller 时，应该尽量做到： + +- **看子类本身就能看懂完整流程** +- 不依赖“阅读基类钩子调用顺序”来推断业务时机 + +--- + +## 6. Dialog 当前实现 + +### 6.1 相关类型 + +- `DialogRawData`（`SepCore.UI`） + - 外部输入模型 + - 可携带： + - 标题 / 内容 / 按钮文本 + - `PauseGame` + - `OnClickConfirm / OnClickCancel / OnClickOther` + - `UserData` + +- `DialogContext`（`SepCore.UIModule`） + - 纯展示数据 + - 不携带回调 + +- `DialogController`（`SepCore.UIModule`） + - 显式实现 `OpenUIAsync / CloseUIAsync` + - 负责缓存按钮回调与 `UserData` + - 负责把 `DialogRawData` 转成 `DialogContext` + +- `DialogForm`（`SepCore.UIModule`） + - 只负责渲染和派发 UI 专用事件 + +- `DialogEventArgs`（`SepCore.Event`） + - 当前 Dialog 只使用**一个事件类型** + - 通过 `ButtonId` 区分按钮： + - `1`：Confirm + - `2`：Cancel + - `3`：Other + +### 6.2 当前数据流 + +1. 外部调用： + + ```csharp + await uiRouter.OpenUIAsync(UIFormType.DialogForm, rawData); + ``` + +2. `DialogController.OpenUIAsync(...)`： + - 校验 `DialogRawData` + - 构造 `DialogContext` + - 缓存按钮回调和 `UserData` + - `await OpenFormAsync(context, timeout)` + +3. `DialogForm` 在按钮点击时只发出： + + - `DialogEventArgs.Create(1, null)` + - `DialogEventArgs.Create(2, null)` + - `DialogEventArgs.Create(3, null)` + +4. `DialogController` 收到 `DialogEventArgs` 后根据 `ButtonId` 选出对应回调 + +5. `DialogController` 调用异步关闭流程，再执行回调： + - `await CloseUIAsync()` + - `callback?.Invoke(userData)` + +6. `CloseUIAsync()` 会先清理缓存，再交给基类关闭 UI + +### 6.3 当前限制 + +- `DialogController.OpenUIAsync(null)` 会失败并输出 warning +- Dialog 当前**不依赖 UseCase** +- `DialogForm` 当前没有本地化默认文本回退： + - 标题、正文、按钮文本都以 `DialogRawData` 传入值为准 + +--- + +## 7. 注意点 + +1. **先注册再打开** + 使用前需确保 `UIRouterComponent` 已完成 `Awake` 自动注册。 + +2. **Controller 必须绑定且可实例化** + 缺少绑定时 Router 直接失败，不会回退到原生打开路径。 + +3. **统一走 async 接口** + 启用 UIModule 管理的 UI，应统一通过： + - `OpenUIAsync(...)` + - `CloseUIAsync(...)` + +4. **Controller 负责显式业务流程** + 基类只提供开关窗机制；`userData` 校验、`Context` 构造、回调缓存与关闭后的后续动作都应在具体 Controller 中明确写出。 + +5. **保持依赖方向** + - `SepCore.Base`：UI 专用事件 + - `SepCore.Runtime`：UI 基础抽象、`RawData`、`UseCase`、`UIRouterComponent` + - `SepCore.Presentation`：Controller、Context、View + +6. **Prefab 脚本一致性** + Dialog prefab 上必须挂载插件内 `SepCore.UIModule.DialogForm`。 + +7. **Dialog 事件语义** + 当前 Dialog 使用单一 `DialogEventArgs` + `ButtonId` 区分按钮，不再使用多个按钮事件类型。 + +8. **Dialog 当前按单实例思路使用** + `DialogController` 当前没有额外用 `sender` / `serialId` 做多实例过滤，默认按单实例 Dialog 使用。 diff --git a/Assets/Plugins/UIModule/docs/UIModule-使用说明.md.meta b/Assets/Plugins/UIModule/docs/UIModule-使用说明.md.meta new file mode 100644 index 0000000..700a5de --- /dev/null +++ b/Assets/Plugins/UIModule/docs/UIModule-使用说明.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8f6066a06979f654fab6ac54a688cbfb +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs b/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs index e08aae1..84f5103 100644 --- a/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs +++ b/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs @@ -2,6 +2,7 @@ using System.Reflection; using Entity; using Entity.EntityData; +using SepCore.Definition; using NUnit.Framework; using UnityEngine; using UnityEngine.TestTools; @@ -79,7 +80,7 @@ namespace Simulation.Tests.PlayMode projectileObject.transform.position = Vector3.zero; ProjectileDataField.SetValue(projectile, - new EnemyProjectileData(3001, 1001, Definition.Enum.CampType.Enemy, 5, 10f, 0.1f, Vector3.right)); + new EnemyProjectileData(3001, 1001, CampType.Enemy, 5, 10f, 0.1f, Vector3.right)); ProjectileIsActiveField.SetValue(projectile, true); ProjectileDirectionField.SetValue(projectile, Vector3.right); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f2761e7..b3797dd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,7 +8,7 @@ PlayerSettings: AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 2 + defaultScreenOrientation: 3 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 diff --git a/docs/AssemblyOrganization.md b/docs/AssemblyOrganization.md new file mode 100644 index 0000000..e30b510 --- /dev/null +++ b/docs/AssemblyOrganization.md @@ -0,0 +1,210 @@ +# SepCore 程序集组织规范 + +本文档定义 `Assets/GameMain/Scripts` 下 C# 代码的程序集（Assembly Definition）拆分规则，用于指导新代码的归属判断和现有代码的维护。 + +--- + +## 1. 设计原则 + +### 1.1 核心约束 + +- **单向依赖**：下层不引用上层，上层可以引用下层。 +- **GameEntry 红线**：凡是有 `GameEntry.` 引用的代码，**一律不能放在 Base**。 +- **框架适配**：UnityGameFramework 是组件化平级协作架构，`GameEntry` 作为全局访问点天然要求它能看到所有 Component。因此 Component 及其扩展方法统一归到 Runtime，不放在 Base。 + +### 1.2 依赖方向 + +``` +SepCore.Procedure（编排层） + ↓ 可引用 +SepCore.Presentation（表现层） + ↓ 可引用 +SepCore.Runtime（运行时基础设施层） + ↓ 可引用 +SepCore.Base（核心定义层） +``` + +Editor 程序集独立，引用除 Presentation 外的所有运行时程序集： + +``` +SepCore.Editor + ↓ 可引用 +SepCore.Procedure / SepCore.Runtime / SepCore.Base / UnityGameFramework.* +``` + +--- + +## 2. 各层职责与判断标准 + +### 2.1 SepCore.Base — 核心定义层 + +**定位**：最稳定、最少变化、零外部依赖的纯基础设施。 + +**判断标准**： +- 不引用 `GameEntry` +- 不引用任何自定义 MonoBehaviour Component +- 不引用 `UnityGameFramework.Runtime` 中的具体 Component（框架基础类型如 `EntityLogic` 除外） +- 以数据结构、常量、枚举、纯算法为主 + +**当前归属目录**： + +| 目录 | 说明 | +|-------------------------------|---------------------------------------------------------| +| `Base/DataTable/` | DR* 数据表行定义、`BinaryReaderExtension`、`DataTableExtension` | +| `Base/Definition/Constant/` | `Constant.*` 常量 | +| `Base/Definition/DataStruct/` | `BuildInfo`、`VersionInfo` 等纯数据结构 | +| `Base/Definition/Enum/` | `SceneType`、`UIFormType` 等枚举 | +| `Base/Entity/EntityData/` | `EntityDataBase`（纯数据类） | +| `Base/Entity/EntityLogic/` | `EntityBase`（继承框架 `EntityLogic`，无 `GameEntry` 引用） | +| `Base/Utility/` | `AssetUtility`、`WebUtility`、`LitJsonHelper`（纯静态工具） | + +### 2.2 SepCore.Runtime — 运行时基础设施层 + +**定位**：所有 GameFrameworkComponent、全局访问点（GameEntry）、以及对框架组件的扩展方法。 + +**判断标准**： +- 包含 `GameEntry.` 引用 +- 继承或扩展框架 Component（如 `DefaultLocalizationHelper`、`UIFormLogic`） +- 对 `SoundComponent`、`UIComponent`、`EntityComponent` 等做扩展方法 +- 自定义的 GameFrameworkComponent（如 `BuiltinDataComponent`） + +**当前归属目录**： + +| 目录 | 说明 | +|----------------------------------------|-----------------------------------------------------------------------------------| +| `Runtime/BuiltinComponent/` | `EntityExtension`、`SoundExtension`、`UIComponentExtension`、`XmlLocalizationHelper` | +| `Runtime/UIBase/` | `UGuiForm`（基类）、`UIExtension`、`DialogParams`、`UGuiGroupHelper`、`CommonButton` | +| `Runtime/Base/` | `GameEntry.cs`、`GameEntry.Builtin.cs`、`GameEntry.Custom.cs` | +| `Runtime/CustomComponent/BuiltinData/` | `BuiltinDataComponent.cs` | +| `Runtime/Debugger/` | `ChangeLanguageDebuggerWindow.cs` | + +**引用配置**： +- `UnityGameFramework.Runtime` +- `GameFramework` +- `SepCore.Base` + +### 2.3 SepCore.Presentation — 表现层 + +**定位**：最顶层的业务 UIForm，只包含具体界面的逻辑，不含可复用的 UI 基础设施。 + +**判断标准**： +- 继承 `UGuiForm`（Runtime 层基类）或直接继承 `MonoBehaviour` +- 不向外暴露被其他 Component/Procedure 直接引用的类型（除非通过 `GameObject` 或基类解耦） +- 允许调用 `GameEntry.*` + +**当前归属目录**： + +| 目录 | 说明 | +|-------|-----------------------------------| +| `UI/` | `DialogForm`、`UpdateResourceForm` | + +**引用配置**： +- `SepCore.Runtime` +- `SepCore.Base` +- `UnityGameFramework.Runtime` +- `GameFramework` + +### 2.4 SepCore.Procedure — 编排层 + +**定位**：游戏生命周期流程（Procedure），作为最顶层协调者，可以引用所有人。 + +**判断标准**： +- 继承 `ProcedureBase` +- 直接引用具体 UIForm 类型（如 `UpdateResourceForm`）是允许的，因为 Procedure 是最顶层 + +**当前归属目录**： + +| 目录 | 说明 | +|--------------|-----------------------------------| +| `Procedure/` | `ProcedureBase` + 所有 Procedure 子类 | + +**引用配置**： +- `SepCore.Presentation` +- `SepCore.Runtime` +- `SepCore.Base` +- `UnityGameFramework.Runtime` +- `GameFramework` + +### 2.5 SepCore.Editor — 编辑器扩展层 + +**定位**：编辑器工具、自定义 Inspector、构建事件等，仅在 Editor 下编译。 + +**引用配置**： +- `UnityGameFramework.Editor` +- `UnityGameFramework.Runtime` +- `SepCore.Runtime` +- `SepCore.Base` +- `GameFramework` + +**注意**：Editor 不引用 `SepCore.Presentation`，避免编辑器逻辑依赖业务表现层。 + +--- + +## 3. 程序集引用矩阵 + +| 引用方 \ 被引用方 | Base | Runtime | Presentation | Procedure | Editor | +|------------------|------|---------|--------------|-----------|--------| +| **Base** | — | ✗ | ✗ | ✗ | ✗ | +| **Runtime** | ✓ | — | ✗ | ✗ | ✗ | +| **Presentation** | ✓ | ✓ | — | ✗ | ✗ | +| **Procedure** | ✓ | ✓ | ✓ | — | ✗ | +| **Editor** | ✓ | ✓ | ✗ | ✗ | — | + +--- + +## 4. 常见反模式 + +### 4.1 Base 层引用 GameEntry + +❌ **错误**：把 `XmlLocalizationHelper`、`ChangeLanguageDebuggerWindow` 等引用 `GameEntry` 的文件放在 Base。 + +✅ **正确**：凡是调用 `GameEntry.*` 的文件，一律放到 Runtime 或更高层。 + +### 4.2 Runtime 层引用 Presentation 的具体类型 + +❌ **错误**：`BuiltinDataComponent` 持有 `UpdateResourceForm` 类型的字段。 + +✅ **正确**：`BuiltinDataComponent` 暴露 `GameObject`，由 Procedure（最顶层）通过 `GetComponent()` 获取。 + +### 4.3 GameEntry 留在 Base + +❌ **错误**：`GameEntry.Custom.cs` 引用了 `BuiltinDataComponent`（Runtime），但 `GameEntry` 放在 Base。 + +✅ **正确**：`GameEntry` 的所有 partial 文件必须和 `BuiltinDataComponent` 在同一程序集，即 Runtime。 + +### 4.4 扩展方法乱放在 Utility/ + +❌ **错误**：把 `SoundComponent.PlayMusic` 这类扩展方法放在 `Utility/SoundExtension.cs`。 + +✅ **正确**：对 Component 的扩展方法跟着被扩展方走，放在 `BuiltinComponent/`（Runtime）下，或按模块分散到各子系统的 Runtime 目录中。 + +--- + +## 5. 命名空间约定 + +程序集拆分后，命名空间保持与原始文件夹路径一致，便于代码导航： + +| 程序集 | 命名空间示例 | +|------------------------|------------------------------------------------------------------------| +| `SepCore.Base` | `SepCore.DataTable`、`SepCore.Definition`、`SepCore.Utility` | +| `SepCore.Runtime` | `SepCore.Runtime`（根命名空间）、`SepCore.UI`、`SepCore.Entity`、`SepCore.Sound` | +| `SepCore.Presentation` | `SepCore.UI`（与 Runtime 共享，因为 DialogForm 等原本就在 `SepCore.UI`） | +| `SepCore.Procedure` | `SepCore.Procedure` | +| `SepCore.Editor` | `SepCore.Editor` | + +允许 Runtime 和 Presentation 共享同一个根命名空间（如 `SepCore.UI`），因为 C# 命名空间可以跨程序集。Presentation 的 `DialogForm` 在 `SepCore.UI` 下，Runtime 的 `UGuiForm` 也在 `SepCore.UI` 下，这是合法的。 + +--- + +## 6. 新增代码决策流程 + +当不确定新文件该放哪一层时，按以下顺序判断： + +1. **是否只在 Editor 使用？** → `SepCore.Editor` +2. **是否继承 `ProcedureBase`？** → `SepCore.Procedure` +3. **是否继承 `UGuiForm` 或 `MonoBehaviour` 且是具体业务界面？** → `SepCore.Presentation` +4. **是否引用 `GameEntry`、是否是 Component、是否是对 Component 的扩展？** → `SepCore.Runtime` +5. **其余所有纯数据/定义/工具** → `SepCore.Base` + +--- +