dotrecast跟recast包合并

DotNet/Model/ET.Model.csproj

@@ -60,8 +60,8 @@
         <ProjectReference Include="..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.core\DotNet~\ET.Core.csproj" />
-        <ProjectReference Include="..\..\Unity\Packages\com.et.dotrecast\DotNet~\ET.DotRecast.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.loader\DotNet~\ET.Loader.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.mathematics\Runtime~\ET.Mathematics.csproj" />
+        <ProjectReference Include="..\..\Unity\Packages\com.et.recast\DotNet~\ET.Recast.csproj" />
     </ItemGroup> 
 </Project>

ET.sln

@@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\ET.Core.cs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core.Editor", "Unity\ET.Core.Editor.csproj", "{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.DotRecast", "Unity\ET.DotRecast.csproj", "{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.YooAssets", "Unity\ET.YooAssets.csproj", "{7BE873E5-6C09-7F6F-D436-69F223C79329}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader", "Unity\ET.Loader.csproj", "{7426908B-F33B-16FE-D8E3-0A19FFDA947F}"
@@ -47,14 +45,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\Packages\c
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader", "Unity\Packages\com.et.loader\DotNet~\ET.Loader.csproj", "{93979EBC-A9EC-41B8-A440-156F23775084}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.DotRecast", "Unity\Packages\com.et.dotrecast\DotNet~\ET.DotRecast.csproj", "{10F05479-5561-4711-BF62-C3951551B51D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.UI", "Unity\ET.UI.csproj", "{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ReferenceCollector", "Unity\ET.ReferenceCollector.csproj", "{C55BBBD3-5A75-B928-B610-9A305A10F7AD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ReferenceCollector.Editor", "Unity\ET.ReferenceCollector.Editor.csproj", "{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Recast", "Unity\Packages\com.et.recast\DotNet~\ET.Recast.csproj", "{1E8489A3-7ED7-4E2A-BA52-440765375987}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Recast", "Unity\ET.Recast.csproj", "{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -125,18 +125,6 @@ Global
 		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x64.Build.0 = Debug|Any CPU
 		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x86.ActiveCfg = Debug|Any CPU
 		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x86.Build.0 = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x64.ActiveCfg = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x64.Build.0 = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x86.ActiveCfg = Debug|Any CPU
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x86.Build.0 = Debug|Any CPU
 		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -293,18 +281,6 @@ Global
 		{93979EBC-A9EC-41B8-A440-156F23775084}.Release|x64.Build.0 = Release|Any CPU
 		{93979EBC-A9EC-41B8-A440-156F23775084}.Release|x86.ActiveCfg = Release|Any CPU
 		{93979EBC-A9EC-41B8-A440-156F23775084}.Release|x86.Build.0 = Release|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Debug|x64.Build.0 = Debug|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Debug|x86.Build.0 = Debug|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x64.ActiveCfg = Release|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x64.Build.0 = Release|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x86.ActiveCfg = Release|Any CPU
-		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x86.Build.0 = Release|Any CPU
 		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -341,6 +317,30 @@ Global
 		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x64.Build.0 = Debug|Any CPU
 		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x86.ActiveCfg = Debug|Any CPU
 		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x86.Build.0 = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Release|x64.Build.0 = Release|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E8489A3-7ED7-4E2A-BA52-440765375987}.Release|x86.Build.0 = Release|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Debug|x64.Build.0 = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Debug|x86.Build.0 = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x64.ActiveCfg = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x64.Build.0 = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x86.ActiveCfg = Debug|Any CPU
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -351,7 +351,6 @@ Global
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{357275F9-23B5-ED06-A723-291680D452AA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{7BE873E5-6C09-7F6F-D436-69F223C79329} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{7426908B-F33B-16FE-D8E3-0A19FFDA947F} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
@@ -365,10 +364,11 @@ Global
 		{CE23DAC2-A1EF-4AF3-878E-C507D252276D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{20C76912-A132-476D-95BA-BBB5955A819C} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{93979EBC-A9EC-41B8-A440-156F23775084} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{10F05479-5561-4711-BF62-C3951551B51D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{C55BBBD3-5A75-B928-B610-9A305A10F7AD} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{1E8489A3-7ED7-4E2A-BA52-440765375987} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Unity/Assets/Scripts/Hotfix/ET.Hotfix.asmdef

@@ -19,5 +19,8 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],
-    "noEngineReferences": true
+    "noEngineReferences": true,
+    "optionalUnityReferences": [],
+    "additionalReferences": [],
+    "compilerOptions": ""
 }

Unity/Assets/Scripts/HotfixView/ET.HotfixView.asmdef

@@ -24,5 +24,8 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],
-    "noEngineReferences": false
+    "noEngineReferences": false,
+    "optionalUnityReferences": [],
+    "additionalReferences": [],
+    "compilerOptions": ""
 }

Unity/Assets/Scripts/Model/ET.Model.asmdef

@@ -4,8 +4,7 @@
     "references": [
         "ET.Core",
         "Unity.Mathematics",
-        "MemoryPack",
-        "ET.DotRecast"
+        "MemoryPack"
     ],
     "includePlatforms": [
         "Editor"
@@ -17,5 +16,8 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],
-    "noEngineReferences": true
+    "noEngineReferences": true,
+    "optionalUnityReferences": [],
+    "additionalReferences": [],
+    "compilerOptions": ""
 }

Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef

@@ -19,5 +19,8 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],
-    "noEngineReferences": false
+    "noEngineReferences": false,
+    "optionalUnityReferences": [],
+    "additionalReferences": [],
+    "compilerOptions": ""
 }

Unity/Packages/com.et.dotrecast/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "com.et.dotrecast",
-  "displayName": "ET.DotRecast",
-  "version": "0.0.1",
-  "unity": "2022.3",
-  "description": "et dotrecast",
-  "author": {
-    "name": "tanghai",
-    "url": "https://github.com/egametang/ET"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/egametang/ET"
-  },
-  "relatedPackages": {},
-  "dependencies": {
-  }
-}

Unity/Packages/com.et.dotrecast/package.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 73e2008e09e1c9a4aa42368d1efbc8fe
-PackageManifestImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Packages/com.et.dotrecast/DotNet~/ET.DotRecast.csproj → Unity/Packages/com.et.recast/DotNet~/ET.Recast.csproj

@@ -5,7 +5,7 @@
         <Nullable>disable</Nullable>
         <LangVersion>12</LangVersion>
         <RootNamespace>ET</RootNamespace>
-        <AssemblyName>ET.DotRecast</AssemblyName>
+        <PackageId>ET.Recast</PackageId>
     </PropertyGroup>
 
     <PropertyGroup>

Unity/Packages/com.et.dotrecast/Runtime.meta → Unity/Packages/com.et.recast/Runtime.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cee956d3c92bac04494ead8962a79eeb
+guid: f1cf80f510653da43af6ae6c715fe808
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}