From 359003969c1640c81d98716ad779a3c92e311dda Mon Sep 17 00:00:00 2001 From: zhangxl <1062808664@qq.com> Date: Fri, 19 Jul 2024 10:57:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BF=AE=E6=94=B9=EF=BC=88?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=9C=BA=E6=99=AF=E3=80=81resources=E7=AD=89?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/BuildinFileManifest.asset | 59 +--------------------- Assets/Scenes/Init.unity | 2 +- Framework_YooAsset_HybridCLR.sln | 12 ++--- ProjectSettings/HybridCLRSettings.asset | 4 +- 4 files changed, 9 insertions(+), 68 deletions(-) diff --git a/Assets/Resources/BuildinFileManifest.asset b/Assets/Resources/BuildinFileManifest.asset index dba81bb..31c196c 100644 --- a/Assets/Resources/BuildinFileManifest.asset +++ b/Assets/Resources/BuildinFileManifest.asset @@ -12,61 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71b02dfa7aa9d4545b3417a18477fbee, type: 3} m_Name: BuildinFileManifest m_EditorClassIdentifier: - BuildinFiles: - - PackageName: DefaultPackage - FileName: 00901b8cbbe65b8eedeecc1ada638b76.bundle - FileCRC32: 5205100c - - PackageName: DefaultPackage - FileName: 02082f32a0b59ba37e790e44fd590cfc.bundle - FileCRC32: 57c13a0a - - PackageName: DefaultPackage - FileName: 273aeda18e073ed52e4233e7d975cee6.bundle - FileCRC32: 357bb30a - - PackageName: DefaultPackage - FileName: 54209192417893c92c2051b3226c024d.bundle - FileCRC32: 8dc9d7d2 - - PackageName: DefaultPackage - FileName: 5bb1d9fc78b7d74e7c3901ff3a0a393d.bundle - FileCRC32: 23e94f14 - - PackageName: DefaultPackage - FileName: 69201750af30aececb14b8bcccd94672.bundle - FileCRC32: cbe93c2f - - PackageName: DefaultPackage - FileName: 8e9c0efe0a47e68df216a219c3ae7900.bundle - FileCRC32: 072ea395 - - PackageName: DefaultPackage - FileName: a4f6c75049202a4b2cc9d77302e3adae.bundle - FileCRC32: a966f160 - - PackageName: DefaultPackage - FileName: be9df03476934e0d40f6f58abc2b5701.bundle - FileCRC32: 52ac2b84 - - PackageName: DefaultPackage - FileName: d38d13a868f0a453f13df376eb27aaf5.bundle - FileCRC32: 1f45c842 - - PackageName: DefaultPackage - FileName: d41b2575f4422208c5b40678a37fe552.bundle - FileCRC32: 04b131d2 - - PackageName: DefaultPackage - FileName: d713d78de30d68ac2c7507eca23fb99c.bundle - FileCRC32: 7bc48fbb - - PackageName: DefaultPackage - FileName: e46db7167d7d51f23152fa5fe4895daf.bundle - FileCRC32: 8a1b16a9 - - PackageName: DefaultPackage - FileName: e6426a0aae86a4d7d810ff4a3c709188.bundle - FileCRC32: 69a716f1 - - PackageName: DefaultPackage - FileName: f314357a8e5ea58643fe209bd3593ae6.bundle - FileCRC32: 957a2126 - - PackageName: DefaultPackage - FileName: f3268115473d3833baf59f5ea059bbc6.bundle - FileCRC32: dd7f72ec - - PackageName: DefaultPackage - FileName: f71a66ef640d7f8d345df15214e1e7af.bundle - FileCRC32: dec33244 - - PackageName: DefaultPackage - FileName: fc10a523639a121c79c316e2181fdaf7.bundle - FileCRC32: fb388deb - - PackageName: DefaultPackage - FileName: fd6a23b13bfd581dfa62a2ec27651575.bundle - FileCRC32: 1e219b0d + BuildinFiles: [] diff --git a/Assets/Scenes/Init.unity b/Assets/Scenes/Init.unity index 45f0aef..1fc1c43 100644 --- a/Assets/Scenes/Init.unity +++ b/Assets/Scenes/Init.unity @@ -133,7 +133,7 @@ GameObject: m_Component: - component: {fileID: 63779663} m_Layer: 0 - m_Name: GameObject + m_Name: ObjectPool m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Framework_YooAsset_HybridCLR.sln b/Framework_YooAsset_HybridCLR.sln index 8bdd28f..095fb3e 100644 --- a/Framework_YooAsset_HybridCLR.sln +++ b/Framework_YooAsset_HybridCLR.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{294e6d56-1b1c-42fb-b926-f2e3316862bc}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotfix", "Hotfix.csproj", "{e04f01c5-6093-b77a-2de5-556e489fa4f1}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{0803a435-acbd-0585-3192-448b4a214bc1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{15a8914d-7f3c-94f5-3c3e-d69e1b59eb1f}" @@ -15,8 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IngameDebugConsole.Runtime", "IngameDebugConsole.Runtime.csproj", "{1bc74da9-4e3f-e28e-c028-265d90567a1d}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotfix", "Hotfix.csproj", "{e04f01c5-6093-b77a-2de5-556e489fa4f1}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniFramework.Machine", "UniFramework.Machine.csproj", "{ba3dee40-778e-9f57-6b42-b7dceb87a141}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader", "Unity.Loader.csproj", "{3771f7f8-3d80-281e-54c3-acf9751ee1f7}" @@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity.T EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{4920da9d-aeb8-a336-3665-34c8c5a30159}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchSocket", "TouchSocket.csproj", "{9d2ae2b7-22db-b343-5d16-cd179ed59975}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{43167fe8-7886-84ab-93d9-fc322b35d48d}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{0c19362e-5c9e-a33d-3bc5-d8b54bcd2fbc}" @@ -48,6 +46,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {294e6d56-1b1c-42fb-b926-f2e3316862bc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {294e6d56-1b1c-42fb-b926-f2e3316862bc}.Debug|Any CPU.Build.0 = Debug|Any CPU + {e04f01c5-6093-b77a-2de5-556e489fa4f1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {e04f01c5-6093-b77a-2de5-556e489fa4f1}.Debug|Any CPU.Build.0 = Debug|Any CPU {0803a435-acbd-0585-3192-448b4a214bc1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0803a435-acbd-0585-3192-448b4a214bc1}.Debug|Any CPU.Build.0 = Debug|Any CPU {15a8914d-7f3c-94f5-3c3e-d69e1b59eb1f}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -60,8 +60,6 @@ Global {7c049e19-3f64-2c7c-49e9-36d43077066f}.Debug|Any CPU.Build.0 = Debug|Any CPU {1bc74da9-4e3f-e28e-c028-265d90567a1d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1bc74da9-4e3f-e28e-c028-265d90567a1d}.Debug|Any CPU.Build.0 = Debug|Any CPU - {e04f01c5-6093-b77a-2de5-556e489fa4f1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {e04f01c5-6093-b77a-2de5-556e489fa4f1}.Debug|Any CPU.Build.0 = Debug|Any CPU {ba3dee40-778e-9f57-6b42-b7dceb87a141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ba3dee40-778e-9f57-6b42-b7dceb87a141}.Debug|Any CPU.Build.0 = Debug|Any CPU {3771f7f8-3d80-281e-54c3-acf9751ee1f7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -72,8 +70,6 @@ Global {043c94ad-22c5-bcf6-a68c-63b97092908a}.Debug|Any CPU.Build.0 = Debug|Any CPU {4920da9d-aeb8-a336-3665-34c8c5a30159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4920da9d-aeb8-a336-3665-34c8c5a30159}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9d2ae2b7-22db-b343-5d16-cd179ed59975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9d2ae2b7-22db-b343-5d16-cd179ed59975}.Debug|Any CPU.Build.0 = Debug|Any CPU {43167fe8-7886-84ab-93d9-fc322b35d48d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43167fe8-7886-84ab-93d9-fc322b35d48d}.Debug|Any CPU.Build.0 = Debug|Any CPU {0c19362e-5c9e-a33d-3bc5-d8b54bcd2fbc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/ProjectSettings/HybridCLRSettings.asset b/ProjectSettings/HybridCLRSettings.asset index eb6fe20..d86ebf7 100644 --- a/ProjectSettings/HybridCLRSettings.asset +++ b/ProjectSettings/HybridCLRSettings.asset @@ -25,9 +25,11 @@ MonoBehaviour: - Temp/Bin/Debug strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip patchAOTAssemblies: - - mscorlib.dll - UniTask.dll - YooAsset.dll + - Sirenix.Utilities.dll + - UnityEngine.CoreModule.dll + - mscorlib.dll outputLinkFile: DemoGame/GameScript/Loader/Plugins/Generated/link.xml outputAOTGenericReferenceFile: DemoGame/GameScript/Loader/Plugins/Generated/AOTGenericReferences.cs maxGenericReferenceIteration: 10