Преглед изворни кода

去掉了thirdparty包,如果需要第三方库,应该做成一个个UnityPackage,不要统一放到thirdparty中

tanghai пре 1 година
родитељ
комит
f319707cac
36 измењених фајлова са 8 додато и 88 уклоњено
  1. 0 15
      ET.sln
  2. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask.meta
  3. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskCompletedMethodBuilder.cs
  4. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskCompletedMethodBuilder.cs.meta
  5. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskMethodBuilder.cs
  6. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskMethodBuilder.cs.meta
  7. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETVoidMethodBuilder.cs
  8. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETVoidMethodBuilder.cs.meta
  9. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETCancellationToken.cs
  10. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETCancellationToken.cs.meta
  11. 4 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTask.cs
  12. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTask.cs.meta
  13. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskCompleted.cs
  14. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskCompleted.cs.meta
  15. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskHelper.cs
  16. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskHelper.cs.meta
  17. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETVoid.cs
  18. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/ETVoid.cs.meta
  19. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/IAwaiter.cs
  20. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/IAwaiter.cs.meta
  21. 1 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/StateMachineWrap.cs
  22. 0 0
      Unity/Packages/com.et.core/Scripts/Core/ETTask/StateMachineWrap.cs.meta
  23. 1 2
      Unity/Packages/com.et.core/Scripts/Core/Unity.Core.asmdef
  24. 0 1
      Unity/Packages/com.et.core/Scripts/Editor/Unity.Core.Editor.asmdef
  25. 1 2
      Unity/Packages/com.et.core/package.json
  26. 0 1
      Unity/Packages/com.et.loader/Scripts/Editor/Unity.Loader.Editor.asmdef
  27. 0 1
      Unity/Packages/com.et.loader/Scripts/Loader/Unity.Loader.asmdef
  28. 0 1
      Unity/Packages/com.et.loader/package.json
  29. 0 8
      Unity/Packages/com.et.thirdparty/Scripts.meta
  30. 0 14
      Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef
  31. 0 7
      Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef.meta
  32. 0 17
      Unity/Packages/com.et.thirdparty/package.json
  33. 0 7
      Unity/Packages/com.et.thirdparty/package.json.meta
  34. 0 1
      Unity/Packages/com.et.yooassets/Scripts/YooAssets/Unity.YooAssets.asmdef
  35. 0 1
      Unity/Packages/com.et.yooassets/package.json
  36. 1 10
      Unity/Packages/packages-lock.json

+ 0 - 15
ET.sln

@@ -37,8 +37,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{36C32B5A-D491-4AD9-8E46-C8FB33880952}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader.Editor", "Unity\Unity.Loader.Editor.csproj", "{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.SourceGenerator", "Share\SourceGenerator\Share.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
@@ -225,18 +223,6 @@ Global
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x64.Build.0 = Release|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x86.ActiveCfg = Release|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x86.Build.0 = Release|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Debug|x86.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.Build.0 = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.ActiveCfg = Debug|Any CPU
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.Build.0 = Debug|Any CPU
 		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -304,7 +290,6 @@ Global
 		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}

+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskCompletedMethodBuilder.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskCompletedMethodBuilder.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskCompletedMethodBuilder.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskCompletedMethodBuilder.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskMethodBuilder.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskMethodBuilder.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETTaskMethodBuilder.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETTaskMethodBuilder.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETVoidMethodBuilder.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETVoidMethodBuilder.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/AsyncETVoidMethodBuilder.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/AsyncETVoidMethodBuilder.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETCancellationToken.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETCancellationToken.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETCancellationToken.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETCancellationToken.cs.meta


+ 4 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTask.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTask.cs

@@ -10,8 +10,10 @@ namespace ET
     [AsyncMethodBuilder(typeof (ETAsyncTaskMethodBuilder))]
     public class ETTask: ICriticalNotifyCompletion
     {
+        [StaticField]
         public static Action<Exception> ExceptionHandler;
         
+        [StaticField]
         public static ETTaskCompleted CompletedTask
         {
             get
@@ -20,6 +22,7 @@ namespace ET
             }
         }
 
+        [StaticField]
         private static readonly ConcurrentQueue<ETTask> queue = new();
 
         /// <summary>
@@ -165,6 +168,7 @@ namespace ET
     [AsyncMethodBuilder(typeof (ETAsyncTaskMethodBuilder<>))]
     public class ETTask<T>: ICriticalNotifyCompletion
     {
+        [StaticField]
         private static readonly ConcurrentQueue<ETTask<T>> queue = new();
         
         /// <summary>

+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTask.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTask.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskCompleted.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskCompleted.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskCompleted.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskCompleted.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskHelper.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskHelper.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETTaskHelper.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETTaskHelper.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETVoid.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETVoid.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/ETVoid.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/ETVoid.cs.meta


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/IAwaiter.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/IAwaiter.cs


+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/IAwaiter.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/IAwaiter.cs.meta


+ 1 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/StateMachineWrap.cs → Unity/Packages/com.et.core/Scripts/Core/ETTask/StateMachineWrap.cs

@@ -12,6 +12,7 @@ namespace ET
     
     public class StateMachineWrap<T>: IStateMachineWrap where T: IAsyncStateMachine
     {
+        [StaticField]
         private static readonly ConcurrentQueue<StateMachineWrap<T>> queue = new();
 
         public static StateMachineWrap<T> Fetch(ref T stateMachine)

+ 0 - 0
Unity/Packages/com.et.thirdparty/Scripts/ETTask/StateMachineWrap.cs.meta → Unity/Packages/com.et.core/Scripts/Core/ETTask/StateMachineWrap.cs.meta


+ 1 - 2
Unity/Packages/com.et.core/Scripts/Core/Unity.Core.asmdef

@@ -3,8 +3,7 @@
     "rootNamespace": "ET",
     "references": [
         "Unity.Mathematics",
-        "MemoryPack",
-        "Unity.ThirdParty"
+        "MemoryPack"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 1
Unity/Packages/com.et.core/Scripts/Editor/Unity.Core.Editor.asmdef

@@ -4,7 +4,6 @@
     "references": [
         "Unity.Mathematics",
         "MemoryPack",
-        "Unity.ThirdParty",
         "Unity.Core"
     ],
     "includePlatforms": [],

+ 1 - 2
Unity/Packages/com.et.core/package.json

@@ -15,7 +15,6 @@
   "relatedPackages": {},
   "dependencies": {
     "com.unity.mathematics": "1.2.6",
-    "com.cysharp.memorypack": "",
-    "com.et.thirdparty": ""
+    "com.cysharp.memorypack": ""
   }
 }

+ 0 - 1
Unity/Packages/com.et.loader/Scripts/Editor/Unity.Loader.Editor.asmdef

@@ -8,7 +8,6 @@
         "HybridCLR.Editor",
         "YooAsset",
         "Unity.Mathematics",
-        "Unity.ThirdParty",
         "Unity.Core.Editor"
     ],
     "includePlatforms": [

+ 0 - 1
Unity/Packages/com.et.loader/Scripts/Loader/Unity.Loader.asmdef

@@ -7,7 +7,6 @@
         "MemoryPack",
         "YooAsset",
         "YooAsset.Editor",
-        "Unity.ThirdParty",
         "Unity.YooAssets"
     ],
     "includePlatforms": [],

+ 0 - 1
Unity/Packages/com.et.loader/package.json

@@ -15,7 +15,6 @@
   "relatedPackages": {},
   "dependencies": {
     "com.et.core": "",
-    "com.et.thirdparty": "",
     "com.et.yooassets": ""
   }
 }

+ 0 - 8
Unity/Packages/com.et.thirdparty/Scripts.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3ce7757d7d51e4cf9a68c35ebb992733
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 14
Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef

@@ -1,14 +0,0 @@
-{
-    "name": "Unity.ThirdParty",
-    "rootNamespace": "ET",
-    "references": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": true,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

+ 0 - 7
Unity/Packages/com.et.thirdparty/Scripts/Unity.ThirdParty.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 32de1db3416244197b0520795f5999d7
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 17
Unity/Packages/com.et.thirdparty/package.json

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

+ 0 - 7
Unity/Packages/com.et.thirdparty/package.json.meta

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

+ 0 - 1
Unity/Packages/com.et.yooassets/Scripts/YooAssets/Unity.YooAssets.asmdef

@@ -3,7 +3,6 @@
     "rootNamespace": "",
     "references": [
         "GUID:e34a5702dd353724aa315fb8011f08c3",
-        "GUID:32de1db3416244197b0520795f5999d7",
         "GUID:9ef2053bcf13a254ab3940a767f7b1a5",
         "GUID:4d1926c9df5b052469a1c63448b7609a"
     ],

+ 0 - 1
Unity/Packages/com.et.yooassets/package.json

@@ -15,7 +15,6 @@
   "relatedPackages": {},
   "dependencies": {
     "com.tuyoogame.yooasset": "2.1.1",
-    "com.et.thirdparty": "",
     "com.et.core": ""
   }
 }

+ 1 - 10
Unity/Packages/packages-lock.json

@@ -20,8 +20,7 @@
       "source": "embedded",
       "dependencies": {
         "com.unity.mathematics": "1.2.6",
-        "com.cysharp.memorypack": "",
-        "com.et.thirdparty": ""
+        "com.cysharp.memorypack": ""
       }
     },
     "com.et.loader": {
@@ -30,23 +29,15 @@
       "source": "embedded",
       "dependencies": {
         "com.et.core": "",
-        "com.et.thirdparty": "",
         "com.et.yooassets": ""
       }
     },
-    "com.et.thirdparty": {
-      "version": "file:com.et.thirdparty",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {}
-    },
     "com.et.yooassets": {
       "version": "file:com.et.yooassets",
       "depth": 0,
       "source": "embedded",
       "dependencies": {
         "com.tuyoogame.yooasset": "2.1.1",
-        "com.et.thirdparty": "",
         "com.et.core": ""
       }
     },