Loader包拆出了YooAssets包

ET.sln

@@ -43,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader.Editor", "Unit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.SourceGenerator", "Share\SourceGenerator\Share.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.YooAssets", "Unity\Unity.YooAssets.csproj", "{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -257,6 +259,18 @@ Global
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x64.Build.0 = Release|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x86.ActiveCfg = Release|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x86.Build.0 = Release|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x64.Build.0 = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x86.Build.0 = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x64.ActiveCfg = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x64.Build.0 = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x86.ActiveCfg = Debug|Any CPU
+		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -279,6 +293,7 @@ Global
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Unity/Packages/com.et.core/Scripts/Editor.meta

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

Unity/Packages/com.et.core/Scripts/Editor/Helper.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5999bd61b5ca4e5ba50b20b2e3a7f9b2
+timeCreated: 1507865451

Unity/Packages/com.et.core/Scripts/Editor/Unity.Core.Editor.asmdef

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

Unity/Packages/com.et.core/Scripts/Editor/Unity.Core.Editor.asmdef.meta

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

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

@@ -13,5 +13,9 @@
     "url": "https://github.com/egametang/ET"
   },
   "relatedPackages": {},
-  "dependencies": {}
-}
+  "dependencies": {
+    "com.unity.mathematics": "1.2.6",
+    "com.cysharp.memorypack": "",
+    "com.et.thirdparty": ""
+  }
+}

Unity/Packages/com.et.loader/Scripts/Editor/BuildEditor/BuildEditor.cs

@@ -38,7 +38,7 @@ namespace ET
         [MenuItem("ET/Build Tool", false, ETMenuItemPriority.BuildTool)]
         public static void ShowWindow()
         {
-            GetWindow<BuildEditor>(DockDefine.Types);
+            GetWindow<BuildEditor>();
         }
 
         private void OnEnable()

Unity/Packages/com.et.loader/Scripts/Editor/Helper.meta

@@ -1,3 +1,8 @@
-fileFormatVersion: 2
-guid: 5999bd61b5ca4e5ba50b20b2e3a7f9b2
-timeCreated: 1507865451
+fileFormatVersion: 2
+guid: 54b63eab8d244df4f90680887530b273
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/com.et.loader/Scripts/Editor/Helper/DockDefine.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ET
-{
-    public static class DockDefine
-    {
-        public static Type[] Types = { typeof (BuildEditor), typeof (ServerCommandLineEditor) };
-    }
-}

Unity/Packages/com.et.loader/Scripts/Editor/Helper/DockDefine.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: cd787c944ffb94cb2a822db7f9f486b3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Packages/com.et.loader/Scripts/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs

@@ -17,7 +17,7 @@ namespace ET
         [MenuItem("ET/ServerTools", false, ETMenuItemPriority.ServerTools)]
         public static void ShowWindow()
         {
-            GetWindow<ServerCommandLineEditor>(DockDefine.Types);
+            GetWindow<ServerCommandLineEditor>();
         }
 
         private int selectStartConfigIndex = 1;

Unity/Packages/com.et.loader/Scripts/Editor/Unity.Loader.Editor.asmdef

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

Unity/Packages/com.et.loader/Scripts/Loader/Unity.Loader.asmdef

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

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

@@ -13,5 +13,9 @@
     "url": "https://github.com/egametang/ET"
   },
   "relatedPackages": {},
-  "dependencies": {}
-}
+  "dependencies": {
+    "com.et.core": "",
+    "com.et.thirdparty": "",
+    "com.et.yooassets": ""
+  }
+}

Unity/Packages/com.et.yooassets/Resources.meta

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

Unity/Packages/com.et.yooassets/Scripts.meta

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

Unity/Packages/com.et.loader/Scripts/Loader/Resource/ResourcesComponent.cs → Unity/Packages/com.et.yooassets/Scripts/YooAssets/ResourcesComponent.cs

@@ -42,7 +42,7 @@ namespace ET
             YooAssets.Destroy();
         }
 
-        public async ETTask CreatePackageAsync(string packageName, bool isDefault = false)
+        public async ETTask CreatePackageAsync(string packageName, EPlayMode ePlayMode, bool isDefault = false)
         {
             ResourcePackage package = YooAssets.CreatePackage(packageName);
             if (isDefault)
@@ -50,9 +50,6 @@ namespace ET
                 YooAssets.SetDefaultPackage(package);
             }
 
-            GlobalConfig globalConfig = Resources.Load<GlobalConfig>("GlobalConfig");
-            EPlayMode ePlayMode = globalConfig.EPlayMode;
-
             // 编辑器下的模拟模式
             switch (ePlayMode)
             {

Unity/Packages/com.et.yooassets/Scripts/YooAssets/Unity.YooAssets.asmdef

@@ -0,0 +1,19 @@
+{
+    "name": "Unity.YooAssets",
+    "rootNamespace": "",
+    "references": [
+        "GUID:e34a5702dd353724aa315fb8011f08c3",
+        "GUID:32de1db3416244197b0520795f5999d7",
+        "GUID:9ef2053bcf13a254ab3940a767f7b1a5",
+        "GUID:4d1926c9df5b052469a1c63448b7609a"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Unity/Packages/com.et.yooassets/Scripts/YooAssets/Unity.YooAssets.asmdef.meta

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

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

@@ -0,0 +1,21 @@
+{
+  "name": "com.et.yooassets",
+  "displayName": "ET.YooAssets",
+  "version": "0.0.1",
+  "unity": "2022.3",
+  "description": "et yooassets",
+  "author": {
+    "name": "tanghai",
+    "url": "https://github.com/egametang/ET"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/egametang/ET"
+  },
+  "relatedPackages": {},
+  "dependencies": {
+    "com.tuyoogame.yooasset": "2.1.1",
+    "com.et.thirdparty": "",
+    "com.et.core": ""
+  }
+}

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

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

Unity/Packages/packages-lock.json

@@ -18,13 +18,21 @@
       "version": "file:com.et.core",
       "depth": 0,
       "source": "embedded",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.mathematics": "1.2.6",
+        "com.cysharp.memorypack": "",
+        "com.et.thirdparty": ""
+      }
     },
     "com.et.loader": {
       "version": "file:com.et.loader",
       "depth": 0,
       "source": "embedded",
-      "dependencies": {}
+      "dependencies": {
+        "com.et.core": "",
+        "com.et.thirdparty": "",
+        "com.et.yooassets": ""
+      }
     },
     "com.et.thirdparty": {
       "version": "file:com.et.thirdparty",
@@ -32,6 +40,16 @@
       "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": ""
+      }
+    },
     "com.tuyoogame.yooasset": {
       "version": "2.1.1",
       "depth": 0,