拆分程序集，统一修改 Core 区域类的命名空间，暂不修复编译问题

2026-05-13 16:48:09 +08:00
parent 3d785d5139
commit 9fc0ef2216
218 changed files with 472 additions and 274 deletions
@@ -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
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e67bd2d1b65d48ce8120141996e55b2b
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c53de6f5028489b4689382a86bfbd807
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:c53de6f5028489b4689382a86bfbd807"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5304296ea426f4d4b8067b7b64a3ad48
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:e67bd2d1b65d48ce8120141996e55b2b"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bd7362132664f0c499e39663c24ade2d
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:0f19320f1ba33834b896afc5a5aaae67"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4c1cfd0d064e8b3418adeca47c20ae1d
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:c53de6f5028489b4689382a86bfbd807"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6bc6ae941e9ae4c43a4f75e3405d0eaf
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:c53de6f5028489b4689382a86bfbd807"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 93d673219f2a1a94599e67456ea33f7f
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:c53de6f5028489b4689382a86bfbd807"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e09026219ecab5e44ab54879792e2b26
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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
    {
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.Definition;
-using GeometryTD.CustomUtility;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 底座组件表
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.Definition;
-using GeometryTD.CustomUtility;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 轴承组件表
@@ -1,6 +1,6 @@
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 敌人配置表
@@ -16,7 +16,7 @@ using System.Text;
 using UnityEngine;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 实体表。
@@ -1,7 +1,7 @@
 using UnityGameFramework.Runtime;
 using Newtonsoft.Json.Linq;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 事件配置表
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.Definition;
-using GeometryTD.CustomUtility;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 关卡表
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.CustomUtility;
-using GeometryTD.Definition;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 关卡阶段表
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.CustomUtility;
-using GeometryTD.Definition;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 关卡阶段出怪条目表
@@ -16,7 +16,7 @@ using System.Text;
 using UnityEngine;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 音乐配置表。
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.Definition;
-using GeometryTD.CustomUtility;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 枪口组件表
@@ -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
 {
    /// <summary>
    /// 局外道具掉落池配置表。
@@ -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
    {
@@ -6,7 +6,7 @@ using System.Text;
 using UnityEngine;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 场景配置表。
@@ -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
    {
@@ -2,7 +2,7 @@
 using System.Text;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 声音配置表。
@@ -1,9 +1,8 @@
 using System;
-using GeometryTD.Definition;
-using GeometryTD.CustomUtility;
+using GeometryTD.Core;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// Tag 表
@@ -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
    {
@@ -2,7 +2,7 @@
 using System.Text;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 界面配置表。
@@ -16,7 +16,7 @@ using System.Text;
 using UnityEngine;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 声音配置表。
@@ -10,7 +10,7 @@ using System;
 using UnityEngine;
 using UnityGameFramework.Runtime;

-namespace GeometryTD.DataTable
+namespace GeometryTD.Core
 {
    public static class DataTableExtension
    {
@@ -0,0 +1,18 @@
+{
+    "name": "GeometryTD.Core",
+    "rootNamespace": "GeometryTD.Core",
+    "references": [
+        "GUID:363c5eb08ff8e6a439b85e37b8c20d96",
+        "GUID:75469ad4d38634e559750d17036d5f7c",
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 771b79705393da244ae720aa28ae8a69
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum CombatParticipantTowerValidationFailureReason
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public static class CombatParticipantTowerValidationText
    {
@@ -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
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 玩家背包聚合数据。
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class BuildInfo
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class EventItem
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class EventOption
    {
@@ -1,8 +1,7 @@
 using System;
-using GeometryTD.Entity;
 using UnityEngine;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    [Serializable]
    public sealed class HitStatusModifierContext
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    [StructLayout(LayoutKind.Auto)]
    public struct ImpactData
@@ -1,6 +1,6 @@
 using System;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 背包内组件实例基类（非 DataTable，表示玩家持有物）。
@@ -2,7 +2,7 @@ using System;
 using Newtonsoft.Json;
 using UnityEngine;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 背包内防御塔实例数据。
@@ -1,6 +1,6 @@
 using System;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 防御塔独立属性快照。
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class VersionInfo
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum AttackMethodType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum AttackPropertyType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 阵营类型。
@@ -1,4 +1,4 @@
-namespace GeometryTD.UI
+namespace GeometryTD.Core
 {
    public enum CombatSelectActionType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 出怪条目类型
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum EventEffectType
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum EventRequirementType
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum InventoryTagSourceType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum LevelThemeType
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum LevelVictoryType
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 关卡阶段结束类型
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum ProcedureMainCombatEntryBlockReason
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum ProcedureMainFlowPhase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum ProcedureMainRunAdvanceResult
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum ProcedureMainRunCompletionResult
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum RarityType
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 关系类型。
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum RepoItemClickActionType
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum SceneType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum TagCategory : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum TagTriggerPhase : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum TagType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum TowerCompSlotType : byte
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    /// <summary>
    /// 界面编号。
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class AddGoldEffect : EventEffectBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class AddRandomCompsEffect : EventEffectBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class DamageRandomTowerEnduranceEffect : EventEffectBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public abstract class EventEffectBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class RemoveRandomCompsEffect : EventEffectBase
    {
@@ -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
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class CompCountAtLeastRequirement : EventRequirementBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public abstract class EventRequirementBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class GoldAtLeastRequirement : EventRequirementBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class HasRelicRequirement : EventRequirementBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public class TowerCountAtLeastRequirement : EventRequirementBase
    {
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:771b79705393da244ae720aa28ae8a69"
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f6496f38c28361745bf703b0dc338bc3
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1,6 +1,6 @@
 using UnityEngine;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public static class InventoryRarityRuleService
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public enum ParticipantTowerAssignFailureReason
    {
@@ -1,6 +1,6 @@
 using System;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    [Serializable]
    public sealed class TagRuntimeData
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public static class TowerTagAggregationService
    {
@@ -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
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public static class AttackShapeTagEffectHandler
    {
@@ -1,6 +1,6 @@
 using UnityEngine;

-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public static class NumericTagEffectHandler
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public abstract class EnemyStatusTagStateBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public sealed class FireTagState : EnemyStatusTagStateBase
    {
@@ -1,4 +1,4 @@
-namespace GeometryTD.Definition
+namespace GeometryTD.Core
 {
    public sealed class IceTagState : EnemyStatusTagStateBase
    {
--- a/Show More
+++ b/Show More