diff --git a/Assets/GameMain/Scripts/Base/GeometryTD.Runtime.asmdef b/Assets/GameMain/Scripts/Base/GeometryTD.Runtime.asmdef new file mode 100644 index 0000000..8fb8c95 --- /dev/null +++ b/Assets/GameMain/Scripts/Base/GeometryTD.Runtime.asmdef @@ -0,0 +1,23 @@ +{ + "name": "GeometryTD.Runtime", + "rootNamespace": "GeometryTD.Runtime", + "references": [ + "GUID:363c5eb08ff8e6a439b85e37b8c20d96", + "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:6055be8ebefd69e48b49212b09b47b2f", + "GUID:771b79705393da244ae720aa28ae8a69", + "GUID:c53de6f5028489b4689382a86bfbd807", + "GUID:0f19320f1ba33834b896afc5a5aaae67" + ], + "includePlatforms": [ + "Android" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/GameMain/GeometryTD.Runtime.asmdef.meta b/Assets/GameMain/Scripts/Base/GeometryTD.Runtime.asmdef.meta similarity index 100% rename from Assets/GameMain/GeometryTD.Runtime.asmdef.meta rename to Assets/GameMain/Scripts/Base/GeometryTD.Runtime.asmdef.meta diff --git a/Assets/GameMain/Scripts/Components/GeometryTD.Gameplay.asmdef b/Assets/GameMain/Scripts/Components/GeometryTD.Gameplay.asmdef new file mode 100644 index 0000000..8a6a5e7 --- /dev/null +++ b/Assets/GameMain/Scripts/Components/GeometryTD.Gameplay.asmdef @@ -0,0 +1,18 @@ +{ + "name": "GeometryTD.Gameplay", + "rootNamespace": "GeometryTD.Gameplay", + "references": [ + "GUID:771b79705393da244ae720aa28ae8a69" + ], + "includePlatforms": [ + "Android" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Components/GeometryTD.Gameplay.asmdef.meta b/Assets/GameMain/Scripts/Components/GeometryTD.Gameplay.asmdef.meta new file mode 100644 index 0000000..e5cb390 --- /dev/null +++ b/Assets/GameMain/Scripts/Components/GeometryTD.Gameplay.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c53de6f5028489b4689382a86bfbd807 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/CustomComponent/CombatNode/GeometryTD.Gameplay.CombatNode.asmref b/Assets/GameMain/Scripts/CustomComponent/CombatNode/GeometryTD.Gameplay.CombatNode.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/CombatNode/GeometryTD.Gameplay.CombatNode.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/CustomComponent/CombatNode/GeometryTD.Gameplay.CombatNode.asmref.meta b/Assets/GameMain/Scripts/CustomComponent/CombatNode/GeometryTD.Gameplay.CombatNode.asmref.meta new file mode 100644 index 0000000..0e9d887 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/CombatNode/GeometryTD.Gameplay.CombatNode.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5304296ea426f4d4b8067b7b64a3ad48 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/CustomComponent/GeometryTD.Runtime.CustomComponent.asmref b/Assets/GameMain/Scripts/CustomComponent/GeometryTD.Runtime.CustomComponent.asmref new file mode 100644 index 0000000..b57aa43 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/GeometryTD.Runtime.CustomComponent.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:e67bd2d1b65d48ce8120141996e55b2b" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/CustomComponent/GeometryTD.Runtime.CustomComponent.asmref.meta b/Assets/GameMain/Scripts/CustomComponent/GeometryTD.Runtime.CustomComponent.asmref.meta new file mode 100644 index 0000000..c840ef8 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/GeometryTD.Runtime.CustomComponent.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bd7362132664f0c499e39663c24ade2d +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/GeometryTD.Presentation.HPBar.asmref b/Assets/GameMain/Scripts/CustomComponent/HPBar/GeometryTD.Presentation.HPBar.asmref new file mode 100644 index 0000000..0a190e1 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/HPBar/GeometryTD.Presentation.HPBar.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:0f19320f1ba33834b896afc5a5aaae67" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/CustomComponent/HPBar/GeometryTD.Presentation.HPBar.asmref.meta b/Assets/GameMain/Scripts/CustomComponent/HPBar/GeometryTD.Presentation.HPBar.asmref.meta new file mode 100644 index 0000000..c3f7497 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/HPBar/GeometryTD.Presentation.HPBar.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c1cfd0d064e8b3418adeca47c20ae1d +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/CustomComponent/InventoryGeneration/GeometryTD.Gameplay.InventoryGeneration.asmref b/Assets/GameMain/Scripts/CustomComponent/InventoryGeneration/GeometryTD.Gameplay.InventoryGeneration.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/InventoryGeneration/GeometryTD.Gameplay.InventoryGeneration.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/CustomComponent/InventoryGeneration/GeometryTD.Gameplay.InventoryGeneration.asmref.meta b/Assets/GameMain/Scripts/CustomComponent/InventoryGeneration/GeometryTD.Gameplay.InventoryGeneration.asmref.meta new file mode 100644 index 0000000..76fadcc --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/InventoryGeneration/GeometryTD.Gameplay.InventoryGeneration.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6bc6ae941e9ae4c43a4f75e3405d0eaf +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/CustomComponent/PlayerInventory/GeometryTD.Gameplay.PlayerInventory.asmref b/Assets/GameMain/Scripts/CustomComponent/PlayerInventory/GeometryTD.Gameplay.PlayerInventory.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/PlayerInventory/GeometryTD.Gameplay.PlayerInventory.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/CustomComponent/PlayerInventory/GeometryTD.Gameplay.PlayerInventory.asmref.meta b/Assets/GameMain/Scripts/CustomComponent/PlayerInventory/GeometryTD.Gameplay.PlayerInventory.asmref.meta new file mode 100644 index 0000000..38bfb4a --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/PlayerInventory/GeometryTD.Gameplay.PlayerInventory.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 93d673219f2a1a94599e67456ea33f7f +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/CustomComponent/TagRegistry/GeometryTD.Gameplay.TagRegistry.asmref b/Assets/GameMain/Scripts/CustomComponent/TagRegistry/GeometryTD.Gameplay.TagRegistry.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/TagRegistry/GeometryTD.Gameplay.TagRegistry.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/CustomComponent/TagRegistry/GeometryTD.Gameplay.TagRegistry.asmref.meta b/Assets/GameMain/Scripts/CustomComponent/TagRegistry/GeometryTD.Gameplay.TagRegistry.asmref.meta new file mode 100644 index 0000000..8659f9c --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/TagRegistry/GeometryTD.Gameplay.TagRegistry.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e09026219ecab5e44ab54879792e2b26 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs b/Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs index 58a6cb6..dccb62d 100644 --- a/Assets/GameMain/Scripts/DataTable/BinaryReaderExtension.cs +++ b/Assets/GameMain/Scripts/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 GeometryTD.DataTable +namespace GeometryTD.Core { public static class BinaryReaderExtension { diff --git a/Assets/GameMain/Scripts/DataTable/DRBaseComp.cs b/Assets/GameMain/Scripts/DataTable/DRBaseComp.cs index 82653de..b80ac40 100644 --- a/Assets/GameMain/Scripts/DataTable/DRBaseComp.cs +++ b/Assets/GameMain/Scripts/DataTable/DRBaseComp.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.Definition; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 底座组件表 diff --git a/Assets/GameMain/Scripts/DataTable/DRBearingComp.cs b/Assets/GameMain/Scripts/DataTable/DRBearingComp.cs index 54cc521..152f066 100644 --- a/Assets/GameMain/Scripts/DataTable/DRBearingComp.cs +++ b/Assets/GameMain/Scripts/DataTable/DRBearingComp.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.Definition; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 轴承组件表 diff --git a/Assets/GameMain/Scripts/DataTable/DREnemy.cs b/Assets/GameMain/Scripts/DataTable/DREnemy.cs index 435bbc5..4c06c27 100644 --- a/Assets/GameMain/Scripts/DataTable/DREnemy.cs +++ b/Assets/GameMain/Scripts/DataTable/DREnemy.cs @@ -1,6 +1,6 @@ using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 敌人配置表 diff --git a/Assets/GameMain/Scripts/DataTable/DREntity.cs b/Assets/GameMain/Scripts/DataTable/DREntity.cs index 0719139..518962f 100644 --- a/Assets/GameMain/Scripts/DataTable/DREntity.cs +++ b/Assets/GameMain/Scripts/DataTable/DREntity.cs @@ -16,7 +16,7 @@ using System.Text; using UnityEngine; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 实体表。 diff --git a/Assets/GameMain/Scripts/DataTable/DREvent.cs b/Assets/GameMain/Scripts/DataTable/DREvent.cs index 1a1167d..b980ed3 100644 --- a/Assets/GameMain/Scripts/DataTable/DREvent.cs +++ b/Assets/GameMain/Scripts/DataTable/DREvent.cs @@ -1,7 +1,7 @@ using UnityGameFramework.Runtime; using Newtonsoft.Json.Linq; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 事件配置表 diff --git a/Assets/GameMain/Scripts/DataTable/DRLevel.cs b/Assets/GameMain/Scripts/DataTable/DRLevel.cs index fecd64e..d317b13 100644 --- a/Assets/GameMain/Scripts/DataTable/DRLevel.cs +++ b/Assets/GameMain/Scripts/DataTable/DRLevel.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.Definition; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 关卡表 diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelPhase.cs b/Assets/GameMain/Scripts/DataTable/DRLevelPhase.cs index c98fe1e..a002320 100644 --- a/Assets/GameMain/Scripts/DataTable/DRLevelPhase.cs +++ b/Assets/GameMain/Scripts/DataTable/DRLevelPhase.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 关卡阶段表 diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelSpawnEntry.cs b/Assets/GameMain/Scripts/DataTable/DRLevelSpawnEntry.cs index f8c41b3..0630c6e 100644 --- a/Assets/GameMain/Scripts/DataTable/DRLevelSpawnEntry.cs +++ b/Assets/GameMain/Scripts/DataTable/DRLevelSpawnEntry.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 关卡阶段出怪条目表 diff --git a/Assets/GameMain/Scripts/DataTable/DRMusic.cs b/Assets/GameMain/Scripts/DataTable/DRMusic.cs index b992428..3ebe998 100644 --- a/Assets/GameMain/Scripts/DataTable/DRMusic.cs +++ b/Assets/GameMain/Scripts/DataTable/DRMusic.cs @@ -16,7 +16,7 @@ using System.Text; using UnityEngine; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 音乐配置表。 diff --git a/Assets/GameMain/Scripts/DataTable/DRMuzzleComp.cs b/Assets/GameMain/Scripts/DataTable/DRMuzzleComp.cs index 15ff629..88e9a76 100644 --- a/Assets/GameMain/Scripts/DataTable/DRMuzzleComp.cs +++ b/Assets/GameMain/Scripts/DataTable/DRMuzzleComp.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.Definition; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 枪口组件表 diff --git a/Assets/GameMain/Scripts/DataTable/DROutGameDropPool.cs b/Assets/GameMain/Scripts/DataTable/DROutGameDropPool.cs index 6972bed..8f31cf2 100644 --- a/Assets/GameMain/Scripts/DataTable/DROutGameDropPool.cs +++ b/Assets/GameMain/Scripts/DataTable/DROutGameDropPool.cs @@ -1,10 +1,9 @@ using System; -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityEngine; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 局外道具掉落池配置表。 diff --git a/Assets/GameMain/Scripts/DataTable/DRRarityTagBudget.cs b/Assets/GameMain/Scripts/DataTable/DRRarityTagBudget.cs index cb4ec0a..91729f8 100644 --- a/Assets/GameMain/Scripts/DataTable/DRRarityTagBudget.cs +++ b/Assets/GameMain/Scripts/DataTable/DRRarityTagBudget.cs @@ -1,8 +1,7 @@ -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { public sealed class DRRarityTagBudget : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRScene.cs b/Assets/GameMain/Scripts/DataTable/DRScene.cs index 1481609..849d970 100644 --- a/Assets/GameMain/Scripts/DataTable/DRScene.cs +++ b/Assets/GameMain/Scripts/DataTable/DRScene.cs @@ -6,7 +6,7 @@ using System.Text; using UnityEngine; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 场景配置表。 diff --git a/Assets/GameMain/Scripts/DataTable/DRShopPrice.cs b/Assets/GameMain/Scripts/DataTable/DRShopPrice.cs index 14d2bdb..9136769 100644 --- a/Assets/GameMain/Scripts/DataTable/DRShopPrice.cs +++ b/Assets/GameMain/Scripts/DataTable/DRShopPrice.cs @@ -1,8 +1,7 @@ -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { public class DRShopPrice : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRSound.cs b/Assets/GameMain/Scripts/DataTable/DRSound.cs index 8e02629..da8b94a 100644 --- a/Assets/GameMain/Scripts/DataTable/DRSound.cs +++ b/Assets/GameMain/Scripts/DataTable/DRSound.cs @@ -2,7 +2,7 @@ using System.Text; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 声音配置表。 diff --git a/Assets/GameMain/Scripts/DataTable/DRTag.cs b/Assets/GameMain/Scripts/DataTable/DRTag.cs index c063794..e0ca3da 100644 --- a/Assets/GameMain/Scripts/DataTable/DRTag.cs +++ b/Assets/GameMain/Scripts/DataTable/DRTag.cs @@ -1,9 +1,8 @@ using System; -using GeometryTD.Definition; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// Tag 表 diff --git a/Assets/GameMain/Scripts/DataTable/DRTagConfig.cs b/Assets/GameMain/Scripts/DataTable/DRTagConfig.cs index e9000f2..99b67b5 100644 --- a/Assets/GameMain/Scripts/DataTable/DRTagConfig.cs +++ b/Assets/GameMain/Scripts/DataTable/DRTagConfig.cs @@ -1,8 +1,7 @@ -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { public sealed class DRTagConfig : DataRowBase { diff --git a/Assets/GameMain/Scripts/DataTable/DRUIForm.cs b/Assets/GameMain/Scripts/DataTable/DRUIForm.cs index a17e73c..85efef4 100644 --- a/Assets/GameMain/Scripts/DataTable/DRUIForm.cs +++ b/Assets/GameMain/Scripts/DataTable/DRUIForm.cs @@ -2,7 +2,7 @@ using System.Text; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 界面配置表。 diff --git a/Assets/GameMain/Scripts/DataTable/DRUISound.cs b/Assets/GameMain/Scripts/DataTable/DRUISound.cs index f8e4493..9a7248d 100644 --- a/Assets/GameMain/Scripts/DataTable/DRUISound.cs +++ b/Assets/GameMain/Scripts/DataTable/DRUISound.cs @@ -16,7 +16,7 @@ using System.Text; using UnityEngine; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { /// /// 声音配置表。 diff --git a/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs b/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs index 853b99e..505e29d 100644 --- a/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs +++ b/Assets/GameMain/Scripts/DataTable/DataTableExtension.cs @@ -10,7 +10,7 @@ using System; using UnityEngine; using UnityGameFramework.Runtime; -namespace GeometryTD.DataTable +namespace GeometryTD.Core { public static class DataTableExtension { diff --git a/Assets/GameMain/GeometryTD.Runtime.asmdef b/Assets/GameMain/Scripts/DataTable/GeometryTD.Core.asmdef similarity index 57% rename from Assets/GameMain/GeometryTD.Runtime.asmdef rename to Assets/GameMain/Scripts/DataTable/GeometryTD.Core.asmdef index 1006865..b2b7729 100644 --- a/Assets/GameMain/GeometryTD.Runtime.asmdef +++ b/Assets/GameMain/Scripts/DataTable/GeometryTD.Core.asmdef @@ -1,11 +1,10 @@ { - "name": "GeometryTD.Runtime", - "rootNamespace": "GeometryTD", + "name": "GeometryTD.Core", + "rootNamespace": "GeometryTD.Core", "references": [ - "UnityGameFramework.Editor", - "UnityGameFramework.Runtime", - "Unity.InputSystem", - "Unity.TextMeshPro" + "GUID:363c5eb08ff8e6a439b85e37b8c20d96", + "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:6055be8ebefd69e48b49212b09b47b2f" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/GameMain/Scripts/DataTable/GeometryTD.Core.asmdef.meta b/Assets/GameMain/Scripts/DataTable/GeometryTD.Core.asmdef.meta new file mode 100644 index 0000000..29432b4 --- /dev/null +++ b/Assets/GameMain/Scripts/DataTable/GeometryTD.Core.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 771b79705393da244ae720aa28ae8a69 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidation.cs b/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidation.cs index 3272d4e..7616acc 100644 --- a/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidation.cs +++ b/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidation.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum CombatParticipantTowerValidationFailureReason { diff --git a/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidationText.cs b/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidationText.cs index afe5b8d..24ae328 100644 --- a/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidationText.cs +++ b/Assets/GameMain/Scripts/Definition/CombatParticipantTowerValidationText.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class CombatParticipantTowerValidationText { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/AttackPayload.cs b/Assets/GameMain/Scripts/Definition/DataStruct/AttackPayload.cs index 51cacd3..1e95a99 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/AttackPayload.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/AttackPayload.cs @@ -1,8 +1,8 @@ using System; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class AttackPayload diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/BackpackInventoryData.cs b/Assets/GameMain/Scripts/Definition/DataStruct/BackpackInventoryData.cs index e7198dd..84d10bc 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/BackpackInventoryData.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/BackpackInventoryData.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 玩家背包聚合数据。 diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs b/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs index 658b102..7f4527e 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/BuildInfo.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class BuildInfo { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/EventItem.cs b/Assets/GameMain/Scripts/Definition/DataStruct/EventItem.cs index 62883e6..bc5a3f4 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/EventItem.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/EventItem.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class EventItem { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/EventOption.cs b/Assets/GameMain/Scripts/Definition/DataStruct/EventOption.cs index 3afb457..22e743d 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/EventOption.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/EventOption.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class EventOption { diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/HitContext.cs b/Assets/GameMain/Scripts/Definition/DataStruct/HitContext.cs index debc4ea..11976db 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/HitContext.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/HitContext.cs @@ -1,8 +1,7 @@ using System; -using GeometryTD.Entity; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class HitStatusModifierContext diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs b/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs index 1db0f0b..cc3862c 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/ImpactData.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [StructLayout(LayoutKind.Auto)] public struct ImpactData diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/TowerCompItemData.cs b/Assets/GameMain/Scripts/Definition/DataStruct/TowerCompItemData.cs index 6ba31d2..b9ca18d 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/TowerCompItemData.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/TowerCompItemData.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 背包内组件实例基类（非 DataTable，表示玩家持有物）。 diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/TowerItemData.cs b/Assets/GameMain/Scripts/Definition/DataStruct/TowerItemData.cs index d2ba619..d4312a5 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/TowerItemData.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/TowerItemData.cs @@ -2,7 +2,7 @@ using System; using Newtonsoft.Json; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 背包内防御塔实例数据。 diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/TowerStatsData.cs b/Assets/GameMain/Scripts/Definition/DataStruct/TowerStatsData.cs index e23379a..c12f022 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/TowerStatsData.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/TowerStatsData.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 防御塔独立属性快照。 diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs b/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs index 24cd43a..bc7c141 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/VersionInfo.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class VersionInfo { diff --git a/Assets/GameMain/Scripts/Definition/Enum/AttackMethodType.cs b/Assets/GameMain/Scripts/Definition/Enum/AttackMethodType.cs index 78d4b0f..df86a41 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/AttackMethodType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/AttackMethodType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum AttackMethodType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/AttackPropertyType.cs b/Assets/GameMain/Scripts/Definition/Enum/AttackPropertyType.cs index 5a0f3d9..7157ae6 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/AttackPropertyType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/AttackPropertyType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum AttackPropertyType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/CampType.cs b/Assets/GameMain/Scripts/Definition/Enum/CampType.cs index ddba1c9..7f35019 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/CampType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/CampType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 阵营类型。 diff --git a/Assets/GameMain/Scripts/UI/Combat/Context/CombatSelectActionType.cs b/Assets/GameMain/Scripts/Definition/Enum/CombatSelectActionType.cs similarity index 85% rename from Assets/GameMain/Scripts/UI/Combat/Context/CombatSelectActionType.cs rename to Assets/GameMain/Scripts/Definition/Enum/CombatSelectActionType.cs index af0372c..1dbcf31 100644 --- a/Assets/GameMain/Scripts/UI/Combat/Context/CombatSelectActionType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/CombatSelectActionType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.UI +namespace GeometryTD.Core { public enum CombatSelectActionType : byte { diff --git a/Assets/GameMain/Scripts/UI/Combat/Context/CombatSelectActionType.cs.meta b/Assets/GameMain/Scripts/Definition/Enum/CombatSelectActionType.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/Combat/Context/CombatSelectActionType.cs.meta rename to Assets/GameMain/Scripts/Definition/Enum/CombatSelectActionType.cs.meta diff --git a/Assets/GameMain/Scripts/Definition/Enum/EntryType.cs b/Assets/GameMain/Scripts/Definition/Enum/EntryType.cs index e29a644..9e20e13 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/EntryType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/EntryType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 出怪条目类型 diff --git a/Assets/GameMain/Scripts/Definition/Enum/EventEffectType.cs b/Assets/GameMain/Scripts/Definition/Enum/EventEffectType.cs index 0231272..615e47b 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/EventEffectType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/EventEffectType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum EventEffectType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/EventRequirementType.cs b/Assets/GameMain/Scripts/Definition/Enum/EventRequirementType.cs index eb02abd..874f29f 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/EventRequirementType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/EventRequirementType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum EventRequirementType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/InventoryTagSourceType.cs b/Assets/GameMain/Scripts/Definition/Enum/InventoryTagSourceType.cs index 2f21259..f7b102f 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/InventoryTagSourceType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/InventoryTagSourceType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum InventoryTagSourceType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/LevelThemeType.cs b/Assets/GameMain/Scripts/Definition/Enum/LevelThemeType.cs index 8efa818..dc002da 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/LevelThemeType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/LevelThemeType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum LevelThemeType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/LevelVictoryType.cs b/Assets/GameMain/Scripts/Definition/Enum/LevelVictoryType.cs index b58db43..6671b1d 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/LevelVictoryType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/LevelVictoryType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum LevelVictoryType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/PhaseEndType.cs b/Assets/GameMain/Scripts/Definition/Enum/PhaseEndType.cs index a8b1e2e..e656e20 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/PhaseEndType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/PhaseEndType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 关卡阶段结束类型 diff --git a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainCombatEntryBlockReason.cs b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainCombatEntryBlockReason.cs index a3feef7..5bb4e36 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainCombatEntryBlockReason.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainCombatEntryBlockReason.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum ProcedureMainCombatEntryBlockReason { diff --git a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainFlowPhase.cs b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainFlowPhase.cs index d9305ba..98f7c36 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainFlowPhase.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainFlowPhase.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum ProcedureMainFlowPhase { diff --git a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunAdvanceResult.cs b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunAdvanceResult.cs index 6fe78cc..9522b8f 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunAdvanceResult.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunAdvanceResult.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum ProcedureMainRunAdvanceResult { diff --git a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunCompletionResult.cs b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunCompletionResult.cs index f5fe2f6..fc0b2bf 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunCompletionResult.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/ProcedureMainRunCompletionResult.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum ProcedureMainRunCompletionResult { diff --git a/Assets/GameMain/Scripts/Definition/Enum/RarityType.cs b/Assets/GameMain/Scripts/Definition/Enum/RarityType.cs index 3cd10df..3e9406e 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/RarityType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/RarityType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum RarityType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs b/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs index cd56fc9..32e5764 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/RelationType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 关系类型。 diff --git a/Assets/GameMain/Scripts/Definition/Enum/RepoItemClickActionType.cs b/Assets/GameMain/Scripts/Definition/Enum/RepoItemClickActionType.cs index 8e74193..486255b 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/RepoItemClickActionType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/RepoItemClickActionType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum RepoItemClickActionType { diff --git a/Assets/GameMain/Scripts/Definition/Enum/SceneType.cs b/Assets/GameMain/Scripts/Definition/Enum/SceneType.cs index 9a96df7..4f49210 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/SceneType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/SceneType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum SceneType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/TagCategory.cs b/Assets/GameMain/Scripts/Definition/Enum/TagCategory.cs index 2cf6a22..11682b7 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/TagCategory.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/TagCategory.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum TagCategory : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/TagTriggerPhase.cs b/Assets/GameMain/Scripts/Definition/Enum/TagTriggerPhase.cs index cfa9d7f..cf4410d 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/TagTriggerPhase.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/TagTriggerPhase.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum TagTriggerPhase : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/TagType.cs b/Assets/GameMain/Scripts/Definition/Enum/TagType.cs index 28c0bec..6a5c32e 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/TagType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/TagType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum TagType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/TowerCompSlotType.cs b/Assets/GameMain/Scripts/Definition/Enum/TowerCompSlotType.cs index 10737c8..def6037 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/TowerCompSlotType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/TowerCompSlotType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum TowerCompSlotType : byte { diff --git a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs b/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs index 3d7553f..08e9763 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { /// /// 界面编号。 diff --git a/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddGoldEffect.cs b/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddGoldEffect.cs index a3ed1f7..fe779e8 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddGoldEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddGoldEffect.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class AddGoldEffect : EventEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddRandomCompsEffect.cs b/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddRandomCompsEffect.cs index d711a20..ca21cf5 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddRandomCompsEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventEffect/AddRandomCompsEffect.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class AddRandomCompsEffect : EventEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventEffect/DamageRandomTowerEnduranceEffect.cs b/Assets/GameMain/Scripts/Definition/Event/EventEffect/DamageRandomTowerEnduranceEffect.cs index 6dcddfa..a127055 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventEffect/DamageRandomTowerEnduranceEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventEffect/DamageRandomTowerEnduranceEffect.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class DamageRandomTowerEnduranceEffect : EventEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventEffect/EventEffectBase.cs b/Assets/GameMain/Scripts/Definition/Event/EventEffect/EventEffectBase.cs index e80516a..42f60f5 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventEffect/EventEffectBase.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventEffect/EventEffectBase.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public abstract class EventEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventEffect/RemoveRandomCompEffect.cs b/Assets/GameMain/Scripts/Definition/Event/EventEffect/RemoveRandomCompEffect.cs index 7ac22d5..ac33913 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventEffect/RemoveRandomCompEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventEffect/RemoveRandomCompEffect.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class RemoveRandomCompsEffect : EventEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventOptionExecutor.cs b/Assets/GameMain/Scripts/Definition/Event/EventOptionExecutor.cs index b94fe72..1c4cc1d 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventOptionExecutor.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventOptionExecutor.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using GeometryTD.CustomComponent; -using GeometryTD.CustomUtility; +using GeometryTD.Core; using GeometryTD.Procedure; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class EventOptionExecutor { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/CompCountAtLeastRequirement.cs b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/CompCountAtLeastRequirement.cs index d54a09b..84d2194 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/CompCountAtLeastRequirement.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/CompCountAtLeastRequirement.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class CompCountAtLeastRequirement : EventRequirementBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/EventRequirementBase.cs b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/EventRequirementBase.cs index 179e497..71cbfc0 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/EventRequirementBase.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/EventRequirementBase.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public abstract class EventRequirementBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/GoldAtLeastRequirement.cs b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/GoldAtLeastRequirement.cs index 13325c8..a680d8b 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/GoldAtLeastRequirement.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/GoldAtLeastRequirement.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class GoldAtLeastRequirement : EventRequirementBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/HasRelicRequirement.cs b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/HasRelicRequirement.cs index 7aff552..2e0fca1 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/HasRelicRequirement.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/HasRelicRequirement.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class HasRelicRequirement : EventRequirementBase { diff --git a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/TowerCountAtLeastRequirement.cs b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/TowerCountAtLeastRequirement.cs index d0d3723..beb8263 100644 --- a/Assets/GameMain/Scripts/Definition/Event/EventRequirement/TowerCountAtLeastRequirement.cs +++ b/Assets/GameMain/Scripts/Definition/Event/EventRequirement/TowerCountAtLeastRequirement.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public class TowerCountAtLeastRequirement : EventRequirementBase { diff --git a/Assets/GameMain/Scripts/Definition/GeometryTD.Core.Definition.asmref b/Assets/GameMain/Scripts/Definition/GeometryTD.Core.Definition.asmref new file mode 100644 index 0000000..2a82464 --- /dev/null +++ b/Assets/GameMain/Scripts/Definition/GeometryTD.Core.Definition.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:771b79705393da244ae720aa28ae8a69" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Definition/GeometryTD.Core.Definition.asmref.meta b/Assets/GameMain/Scripts/Definition/GeometryTD.Core.Definition.asmref.meta new file mode 100644 index 0000000..7e04ca4 --- /dev/null +++ b/Assets/GameMain/Scripts/Definition/GeometryTD.Core.Definition.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f6496f38c28361745bf703b0dc338bc3 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Definition/InventoryRarityRuleService.cs b/Assets/GameMain/Scripts/Definition/InventoryRarityRuleService.cs index 8b14402..d7535ac 100644 --- a/Assets/GameMain/Scripts/Definition/InventoryRarityRuleService.cs +++ b/Assets/GameMain/Scripts/Definition/InventoryRarityRuleService.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class InventoryRarityRuleService { diff --git a/Assets/GameMain/Scripts/Definition/ParticipantTowerAssignResult.cs b/Assets/GameMain/Scripts/Definition/ParticipantTowerAssignResult.cs index 91de081..71482cf 100644 --- a/Assets/GameMain/Scripts/Definition/ParticipantTowerAssignResult.cs +++ b/Assets/GameMain/Scripts/Definition/ParticipantTowerAssignResult.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public enum ParticipantTowerAssignFailureReason { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TagRuntimeData.cs b/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TagRuntimeData.cs index da34de2..efb92f4 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TagRuntimeData.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TagRuntimeData.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class TagRuntimeData diff --git a/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TowerTagAggregationService.cs b/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TowerTagAggregationService.cs index 38d2934..a26047e 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TowerTagAggregationService.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Aggregation/TowerTagAggregationService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class TowerTagAggregationService { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/EnemyStatusTagRegistry.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/EnemyStatusTagRegistry.cs index 2388d54..828f3d4 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/EnemyStatusTagRegistry.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/EnemyStatusTagRegistry.cs @@ -1,9 +1,6 @@ -using System; using System.Collections.Generic; -using GeometryTD.Entity; -using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class EnemyStatusTagRegistry { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/AttackShapeTagEffectHandler.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/AttackShapeTagEffectHandler.cs index 3876229..b081433 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/AttackShapeTagEffectHandler.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/AttackShapeTagEffectHandler.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class AttackShapeTagEffectHandler { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/NumericTagEffectHandler.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/NumericTagEffectHandler.cs index 6ab3232..893741d 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/NumericTagEffectHandler.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/Handlers/NumericTagEffectHandler.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class NumericTagEffectHandler { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/States/EnemyStatusTagStateBase.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/States/EnemyStatusTagStateBase.cs index 1b80158..3528519 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/States/EnemyStatusTagStateBase.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/States/EnemyStatusTagStateBase.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public abstract class EnemyStatusTagStateBase { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/States/FireTagState.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/States/FireTagState.cs index 12bb3ed..67b2704 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/States/FireTagState.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/States/FireTagState.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class FireTagState : EnemyStatusTagStateBase { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/States/IceTagState.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/States/IceTagState.cs index f99287c..fb1c1cd 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/States/IceTagState.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/States/IceTagState.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class IceTagState : EnemyStatusTagStateBase { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/EnemyStatusTagEffectBase.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/EnemyStatusTagEffectBase.cs index 6938d57..310f5bd 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/EnemyStatusTagEffectBase.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/EnemyStatusTagEffectBase.cs @@ -1,7 +1,7 @@ using System; using GeometryTD.Entity; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public abstract class EnemyStatusTagEffectBase : IEnemyStatusTagEffect { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/FireTagEffect.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/FireTagEffect.cs index 91de299..1c9c158 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/FireTagEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/FireTagEffect.cs @@ -2,7 +2,7 @@ using GeometryTD.Entity; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class FireTagEffect : EnemyStatusTagEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IEnemyStatusTagEffect.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IEnemyStatusTagEffect.cs index 2a3bc0b..a60f626 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IEnemyStatusTagEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IEnemyStatusTagEffect.cs @@ -1,7 +1,7 @@ using System; using GeometryTD.Entity; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public interface IEnemyStatusTagEffect { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IceTagEffect.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IceTagEffect.cs index f0b1f14..f79244a 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IceTagEffect.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/StatusEffects/IceTagEffect.cs @@ -2,7 +2,7 @@ using GeometryTD.Entity; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class IceTagEffect : EnemyStatusTagEffectBase { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Combat/TagEffectResolver.cs b/Assets/GameMain/Scripts/Definition/Tag/Combat/TagEffectResolver.cs index 1c0d3f0..ffde966 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Combat/TagEffectResolver.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Combat/TagEffectResolver.cs @@ -1,7 +1,6 @@ -using GeometryTD.Entity; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class TagEffectResolver { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Generation/ComponentTagGenerationService.cs b/Assets/GameMain/Scripts/Definition/Tag/Generation/ComponentTagGenerationService.cs index 4a8fa8f..bc27546 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Generation/ComponentTagGenerationService.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Generation/ComponentTagGenerationService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using Random = System.Random; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class ComponentTagGenerationService { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Generation/InventoryTagRandomContext.cs b/Assets/GameMain/Scripts/Definition/Tag/Generation/InventoryTagRandomContext.cs index 24adbb6..89651a9 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Generation/InventoryTagRandomContext.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Generation/InventoryTagRandomContext.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public readonly struct InventoryTagRandomContext diff --git a/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRule.cs b/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRule.cs index 60ac68c..c47387e 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRule.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRule.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class RarityTagBudgetRule { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRuleRegistry.cs b/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRuleRegistry.cs index 395447e..910aec7 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRuleRegistry.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Generation/RarityTagBudgetRuleRegistry.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using GeometryTD.DataTable; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class RarityTagBudgetRuleRegistry { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRule.cs b/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRule.cs index fb5a2bd..a2e1fda 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRule.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRule.cs @@ -1,4 +1,4 @@ -namespace GeometryTD.Definition +namespace GeometryTD.Core { public sealed class TagGenerationRule { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRuleRegistry.cs b/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRuleRegistry.cs index f6a38e7..4a94284 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRuleRegistry.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Generation/TagGenerationRuleRegistry.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using GeometryTD.DataTable; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class TagGenerationRuleRegistry { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/AbsoluteZeroTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/AbsoluteZeroTagConfig.cs index 1cbe5b2..7d4e54d 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/AbsoluteZeroTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/AbsoluteZeroTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class AbsoluteZeroTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/BurnSpreadTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/BurnSpreadTagConfig.cs index 03943ac..3707585 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/BurnSpreadTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/BurnSpreadTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class BurnSpreadTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/CritTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/CritTagConfig.cs index b97228f..d60f275 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/CritTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/CritTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class CritTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ExecutionTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ExecutionTagConfig.cs index 068fa75..92380a9 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ExecutionTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ExecutionTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class ExecutionTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FireTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FireTagConfig.cs index 66fedd4..f6c0974 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FireTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FireTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class FireTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FreezeMaskTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FreezeMaskTagConfig.cs index 3d0b381..d91ee04 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FreezeMaskTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/FreezeMaskTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class FreezeMaskTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IceTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IceTagConfig.cs index 4a7a9aa..31f05b5 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IceTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IceTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class IceTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IgniteBurstTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IgniteBurstTagConfig.cs index a042c3c..c327d7b 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IgniteBurstTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/IgniteBurstTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class IgniteBurstTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/InfernoTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/InfernoTagConfig.cs index 82e6806..9c8a7e9 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/InfernoTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/InfernoTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class InfernoTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/OverpenetrateTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/OverpenetrateTagConfig.cs index b3b20a2..734affa 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/OverpenetrateTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/OverpenetrateTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class OverpenetrateTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/PierceTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/PierceTagConfig.cs index d68fd57..a00b5f0 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/PierceTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/PierceTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class PierceTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ShatterTagConfig.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ShatterTagConfig.cs index c1ac605..360963c 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ShatterTagConfig.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/ShatterTagConfig.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class ShatterTagConfig : TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/TagConfigBase.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/TagConfigBase.cs index 11635a4..5007204 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/TagConfigBase.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/Config/TagConfigBase.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public abstract class TagConfigBase diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinition.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinition.cs index 710ca92..9baabaf 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinition.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinition.cs @@ -1,6 +1,6 @@ using System; -namespace GeometryTD.Definition +namespace GeometryTD.Core { [Serializable] public sealed class TagDefinition diff --git a/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinitionRegistry.cs b/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinitionRegistry.cs index 9b3de3e..4874038 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinitionRegistry.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Metadata/TagDefinitionRegistry.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using GeometryTD.DataTable; +using GeometryTD.Core; using Newtonsoft.Json.Linq; using UnityEngine; -namespace GeometryTD.Definition +namespace GeometryTD.Core { public static class TagDefinitionRegistry { diff --git a/Assets/GameMain/Scripts/Definition/Tag/Presentation/TagDisplayUtility.cs b/Assets/GameMain/Scripts/Definition/Tag/Presentation/TagDisplayUtility.cs index 461ca74..082abd2 100644 --- a/Assets/GameMain/Scripts/Definition/Tag/Presentation/TagDisplayUtility.cs +++ b/Assets/GameMain/Scripts/Definition/Tag/Presentation/TagDisplayUtility.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using UnityGameFramework.Runtime; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class TagDisplayUtility { diff --git a/Assets/GameMain/Scripts/Editor/GeometryTD.Editor.asmdef b/Assets/GameMain/Scripts/Editor/GeometryTD.Editor.asmdef index 2682f22..3295e6c 100644 --- a/Assets/GameMain/Scripts/Editor/GeometryTD.Editor.asmdef +++ b/Assets/GameMain/Scripts/Editor/GeometryTD.Editor.asmdef @@ -2,8 +2,11 @@ "name": "GeometryTD.Editor", "rootNamespace": "GeometryTD.Editor", "references": [ - "GeometryTD.Runtime", - "UnityGameFramework.Editor" + "GUID:a2d8a19598eca814496b089021d08d60", + "GUID:771b79705393da244ae720aa28ae8a69", + "GUID:c53de6f5028489b4689382a86bfbd807", + "GUID:0f19320f1ba33834b896afc5a5aaae67", + "GUID:e67bd2d1b65d48ce8120141996e55b2b" ], "includePlatforms": [ "Editor" @@ -16,4 +19,4 @@ "defineConstraints": [], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Entity/GeometryTD.Gameplay.Entity.asmref b/Assets/GameMain/Scripts/Entity/GeometryTD.Gameplay.Entity.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/Entity/GeometryTD.Gameplay.Entity.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Entity/GeometryTD.Gameplay.Entity.asmref.meta b/Assets/GameMain/Scripts/Entity/GeometryTD.Gameplay.Entity.asmref.meta new file mode 100644 index 0000000..944a034 --- /dev/null +++ b/Assets/GameMain/Scripts/Entity/GeometryTD.Gameplay.Entity.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 62e58499211fca04abe645b20dd79c2d +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatBaseHpChangedEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatBaseHpChangedEventArgs.cs index 7486e02..aa27f7a 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatBaseHpChangedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatBaseHpChangedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatBaseHpChangedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatCoinChangedEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatCoinChangedEventArgs.cs index f0b173c..ff5973c 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatCoinChangedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatCoinChangedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatCoinChangedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatDebugFailEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatDebugFailEventArgs.cs index ae32419..9febe50 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatDebugFailEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatDebugFailEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatDebugFailEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatEndEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatEndEventArgs.cs index b2a9589..bf89843 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatEndEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatEndEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatEndEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatEnemyHpRateChangedEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatEnemyHpRateChangedEventArgs.cs index b21d2fc..ae31fe8 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatEnemyHpRateChangedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatEnemyHpRateChangedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatEnemyHpRateChangedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatFinishReturnEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatFinishReturnEventArgs.cs index 452de0d..6f6abd7 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatFinishReturnEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatFinishReturnEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatFinishReturnEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatPauseEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatPauseEventArgs.cs index 97f0bdd..8b36a36 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatPauseEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatPauseEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatPauseEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatProcessEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatProcessEventArgs.cs index fa5c36e..257abb2 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatProcessEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatProcessEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatProcessEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Combat/CombatSelectItemClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Combat/CombatSelectItemClickEventArgs.cs index acc1709..040e3a8 100644 --- a/Assets/GameMain/Scripts/Event/Combat/CombatSelectItemClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Combat/CombatSelectItemClickEventArgs.cs @@ -1,8 +1,7 @@ using GameFramework; using GameFramework.Event; -using GeometryTD.UI; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombatSelectItemClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/EventForm/EventOptionItemSelectedEventArgs.cs b/Assets/GameMain/Scripts/Event/EventForm/EventOptionItemSelectedEventArgs.cs index d7b10d8..41e4e25 100644 --- a/Assets/GameMain/Scripts/Event/EventForm/EventOptionItemSelectedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/EventForm/EventOptionItemSelectedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class EventOptionItemSelectedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Game/NodeCompleteEventArgs.cs b/Assets/GameMain/Scripts/Event/Game/NodeCompleteEventArgs.cs index 13b82d1..f7d5205 100644 --- a/Assets/GameMain/Scripts/Event/Game/NodeCompleteEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Game/NodeCompleteEventArgs.cs @@ -1,8 +1,7 @@ using GameFramework; using GameFramework.Event; -using GeometryTD.Procedure; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class NodeCompleteEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Game/NodeEnterEventArgs.cs b/Assets/GameMain/Scripts/Event/Game/NodeEnterEventArgs.cs index 04b20e4..dc12343 100644 --- a/Assets/GameMain/Scripts/Event/Game/NodeEnterEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Game/NodeEnterEventArgs.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.Event; using GeometryTD.Procedure; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class NodeEnterEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Game/NodeMapNodeClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Game/NodeMapNodeClickEventArgs.cs index 8b3fb8e..fcd9668 100644 --- a/Assets/GameMain/Scripts/Event/Game/NodeMapNodeClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Game/NodeMapNodeClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class NodeMapNodeClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Game/NodeMapNodeEnterRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Game/NodeMapNodeEnterRequestedEventArgs.cs index 064a930..5767f36 100644 --- a/Assets/GameMain/Scripts/Event/Game/NodeMapNodeEnterRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Game/NodeMapNodeEnterRequestedEventArgs.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.Event; using GeometryTD.Procedure; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class NodeMapNodeEnterRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Game/TestMenuNodeClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Game/TestMenuNodeClickEventArgs.cs index df7f777..b675f45 100644 --- a/Assets/GameMain/Scripts/Event/Game/TestMenuNodeClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Game/TestMenuNodeClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public enum TestMenuNodeType : byte { diff --git a/Assets/GameMain/Scripts/Event/General/RewardSelectGiveUpEventArgs.cs b/Assets/GameMain/Scripts/Event/General/RewardSelectGiveUpEventArgs.cs index 9289192..f778b35 100644 --- a/Assets/GameMain/Scripts/Event/General/RewardSelectGiveUpEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/General/RewardSelectGiveUpEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class RewardSelectGiveUpEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/General/RewardSelectItemSelectedEventArgs.cs b/Assets/GameMain/Scripts/Event/General/RewardSelectItemSelectedEventArgs.cs index 80d46ba..a9e6023 100644 --- a/Assets/GameMain/Scripts/Event/General/RewardSelectItemSelectedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/General/RewardSelectItemSelectedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class RewardSelectItemSelectedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/General/RewardSelectRefreshEventArgs.cs b/Assets/GameMain/Scripts/Event/General/RewardSelectRefreshEventArgs.cs index aaa01df..d4dacfd 100644 --- a/Assets/GameMain/Scripts/Event/General/RewardSelectRefreshEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/General/RewardSelectRefreshEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class RewardSelectRefreshEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/GeometryTD.Core.Event.asmref b/Assets/GameMain/Scripts/Event/GeometryTD.Core.Event.asmref new file mode 100644 index 0000000..2a82464 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/GeometryTD.Core.Event.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:771b79705393da244ae720aa28ae8a69" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/GeometryTD.Core.Event.asmref.meta b/Assets/GameMain/Scripts/Event/GeometryTD.Core.Event.asmref.meta new file mode 100644 index 0000000..fee86fb --- /dev/null +++ b/Assets/GameMain/Scripts/Event/GeometryTD.Core.Event.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69c11dc380e09384b8532fbc7264c38e +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/MainForm/RepoButtonClickedEventArgs.cs b/Assets/GameMain/Scripts/Event/MainForm/RepoButtonClickedEventArgs.cs index 9d57b2f..3ef8613 100644 --- a/Assets/GameMain/Scripts/Event/MainForm/RepoButtonClickedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/MainForm/RepoButtonClickedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class RepoButtonClickedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/MainForm/ReturnButtonClickedEventArgs.cs b/Assets/GameMain/Scripts/Event/MainForm/ReturnButtonClickedEventArgs.cs index 02ee195..6f38be0 100644 --- a/Assets/GameMain/Scripts/Event/MainForm/ReturnButtonClickedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/MainForm/ReturnButtonClickedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class ReturnButtonClickedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuExitRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuExitRequestedEventArgs.cs index ec44241..a39a734 100644 --- a/Assets/GameMain/Scripts/Event/Menu/MenuExitRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Menu/MenuExitRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class MenuExitRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSettingsRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuSettingsRequestedEventArgs.cs index 6d9db5e..78058b9 100644 --- a/Assets/GameMain/Scripts/Event/Menu/MenuSettingsRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSettingsRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class MenuSettingsRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuStartRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuStartRequestedEventArgs.cs index 76ffb38..422fd14 100644 --- a/Assets/GameMain/Scripts/Event/Menu/MenuStartRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Menu/MenuStartRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class MenuStartRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/CombineSlotClickedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/CombineSlotClickedEventArgs.cs index 6d9c780..c9127ab 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/CombineSlotClickedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/CombineSlotClickedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class CombineSlotClickedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoCombineRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoCombineRequestedEventArgs.cs index 2fef81e..4ecabd6 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoCombineRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoCombineRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class RepoCombineRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoFormReturnEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoFormReturnEventArgs.cs index d9fa41e..a3dc7f5 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoFormReturnEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoFormReturnEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class RepoFormReturnEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoItemClickedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoItemClickedEventArgs.cs index b7e97e2..99a44e0 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoItemClickedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoItemClickedEventArgs.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.Event; using UnityEngine; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class RepoItemClickedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoItemDragEndedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoItemDragEndedEventArgs.cs index 8d8a8e0..dd708e0 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoItemDragEndedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoItemDragEndedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public class RepoItemDragEndedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoParticipantAssignRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoParticipantAssignRequestedEventArgs.cs index 7f5e344..117c7eb 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoParticipantAssignRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoParticipantAssignRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class RepoParticipantAssignRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoSellCancelRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoSellCancelRequestedEventArgs.cs index 5ad03b0..bbed663 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoSellCancelRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoSellCancelRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class RepoSellCancelRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoSellConfirmRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoSellConfirmRequestedEventArgs.cs index ce0557b..a193d97 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoSellConfirmRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoSellConfirmRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class RepoSellConfirmRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/RepoForm/RepoSellModeToggleRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/RepoForm/RepoSellModeToggleRequestedEventArgs.cs index e96c3e0..9d987d9 100644 --- a/Assets/GameMain/Scripts/Event/RepoForm/RepoSellModeToggleRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RepoForm/RepoSellModeToggleRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class RepoSellModeToggleRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopExitRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Shop/ShopExitRequestedEventArgs.cs index 7af3669..08ee925 100644 --- a/Assets/GameMain/Scripts/Event/Shop/ShopExitRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Shop/ShopExitRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class ShopExitRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopInventoryRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Shop/ShopInventoryRequestedEventArgs.cs index b299c12..4961e91 100644 --- a/Assets/GameMain/Scripts/Event/Shop/ShopInventoryRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Shop/ShopInventoryRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class ShopInventoryRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopPurchaseRequestedEventArgs.cs b/Assets/GameMain/Scripts/Event/Shop/ShopPurchaseRequestedEventArgs.cs index eece0c2..fe3c0bc 100644 --- a/Assets/GameMain/Scripts/Event/Shop/ShopPurchaseRequestedEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/Shop/ShopPurchaseRequestedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace GeometryTD.CustomEvent +namespace GeometryTD.Core { public sealed class ShopPurchaseRequestedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Factory/GeometryTD.Gameplay.Factory.asmref b/Assets/GameMain/Scripts/Factory/GeometryTD.Gameplay.Factory.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/Factory/GeometryTD.Gameplay.Factory.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Factory/GeometryTD.Gameplay.Factory.asmref.meta b/Assets/GameMain/Scripts/Factory/GeometryTD.Gameplay.Factory.asmref.meta new file mode 100644 index 0000000..91f0ccb --- /dev/null +++ b/Assets/GameMain/Scripts/Factory/GeometryTD.Gameplay.Factory.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ada838ae7527f56459d5605688ca4467 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Network/GeometryTD.Runtime.Network.asmref b/Assets/GameMain/Scripts/Network/GeometryTD.Runtime.Network.asmref new file mode 100644 index 0000000..b57aa43 --- /dev/null +++ b/Assets/GameMain/Scripts/Network/GeometryTD.Runtime.Network.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:e67bd2d1b65d48ce8120141996e55b2b" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Network/GeometryTD.Runtime.Network.asmref.meta b/Assets/GameMain/Scripts/Network/GeometryTD.Runtime.Network.asmref.meta new file mode 100644 index 0000000..aff2fb4 --- /dev/null +++ b/Assets/GameMain/Scripts/Network/GeometryTD.Runtime.Network.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69e2859ef5f22324b84ed2016b094800 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/PoolObjectBase/GeometryTD.Gameplay.PoolObjectBase.asmref b/Assets/GameMain/Scripts/PoolObjectBase/GeometryTD.Gameplay.PoolObjectBase.asmref new file mode 100644 index 0000000..f3656b4 --- /dev/null +++ b/Assets/GameMain/Scripts/PoolObjectBase/GeometryTD.Gameplay.PoolObjectBase.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:c53de6f5028489b4689382a86bfbd807" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/PoolObjectBase/GeometryTD.Gameplay.PoolObjectBase.asmref.meta b/Assets/GameMain/Scripts/PoolObjectBase/GeometryTD.Gameplay.PoolObjectBase.asmref.meta new file mode 100644 index 0000000..3620e40 --- /dev/null +++ b/Assets/GameMain/Scripts/PoolObjectBase/GeometryTD.Gameplay.PoolObjectBase.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4925bf1c2d58fc840b742536afb76e59 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Procedure/GeometryTD.Runtime.Procedure.asmref b/Assets/GameMain/Scripts/Procedure/GeometryTD.Runtime.Procedure.asmref new file mode 100644 index 0000000..b57aa43 --- /dev/null +++ b/Assets/GameMain/Scripts/Procedure/GeometryTD.Runtime.Procedure.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:e67bd2d1b65d48ce8120141996e55b2b" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Procedure/GeometryTD.Runtime.Procedure.asmref.meta b/Assets/GameMain/Scripts/Procedure/GeometryTD.Runtime.Procedure.asmref.meta new file mode 100644 index 0000000..d0ad8b4 --- /dev/null +++ b/Assets/GameMain/Scripts/Procedure/GeometryTD.Runtime.Procedure.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ae1b260f229cfd44dadbb1fd5e2122b7 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Scene/GeometryTD.Runtime.Scene.asmref b/Assets/GameMain/Scripts/Scene/GeometryTD.Runtime.Scene.asmref new file mode 100644 index 0000000..b57aa43 --- /dev/null +++ b/Assets/GameMain/Scripts/Scene/GeometryTD.Runtime.Scene.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:e67bd2d1b65d48ce8120141996e55b2b" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Scene/GeometryTD.Runtime.Scene.asmref.meta b/Assets/GameMain/Scripts/Scene/GeometryTD.Runtime.Scene.asmref.meta new file mode 100644 index 0000000..e69a632 --- /dev/null +++ b/Assets/GameMain/Scripts/Scene/GeometryTD.Runtime.Scene.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 53f3a3f2a6b685442b169744315469cc +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Sound/GeometryTD.Runtime.Sound.asmref b/Assets/GameMain/Scripts/Sound/GeometryTD.Runtime.Sound.asmref new file mode 100644 index 0000000..b57aa43 --- /dev/null +++ b/Assets/GameMain/Scripts/Sound/GeometryTD.Runtime.Sound.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:e67bd2d1b65d48ce8120141996e55b2b" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Sound/GeometryTD.Runtime.Sound.asmref.meta b/Assets/GameMain/Scripts/Sound/GeometryTD.Runtime.Sound.asmref.meta new file mode 100644 index 0000000..a3996b0 --- /dev/null +++ b/Assets/GameMain/Scripts/Sound/GeometryTD.Runtime.Sound.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5cd75ba7f1e9eeb4ba1a835b7686c996 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GeometryTD.Presentation.asmdef b/Assets/GameMain/Scripts/UI/GeometryTD.Presentation.asmdef new file mode 100644 index 0000000..6b27e89 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GeometryTD.Presentation.asmdef @@ -0,0 +1,20 @@ +{ + "name": "GeometryTD.Presentation", + "rootNamespace": "GeometryTD.Presentation", + "references": [ + "GUID:c53de6f5028489b4689382a86bfbd807", + "GUID:771b79705393da244ae720aa28ae8a69", + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [ + "Android" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GeometryTD.Presentation.asmdef.meta b/Assets/GameMain/Scripts/UI/GeometryTD.Presentation.asmdef.meta new file mode 100644 index 0000000..8d90e4a --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GeometryTD.Presentation.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f19320f1ba33834b896afc5a5aaae67 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Utility/AssetUtility.cs b/Assets/GameMain/Scripts/Utility/AssetUtility.cs index a3a047c..bca0674 100644 --- a/Assets/GameMain/Scripts/Utility/AssetUtility.cs +++ b/Assets/GameMain/Scripts/Utility/AssetUtility.cs @@ -1,13 +1,7 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ +using GameFramework; +using UnityGameFramework.Runtime; -using GameFramework; - -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class AssetUtility { @@ -71,7 +65,7 @@ namespace GeometryTD.CustomUtility { return Utility.Text.Format("Assets/GameMain/Entities/LevelMap/Level{0}.prefab", assetName); } - + public static string GetTextureAsset(string assetName) { // Assets/GameMain/Textures/Capsule.png diff --git a/Assets/GameMain/Scripts/Utility/EnumUtility.cs b/Assets/GameMain/Scripts/Utility/EnumUtility.cs index c2cda9e..6041022 100644 --- a/Assets/GameMain/Scripts/Utility/EnumUtility.cs +++ b/Assets/GameMain/Scripts/Utility/EnumUtility.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityGameFramework.Runtime; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class EnumUtility where T : struct, System.Enum { diff --git a/Assets/GameMain/Scripts/Utility/GeometryTD.Core.Utility.asmref b/Assets/GameMain/Scripts/Utility/GeometryTD.Core.Utility.asmref new file mode 100644 index 0000000..2a82464 --- /dev/null +++ b/Assets/GameMain/Scripts/Utility/GeometryTD.Core.Utility.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:771b79705393da244ae720aa28ae8a69" +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Utility/GeometryTD.Core.Utility.asmref.meta b/Assets/GameMain/Scripts/Utility/GeometryTD.Core.Utility.asmref.meta new file mode 100644 index 0000000..0447427 --- /dev/null +++ b/Assets/GameMain/Scripts/Utility/GeometryTD.Core.Utility.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a5b030a696af2e4da175cc032ea0b91 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Utility/IconColorGenerator.cs b/Assets/GameMain/Scripts/Utility/IconColorGenerator.cs index 9d7c8f2..d5399f1 100644 --- a/Assets/GameMain/Scripts/Utility/IconColorGenerator.cs +++ b/Assets/GameMain/Scripts/Utility/IconColorGenerator.cs @@ -1,9 +1,8 @@ using GameFramework.DataTable; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class IconColorGenerator { diff --git a/Assets/GameMain/Scripts/Utility/InventoryCloneUtility.cs b/Assets/GameMain/Scripts/Utility/InventoryCloneUtility.cs index 1cb124f..e2125d8 100644 --- a/Assets/GameMain/Scripts/Utility/InventoryCloneUtility.cs +++ b/Assets/GameMain/Scripts/Utility/InventoryCloneUtility.cs @@ -1,8 +1,8 @@ using System; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class InventoryCloneUtility { diff --git a/Assets/GameMain/Scripts/Utility/InventoryParticipantUtility.cs b/Assets/GameMain/Scripts/Utility/InventoryParticipantUtility.cs index 19f9dea..72df735 100644 --- a/Assets/GameMain/Scripts/Utility/InventoryParticipantUtility.cs +++ b/Assets/GameMain/Scripts/Utility/InventoryParticipantUtility.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class InventoryParticipantUtility { diff --git a/Assets/GameMain/Scripts/Utility/InventorySeedUtility.cs b/Assets/GameMain/Scripts/Utility/InventorySeedUtility.cs index 25fa744..c983cf5 100644 --- a/Assets/GameMain/Scripts/Utility/InventorySeedUtility.cs +++ b/Assets/GameMain/Scripts/Utility/InventorySeedUtility.cs @@ -1,6 +1,6 @@ -using GeometryTD.Definition; +using GeometryTD.Core; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class InventorySeedUtility { diff --git a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs b/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs index 5fa5888..9ffb37c 100644 --- a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs +++ b/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using GeometryTD.Definition; +using GeometryTD.Core; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class ItemDescUtility { diff --git a/Assets/GameMain/Scripts/Utility/JsonNetUtility.cs b/Assets/GameMain/Scripts/Utility/JsonNetUtility.cs index abe08ce..e6348b8 100644 --- a/Assets/GameMain/Scripts/Utility/JsonNetUtility.cs +++ b/Assets/GameMain/Scripts/Utility/JsonNetUtility.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { /// /// Newtonsoft.Json 函数集辅助器。 diff --git a/Assets/GameMain/Scripts/Utility/ShopPriceRuleService.cs b/Assets/GameMain/Scripts/Utility/ShopPriceRuleService.cs index 69ec2b2..e67646c 100644 --- a/Assets/GameMain/Scripts/Utility/ShopPriceRuleService.cs +++ b/Assets/GameMain/Scripts/Utility/ShopPriceRuleService.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using GameFramework.DataTable; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityEngine; using Random = System.Random; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class ShopPriceRuleService { diff --git a/Assets/GameMain/Scripts/Utility/TowerComposedIconCacheUtility.cs b/Assets/GameMain/Scripts/Utility/TowerComposedIconCacheUtility.cs index 480147a..23dbc8b 100644 --- a/Assets/GameMain/Scripts/Utility/TowerComposedIconCacheUtility.cs +++ b/Assets/GameMain/Scripts/Utility/TowerComposedIconCacheUtility.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using GeometryTD.Definition; +using GeometryTD.Core; using UnityEngine; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class TowerComposedIconCacheUtility { diff --git a/Assets/GameMain/Scripts/Utility/TowerIconComposeUtility.cs b/Assets/GameMain/Scripts/Utility/TowerIconComposeUtility.cs index 256f55e..e7ba731 100644 --- a/Assets/GameMain/Scripts/Utility/TowerIconComposeUtility.cs +++ b/Assets/GameMain/Scripts/Utility/TowerIconComposeUtility.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; using UnityEngine; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class TowerIconComposeUtility { diff --git a/Assets/GameMain/Scripts/Utility/WebUtility.cs b/Assets/GameMain/Scripts/Utility/WebUtility.cs index 88e32c1..7cebee4 100644 --- a/Assets/GameMain/Scripts/Utility/WebUtility.cs +++ b/Assets/GameMain/Scripts/Utility/WebUtility.cs @@ -7,7 +7,7 @@ using System; -namespace GeometryTD.CustomUtility +namespace GeometryTD.Core { public static class WebUtility { diff --git a/Assets/Tests/EditMode/CombatParticipantTowerValidationServiceTests.cs b/Assets/Tests/EditMode/CombatParticipantTowerValidationServiceTests.cs index 31a8fff..13b7a67 100644 --- a/Assets/Tests/EditMode/CombatParticipantTowerValidationServiceTests.cs +++ b/Assets/Tests/EditMode/CombatParticipantTowerValidationServiceTests.cs @@ -1,5 +1,5 @@ using System.Linq; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/CombatSettlementServiceTests.cs b/Assets/Tests/EditMode/CombatSettlementServiceTests.cs index 3bafdbf..613780c 100644 --- a/Assets/Tests/EditMode/CombatSettlementServiceTests.cs +++ b/Assets/Tests/EditMode/CombatSettlementServiceTests.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Reflection; -using GeometryTD.CustomComponent; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Gameplay.CustomComponent; +using GeometryTD.Core; using GeometryTD.UI; using NUnit.Framework; using UnityEngine; diff --git a/Assets/Tests/EditMode/ComponentTagGenerationServiceTests.cs b/Assets/Tests/EditMode/ComponentTagGenerationServiceTests.cs index a81ad00..836419d 100644 --- a/Assets/Tests/EditMode/ComponentTagGenerationServiceTests.cs +++ b/Assets/Tests/EditMode/ComponentTagGenerationServiceTests.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; -using GeometryTD.CustomUtility; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/ContinueChallengeMultiplierTests.cs b/Assets/Tests/EditMode/ContinueChallengeMultiplierTests.cs index a83fee8..cbc04b8 100644 --- a/Assets/Tests/EditMode/ContinueChallengeMultiplierTests.cs +++ b/Assets/Tests/EditMode/ContinueChallengeMultiplierTests.cs @@ -1,4 +1,4 @@ -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.UI; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/EventDefinitionFactoryTests.cs b/Assets/Tests/EditMode/EventDefinitionFactoryTests.cs index e0be4d2..61f559e 100644 --- a/Assets/Tests/EditMode/EventDefinitionFactoryTests.cs +++ b/Assets/Tests/EditMode/EventDefinitionFactoryTests.cs @@ -1,6 +1,5 @@ -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Factory; -using GeometryTD.DataTable; using Newtonsoft.Json.Linq; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/EventOptionExecutorTests.cs b/Assets/Tests/EditMode/EventOptionExecutorTests.cs index 3f7e873..6164a0f 100644 --- a/Assets/Tests/EditMode/EventOptionExecutorTests.cs +++ b/Assets/Tests/EditMode/EventOptionExecutorTests.cs @@ -6,8 +6,7 @@ using System.Linq; using System.Reflection; using GameFramework.DataTable; using GeometryTD.CustomComponent; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Procedure; using Newtonsoft.Json.Linq; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/GeometryTD.Tests.EditMode.asmdef b/Assets/Tests/EditMode/GeometryTD.Tests.EditMode.asmdef index ccc0abe..29e4e8c 100644 --- a/Assets/Tests/EditMode/GeometryTD.Tests.EditMode.asmdef +++ b/Assets/Tests/EditMode/GeometryTD.Tests.EditMode.asmdef @@ -2,10 +2,12 @@ "name": "GeometryTD.Tests.EditMode", "rootNamespace": "GeometryTD.Tests.EditMode", "references": [ - "GeometryTD.Runtime", "UnityGameFramework.Runtime", "UnityEngine.TestRunner", - "UnityEditor.TestRunner" + "UnityEditor.TestRunner", + "GeometryTD.Core", + "GeometryTD.Runtime", + "GeometryTD.Gameplay" ], "includePlatforms": [ "Editor" diff --git a/Assets/Tests/EditMode/InventoryGenerationStabilityTests.cs b/Assets/Tests/EditMode/InventoryGenerationStabilityTests.cs index 7b16066..2dacf05 100644 --- a/Assets/Tests/EditMode/InventoryGenerationStabilityTests.cs +++ b/Assets/Tests/EditMode/InventoryGenerationStabilityTests.cs @@ -5,8 +5,7 @@ using System.Linq; using System.Reflection; using GameFramework.DataTable; using GeometryTD.CustomComponent; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.UI; using NUnit.Framework; using UnityEngine; diff --git a/Assets/Tests/EditMode/InventoryRarityRuleServiceTests.cs b/Assets/Tests/EditMode/InventoryRarityRuleServiceTests.cs index a4ec10d..0d4a615 100644 --- a/Assets/Tests/EditMode/InventoryRarityRuleServiceTests.cs +++ b/Assets/Tests/EditMode/InventoryRarityRuleServiceTests.cs @@ -1,5 +1,4 @@ -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/ItemDescUtilityTests.cs b/Assets/Tests/EditMode/ItemDescUtilityTests.cs index 41ea80e..cf39b07 100644 --- a/Assets/Tests/EditMode/ItemDescUtilityTests.cs +++ b/Assets/Tests/EditMode/ItemDescUtilityTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/ParticipantTowerAssignResultTests.cs b/Assets/Tests/EditMode/ParticipantTowerAssignResultTests.cs index 35ffb57..d150a09 100644 --- a/Assets/Tests/EditMode/ParticipantTowerAssignResultTests.cs +++ b/Assets/Tests/EditMode/ParticipantTowerAssignResultTests.cs @@ -1,5 +1,4 @@ -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/PlayerInventoryTowerAssemblyServiceTests.cs b/Assets/Tests/EditMode/PlayerInventoryTowerAssemblyServiceTests.cs index edb6e1e..2a60f4e 100644 --- a/Assets/Tests/EditMode/PlayerInventoryTowerAssemblyServiceTests.cs +++ b/Assets/Tests/EditMode/PlayerInventoryTowerAssemblyServiceTests.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Reflection; using GameFramework.DataTable; using GeometryTD.CustomComponent; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; using UnityEngine; diff --git a/Assets/Tests/EditMode/PlayerInventoryTowerRosterServiceTests.cs b/Assets/Tests/EditMode/PlayerInventoryTowerRosterServiceTests.cs index 7c414d4..e8022f7 100644 --- a/Assets/Tests/EditMode/PlayerInventoryTowerRosterServiceTests.cs +++ b/Assets/Tests/EditMode/PlayerInventoryTowerRosterServiceTests.cs @@ -1,6 +1,5 @@ using GeometryTD.CustomComponent; -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/PlayerInventoryTradeServiceTests.cs b/Assets/Tests/EditMode/PlayerInventoryTradeServiceTests.cs index ee097c7..99da548 100644 --- a/Assets/Tests/EditMode/PlayerInventoryTradeServiceTests.cs +++ b/Assets/Tests/EditMode/PlayerInventoryTradeServiceTests.cs @@ -3,8 +3,7 @@ using System.Collections; using System.Collections.Generic; using GameFramework.DataTable; using GeometryTD.CustomComponent; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/EditMode/ProcedureMainFlowTests.cs b/Assets/Tests/EditMode/ProcedureMainFlowTests.cs index c105338..7356822 100644 --- a/Assets/Tests/EditMode/ProcedureMainFlowTests.cs +++ b/Assets/Tests/EditMode/ProcedureMainFlowTests.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Reflection; using CustomComponent; using GeometryTD.CustomComponent; -using GeometryTD.CustomEvent; -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Factory; using GeometryTD.Procedure; using GeometryTD.UI; diff --git a/Assets/Tests/EditMode/ProcedureMainParticipantTowerCleanupServiceTests.cs b/Assets/Tests/EditMode/ProcedureMainParticipantTowerCleanupServiceTests.cs index 659efc7..4f89f15 100644 --- a/Assets/Tests/EditMode/ProcedureMainParticipantTowerCleanupServiceTests.cs +++ b/Assets/Tests/EditMode/ProcedureMainParticipantTowerCleanupServiceTests.cs @@ -1,4 +1,4 @@ -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Procedure; using GeometryTD.UI; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/ProcedureMainServicesTests.cs b/Assets/Tests/EditMode/ProcedureMainServicesTests.cs index c644af4..0d8ac02 100644 --- a/Assets/Tests/EditMode/ProcedureMainServicesTests.cs +++ b/Assets/Tests/EditMode/ProcedureMainServicesTests.cs @@ -1,4 +1,4 @@ -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Factory; using GeometryTD.Procedure; using GeometryTD.UI; diff --git a/Assets/Tests/EditMode/RepoParticipantAssignDialogUtilityTests.cs b/Assets/Tests/EditMode/RepoParticipantAssignDialogUtilityTests.cs index 2ad29c7..03b1647 100644 --- a/Assets/Tests/EditMode/RepoParticipantAssignDialogUtilityTests.cs +++ b/Assets/Tests/EditMode/RepoParticipantAssignDialogUtilityTests.cs @@ -1,4 +1,4 @@ -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.UI; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/RunStateTests.cs b/Assets/Tests/EditMode/RunStateTests.cs index 6155c15..b271ce7 100644 --- a/Assets/Tests/EditMode/RunStateTests.cs +++ b/Assets/Tests/EditMode/RunStateTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using GeometryTD.CustomEvent; -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Factory; using GeometryTD.Procedure; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/ShopPricingRuleTests.cs b/Assets/Tests/EditMode/ShopPricingRuleTests.cs index 7c68b7b..c82791c 100644 --- a/Assets/Tests/EditMode/ShopPricingRuleTests.cs +++ b/Assets/Tests/EditMode/ShopPricingRuleTests.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Reflection; using GameFramework.DataTable; using GeometryTD.CustomComponent; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.UI; using NUnit.Framework; diff --git a/Assets/Tests/EditMode/TagCombatRuntimeTests.cs b/Assets/Tests/EditMode/TagCombatRuntimeTests.cs index fb160ba..188efcd 100644 --- a/Assets/Tests/EditMode/TagCombatRuntimeTests.cs +++ b/Assets/Tests/EditMode/TagCombatRuntimeTests.cs @@ -1,9 +1,7 @@ using Components; -using GeometryTD.DataTable; -using GeometryTD.Definition; +using GeometryTD.Core; using GeometryTD.Entity; using GeometryTD.Entity.EntityData; -using GeometryTD.CustomUtility; using NUnit.Framework; using UnityEngine; diff --git a/Assets/Tests/EditMode/TowerTagAggregationServiceTests.cs b/Assets/Tests/EditMode/TowerTagAggregationServiceTests.cs index ee83fab..fe628a2 100644 --- a/Assets/Tests/EditMode/TowerTagAggregationServiceTests.cs +++ b/Assets/Tests/EditMode/TowerTagAggregationServiceTests.cs @@ -1,5 +1,4 @@ -using GeometryTD.CustomUtility; -using GeometryTD.Definition; +using GeometryTD.Core; using NUnit.Framework; namespace GeometryTD.Tests.EditMode diff --git a/Assets/Tests/PlayMode/GeometryTD.Tests.PlayMode.asmdef b/Assets/Tests/PlayMode/GeometryTD.Tests.PlayMode.asmdef index 096eed3..f06a0ff 100644 --- a/Assets/Tests/PlayMode/GeometryTD.Tests.PlayMode.asmdef +++ b/Assets/Tests/PlayMode/GeometryTD.Tests.PlayMode.asmdef @@ -2,21 +2,25 @@ "name": "GeometryTD.Tests.PlayMode", "rootNamespace": "GeometryTD.Tests.PlayMode", "references": [ + "UnityGameFramework.Runtime", + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", "GeometryTD.Runtime", - "UnityGameFramework.Runtime" + "GeometryTD.Core", + "GeometryTD.Gameplay" ], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "GameFramework.dll" + "GameFramework.dll", + "nunit.framework.dll" ], "autoReferenced": false, - "defineConstraints": [], + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], "versionDefines": [], - "noEngineReferences": false, - "optionalUnityReferences": [ - "TestAssemblies" - ] -} + "noEngineReferences": false +} \ No newline at end of file