diff --git a/Assets/Res/Main/HotUpdateDll/Main.bytes b/Assets/Res/Main/HotUpdateDll/Main.bytes index e4d5683..2e35626 100644 Binary files a/Assets/Res/Main/HotUpdateDll/Main.bytes and b/Assets/Res/Main/HotUpdateDll/Main.bytes differ diff --git a/Assets/Res/Main/HotUpdateDll/Mirror.dll.bytes b/Assets/Res/Main/HotUpdateDll/Mirror.dll.bytes index 1047175..d18e07c 100644 Binary files a/Assets/Res/Main/HotUpdateDll/Mirror.dll.bytes and b/Assets/Res/Main/HotUpdateDll/Mirror.dll.bytes differ diff --git a/Assets/Res/Main/HotUpdateDll/System.Core.dll.bytes b/Assets/Res/Main/HotUpdateDll/System.Core.dll.bytes index 1d0dcd1..ec254a5 100644 Binary files a/Assets/Res/Main/HotUpdateDll/System.Core.dll.bytes and b/Assets/Res/Main/HotUpdateDll/System.Core.dll.bytes differ diff --git a/Assets/Res/Main/HotUpdateDll/System.dll.bytes b/Assets/Res/Main/HotUpdateDll/System.dll.bytes index 5d3b33b..9499cc6 100644 Binary files a/Assets/Res/Main/HotUpdateDll/System.dll.bytes and b/Assets/Res/Main/HotUpdateDll/System.dll.bytes differ diff --git a/Assets/Res/Main/HotUpdateDll/mscorlib.dll.bytes b/Assets/Res/Main/HotUpdateDll/mscorlib.dll.bytes index ac6de64..e3b5b65 100644 Binary files a/Assets/Res/Main/HotUpdateDll/mscorlib.dll.bytes and b/Assets/Res/Main/HotUpdateDll/mscorlib.dll.bytes differ diff --git a/Assets/Res/Main/ShaderVariants/MyShaderVariants.json b/Assets/Res/Main/ShaderVariants/MyShaderVariants.json index b8fe011..4115e5f 100644 --- a/Assets/Res/Main/ShaderVariants/MyShaderVariants.json +++ b/Assets/Res/Main/ShaderVariants/MyShaderVariants.json @@ -1,6 +1,6 @@ { - "ShaderTotalCount": 19, - "VariantTotalCount": 40, + "ShaderTotalCount": 20, + "VariantTotalCount": 42, "ShaderVariantInfos": [ { "AssetPath": "Assets/Res/Main/Shader/SimpleURPToonLitOutlineExample.shader", @@ -12,20 +12,17 @@ "Keywords": [ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", "_REFLECTION_PROBE_BLENDING", "_REFLECTION_PROBE_BOX_PROJECTION", - "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "EVALUATE_SH_VERTEX" + "_SCREEN_SPACE_OCCLUSION" ] }, { "PassType": 0, "Keywords": [ "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", - "EVALUATE_SH_VERTEX" + "_MAIN_LIGHT_SHADOWS" ] }, { @@ -39,20 +36,17 @@ "Keywords": [ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", "_REFLECTION_PROBE_BLENDING", "_REFLECTION_PROBE_BOX_PROJECTION", - "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "EVALUATE_SH_VERTEX" + "_SCREEN_SPACE_OCCLUSION" ] }, { "PassType": 13, "Keywords": [ "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", - "EVALUATE_SH_VERTEX" + "_MAIN_LIGHT_SHADOWS" ] }, { @@ -63,10 +57,23 @@ } ] }, + { + "AssetPath": "Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/FallbackShader.shader", + "ShaderName": "Hidden/Core/FallbackError", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, { "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader", "ShaderName": "Universal Render Pipeline/Lit", - "ShaderVariantCount": 11, + "ShaderVariantCount": 12, "ShaderVariantElements": [ { "PassType": 13, @@ -79,12 +86,10 @@ "Keywords": [ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", "_REFLECTION_PROBE_BLENDING", "_REFLECTION_PROBE_BOX_PROJECTION", - "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "EVALUATE_SH_VERTEX" + "_SCREEN_SPACE_OCCLUSION" ] }, { @@ -93,12 +98,10 @@ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", "_DETAIL_MULX2", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", "_REFLECTION_PROBE_BLENDING", "_REFLECTION_PROBE_BOX_PROJECTION", - "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "EVALUATE_SH_VERTEX" + "_SCREEN_SPACE_OCCLUSION" ] }, { @@ -107,12 +110,10 @@ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", "_EMISSION", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", "_REFLECTION_PROBE_BLENDING", "_REFLECTION_PROBE_BOX_PROJECTION", - "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "EVALUATE_SH_VERTEX" + "_SCREEN_SPACE_OCCLUSION" ] }, { @@ -121,22 +122,32 @@ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", "_ENVIRONMENTREFLECTIONS_OFF", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", + "_REFLECTION_PROBE_BLENDING", + "_REFLECTION_PROBE_BOX_PROJECTION", + "_SCREEN_SPACE_OCCLUSION", + "_SPECULARHIGHLIGHTS_OFF" + ] + }, + { + "PassType": 13, + "Keywords": [ + "_ADDITIONAL_LIGHT_SHADOWS", + "_ADDITIONAL_LIGHTS", + "_ENVIRONMENTREFLECTIONS_OFF", + "_MAIN_LIGHT_SHADOWS", "_NORMALMAP", "_REFLECTION_PROBE_BLENDING", "_REFLECTION_PROBE_BOX_PROJECTION", "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "_SPECULARHIGHLIGHTS_OFF", - "EVALUATE_SH_VERTEX" + "_SPECULARHIGHLIGHTS_OFF" ] }, { "PassType": 13, "Keywords": [ "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", - "EVALUATE_SH_VERTEX" + "_MAIN_LIGHT_SHADOWS" ] }, { @@ -144,17 +155,15 @@ "Keywords": [ "_ADDITIONAL_LIGHTS", "_DETAIL_MULX2", - "_MAIN_LIGHT_SHADOWS_CASCADE", - "EVALUATE_SH_VERTEX" + "_MAIN_LIGHT_SHADOWS" ] }, { "PassType": 13, "Keywords": [ "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", - "_NORMALMAP", - "EVALUATE_SH_VERTEX" + "_MAIN_LIGHT_SHADOWS", + "_NORMALMAP" ] }, { @@ -214,21 +223,18 @@ "Keywords": [ "_ADDITIONAL_LIGHT_SHADOWS", "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", + "_MAIN_LIGHT_SHADOWS", "_REFLECTION_PROBE_BLENDING", "_SCREEN_SPACE_OCCLUSION", - "_SHADOWS_SOFT", - "_TERRAIN_INSTANCED_PERPIXEL_NORMAL", - "EVALUATE_SH_VERTEX" + "_TERRAIN_INSTANCED_PERPIXEL_NORMAL" ] }, { "PassType": 13, "Keywords": [ "_ADDITIONAL_LIGHTS", - "_MAIN_LIGHT_SHADOWS_CASCADE", - "_TERRAIN_INSTANCED_PERPIXEL_NORMAL", - "EVALUATE_SH_VERTEX" + "_MAIN_LIGHT_SHADOWS", + "_TERRAIN_INSTANCED_PERPIXEL_NORMAL" ] }, { diff --git a/Assets/Res/Main/ShaderVariants/MyShaderVariants.shadervariants b/Assets/Res/Main/ShaderVariants/MyShaderVariants.shadervariants index 87d5459..144ed30 100644 --- a/Assets/Res/Main/ShaderVariants/MyShaderVariants.shadervariants +++ b/Assets/Res/Main/ShaderVariants/MyShaderVariants.shadervariants @@ -94,29 +94,28 @@ ShaderVariantCollection: passType: 8 - keywords: passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS_CASCADE _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION - _SCREEN_SPACE_OCCLUSION _SHADOWS_SOFT + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS + _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _EMISSION _MAIN_LIGHT_SHADOWS_CASCADE _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION - _SCREEN_SPACE_OCCLUSION _SHADOWS_SOFT + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _EMISSION _MAIN_LIGHT_SHADOWS + _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _ENVIRONMENTREFLECTIONS_OFF _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _REFLECTION_PROBE_BLENDING - _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION _SHADOWS_SOFT - _SPECULARHIGHLIGHTS_OFF + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _ENVIRONMENTREFLECTIONS_OFF + _MAIN_LIGHT_SHADOWS _NORMALMAP _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION + _SCREEN_SPACE_OCCLUSION _SPECULARHIGHLIGHTS_OFF passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _MAIN_LIGHT_SHADOWS_CASCADE _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION - _SCREEN_SPACE_OCCLUSION _SHADOWS_SOFT + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _ENVIRONMENTREFLECTIONS_OFF + _MAIN_LIGHT_SHADOWS _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION + _SCREEN_SPACE_OCCLUSION _SPECULARHIGHLIGHTS_OFF passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS_CASCADE + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS_CASCADE + - keywords: _ADDITIONAL_LIGHTS _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP + - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _NORMALMAP passType: 13 - keywords: _DETAIL_MULX2 passType: 13 @@ -136,29 +135,30 @@ ShaderVariantCollection: passType: 8 - keywords: passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _MAIN_LIGHT_SHADOWS_CASCADE _REFLECTION_PROBE_BLENDING _SCREEN_SPACE_OCCLUSION - _SHADOWS_SOFT _TERRAIN_INSTANCED_PERPIXEL_NORMAL + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _REFLECTION_PROBE_BLENDING _SCREEN_SPACE_OCCLUSION _TERRAIN_INSTANCED_PERPIXEL_NORMAL passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS_CASCADE - _TERRAIN_INSTANCED_PERPIXEL_NORMAL + - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _TERRAIN_INSTANCED_PERPIXEL_NORMAL passType: 13 - first: {fileID: 4800000, guid: 715e1d138b462a0458266dbf06a1bf71, type: 3} second: variants: - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _MAIN_LIGHT_SHADOWS_CASCADE _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION - _SCREEN_SPACE_OCCLUSION _SHADOWS_SOFT + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION passType: 0 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS_CASCADE + - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS passType: 0 - keywords: passType: 8 - keywords: passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS - _MAIN_LIGHT_SHADOWS_CASCADE _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION - _SCREEN_SPACE_OCCLUSION _SHADOWS_SOFT + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _REFLECTION_PROBE_BLENDING _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION passType: 13 - - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS_CASCADE + - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS passType: 13 + - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3} + second: + variants: + - keywords: + passType: 0 diff --git a/Assets/Res/Preload/HotUpdateDll/Preload.bytes b/Assets/Res/Preload/HotUpdateDll/Preload.bytes index e59e2bb..df94b5d 100644 Binary files a/Assets/Res/Preload/HotUpdateDll/Preload.bytes and b/Assets/Res/Preload/HotUpdateDll/Preload.bytes differ diff --git a/Assets/Res/Preload/ShaderVariants/MyShaderVariants.json b/Assets/Res/Preload/ShaderVariants/MyShaderVariants.json index e066e28..9eef388 100644 --- a/Assets/Res/Preload/ShaderVariants/MyShaderVariants.json +++ b/Assets/Res/Preload/ShaderVariants/MyShaderVariants.json @@ -1,7 +1,20 @@ { - "ShaderTotalCount": 13, - "VariantTotalCount": 15, + "ShaderTotalCount": 14, + "VariantTotalCount": 16, "ShaderVariantInfos": [ + { + "AssetPath": "Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/FallbackShader.shader", + "ShaderName": "Hidden/Core/FallbackError", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, { "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/CoreBlit.shader", "ShaderName": "Hidden/Universal/CoreBlit", diff --git a/Assets/Res/Preload/ShaderVariants/MyShaderVariants.shadervariants b/Assets/Res/Preload/ShaderVariants/MyShaderVariants.shadervariants index ba5ad59..1380c8b 100644 --- a/Assets/Res/Preload/ShaderVariants/MyShaderVariants.shadervariants +++ b/Assets/Res/Preload/ShaderVariants/MyShaderVariants.shadervariants @@ -77,3 +77,8 @@ ShaderVariantCollection: passType: 0 - keywords: _INTERLEAVED_GRADIENT _SAMPLE_COUNT_HIGH _SOURCE_DEPTH_NORMALS passType: 0 + - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3} + second: + variants: + - keywords: + passType: 0 diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomRules.meta b/Assets/Samples/YooAsset.meta similarity index 77% rename from Assets/ThirdParty/Extension Sample/Editor/CustomRules.meta rename to Assets/Samples/YooAsset.meta index 8c59b82..afd17f0 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/CustomRules.meta +++ b/Assets/Samples/YooAsset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73ef838ec60c36249ba05eaa3c96273e +guid: cabd4a0ffe7f92341ad5799c9e49801f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem.meta b/Assets/Samples/YooAsset/2.3.16.meta similarity index 77% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem.meta rename to Assets/Samples/YooAsset/2.3.16.meta index 6722670..aacc0ee 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem.meta +++ b/Assets/Samples/YooAsset/2.3.16.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5280dfac6a481ee429c769ba5688c9d2 +guid: dc91fa8da965b074eb6f844cc0084943 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Editor/BuildTool.cs b/Assets/Scripts/Editor/BuildTool.cs index 56f4afb..6ce90c1 100644 --- a/Assets/Scripts/Editor/BuildTool.cs +++ b/Assets/Scripts/Editor/BuildTool.cs @@ -31,10 +31,10 @@ public class BuildTool public static void ExecuteBuild(string PackageName, EBuildPipeline BuildPipeline, BuildTarget BuildTarget, EFileNameStyle fileNameStyle, EBuildinFileCopyOption buildinFileCopyOption) { - var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline); - var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline); - var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline); - var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, BuildPipeline); + var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline.ToString()); + var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline.ToString()); + var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline.ToString()); + var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, BuildPipeline.ToString()); var builtinShaderBundleName = GetBuiltinShaderBundleName(PackageName); ScriptableBuildParameters buildParameters = new ScriptableBuildParameters(); @@ -80,7 +80,7 @@ public class BuildTool public static IEncryptionServices CreateEncryptionInstance(string PackageName, EBuildPipeline BuildPipeline) { - var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline); + var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, BuildPipeline.ToString()); var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices)); var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName)); if (classType != null) diff --git a/Assets/Scripts/HotUpdate/Main/MirrorRoomTest/MyNetworkManagerHUD.cs b/Assets/Scripts/HotUpdate/Main/MirrorRoomTest/MyNetworkManagerHUD.cs index d0cdd0c..36d4fa2 100644 --- a/Assets/Scripts/HotUpdate/Main/MirrorRoomTest/MyNetworkManagerHUD.cs +++ b/Assets/Scripts/HotUpdate/Main/MirrorRoomTest/MyNetworkManagerHUD.cs @@ -26,8 +26,6 @@ public class MyNetworkManagerHUD : MonoBehaviour public bool alwaysAutoStart = false; public NetworkDiscovery networkDiscovery; readonly Dictionary discoveredServers = new Dictionary(); - private TouchScreenKeyboard keyboard; - private int keyboardStatus = 0; private void Start() { diff --git a/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs b/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs index 39b4d70..050e7c7 100644 --- a/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs +++ b/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs @@ -113,7 +113,7 @@ internal class FsmInitializePackage : IStateNode /// public string GetHostServerURL(string packageName) { - string hostServerIP = $"http://47.107.55.108:8080/{Application.productName}"; + string hostServerIP = $"https://home.gtuantuan.online/{Application.productName}"; if (GameManager.Inst.ServerAddress != "" && GameManager.Inst.ServerAddress != null) hostServerIP = $"{GameManager.Inst.ServerAddress}/{Application.productName}"; string appVersion = "v1"; diff --git a/Assets/Settings/AssetBundleCollectorConfig.xml b/Assets/Settings/AssetBundleCollectorConfig.xml index 6ff64d2..c6d1427 100644 --- a/Assets/Settings/AssetBundleCollectorConfig.xml +++ b/Assets/Settings/AssetBundleCollectorConfig.xml @@ -1,7 +1,7 @@  - + - + @@ -12,7 +12,7 @@ - + diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index 58f8a83..b22302b 100644 --- a/Assets/Settings/URP-HighFidelity.asset +++ b/Assets/Settings/URP-HighFidelity.asset @@ -26,7 +26,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 4 - m_RenderScale: 2 + m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 @@ -45,7 +45,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 512 m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 - m_ShadowDistance: 1 + m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} diff --git a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes index 1911381..56d6d20 100644 Binary files a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes and b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes differ diff --git a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json index d447900..067789e 100644 --- a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json +++ b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json @@ -1,11 +1,11 @@ { "FileVersion": "1.0.0", "PackageName": "Preload", - "PackageVersion": "2025-10-23-619", + "PackageVersion": "2025-10-25-1011", "Wrappers": [ { - "BundleGUID": "2e42ccf99ea94f39f58b060fa3cf244a", - "FileName": "preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle" + "BundleGUID": "e30b5f0bc472d219a39098dcdc864682", + "FileName": "preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle" }, { "BundleGUID": "3af8985a0950e33249e822a39aa0ccc6", @@ -16,8 +16,8 @@ "FileName": "preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle" }, { - "BundleGUID": "4e1243970ec9c75cdb3d1f2552618719", - "FileName": "preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle" + "BundleGUID": "70979c3eee73e29e00d15d5cae1bb87b", + "FileName": "preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle" } ] } \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload.version b/Assets/StreamingAssets/yoo/Preload/Preload.version index 54b7d97..3d288cb 100644 --- a/Assets/StreamingAssets/yoo/Preload/Preload.version +++ b/Assets/StreamingAssets/yoo/Preload/Preload.version @@ -1 +1 @@ -2025-10-23-619 \ No newline at end of file +2025-10-25-1011 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.bytes b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.bytes deleted file mode 100644 index 83fd402..0000000 Binary files a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.bytes and /dev/null differ diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.hash b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.hash deleted file mode 100644 index ab53043..0000000 --- a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.hash +++ /dev/null @@ -1 +0,0 @@ -b56586ac \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.bytes b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.bytes new file mode 100644 index 0000000..d992b0e Binary files /dev/null and b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.bytes differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle.meta b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.bytes.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle.meta rename to Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.bytes.meta index 557c42d..5010d58 100644 --- a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle.meta +++ b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10649d0a8a6844f468c474855f53f602 +guid: a895cb26994f9c743b72bbc308a5ee83 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.hash b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.hash new file mode 100644 index 0000000..7d844b9 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.hash @@ -0,0 +1 @@ +ff51d7ec \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.bytes.meta b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.hash.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.bytes.meta rename to Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.hash.meta index 0773270..13ed74f 100644 --- a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.bytes.meta +++ b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-25-1011.hash.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2781ee36fc150f4f9d0f5ea6002be3f +guid: a43b153e67810504bac9896a6fc16c11 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle similarity index 83% rename from Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle rename to Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle index 15ae9e1..c08b98a 100644 Binary files a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_2e42ccf99ea94f39f58b060fa3cf244a.bundle and b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle.meta b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle.meta rename to Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle.meta index 9130819..d4912cf 100644 --- a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle.meta +++ b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_e30b5f0bc472d219a39098dcdc864682.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2caec77def88e2f45aee1d5665c10ecf +guid: 1aaea0beb90b742419c5204470c6dea8 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle similarity index 92% rename from Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle rename to Assets/StreamingAssets/yoo/Preload/preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle index 683ded8..547d145 100644 Binary files a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle and b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle differ diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.hash.meta b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.hash.meta rename to Assets/StreamingAssets/yoo/Preload/preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle.meta index ff127c9..264e202 100644 --- a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-23-619.hash.meta +++ b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_70979c3eee73e29e00d15d5cae1bb87b.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de5cc13b1c1b9a04d97cb4e2ac682600 +guid: e885b1ee4e07aae4993c06a0d174f6f6 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ThirdParty/Extension Sample.meta b/Assets/ThirdParty/Extension Sample.meta index 6eb410d..c697e51 100644 --- a/Assets/ThirdParty/Extension Sample.meta +++ b/Assets/ThirdParty/Extension Sample.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5862ead0f353bb44e8a023649607f100 +guid: 92c2724dd632ceb4086f6623adf2e304 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Editor.meta b/Assets/ThirdParty/Extension Sample/Editor.meta index ee12050..7cc6396 100644 --- a/Assets/ThirdParty/Extension Sample/Editor.meta +++ b/Assets/ThirdParty/Extension Sample/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 83541de392f5489438a81cb60f751e9c +guid: 4be2e9448b686254685a931e1a476439 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem.meta b/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache.meta similarity index 77% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem.meta rename to Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache.meta index cff102c..0c1b566 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ccb22c5c90bfe2f43a0f83f873dd6646 +guid: b1774501eb8484d47b6c9d61585b4cd4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache/ClearBuildCache.cs b/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache/ClearBuildCache.cs new file mode 100644 index 0000000..efb91a4 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache/ClearBuildCache.cs @@ -0,0 +1,25 @@ +using System; +using System.IO; +using UnityEditor; +using UnityEngine; + +namespace YooAsset.Editor +{ + internal class ClearBuildCacheWindow + { + [MenuItem("Tools/Clear Build Cache", false, 2)] + public static void OpenWindow() + { + // 清空SBP构建缓存 + UnityEditor.Build.Pipeline.Utilities.BuildCache.PurgeCache(false); + + // 删除AssetDependDB文件 + string projectPath = YooAsset.Editor.EditorTools.GetProjectPath(); + string databaseFilePath = $"{projectPath}/Library/AssetDependencyDB"; + if (File.Exists(databaseFilePath)) + { + File.Delete(databaseFilePath); + } + } + } +} \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache/ClearBuildCache.cs.meta similarity index 83% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs.meta rename to Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache/ClearBuildCache.cs.meta index 0826d65..0e5c96a 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ClearBuildCache/ClearBuildCache.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 80ce0631d38cf74458c902fb325afb81 +guid: 8bf2d0ddd780f1746b7f1c7e0f9959e0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult.meta b/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog.meta similarity index 77% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult.meta rename to Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog.meta index e606ef8..5a5b3d6 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 879f2b393f883554899ab3345f0dc998 +guid: f450f29c62aedae4390edc923f71811d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog/CreateBuildinCatalogWindow.cs b/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog/CreateBuildinCatalogWindow.cs new file mode 100644 index 0000000..b8c03bd --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog/CreateBuildinCatalogWindow.cs @@ -0,0 +1,92 @@ +using System.IO; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEditor; + +namespace YooAsset.Editor +{ + public class CreateBuildinCatalogWindow : EditorWindow + { + static CreateBuildinCatalogWindow _thisInstance; + + [MenuItem("Tools/内置清单生成工具（Catalog）", false, 101)] + static void ShowWindow() + { + if (_thisInstance == null) + { + _thisInstance = EditorWindow.GetWindow(typeof(CreateBuildinCatalogWindow), false, "内置清单生成工具", true) as CreateBuildinCatalogWindow; + _thisInstance.minSize = new Vector2(800, 600); + } + _thisInstance.Show(); + } + + private string _directoryRoot = string.Empty; + + private void OnGUI() + { + GUILayout.Space(10); + EditorGUILayout.BeginHorizontal(); + if (GUILayout.Button("选择内置资源目录", GUILayout.MaxWidth(150))) + { + string resultPath = EditorUtility.OpenFolderPanel("Find", "Assets/", "StreamingAssets"); + if (!string.IsNullOrEmpty(resultPath)) + _directoryRoot = resultPath; + } + EditorGUILayout.LabelField(_directoryRoot); + EditorGUILayout.EndHorizontal(); + + if (string.IsNullOrEmpty(_directoryRoot) == false) + { + if (GUILayout.Button("生成Catalog文件", GUILayout.MaxWidth(150))) + { + CreateCatalogFile(_directoryRoot); + } + } + } + + private void CreateCatalogFile(string directoryRoot) + { + // 搜索所有Package目录 + List packageRoots = GetPackageRoots(directoryRoot); + foreach (var packageRoot in packageRoots) + { + DirectoryInfo directoryInfo = new DirectoryInfo(packageRoot); + string packageName = directoryInfo.Name; + try + { + bool result = CatalogTools.CreateCatalogFile(null, packageName, packageRoot); //TODO 自行处理解密 + if (result == false) + { + Debug.LogError($"Create package {packageName} catalog file failed ! See the detail error in console !"); + } + } + catch (System.Exception ex) + { + Debug.LogError($"Create package {packageName} catalog file failed ! {ex.Message}"); + } + } + } + private List GetPackageRoots(string rootPath) + { + // 检查目录是否存在 + if (Directory.Exists(rootPath) == false) + { + throw new DirectoryNotFoundException($"目录不存在: {rootPath}"); + } + + // 搜索所有 .version 文件（包含子目录） + string[] versionFiles = Directory.GetFiles( + rootPath, + "*.version", + SearchOption.AllDirectories + ); + + // 提取文件所在目录路径并去重 + return versionFiles + .Select(file => Path.GetDirectoryName(file)) + .Distinct() + .ToList(); + } + } +} \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog/CreateBuildinCatalogWindow.cs.meta similarity index 83% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs.meta rename to Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog/CreateBuildinCatalogWindow.cs.meta index b3abf50..528015a 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/CreateBuildinCatalog/CreateBuildinCatalogWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0bdf53359f9e17b41b08982a2be2098c +guid: 16ab831593388974fa7e8f8c7e8199a8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline.meta b/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline.meta new file mode 100644 index 0000000..cb00cbe --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8f5ca9e913008d4988fe0f4a2f4a443 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline/CustomBuildPipelineViewer.cs b/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline/CustomBuildPipelineViewer.cs new file mode 100644 index 0000000..21d7468 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline/CustomBuildPipelineViewer.cs @@ -0,0 +1,18 @@ +using System; +using System.IO; +using System.Linq; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; +using UnityEditor.UIElements; +using UnityEngine.UIElements; +using YooAsset.Editor; + +[BuildPipelineAttribute("CustomBuildPipeline")] +internal class CustomBuildPipelineViewer : BuiltinBuildPipelineViewer +{ + protected override string GetDefaultPackageVersion() + { + return "v1.0.0"; + } +} \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline/CustomBuildPipelineViewer.cs.meta similarity index 83% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs.meta rename to Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline/CustomBuildPipelineViewer.cs.meta index e6e0ca6..e546762 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/CustomBuildPipeline/CustomBuildPipelineViewer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 614227bf558da7149a7eb6de7dfa1a21 +guid: e721201eb2cad4e4ca207b9c99208055 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules.meta b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules.meta new file mode 100644 index 0000000..6968f20 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 103e9c32154c7724a85a89b54576d2c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomAdressRule.cs b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomAdressRule.cs similarity index 100% rename from Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomAdressRule.cs rename to Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomAdressRule.cs diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomAdressRule.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomAdressRule.cs.meta similarity index 83% rename from Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomAdressRule.cs.meta rename to Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomAdressRule.cs.meta index d8dcf6d..7a5b019 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomAdressRule.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomAdressRule.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73aae15a0e1aec742a7e8f05755a2013 +guid: 58b8635bcecc5b44dad501fff5dbf8c1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomPackRule.cs b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomPackRule.cs similarity index 100% rename from Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomPackRule.cs rename to Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomPackRule.cs diff --git a/Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomPackRule.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomPackRule.cs.meta similarity index 83% rename from Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomPackRule.cs.meta rename to Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomPackRule.cs.meta index 40f5ad7..b573ed8 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/CustomRules/CustomPackRule.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/CustomCollectRules/CustomPackRule.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff1eb84d9996ca1409e37f45617b1bdb +guid: ded28d0056e4afe46a0ce446de51617b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/PackageComparator.meta b/Assets/ThirdParty/Extension Sample/Editor/PackageComparator.meta index 00a5cca..0af071d 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/PackageComparator.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/PackageComparator.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0b4ccec8007a6047aade899b4b74fcf +guid: 1862925d68796e84d8dd0a39a85e89df folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs b/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs index d3b6728..3bc616f 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs +++ b/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs @@ -106,11 +106,11 @@ namespace YooAsset.Editor // 加载补丁清单1 byte[] bytesData1 = FileUtility.ReadAllBytes(_manifestPath1); - PackageManifest manifest1 = ManifestTools.DeserializeFromBinary(bytesData1); + PackageManifest manifest1 = ManifestTools.DeserializeFromBinary(bytesData1, null); //TODO 自行处理解密 // 加载补丁清单1 byte[] bytesData2 = FileUtility.ReadAllBytes(_manifestPath2); - PackageManifest manifest2 = ManifestTools.DeserializeFromBinary(bytesData2); + PackageManifest manifest2 = ManifestTools.DeserializeFromBinary(bytesData2, null); //TODO 自行处理解密 // 拷贝文件列表 foreach (var bundle2 in manifest2.BundleList) diff --git a/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs.meta index efc87bd..a509a3f 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ff3c700b7f108b48998aa1630a769e1 +guid: e2beaa5e8aad3e0439f058dc9fe34be5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/PackageImporter.meta b/Assets/ThirdParty/Extension Sample/Editor/PackageImporter.meta index 0ad5c46..2d39b86 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/PackageImporter.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/PackageImporter.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa6624433c5d8e445b1426dcdf0763ba +guid: afb453c8615ab124ebd40d8900ac3903 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs b/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs index 6e692c6..7d89dc0 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs +++ b/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs @@ -71,7 +71,7 @@ namespace YooAsset.Editor // 加载补丁清单 byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath); - PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData); + PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData, null); //TODO 自行处理解密 // 拷贝文件列表 int fileCount = 0; diff --git a/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs.meta index cb3d485..f33ce54 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 699068f8f637708409436199baa62c1f +guid: 25b53e0405c55694c901623ee9cb0d1a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild.meta b/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild.meta new file mode 100644 index 0000000..750d2d0 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36626e333f5e25c4581bc91db0189714 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs b/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs new file mode 100644 index 0000000..339fc58 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using System.IO; +using UnityEngine; + +namespace YooAsset +{ + public class PreprocessBuildCatalog : UnityEditor.Build.IPreprocessBuildWithReport + { + public int callbackOrder { get { return 0; } } + + /// + /// 在构建应用程序前自动生成内置资源目录文件。 + /// 原理：搜索StreamingAssets目录下的所有资源文件，将这些文件信息写入文件，然后在运行时做查询用途。 + /// + public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report) + { + YooLogger.Log("Begin to create catalog file !"); + + string rootPath = YooAssetSettingsData.GetYooDefaultBuildinRoot(); + DirectoryInfo rootDirectory = new DirectoryInfo(rootPath); + if (rootDirectory.Exists == false) + { + Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}"); + return; + } + + // 搜索所有Package目录 + DirectoryInfo[] subDirectories = rootDirectory.GetDirectories(); + foreach (var subDirectory in subDirectories) + { + string packageName = subDirectory.Name; + string pacakgeDirectory = subDirectory.FullName; + try + { + bool result = CatalogTools.CreateCatalogFile(null, packageName, pacakgeDirectory); //TODO 自行处理解密 + if (result == false) + { + Debug.LogError($"Create package {packageName} catalog file failed ! See the detail error in console !"); + } + } + catch (System.Exception ex) + { + Debug.LogError($"Create package {packageName} catalog file failed ! {ex.Message}"); + } + } + } + } +} \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs.meta similarity index 83% rename from Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs.meta rename to Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs.meta index 2b1312a..5400d79 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19997de7b89b54445961e8b973f43ab3 +guid: 6b5abe115ebfe1344b674db78b2edf6c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector.meta index 165a9a9..c5c6838 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dcb9955c15609744a9666bd76f6af3d9 +guid: a0be37da2654700439f6ac33bcd9e2e9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta index 301e681..147a4db 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab74d4ff4a2805147883de70a1559a0a +guid: 018667dae4e4d9c4bb5cee34bae3d761 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta index 1ccf9c8..e2d78cf 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97098b04691f5c046ac4829f1d72f425 +guid: 2727e0805ce46af45a0756651ff52023 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs.meta index 79df03e..141f5ee 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21b4cc6bf4c0c064d8e2687024e24c86 +guid: e1fa8fc528c12e9408f1b848e3761488 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta index b9566a8..aa5bfda 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44454e58a49818040a1aef5799e71b30 +guid: 5210230009c62ab4f8871c7961691bbe MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta index 6d9150f..a8b628c 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70401cc80b9807e46bd8283e01b4302f +guid: b74ce9bc5de5759458cc946d59ddb614 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta index be7861d..18b46c3 100644 --- a/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta +++ b/Assets/ThirdParty/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9bff4878063eaf04dab8713e1e662ac5 +guid: 2766d66d18232984aad17caf2fcd6397 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime.meta b/Assets/ThirdParty/Extension Sample/Runtime.meta index 547122b..58410f8 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6816dd00c9cfdce4d9386c0b3088b843 +guid: 3e7425c4ab8481641bbcfa37e4c731b3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass.meta index d079c9d..946b6c5 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d7171aa14ba0e649900533bfeed0edb +guid: 434096c030433934ab04d2da806cc1b7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/AssetHandleExtension.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/AssetHandleExtension.cs.meta index 2ad6011..2b0c8ef 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/AssetHandleExtension.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/AssetHandleExtension.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0893ac05d109894e9acb6deeb688ee5 +guid: 11b50923bc56ba049b13bede653e0432 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/HandleBaseExtension.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/HandleBaseExtension.cs.meta index f39f52d..3430d4d 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/HandleBaseExtension.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionClass/HandleBaseExtension.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 03c367406c5062c41ba3290201be20c2 +guid: b01030957433cdd4cb232b79fb7ed993 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs deleted file mode 100644 index f30ac53..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs +++ /dev/null @@ -1,67 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using System.IO; -using UnityEngine; -using UnityEngine.SceneManagement; -using TTSDK; - -namespace YooAsset -{ - internal class TTAssetBundleResult : BundleResult - { - private readonly IFileSystem _fileSystem; - private readonly PackageBundle _packageBundle; - private readonly AssetBundle _assetBundle; - - public TTAssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle) - { - _fileSystem = fileSystem; - _packageBundle = packageBundle; - _assetBundle = assetBundle; - } - - public override void UnloadBundleFile() - { - if (_assetBundle != null) - { - if (_packageBundle.Encrypted) - _assetBundle.Unload(true); - else - _assetBundle.TTUnload(true); - } - } - public override string GetBundleFilePath() - { - return _fileSystem.GetBundleFilePath(_packageBundle); - } - public override byte[] ReadBundleFileData() - { - return _fileSystem.ReadBundleFileData(_packageBundle); - } - public override string ReadBundleFileText() - { - return _fileSystem.ReadBundleFileText(_packageBundle); - } - - public override FSLoadAssetOperation LoadAssetAsync(AssetInfo assetInfo) - { - var operation = new AssetBundleLoadAssetOperation(_packageBundle, _assetBundle, assetInfo); - return operation; - } - public override FSLoadAllAssetsOperation LoadAllAssetsAsync(AssetInfo assetInfo) - { - var operation = new AssetBundleLoadAllAssetsOperation(_packageBundle, _assetBundle, assetInfo); - return operation; - } - public override FSLoadSubAssetsOperation LoadSubAssetsAsync(AssetInfo assetInfo) - { - var operation = new AssetBundleLoadSubAssetsOperation(_packageBundle, _assetBundle, assetInfo); - return operation; - } - public override FSLoadSceneOperation LoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad) - { - var operation = new AssetBundleLoadSceneOperation(assetInfo, loadParams, suspendLoad); - return operation; - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation.meta deleted file mode 100644 index 7e4113c..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8cba5e0b26df8ee40a93d697f889e33d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs deleted file mode 100644 index d79c890..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs +++ /dev/null @@ -1,101 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using UnityEngine; -using UnityEngine.Networking; -using YooAsset; - -internal class TTFSDownloadFileOperation : DefaultDownloadFileOperation -{ - private TiktokFileSystem _fileSystem; - private ESteps _steps = ESteps.None; - - internal TTFSDownloadFileOperation(TiktokFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options) - { - _fileSystem = fileSystem; - } - internal override void InternalStart() - { - _steps = ESteps.CreateRequest; - } - internal override void InternalUpdate() - { - // 创建下载器 - if (_steps == ESteps.CreateRequest) - { - // 获取请求地址 - _requestURL = GetRequestURL(); - - // 重置变量 - ResetRequestFiled(); - - // 创建下载器 - CreateWebRequest(); - - _steps = ESteps.CheckRequest; - } - - // 检测下载结果 - if (_steps == ESteps.CheckRequest) - { - DownloadProgress = _webRequest.downloadProgress; - DownloadedBytes = (long)_webRequest.downloadedBytes; - Progress = DownloadProgress; - if (_webRequest.isDone == false) - { - CheckRequestTimeout(); - return; - } - - // 检查网络错误 - if (CheckRequestResult()) - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.TryAgain; - } - - // 注意：最终释放请求器 - DisposeWebRequest(); - } - - // 重新尝试下载 - if (_steps == ESteps.TryAgain) - { - if (FailedTryAgain <= 0) - { - Status = EOperationStatus.Failed; - _steps = ESteps.Done; - YooLogger.Error(Error); - return; - } - - _tryAgainTimer += Time.unscaledDeltaTime; - if (_tryAgainTimer > 1f) - { - FailedTryAgain--; - _steps = ESteps.CreateRequest; - YooLogger.Warning(Error); - } - } - } - - private void CreateWebRequest() - { - //TODO : 抖音小游戏没有找到预下载方法 - _webRequest = UnityWebRequest.Get(_requestURL); - _webRequest.disposeDownloadHandlerOnDispose = true; - _webRequest.SendWebRequest(); - } - private void DisposeWebRequest() - { - if (_webRequest != null) - { - //注意：引擎底层会自动调用Abort方法 - _webRequest.Dispose(); - _webRequest = null; - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs deleted file mode 100644 index 233c809..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs +++ /dev/null @@ -1,20 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using YooAsset; - -internal partial class TTFSInitializeOperation : FSInitializeFileSystemOperation -{ - private readonly TiktokFileSystem _fileSystem; - - public TTFSInitializeOperation(TiktokFileSystem fileSystem) - { - _fileSystem = fileSystem; - } - internal override void InternalStart() - { - Status = EOperationStatus.Succeed; - } - internal override void InternalUpdate() - { - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs deleted file mode 100644 index a7e8773..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs +++ /dev/null @@ -1,98 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using UnityEngine; -using UnityEngine.Networking; -using YooAsset; - -internal class TTFSLoadBundleOperation : FSLoadBundleOperation -{ - private enum ESteps - { - None, - DownloadAssetBundle, - Done, - } - - private readonly TiktokFileSystem _fileSystem; - private readonly PackageBundle _bundle; - private DownloadAssetBundleOperation _downloadAssetBundleOp; - private ESteps _steps = ESteps.None; - - internal TTFSLoadBundleOperation(TiktokFileSystem fileSystem, PackageBundle bundle) - { - _fileSystem = fileSystem; - _bundle = bundle; - } - internal override void InternalStart() - { - _steps = ESteps.DownloadAssetBundle; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.DownloadAssetBundle) - { - if (_downloadAssetBundleOp == null) - { - DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60); - options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName); ; - options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName); - - if (_bundle.Encrypted) - { - _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(false, _fileSystem.DecryptionServices, _bundle, options); - _downloadAssetBundleOp.StartOperation(); - AddChildOperation(_downloadAssetBundleOp); - } - else - { - _downloadAssetBundleOp = new DownloadTiktokAssetBundleOperation(_bundle, options); - _downloadAssetBundleOp.StartOperation(); - AddChildOperation(_downloadAssetBundleOp); - } - } - - _downloadAssetBundleOp.UpdateOperation(); - DownloadProgress = _downloadAssetBundleOp.DownloadProgress; - DownloadedBytes = (long)_downloadAssetBundleOp.DownloadedBytes; - Progress = DownloadProgress; - if (_downloadAssetBundleOp.IsDone == false) - return; - - if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed) - { - var assetBundle = _downloadAssetBundleOp.Result; - if (assetBundle == null) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !"; - } - else - { - _steps = ESteps.Done; - Result = new TTAssetBundleResult(_fileSystem, _bundle, assetBundle); - Status = EOperationStatus.Succeed; - } - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _downloadAssetBundleOp.Error; - } - } - } - internal override void InternalWaitForAsyncComplete() - { - if (_steps != ESteps.Done) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "WebGL platform not support sync load method !"; - UnityEngine.Debug.LogError(Error); - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs deleted file mode 100644 index d5d448c..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs +++ /dev/null @@ -1,92 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using YooAsset; - -internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation -{ - private enum ESteps - { - None, - RequestPackageHash, - LoadPackageManifest, - Done, - } - - private readonly TiktokFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly int _timeout; - private RequestTiktokPackageHashOperation _requestPackageHashOp; - private LoadTiktokPackageManifestOperation _loadPackageManifestOp; - private ESteps _steps = ESteps.None; - - - public TTFSLoadPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _timeout = timeout; - } - internal override void InternalStart() - { - _steps = ESteps.RequestPackageHash; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageHash) - { - if (_requestPackageHashOp == null) - { - _requestPackageHashOp = new RequestTiktokPackageHashOperation(_fileSystem, _packageVersion, _timeout); - _requestPackageHashOp.StartOperation(); - AddChildOperation(_requestPackageHashOp); - } - - _requestPackageHashOp.UpdateOperation(); - if (_requestPackageHashOp.IsDone == false) - return; - - if (_requestPackageHashOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.LoadPackageManifest; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _requestPackageHashOp.Error; - } - } - - if (_steps == ESteps.LoadPackageManifest) - { - if (_loadPackageManifestOp == null) - { - string packageHash = _requestPackageHashOp.PackageHash; - _loadPackageManifestOp = new LoadTiktokPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout); - _loadPackageManifestOp.StartOperation(); - AddChildOperation(_loadPackageManifestOp); - } - - _loadPackageManifestOp.UpdateOperation(); - Progress = _loadPackageManifestOp.Progress; - if (_loadPackageManifestOp.IsDone == false) - return; - - if (_loadPackageManifestOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - Manifest = _loadPackageManifestOp.Manifest; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _loadPackageManifestOp.Error; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs.meta deleted file mode 100644 index 7b4505f..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2850c0b0e742f824f9d1f12b7d68b806 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs deleted file mode 100644 index 75e282c..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs +++ /dev/null @@ -1,62 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using YooAsset; - -internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOperation -{ - private enum ESteps - { - None, - RequestPackageVersion, - Done, - } - - private readonly TiktokFileSystem _fileSystem; - private readonly int _timeout; - private RequestTiktokPackageVersionOperation _requestPackageVersionOp; - private ESteps _steps = ESteps.None; - - - internal TTFSRequestPackageVersionOperation(TiktokFileSystem fileSystem, int timeout) - { - _fileSystem = fileSystem; - _timeout = timeout; - } - internal override void InternalStart() - { - _steps = ESteps.RequestPackageVersion; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageVersion) - { - if (_requestPackageVersionOp == null) - { - _requestPackageVersionOp = new RequestTiktokPackageVersionOperation(_fileSystem, _timeout); - _requestPackageVersionOp.StartOperation(); - AddChildOperation(_requestPackageVersionOp); - } - - _requestPackageVersionOp.UpdateOperation(); - Progress = _requestPackageVersionOp.Progress; - if (_requestPackageVersionOp.IsDone == false) - return; - - if (_requestPackageVersionOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - PackageVersion = _requestPackageVersionOp.PackageVersion; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _requestPackageVersionOp.Error; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs.meta deleted file mode 100644 index 80e9802..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8210185faba92a3479bf6713abab1f19 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal.meta deleted file mode 100644 index 6df9ad2..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 101c97835f86e9147993961f514caf2c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs deleted file mode 100644 index d3f2326..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs +++ /dev/null @@ -1,126 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using UnityEngine; -using TTSDK; - -namespace YooAsset -{ - internal class DownloadTiktokAssetBundleOperation : DownloadAssetBundleOperation - { - private ESteps _steps = ESteps.None; - - internal DownloadTiktokAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options) : base(bundle, options) - { - } - internal override void InternalStart() - { - _steps = ESteps.CreateRequest; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - // 创建下载器 - if (_steps == ESteps.CreateRequest) - { - // 获取请求地址 - _requestURL = GetRequestURL(); - - // 重置变量 - ResetRequestFiled(); - - // 创建下载器 - CreateWebRequest(); - - _steps = ESteps.CheckRequest; - } - - // 检测下载结果 - if (_steps == ESteps.CheckRequest) - { - DownloadProgress = _webRequest.downloadProgress; - DownloadedBytes = (long)_webRequest.downloadedBytes; - Progress = DownloadProgress; - if (_webRequest.isDone == false) - { - //TODO 需要验证抖音插件请求器的下载进度 - //CheckRequestTimeout(); - return; - } - - // 检查网络错误 - if (CheckRequestResult()) - { - var downloadHanlder = (DownloadHandlerTTAssetBundle)_webRequest.downloadHandler; - AssetBundle assetBundle = downloadHanlder.assetBundle; - if (assetBundle == null) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "Download handler asset bundle object is null !"; - } - else - { - _steps = ESteps.Done; - Result = assetBundle; - Status = EOperationStatus.Succeed; - - //TODO 需要验证抖音插件请求器的下载进度 - DownloadProgress = 1f; - DownloadedBytes = Bundle.FileSize; - Progress = 1f; - } - } - else - { - _steps = ESteps.TryAgain; - } - - // 注意：最终释放请求器 - DisposeWebRequest(); - } - - // 重新尝试下载 - if (_steps == ESteps.TryAgain) - { - if (FailedTryAgain <= 0) - { - Status = EOperationStatus.Failed; - _steps = ESteps.Done; - YooLogger.Error(Error); - return; - } - - _tryAgainTimer += Time.unscaledDeltaTime; - if (_tryAgainTimer > 1f) - { - FailedTryAgain--; - _steps = ESteps.CreateRequest; - YooLogger.Warning(Error); - } - } - } - internal override void InternalAbort() - { - _steps = ESteps.Done; - DisposeWebRequest(); - } - - private void CreateWebRequest() - { - _webRequest = TTAssetBundle.GetAssetBundle(_requestURL); - _webRequest.disposeDownloadHandlerOnDispose = true; - _webRequest.SendWebRequest(); - } - private void DisposeWebRequest() - { - if (_webRequest != null) - { - //注意：引擎底层会自动调用Abort方法 - _webRequest.Dispose(); - _webRequest = null; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs.meta deleted file mode 100644 index 70d48bd..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fa5e1bc536118b14ba56f53930539e38 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs deleted file mode 100644 index 5479c2d..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs +++ /dev/null @@ -1,129 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using YooAsset; - -internal class LoadTiktokPackageManifestOperation : AsyncOperationBase -{ - private enum ESteps - { - None, - RequestFileData, - VerifyFileData, - LoadManifest, - Done, - } - - private readonly TiktokFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly string _packageHash; - private readonly int _timeout; - private UnityWebDataRequestOperation _webDataRequestOp; - private DeserializeManifestOperation _deserializer; - private int _requestCount = 0; - private ESteps _steps = ESteps.None; - - /// - /// 包裹清单 - /// - public PackageManifest Manifest { private set; get; } - - - internal LoadTiktokPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, string packageHash, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _packageHash = packageHash; - _timeout = timeout; - } - internal override void InternalStart() - { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation)); - _steps = ESteps.RequestFileData; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestFileData) - { - if (_webDataRequestOp == null) - { - string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion); - string url = GetRequestURL(fileName); - _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout); - _webDataRequestOp.StartOperation(); - AddChildOperation(_webDataRequestOp); - } - - _webDataRequestOp.UpdateOperation(); - Progress = _webDataRequestOp.Progress; - if (_webDataRequestOp.IsDone == false) - return; - - if (_webDataRequestOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.VerifyFileData; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _webDataRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation)); - } - } - - if (_steps == ESteps.VerifyFileData) - { - string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result); - if (fileHash == _packageHash) - { - _steps = ESteps.LoadManifest; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "Failed to verify package manifest file!"; - } - } - - if (_steps == ESteps.LoadManifest) - { - if (_deserializer == null) - { - _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result); - _deserializer.StartOperation(); - AddChildOperation(_deserializer); - } - - _deserializer.UpdateOperation(); - Progress = _deserializer.Progress; - if (_deserializer.IsDone == false) - return; - - if (_deserializer.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - Manifest = _deserializer.Manifest; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _deserializer.Error; - } - } - } - - private string GetRequestURL(string fileName) - { - // 轮流返回请求地址 - if (_requestCount % 2 == 0) - return _fileSystem.RemoteServices.GetRemoteMainURL(fileName); - else - return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName); - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta deleted file mode 100644 index 6bb1e19..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b648d648fa0c4e44d811b42b80891543 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs deleted file mode 100644 index daf7c92..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs +++ /dev/null @@ -1,92 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using YooAsset; - -internal class RequestTiktokPackageHashOperation : AsyncOperationBase -{ - private enum ESteps - { - None, - RequestPackageHash, - Done, - } - - private readonly TiktokFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly int _timeout; - private UnityWebTextRequestOperation _webTextRequestOp; - private int _requestCount = 0; - private ESteps _steps = ESteps.None; - - /// - /// 包裹哈希值 - /// - public string PackageHash { private set; get; } - - - public RequestTiktokPackageHashOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _timeout = timeout; - } - internal override void InternalStart() - { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation)); - _steps = ESteps.RequestPackageHash; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageHash) - { - if (_webTextRequestOp == null) - { - string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion); - string url = GetRequestURL(fileName); - _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout); - _webTextRequestOp.StartOperation(); - AddChildOperation(_webTextRequestOp); - } - - _webTextRequestOp.UpdateOperation(); - Progress = _webTextRequestOp.Progress; - if (_webTextRequestOp.IsDone == false) - return; - - if (_webTextRequestOp.Status == EOperationStatus.Succeed) - { - PackageHash = _webTextRequestOp.Result; - if (string.IsNullOrEmpty(PackageHash)) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = $"Wechat package hash file content is empty !"; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _webTextRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation)); - } - } - } - - private string GetRequestURL(string fileName) - { - // 轮流返回请求地址 - if (_requestCount % 2 == 0) - return _fileSystem.RemoteServices.GetRemoteMainURL(fileName); - else - return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName); - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta deleted file mode 100644 index 7a99745..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 51a0e40e248b49a4783b3dca33a23cf1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs deleted file mode 100644 index dd5357f..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs +++ /dev/null @@ -1,90 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using YooAsset; - -internal class RequestTiktokPackageVersionOperation : AsyncOperationBase -{ - private enum ESteps - { - None, - RequestPackageVersion, - Done, - } - - private readonly TiktokFileSystem _fileSystem; - private readonly int _timeout; - private UnityWebTextRequestOperation _webTextRequestOp; - private int _requestCount = 0; - private ESteps _steps = ESteps.None; - - /// - /// 包裹版本 - /// - public string PackageVersion { private set; get; } - - - public RequestTiktokPackageVersionOperation(TiktokFileSystem fileSystem, int timeout) - { - _fileSystem = fileSystem; - _timeout = timeout; - } - internal override void InternalStart() - { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation)); - _steps = ESteps.RequestPackageVersion; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageVersion) - { - if (_webTextRequestOp == null) - { - string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName); - string url = GetRequestURL(fileName); - _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout); - _webTextRequestOp.StartOperation(); - AddChildOperation(_webTextRequestOp); - } - - _webTextRequestOp.UpdateOperation(); - Progress = _webTextRequestOp.Progress; - if (_webTextRequestOp.IsDone == false) - return; - - if (_webTextRequestOp.Status == EOperationStatus.Succeed) - { - PackageVersion = _webTextRequestOp.Result; - if (string.IsNullOrEmpty(PackageVersion)) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = $"Wechat package version file content is empty !"; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _webTextRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation)); - } - } - } - - private string GetRequestURL(string fileName) - { - // 轮流返回请求地址 - if (_requestCount % 2 == 0) - return _fileSystem.RemoteServices.GetRemoteMainURL(fileName); - else - return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName); - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta deleted file mode 100644 index be04d19..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a04c463fb00f60f499541fbb98e4fdc4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs deleted file mode 100644 index ab13aec..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs +++ /dev/null @@ -1,266 +0,0 @@ -#if UNITY_WEBGL && DOUYINMINIGAME -using System.Collections.Generic; -using UnityEngine; -using YooAsset; -using TTSDK; -using System.Linq; -using System; - -public static class TiktokFileSystemCreater -{ - public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices) - { - string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension"; - var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot); - fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices); - return fileSystemParams; - } - - public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices) - { - string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension"; - var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot); - fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices); - fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices); - return fileSystemParams; - } -} - -/// -/// 抖音小游戏文件系统 -/// 参考：https://developer.open-douyin.com/docs/resource/zh-CN/mini-game/develop/guide/know -/// -internal class TiktokFileSystem : IFileSystem -{ - private class WebRemoteServices : IRemoteServices - { - private readonly string _webPackageRoot; - protected readonly Dictionary _mapping = new Dictionary(10000); - - public WebRemoteServices(string buildinPackRoot) - { - _webPackageRoot = buildinPackRoot; - } - string IRemoteServices.GetRemoteMainURL(string fileName) - { - return GetFileLoadURL(fileName); - } - string IRemoteServices.GetRemoteFallbackURL(string fileName) - { - return GetFileLoadURL(fileName); - } - - private string GetFileLoadURL(string fileName) - { - if (_mapping.TryGetValue(fileName, out string url) == false) - { - string filePath = PathUtility.Combine(_webPackageRoot, fileName); - url = DownloadSystemHelper.ConvertToWWWPath(filePath); - _mapping.Add(fileName, url); - } - return url; - } - } - - private readonly Dictionary _cacheFilePathMapping = new Dictionary(10000); - private TTFileSystemManager _fileSystemMgr; - private string _ttCacheRoot = string.Empty; - - /// - /// 包裹名称 - /// - public string PackageName { private set; get; } - - /// - /// 文件根目录 - /// - public string FileRoot - { - get - { - return _ttCacheRoot; - } - } - - /// - /// 文件数量 - /// - public int FileCount - { - get - { - return 0; - } - } - - #region 自定义参数 - /// - /// 自定义参数：远程服务接口 - /// - public IRemoteServices RemoteServices { private set; get; } = null; - - /// - /// 自定义参数：解密方法类 - /// - public IWebDecryptionServices DecryptionServices { private set; get; } - #endregion - - - public TiktokFileSystem() - { - } - public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync() - { - var operation = new TTFSInitializeOperation(this); - return operation; - } - public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) - { - var operation = new TTFSLoadPackageManifestOperation(this, packageVersion, timeout); - return operation; - } - public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout) - { - var operation = new TTFSRequestPackageVersionOperation(this, timeout); - return operation; - } - public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) - { - var operation = new FSClearCacheFilesCompleteOperation(); - return operation; - } - public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options) - { - options.MainURL = RemoteServices.GetRemoteMainURL(bundle.FileName); - options.FallbackURL = RemoteServices.GetRemoteFallbackURL(bundle.FileName); - var operation = new TTFSDownloadFileOperation(this, bundle, options); - return operation; - } - public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle) - { - if (bundle.BundleType == (int)EBuildBundleType.AssetBundle) - { - var operation = new TTFSLoadBundleOperation(this, bundle); - return operation; - } - else - { - string error = $"{nameof(TiktokFileSystem)} not support load bundle type : {bundle.BundleType}"; - var operation = new FSLoadBundleCompleteOperation(error); - return operation; - } - } - - public virtual void SetParameter(string name, object value) - { - if (name == FileSystemParametersDefine.REMOTE_SERVICES) - { - RemoteServices = (IRemoteServices)value; - } - else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES) - { - DecryptionServices = (IWebDecryptionServices)value; - } - else - { - YooLogger.Warning($"Invalid parameter : {name}"); - } - } - public virtual void OnCreate(string packageName, string rootDirectory) - { - PackageName = packageName; - _ttCacheRoot = rootDirectory; - - if (string.IsNullOrEmpty(_ttCacheRoot)) - { - throw new System.Exception("请配置抖音小游戏的缓存根目录！"); - } - - // 注意：CDN服务未启用的情况下，使用抖音WEB服务器 - if (RemoteServices == null) - { - string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName); - RemoteServices = new WebRemoteServices(webRoot); - } - - _fileSystemMgr = TT.GetFileSystemManager(); - } - public virtual void OnDestroy() - { - } - - public virtual bool Belong(PackageBundle bundle) - { - return true; - } - public virtual bool Exists(PackageBundle bundle) - { - return CheckCacheFileExist(bundle); - } - public virtual bool NeedDownload(PackageBundle bundle) - { - if (Belong(bundle) == false) - return false; - - return Exists(bundle) == false; - } - public virtual bool NeedUnpack(PackageBundle bundle) - { - return false; - } - public virtual bool NeedImport(PackageBundle bundle) - { - return false; - } - - public virtual string GetBundleFilePath(PackageBundle bundle) - { - return GetCacheFileLoadPath(bundle); - } - public virtual byte[] ReadBundleFileData(PackageBundle bundle) - { - if (CheckCacheFileExist(bundle)) - { - string filePath = GetCacheFileLoadPath(bundle); - return _fileSystemMgr.ReadFileSync(filePath); - } - else - { - return Array.Empty(); - } - } - public virtual string ReadBundleFileText(PackageBundle bundle) - { - if (CheckCacheFileExist(bundle)) - { - string filePath = GetCacheFileLoadPath(bundle); - return _fileSystemMgr.ReadFileSync(filePath, "utf8"); - } - else - { - return string.Empty; - } - } - - #region 内部方法 - public TTFileSystemManager GetFileSystemMgr() - { - return _fileSystemMgr; - } - public bool CheckCacheFileExist(PackageBundle bundle) - { - string url = RemoteServices.GetRemoteMainURL(bundle.FileName); - return _fileSystemMgr.IsUrlCached(url); - } - private string GetCacheFileLoadPath(PackageBundle bundle) - { - if (_cacheFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false) - { - filePath = _fileSystemMgr.GetLocalCachedPathForUrl(bundle.FileName); - _cacheFilePathMapping.Add(bundle.BundleGUID, filePath); - } - return filePath; - } - #endregion -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs.meta deleted file mode 100644 index ac1a607..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e6b4324eddc60f045aa271bc5bb50cc9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem.meta deleted file mode 100644 index 6d94b25..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0165bf1a62988a439ce3a00db043620 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult.meta deleted file mode 100644 index ebc65f8..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b4c0dec5e8fae814eb7ac0299187e8f4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs deleted file mode 100644 index 80510bd..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs +++ /dev/null @@ -1,67 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using System.IO; -using UnityEngine; -using UnityEngine.SceneManagement; -using WeChatWASM; - -namespace YooAsset -{ - internal class WXAssetBundleResult : BundleResult - { - private readonly IFileSystem _fileSystem; - private readonly PackageBundle _packageBundle; - private readonly AssetBundle _assetBundle; - - public WXAssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle) - { - _fileSystem = fileSystem; - _packageBundle = packageBundle; - _assetBundle = assetBundle; - } - - public override void UnloadBundleFile() - { - if (_assetBundle != null) - { - if (_packageBundle.Encrypted) - _assetBundle.Unload(true); - else - _assetBundle.WXUnload(true); - } - } - public override string GetBundleFilePath() - { - return _fileSystem.GetBundleFilePath(_packageBundle); - } - public override byte[] ReadBundleFileData() - { - return _fileSystem.ReadBundleFileData(_packageBundle); - } - public override string ReadBundleFileText() - { - return _fileSystem.ReadBundleFileText(_packageBundle); - } - - public override FSLoadAssetOperation LoadAssetAsync(AssetInfo assetInfo) - { - var operation = new AssetBundleLoadAssetOperation(_packageBundle, _assetBundle, assetInfo); - return operation; - } - public override FSLoadAllAssetsOperation LoadAllAssetsAsync(AssetInfo assetInfo) - { - var operation = new AssetBundleLoadAllAssetsOperation(_packageBundle, _assetBundle, assetInfo); - return operation; - } - public override FSLoadSubAssetsOperation LoadSubAssetsAsync(AssetInfo assetInfo) - { - var operation = new AssetBundleLoadSubAssetsOperation(_packageBundle, _assetBundle, assetInfo); - return operation; - } - public override FSLoadSceneOperation LoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad) - { - var operation = new AssetBundleLoadSceneOperation(assetInfo, loadParams, suspendLoad); - return operation; - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs.meta deleted file mode 100644 index 0ec0d54..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 750c122b5d921aa4a9c882e21982ebd5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation.meta deleted file mode 100644 index 491fb2c..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 85ec3f4c43303f74a9b9fa14288f9201 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs deleted file mode 100644 index 893fdf7..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs +++ /dev/null @@ -1,57 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using YooAsset; -using WeChatWASM; - -internal class WXFSClearAllBundleFilesOperation : FSClearCacheFilesOperation -{ - private enum ESteps - { - None, - ClearAllCacheFiles, - WaitResult, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private ESteps _steps = ESteps.None; - - internal WXFSClearAllBundleFilesOperation(WechatFileSystem fileSystem) - { - _fileSystem = fileSystem; - } - internal override void InternalStart() - { - _steps = ESteps.ClearAllCacheFiles; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.ClearAllCacheFiles) - { - _steps = ESteps.WaitResult; - - WX.CleanAllFileCache((bool isOk) => - { - if (isOk) - { - YooLogger.Log("微信缓存清理成功！"); - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - else - { - YooLogger.Log("微信缓存清理失败！"); - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "微信缓存清理失败！"; - } - }); - } - } -} -#endif diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs.meta deleted file mode 100644 index 984245b..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d48600eb90915544586c0108b94cfd02 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs deleted file mode 100644 index c54e1d4..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs +++ /dev/null @@ -1,111 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using System.Collections.Generic; -using System.IO; -using System.Linq; -using YooAsset; -using WeChatWASM; - -internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation -{ - private enum ESteps - { - None, - GetUnusedCacheFiles, - WaitingSearch, - ClearUnusedCacheFiles, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly PackageManifest _manifest; - private List _unusedCacheFiles = new List(1000); - private int _unusedFileTotalCount = 0; - private ESteps _steps = ESteps.None; - - internal WXFSClearUnusedBundleFilesAsync(WechatFileSystem fileSystem, PackageManifest manifest) - { - _fileSystem = fileSystem; - _manifest = manifest; - } - internal override void InternalStart() - { - _steps = ESteps.GetUnusedCacheFiles; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.GetUnusedCacheFiles) - { - _steps = ESteps.WaitingSearch; - - // 说明：__GAME_FILE_CACHE/yoo/ 目录下包含所有的资源文件和清单文件 - var fileSystemMgr = _fileSystem.GetFileSystemMgr(); - var statOption = new WXStatOption(); - statOption.path = _fileSystem.FileRoot; - statOption.recursive = true; - statOption.success = (WXStatResponse response) => - { - foreach (var fileStat in response.stats) - { - // 如果是目录文件 - string fileExtension = Path.GetExtension(fileStat.path); - if (string.IsNullOrEmpty(fileExtension)) - continue; - - // 如果是资源清单 - //TODO 默认的清单文件格式 - if (fileExtension == ".bytes" || fileExtension == ".hash") - continue; - - // 注意：适配不同的文件命名方式！ - string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileStat.path); - string bundleGUID = fileNameWithoutExtension.Split('_').Last(); - if (_manifest.TryGetPackageBundleByBundleGUID(bundleGUID, out PackageBundle value) == false) - { - string filePath = _fileSystem.FileRoot + fileStat.path; - if (_unusedCacheFiles.Contains(filePath) == false) - _unusedCacheFiles.Add(filePath); - } - } - - _steps = ESteps.ClearUnusedCacheFiles; - _unusedFileTotalCount = _unusedCacheFiles.Count; - YooLogger.Log($"Found unused cache files count : {_unusedFileTotalCount}"); - }; - statOption.fail = (WXStatResponse response) => - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = response.errMsg; - }; - fileSystemMgr.Stat(statOption); - } - - if (_steps == ESteps.ClearUnusedCacheFiles) - { - for (int i = _unusedCacheFiles.Count - 1; i >= 0; i--) - { - string filePath = _unusedCacheFiles[i]; - _unusedCacheFiles.RemoveAt(i); - WX.RemoveFile(filePath, null); - - if (OperationSystem.IsBusy) - break; - } - - if (_unusedFileTotalCount == 0) - Progress = 1.0f; - else - Progress = 1.0f - (_unusedCacheFiles.Count / _unusedFileTotalCount); - - if (_unusedCacheFiles.Count == 0) - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs.meta deleted file mode 100644 index f660e19..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e4938d8a5a9d7f24db37f8df6b32501f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs deleted file mode 100644 index c9c8ede..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs +++ /dev/null @@ -1,110 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using UnityEngine; -using UnityEngine.Networking; -using YooAsset; -using WeChatWASM; - -internal class WXFSDownloadFileOperation : DefaultDownloadFileOperation -{ - private WechatFileSystem _fileSystem; - private ESteps _steps = ESteps.None; - - internal WXFSDownloadFileOperation(WechatFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options) - { - _fileSystem = fileSystem; - } - internal override void InternalStart() - { - _steps = ESteps.CreateRequest; - } - internal override void InternalUpdate() - { - // 创建下载器 - if (_steps == ESteps.CreateRequest) - { - // 获取请求地址 - _requestURL = GetRequestURL(); - - // 重置变量 - ResetRequestFiled(); - - // 创建下载器 - CreateWebRequest(); - - _steps = ESteps.CheckRequest; - } - - // 检测下载结果 - if (_steps == ESteps.CheckRequest) - { - DownloadProgress = _webRequest.downloadProgress; - DownloadedBytes = (long)_webRequest.downloadedBytes; - Progress = DownloadProgress; - if (_webRequest.isDone == false) - { - //TODO 由于微信小游戏插件的问题，暂时不能判定超时！ - // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108# - //CheckRequestTimeout(); - return; - } - - // 检查网络错误 - if (CheckRequestResult()) - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - - //TODO 解决微信小游戏插件问题 - // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108# - DownloadProgress = 1f; - DownloadedBytes = Bundle.FileSize; - Progress = 1f; - } - else - { - _steps = ESteps.TryAgain; - } - - // 注意：最终释放请求器 - DisposeWebRequest(); - } - - // 重新尝试下载 - if (_steps == ESteps.TryAgain) - { - if (FailedTryAgain <= 0) - { - Status = EOperationStatus.Failed; - _steps = ESteps.Done; - YooLogger.Error(Error); - return; - } - - _tryAgainTimer += Time.unscaledDeltaTime; - if (_tryAgainTimer > 1f) - { - FailedTryAgain--; - _steps = ESteps.CreateRequest; - YooLogger.Warning(Error); - } - } - } - - private void CreateWebRequest() - { - _webRequest = UnityWebRequest.Get(_requestURL); - _webRequest.SetRequestHeader("wechatminigame-preload", "1"); - _webRequest.disposeDownloadHandlerOnDispose = true; - _webRequest.SendWebRequest(); - } - private void DisposeWebRequest() - { - if (_webRequest != null) - { - //注意：引擎底层会自动调用Abort方法 - _webRequest.Dispose(); - _webRequest = null; - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs.meta deleted file mode 100644 index 19b0ba9..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e58c7876bd106e04380cbf4c00e8d584 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs deleted file mode 100644 index 2468902..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs +++ /dev/null @@ -1,20 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal partial class WXFSInitializeOperation : FSInitializeFileSystemOperation -{ - private readonly WechatFileSystem _fileSystem; - - public WXFSInitializeOperation(WechatFileSystem fileSystem) - { - _fileSystem = fileSystem; - } - internal override void InternalStart() - { - Status = EOperationStatus.Succeed; - } - internal override void InternalUpdate() - { - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs.meta deleted file mode 100644 index 77e5e65..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a0c5566de97a44245b840bf388cdfbe0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs deleted file mode 100644 index e0ce2a7..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs +++ /dev/null @@ -1,96 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal class WXFSLoadBundleOperation : FSLoadBundleOperation -{ - private enum ESteps - { - None, - DownloadAssetBundle, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly PackageBundle _bundle; - private DownloadAssetBundleOperation _downloadAssetBundleOp; - private ESteps _steps = ESteps.None; - - internal WXFSLoadBundleOperation(WechatFileSystem fileSystem, PackageBundle bundle) - { - _fileSystem = fileSystem; - _bundle = bundle; - } - internal override void InternalStart() - { - _steps = ESteps.DownloadAssetBundle; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.DownloadAssetBundle) - { - if (_downloadAssetBundleOp == null) - { - DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60); - options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName); ; - options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName); - - if (_bundle.Encrypted) - { - _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(false, _fileSystem.DecryptionServices, _bundle, options); - _downloadAssetBundleOp.StartOperation(); - AddChildOperation(_downloadAssetBundleOp); - } - else - { - _downloadAssetBundleOp = new DownloadWechatAssetBundleOperation(_bundle, options); - _downloadAssetBundleOp.StartOperation(); - AddChildOperation(_downloadAssetBundleOp); - } - } - - _downloadAssetBundleOp.UpdateOperation(); - DownloadProgress = _downloadAssetBundleOp.DownloadProgress; - DownloadedBytes = (long)_downloadAssetBundleOp.DownloadedBytes; - Progress = DownloadProgress; - if (_downloadAssetBundleOp.IsDone == false) - return; - - if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed) - { - var assetBundle = _downloadAssetBundleOp.Result; - if (assetBundle == null) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !"; - } - else - { - _steps = ESteps.Done; - Result = new WXAssetBundleResult(_fileSystem, _bundle, assetBundle); - Status = EOperationStatus.Succeed; - } - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _downloadAssetBundleOp.Error; - } - } - } - internal override void InternalWaitForAsyncComplete() - { - if (_steps != ESteps.Done) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "WebGL platform not support sync load method !"; - UnityEngine.Debug.LogError(Error); - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs.meta deleted file mode 100644 index 04eec17..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7277b7d1ed5616b41986cad60c3fe97c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs deleted file mode 100644 index 712959a..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs +++ /dev/null @@ -1,92 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation -{ - private enum ESteps - { - None, - RequestPackageHash, - LoadPackageManifest, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly int _timeout; - private RequestWechatPackageHashOperation _requestPackageHashOp; - private LoadWechatPackageManifestOperation _loadPackageManifestOp; - private ESteps _steps = ESteps.None; - - - public WXFSLoadPackageManifestOperation(WechatFileSystem fileSystem, string packageVersion, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _timeout = timeout; - } - internal override void InternalStart() - { - _steps = ESteps.RequestPackageHash; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageHash) - { - if (_requestPackageHashOp == null) - { - _requestPackageHashOp = new RequestWechatPackageHashOperation(_fileSystem, _packageVersion, _timeout); - _requestPackageHashOp.StartOperation(); - AddChildOperation(_requestPackageHashOp); - } - - _requestPackageHashOp.UpdateOperation(); - if (_requestPackageHashOp.IsDone == false) - return; - - if (_requestPackageHashOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.LoadPackageManifest; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _requestPackageHashOp.Error; - } - } - - if (_steps == ESteps.LoadPackageManifest) - { - if (_loadPackageManifestOp == null) - { - string packageHash = _requestPackageHashOp.PackageHash; - _loadPackageManifestOp = new LoadWechatPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout); - _loadPackageManifestOp.StartOperation(); - AddChildOperation(_loadPackageManifestOp); - } - - _loadPackageManifestOp.UpdateOperation(); - Progress = _loadPackageManifestOp.Progress; - if (_loadPackageManifestOp.IsDone == false) - return; - - if (_loadPackageManifestOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - Manifest = _loadPackageManifestOp.Manifest; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _loadPackageManifestOp.Error; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs.meta deleted file mode 100644 index bb1d302..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cfbe2efa84cb0524f9e3482e6b895f41 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs deleted file mode 100644 index 293c748..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs +++ /dev/null @@ -1,64 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal class WXFSRequestPackageVersionOperation : FSRequestPackageVersionOperation -{ - private enum ESteps - { - None, - RequestPackageVersion, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly bool _appendTimeTicks; - private readonly int _timeout; - private RequestWechatPackageVersionOperation _requestWebPackageVersionOp; - private ESteps _steps = ESteps.None; - - - internal WXFSRequestPackageVersionOperation(WechatFileSystem fileSystem, bool appendTimeTicks, int timeout) - { - _fileSystem = fileSystem; - _appendTimeTicks = appendTimeTicks; - _timeout = timeout; - } - internal override void InternalStart() - { - _steps = ESteps.RequestPackageVersion; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageVersion) - { - if (_requestWebPackageVersionOp == null) - { - _requestWebPackageVersionOp = new RequestWechatPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout); - _requestWebPackageVersionOp.StartOperation(); - AddChildOperation(_requestWebPackageVersionOp); - } - - _requestWebPackageVersionOp.UpdateOperation(); - Progress = _requestWebPackageVersionOp.Progress; - if (_requestWebPackageVersionOp.IsDone == false) - return; - - if (_requestWebPackageVersionOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - PackageVersion = _requestWebPackageVersionOp.PackageVersion; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _requestWebPackageVersionOp.Error; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs.meta deleted file mode 100644 index d71d9a1..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4353a9a0cbf86cc43acf3320458e3ac8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal.meta deleted file mode 100644 index cf76301..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fd307b5063003545a663ccbec226a23 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs deleted file mode 100644 index ae9393d..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs +++ /dev/null @@ -1,128 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using UnityEngine; -using WeChatWASM; - -namespace YooAsset -{ - internal class DownloadWechatAssetBundleOperation : DownloadAssetBundleOperation - { - private ESteps _steps = ESteps.None; - - internal DownloadWechatAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options) : base(bundle, options) - { - } - internal override void InternalStart() - { - _steps = ESteps.CreateRequest; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - // 创建下载器 - if (_steps == ESteps.CreateRequest) - { - // 获取请求地址 - _requestURL = GetRequestURL(); - - // 重置变量 - ResetRequestFiled(); - - // 创建下载器 - CreateWebRequest(); - - _steps = ESteps.CheckRequest; - } - - // 检测下载结果 - if (_steps == ESteps.CheckRequest) - { - DownloadProgress = _webRequest.downloadProgress; - DownloadedBytes = (long)_webRequest.downloadedBytes; - Progress = DownloadProgress; - if (_webRequest.isDone == false) - { - //TODO 由于微信小游戏插件的问题，暂时不能判定超时！ - // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108# - //CheckRequestTimeout(); - return; - } - - // 检查网络错误 - if (CheckRequestResult()) - { - var downloadHanlder = (DownloadHandlerWXAssetBundle)_webRequest.downloadHandler; - AssetBundle assetBundle = downloadHanlder.assetBundle; - if (assetBundle == null) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "Download handler asset bundle object is null !"; - } - else - { - _steps = ESteps.Done; - Result = assetBundle; - Status = EOperationStatus.Succeed; - - //TODO 解决微信小游戏插件问题 - // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108# - DownloadProgress = 1f; - DownloadedBytes = Bundle.FileSize; - Progress = 1f; - } - } - else - { - _steps = ESteps.TryAgain; - } - - // 注意：最终释放请求器 - DisposeWebRequest(); - } - - // 重新尝试下载 - if (_steps == ESteps.TryAgain) - { - if (FailedTryAgain <= 0) - { - Status = EOperationStatus.Failed; - _steps = ESteps.Done; - YooLogger.Error(Error); - return; - } - - _tryAgainTimer += Time.unscaledDeltaTime; - if (_tryAgainTimer > 1f) - { - FailedTryAgain--; - _steps = ESteps.CreateRequest; - YooLogger.Warning(Error); - } - } - } - internal override void InternalAbort() - { - _steps = ESteps.Done; - DisposeWebRequest(); - } - - private void CreateWebRequest() - { - _webRequest = WXAssetBundle.GetAssetBundle(_requestURL); - _webRequest.disposeDownloadHandlerOnDispose = true; - _webRequest.SendWebRequest(); - } - private void DisposeWebRequest() - { - if (_webRequest != null) - { - //注意：引擎底层会自动调用Abort方法 - _webRequest.Dispose(); - _webRequest = null; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs.meta deleted file mode 100644 index b3d8e26..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e556be3f274429e4ca6c542fff90e6ab -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs deleted file mode 100644 index ba38722..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs +++ /dev/null @@ -1,129 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal class LoadWechatPackageManifestOperation : AsyncOperationBase -{ - private enum ESteps - { - None, - RequestFileData, - VerifyFileData, - LoadManifest, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly string _packageHash; - private readonly int _timeout; - private UnityWebDataRequestOperation _webDataRequestOp; - private DeserializeManifestOperation _deserializer; - private int _requestCount = 0; - private ESteps _steps = ESteps.None; - - /// - /// 包裹清单 - /// - public PackageManifest Manifest { private set; get; } - - - internal LoadWechatPackageManifestOperation(WechatFileSystem fileSystem, string packageVersion, string packageHash, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _packageHash = packageHash; - _timeout = timeout; - } - internal override void InternalStart() - { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadWechatPackageManifestOperation)); - _steps = ESteps.RequestFileData; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestFileData) - { - if (_webDataRequestOp == null) - { - string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion); - string url = GetRequestURL(fileName); - _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout); - _webDataRequestOp.StartOperation(); - AddChildOperation(_webDataRequestOp); - } - - _webDataRequestOp.UpdateOperation(); - Progress = _webDataRequestOp.Progress; - if (_webDataRequestOp.IsDone == false) - return; - - if (_webDataRequestOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.VerifyFileData; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _webDataRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadWechatPackageManifestOperation)); - } - } - - if (_steps == ESteps.VerifyFileData) - { - string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result); - if (fileHash == _packageHash) - { - _steps = ESteps.LoadManifest; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = "Failed to verify package manifest file!"; - } - } - - if (_steps == ESteps.LoadManifest) - { - if (_deserializer == null) - { - _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result); - _deserializer.StartOperation(); - AddChildOperation(_deserializer); - } - - _deserializer.UpdateOperation(); - Progress = _deserializer.Progress; - if (_deserializer.IsDone == false) - return; - - if (_deserializer.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - Manifest = _deserializer.Manifest; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _deserializer.Error; - } - } - } - - private string GetRequestURL(string fileName) - { - // 轮流返回请求地址 - if (_requestCount % 2 == 0) - return _fileSystem.RemoteServices.GetRemoteMainURL(fileName); - else - return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName); - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta deleted file mode 100644 index 183900f..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2c2153284d246964fb2146f9fdda311c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs deleted file mode 100644 index a997322..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs +++ /dev/null @@ -1,92 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal class RequestWechatPackageHashOperation : AsyncOperationBase -{ - private enum ESteps - { - None, - RequestPackageHash, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly int _timeout; - private UnityWebTextRequestOperation _webTextRequestOp; - private int _requestCount = 0; - private ESteps _steps = ESteps.None; - - /// - /// 包裹哈希值 - /// - public string PackageHash { private set; get; } - - - public RequestWechatPackageHashOperation(WechatFileSystem fileSystem, string packageVersion, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _timeout = timeout; - } - internal override void InternalStart() - { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWechatPackageHashOperation)); - _steps = ESteps.RequestPackageHash; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageHash) - { - if (_webTextRequestOp == null) - { - string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion); - string url = GetRequestURL(fileName); - _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout); - _webTextRequestOp.StartOperation(); - AddChildOperation(_webTextRequestOp); - } - - _webTextRequestOp.UpdateOperation(); - Progress = _webTextRequestOp.Progress; - if (_webTextRequestOp.IsDone == false) - return; - - if (_webTextRequestOp.Status == EOperationStatus.Succeed) - { - PackageHash = _webTextRequestOp.Result; - if (string.IsNullOrEmpty(PackageHash)) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = $"Wechat package hash file content is empty !"; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _webTextRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWechatPackageHashOperation)); - } - } - } - - private string GetRequestURL(string fileName) - { - // 轮流返回请求地址 - if (_requestCount % 2 == 0) - return _fileSystem.RemoteServices.GetRemoteMainURL(fileName); - else - return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName); - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta deleted file mode 100644 index c2f4ed9..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3f8269507a575884f935f9fbc71396ea -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs deleted file mode 100644 index 19a9ff6..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs +++ /dev/null @@ -1,100 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using YooAsset; - -internal class RequestWechatPackageVersionOperation : AsyncOperationBase -{ - private enum ESteps - { - None, - RequestPackageVersion, - Done, - } - - private readonly WechatFileSystem _fileSystem; - private readonly int _timeout; - private readonly bool _appendTimeTicks; - private UnityWebTextRequestOperation _webTextRequestOp; - private int _requestCount = 0; - private ESteps _steps = ESteps.None; - - /// - /// 包裹版本 - /// - public string PackageVersion { private set; get; } - - - public RequestWechatPackageVersionOperation(WechatFileSystem fileSystem, bool appendTimeTicks, int timeout) - { - _fileSystem = fileSystem; - _appendTimeTicks = appendTimeTicks; - _timeout = timeout; - } - internal override void InternalStart() - { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWechatPackageVersionOperation)); - _steps = ESteps.RequestPackageVersion; - } - internal override void InternalUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestPackageVersion) - { - if (_webTextRequestOp == null) - { - string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName); - string url = GetRequestURL(fileName); - _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout); - _webTextRequestOp.StartOperation(); - AddChildOperation(_webTextRequestOp); - } - - _webTextRequestOp.UpdateOperation(); - Progress = _webTextRequestOp.Progress; - if (_webTextRequestOp.IsDone == false) - return; - - if (_webTextRequestOp.Status == EOperationStatus.Succeed) - { - PackageVersion = _webTextRequestOp.Result; - if (string.IsNullOrEmpty(PackageVersion)) - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = $"Wechat package version file content is empty !"; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Succeed; - } - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _webTextRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWechatPackageVersionOperation)); - } - } - } - - private string GetRequestURL(string fileName) - { - string url; - - // 轮流返回请求地址 - if (_requestCount % 2 == 0) - url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName); - else - url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName); - - // 在URL末尾添加时间戳 - if (_appendTimeTicks) - return $"{url}?{System.DateTime.UtcNow.Ticks}"; - else - return url; - } -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta deleted file mode 100644 index 8958ebe..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 758fbcd91469b3f4e843a9ea7e3deda9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs deleted file mode 100644 index c789081..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs +++ /dev/null @@ -1,277 +0,0 @@ -#if UNITY_WEBGL && WEIXINMINIGAME -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using YooAsset; -using WeChatWASM; - -public static class WechatFileSystemCreater -{ - public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices) - { - string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension"; - var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot); - fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices); - return fileSystemParams; - } - public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices) - { - string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension"; - var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot); - fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices); - fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices); - return fileSystemParams; - } -} - -/// -/// 微信小游戏文件系统 -/// 参考：https://wechat-miniprogram.github.io/minigame-unity-webgl-transform/Design/UsingAssetBundle.html -/// -internal class WechatFileSystem : IFileSystem -{ - private class WebRemoteServices : IRemoteServices - { - private readonly string _webPackageRoot; - protected readonly Dictionary _mapping = new Dictionary(10000); - - public WebRemoteServices(string buildinPackRoot) - { - _webPackageRoot = buildinPackRoot; - } - string IRemoteServices.GetRemoteMainURL(string fileName) - { - return GetFileLoadURL(fileName); - } - string IRemoteServices.GetRemoteFallbackURL(string fileName) - { - return GetFileLoadURL(fileName); - } - - private string GetFileLoadURL(string fileName) - { - if (_mapping.TryGetValue(fileName, out string url) == false) - { - string filePath = PathUtility.Combine(_webPackageRoot, fileName); - url = DownloadSystemHelper.ConvertToWWWPath(filePath); - _mapping.Add(fileName, url); - } - return url; - } - } - - private readonly Dictionary _cacheFilePathMapping = new Dictionary(10000); - private WXFileSystemManager _fileSystemMgr; - private string _wxCacheRoot = string.Empty; - - /// - /// 包裹名称 - /// - public string PackageName { private set; get; } - - private readonly string _packageRoot = YooAssetSettingsData.Setting.DefaultYooFolderName; - - /// - /// 文件根目录 - /// - public string FileRoot - { - get - { - return _wxCacheRoot; - } - } - - /// - /// 文件数量 - /// - public int FileCount - { - get - { - return 0; - } - } - - #region 自定义参数 - /// - /// 自定义参数：远程服务接口 - /// - public IRemoteServices RemoteServices { private set; get; } = null; - - /// - /// 自定义参数：解密方法类 - /// - public IWebDecryptionServices DecryptionServices { private set; get; } - #endregion - - - public WechatFileSystem() - { - } - public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync() - { - var operation = new WXFSInitializeOperation(this); - return operation; - } - public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) - { - var operation = new WXFSLoadPackageManifestOperation(this, packageVersion, timeout); - return operation; - } - public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout) - { - var operation = new WXFSRequestPackageVersionOperation(this, appendTimeTicks, timeout); - return operation; - } - public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) - { - if (options.ClearMode == EFileClearMode.ClearAllBundleFiles.ToString()) - { - var operation = new WXFSClearAllBundleFilesOperation(this); - return operation; - } - else if (options.ClearMode == EFileClearMode.ClearUnusedBundleFiles.ToString()) - { - var operation = new WXFSClearUnusedBundleFilesAsync(this, manifest); - return operation; - } - else - { - string error = $"Invalid clear mode : {options.ClearMode}"; - var operation = new FSClearCacheFilesCompleteOperation(error); - return operation; - } - } - public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options) - { - options.MainURL = RemoteServices.GetRemoteMainURL(bundle.FileName); - options.FallbackURL = RemoteServices.GetRemoteFallbackURL(bundle.FileName); - var operation = new WXFSDownloadFileOperation(this, bundle, options); - return operation; - } - public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle) - { - if (bundle.BundleType == (int)EBuildBundleType.AssetBundle) - { - var operation = new WXFSLoadBundleOperation(this, bundle); - return operation; - } - else - { - string error = $"{nameof(WechatFileSystem)} not support load bundle type : {bundle.BundleType}"; - var operation = new FSLoadBundleCompleteOperation(error); - return operation; - } - } - - public virtual void SetParameter(string name, object value) - { - if (name == FileSystemParametersDefine.REMOTE_SERVICES) - { - RemoteServices = (IRemoteServices)value; - } - else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES) - { - DecryptionServices = (IWebDecryptionServices)value; - } - else - { - YooLogger.Warning($"Invalid parameter : {name}"); - } - } - public virtual void OnCreate(string packageName, string packageRoot) - { - PackageName = packageName; - _wxCacheRoot = packageRoot; - - if (string.IsNullOrEmpty(_wxCacheRoot)) - { - throw new System.Exception("请配置微信小游戏缓存根目录！"); - } - - // 注意：CDN服务未启用的情况下，使用微信WEB服务器 - if (RemoteServices == null) - { - string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName); - RemoteServices = new WebRemoteServices(webRoot); - } - - _fileSystemMgr = WX.GetFileSystemManager(); - } - public virtual void OnDestroy() - { - } - - public virtual bool Belong(PackageBundle bundle) - { - return true; - } - public virtual bool Exists(PackageBundle bundle) - { - string filePath = GetCacheFileLoadPath(bundle); - return CheckCacheFileExist(filePath); - } - public virtual bool NeedDownload(PackageBundle bundle) - { - if (Belong(bundle) == false) - return false; - - return Exists(bundle) == false; - } - public virtual bool NeedUnpack(PackageBundle bundle) - { - return false; - } - public virtual bool NeedImport(PackageBundle bundle) - { - return false; - } - - public virtual string GetBundleFilePath(PackageBundle bundle) - { - return GetCacheFileLoadPath(bundle); - } - public virtual byte[] ReadBundleFileData(PackageBundle bundle) - { - string filePath = GetCacheFileLoadPath(bundle); - if (CheckCacheFileExist(filePath)) - return _fileSystemMgr.ReadFileSync(filePath); - else - return Array.Empty(); - } - public virtual string ReadBundleFileText(PackageBundle bundle) - { - string filePath = GetCacheFileLoadPath(bundle); - if (CheckCacheFileExist(filePath)) - return _fileSystemMgr.ReadFileSync(filePath, "utf8"); - else - return string.Empty; - } - - #region 内部方法 - public WXFileSystemManager GetFileSystemMgr() - { - return _fileSystemMgr; - } - public bool CheckCacheFileExist(string filePath) - { - string result = WX.GetCachePath(filePath); - if (string.IsNullOrEmpty(result)) - return false; - else - return true; - } - public string GetCacheFileLoadPath(PackageBundle bundle) - { - if (_cacheFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false) - { - filePath = PathUtility.Combine(_wxCacheRoot, bundle.FileName); - _cacheFilePathMapping.Add(bundle.BundleGUID, filePath); - } - return filePath; - } - #endregion -} -#endif \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs.meta deleted file mode 100644 index abc313f..0000000 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 97f01c24ae799f34393a4362f33a0e1f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation.meta index 9c4013d..da55543 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f63bfdaa2e1fd3d48b604787fd1a8c99 +guid: ce24dc335597c9f4ab419485c010c495 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs index 466cd79..bdce494 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs @@ -58,7 +58,7 @@ public class CopyBuildinManifestOperation : GameAsyncOperation string sourcePath = GetBuildinHashFilePath(); string destPath = GetCacheHashFilePath(); string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath); - _hashFileRequestOp = new UnityWebFileRequestOperation(url, destPath); + _hashFileRequestOp = new UnityWebFileRequestOperation(url, destPath, 60); OperationSystem.StartOperation(_packageName, _hashFileRequestOp); } @@ -97,7 +97,7 @@ public class CopyBuildinManifestOperation : GameAsyncOperation string sourcePath = GetBuildinManifestFilePath(); string destPath = GetCacheManifestFilePath(); string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath); - _manifestFileRequestOp = new UnityWebFileRequestOperation(url, destPath); + _manifestFileRequestOp = new UnityWebFileRequestOperation(url, destPath, 60); OperationSystem.StartOperation(_packageName, _manifestFileRequestOp); } diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs.meta index 745ac22..668b71b 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/CopyBuildinManifestOperation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41ab464f315df234fb40b0c24e97ee23 +guid: 1cfb45518e8404846b5d7fcae445c678 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs new file mode 100644 index 0000000..8259546 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using YooAsset; + +/// +/// 获取包体里的内置资源清单版本 +/// +public class GetBuildinPackageVersionOperation : GameAsyncOperation +{ + private enum ESteps + { + None, + GetPackageVersion, + Done, + } + + private readonly string _packageName; + private UnityWebTextRequestOperation _versionFileRequestOp; + private ESteps _steps = ESteps.None; + + /// + /// 内置资源清单版本 + /// + public string PackageVersion { private set; get; } + + public GetBuildinPackageVersionOperation(string packageName) + { + _packageName = packageName; + } + protected override void OnStart() + { + _steps = ESteps.GetPackageVersion; + } + protected override void OnUpdate() + { + if (_steps == ESteps.None || _steps == ESteps.Done) + return; + + if (_steps == ESteps.GetPackageVersion) + { + if (_versionFileRequestOp == null) + { + string filePath = GetBuildinPackageVersionFilePath(); + string url = DownloadSystemHelper.ConvertToWWWPath(filePath); + _versionFileRequestOp = new UnityWebTextRequestOperation(url, 60); + OperationSystem.StartOperation(_packageName, _versionFileRequestOp); + } + + if (_versionFileRequestOp.IsDone == false) + return; + + if (_versionFileRequestOp.Status == EOperationStatus.Succeed) + { + _steps = ESteps.Done; + Status = EOperationStatus.Succeed; + PackageVersion = _versionFileRequestOp.Result; + } + else + { + _steps = ESteps.Done; + Status = EOperationStatus.Failed; + Error = _versionFileRequestOp.Error; + } + } + } + protected override void OnAbort() + { + } + + private string GetBuildinYooRoot() + { + return YooAssetSettingsData.GetYooDefaultBuildinRoot(); + } + private string GetBuildinPackageVersionFilePath() + { + string fileRoot = GetBuildinYooRoot(); + string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName); + return PathUtility.Combine(fileRoot, _packageName, fileName); + } +} \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs.meta new file mode 100644 index 0000000..d5ac084 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 609e1ce54918dab40900d532704b1187 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetCacheBundleSizeOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetCacheBundleSizeOperation.cs.meta index 2871655..9e12ef2 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetCacheBundleSizeOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/GetCacheBundleSizeOperation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8790bf5eb17db6843b696018a2b1ce6a +guid: e7411f91151d98644952c22e66b2ab6e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadAssetsByTagOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadAssetsByTagOperation.cs.meta index 0db7901..848e229 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadAssetsByTagOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadAssetsByTagOperation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35cd25a83a43dfb4093399183b31a0d0 +guid: 1fdd7622a256fee4cbb1eadb04fcf769 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadGameObjectOperation.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadGameObjectOperation.cs.meta index 88493c7..af5c3ab 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadGameObjectOperation.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/ExtensionOperation/LoadGameObjectOperation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55478908ad5dc5541af1529a3faccee7 +guid: ed2dbde46bd8faf4f972d7c6fb8ad163 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/GameObjectAssetReference.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/GameObjectAssetReference.cs.meta index 062d368..b99c95d 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/GameObjectAssetReference.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/GameObjectAssetReference.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1534f1a1b207ad542bf1fc73da8b4316 +guid: 91088b472036742418c576c79576e6a2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor.meta b/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor.meta new file mode 100644 index 0000000..9ec4e47 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0c72b92f8bf3db4b9920e968e43b2df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor/OperationMonitor.cs b/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor/OperationMonitor.cs new file mode 100644 index 0000000..bda79d7 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor/OperationMonitor.cs @@ -0,0 +1,21 @@ +using System; +using UnityEngine; +using YooAsset; + +public static class OperationMonitor +{ + public static void RegisterOperationCallback() + { + OperationSystem.RegisterStartCallback(OperationStartCallback); + OperationSystem.RegisterFinishCallback(OperationFinishCallback); + } + + private static void OperationStartCallback(string packageName, AsyncOperationBase operation) + { + Debug.Log($"Operation start : {operation.GetType().Name}"); + } + private static void OperationFinishCallback(string packageName, AsyncOperationBase operation) + { + Debug.Log($"Operation finish : {operation.GetType().Name}"); + } +} \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor/OperationMonitor.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor/OperationMonitor.cs.meta new file mode 100644 index 0000000..27d96d0 --- /dev/null +++ b/Assets/ThirdParty/Extension Sample/Runtime/OperationMonitor/OperationMonitor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fecc774089972ae4eaecb16bdaf9d319 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor.meta b/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor.meta index 9867641..7118491 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67ce0f6fc08b0724d95a9f86697bbde3 +guid: 28b6abc3d7964494fbb6021fff7e56b2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelManifest.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelManifest.cs.meta index 4f86ead..66f6bdb 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelManifest.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelManifest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2537124b11b52a458e01629f6b18f55 +guid: 99a4f9ca0e6a7e448b2af1cdcabf85b4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelMonitor.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelMonitor.cs.meta index 716a4d9..e1547e1 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelMonitor.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/PanelMonitor/PanelMonitor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6bed3b2eaa555ec4e9aaa22a888b504c +guid: 7c1115e6c4719bc4f9ed4004c4e779e3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader.meta b/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader.meta index 4040b65..69f0062 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eee88a2a10c99aa49b12a0fbff4084f0 +guid: dcceb2ffcd5ffb748be5d036100657d0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs b/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs index 18940c7..bf3ba4a 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs +++ b/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs @@ -37,8 +37,10 @@ public class SpriteAtlasLoader : MonoBehaviour return; } + var atlas = loadHandle.AssetObject as SpriteAtlas; + _loadedAtlas.Add(atlasName, atlas); _loadHandles.Add(loadHandle); - callback.Invoke(loadHandle.AssetObject as SpriteAtlas); + callback.Invoke(atlas); } } } \ No newline at end of file diff --git a/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs.meta b/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs.meta index 1a5e3a1..12ea631 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/SpriteAtlasLoader/SpriteAtlasLoader.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a506251ccc863fe4182436d24685c181 +guid: 4fbc88205568dad45b12e20904b0be54 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef b/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef index f2d902c..ad3d122 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef +++ b/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef @@ -2,9 +2,7 @@ "name": "YooAsset.RuntimeExtension", "rootNamespace": "", "references": [ - "GUID:e34a5702dd353724aa315fb8011f08c3", - "GUID:5efd170ecd8084500bed5692932fe14e", - "GUID:bb21d6197862c4c3e863390dec9859a7" + "GUID:e34a5702dd353724aa315fb8011f08c3" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef.meta b/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef.meta index 3348f8e..31afce0 100644 --- a/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef.meta +++ b/Assets/ThirdParty/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3fe1a3e70da50184f9897101cad7e4f2 +guid: 0463230af00bae04aafef83cb2716ca1 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Packages/manifest.json b/Packages/manifest.json index 7bba2ee..8f18695 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git", - "com.tuyoogame.yooasset": "2.3.9", + "com.tuyoogame.yooasset": "2.3.16", "com.unity.cinemachine": "2.10.3", "com.unity.collab-proxy": "2.8.1", "com.unity.ide.rider": "3.0.36", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index fef5e49..201d3d0 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -5,10 +5,10 @@ "depth": 0, "source": "git", "dependencies": {}, - "hash": "fca130bbfaa58fab93b09a57ec83704c2aab4d4f" + "hash": "01754c8fb47bd49697b3428993109e7a972a7968" }, "com.tuyoogame.yooasset": { - "version": "2.3.9", + "version": "2.3.16", "depth": 0, "source": "registry", "dependencies": { diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 6674169..f3efa5d 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43.2 - width: 2048 - height: 1188.8 + y: 43 + width: 2560 + height: 1349 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2048 - height: 1188.8 + width: 2560 + height: 1349 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2048 + width: 2560 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1168.8 - width: 2048 + y: 1329 + width: 2560 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 2048 - height: 1138.8 + width: 2560 + height: 1299 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 102 + controlID: 42 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1501.6 - height: 1138.8 + width: 1877 + height: 1299 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 42 + controlID: 43 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -166,12 +166,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1501.6 - height: 721.6 + width: 1877 + height: 700 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 43 + controlID: 44 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -190,13 +190,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 325.6 - height: 721.6 + width: 407 + height: 700 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -209,29 +209,27 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AssetStoreWindow + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 325.6 + x: 407 y: 0 - width: 1176 - height: 721.6 - m_MinSize: {x: 457, y: 375} + width: 1470 + height: 700 + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} - {fileID: 16} - {fileID: 17} - {fileID: 18} - - {fileID: 19} - - {fileID: 20} - - {fileID: 21} + - {fileID: 13} - {fileID: 12} - m_Selected: 6 - m_LastSelected: 1 + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 5 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -242,26 +240,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 721.6 - width: 1501.6 - height: 417.20007 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + y: 700 + width: 1877 + height: 599 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 20} m_Panes: + - {fileID: 20} + - {fileID: 21} - {fileID: 22} + - {fileID: 14} - {fileID: 23} - - {fileID: 24} - - {fileID: 13} - - {fileID: 25} - m_Selected: 3 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 3 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -277,16 +275,16 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1501.6 + x: 1877 y: 0 - width: 546.4 - height: 1138.8 + width: 683 + height: 1299 m_MinSize: {x: 276, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 26} + m_ActualView: {fileID: 24} m_Panes: - - {fileID: 26} - - {fileID: 27} + - {fileID: 24} + - {fileID: 25} m_Selected: 0 m_LastSelected: 1 --- !u!114 &12 @@ -298,21 +296,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0063c156ec88acc4d862f9b31e6c74ad, type: 3} + m_Script: {fileID: 11500000, guid: 66e43420e95cd0b4bae8803a31e9817b, type: 3} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 800, y: 600} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: AssetBundle Reporter + m_Text: AssetBundle Builder m_Image: {fileID: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 325.6 - y: 73.6 - width: 1174 - height: 700.6 + x: 407 + y: 73 + width: 1468 + height: 562 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -331,23 +329,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b730ebd685b28964a9f002593751e98a, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 800, y: 600} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, - type: 0} + m_Text: AssetBundle Collector + m_Image: {fileID: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 795.2 - width: 1500.6 - height: 396.20007 + x: 407 + y: 73 + width: 1468 + height: 562 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -359,6 +356,41 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 --- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 773 + width: 1876 + height: 578 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -374,15 +406,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73.6 - width: 324.6 - height: 700.6 + y: 73 + width: 406 + height: 679 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -398,7 +430,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2aedffff32edffff18f4fffff6f4ffff06f5ffff08fbfffff4ffffffec7e0000 + m_ExpandedIDs: 08fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -422,7 +454,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -438,15 +470,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 325.6 - y: 73.6 - width: 1174 - height: 700.6 + x: 407 + y: 73 + width: 1468 + height: 679 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -868,7 +900,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.049595416, y: 0.36881834, z: -0.019750841, w: 0.9279928} speed: 2 - m_Value: {x: 0.04959424, y: 0.36880958, z: -0.019750372, w: 0.9279708} + m_Value: {x: -0.04959542, y: -0.36881837, z: 0.019750841, w: -0.9279928} m_Size: m_Target: 6.4852448 speed: 2 @@ -897,7 +929,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -913,15 +945,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 325.6 - y: 73.6 - width: 1174 - height: 700.6 + x: 407 + y: 73 + width: 1468 + height: 562 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -953,10 +985,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1024 - m_HBaseRangeMax: 1024 - m_VBaseRangeMin: -576 - m_VBaseRangeMax: 576 + m_HBaseRangeMin: -1280 + m_HBaseRangeMax: 1280 + m_VBaseRangeMin: -720 + m_VBaseRangeMax: 720 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -974,30 +1006,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1174 - height: 679.6 - m_Scale: {x: 0.5732422, y: 0.5732422} - m_Translation: {x: 587, y: 339.8} + width: 1468 + height: 541 + m_Scale: {x: 0.37569445, y: 0.37569445} + m_Translation: {x: 734, y: 270.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1024 - y: -592.7686 - width: 2048 - height: 1185.5372 + x: -1953.7153 + y: -720 + width: 3907.4307 + height: 1440 m_MinimalGUI: 1 - m_defaultScale: 0.5732422 - m_LastWindowPixelSize: {x: 1467.5, y: 875.75} + m_defaultScale: 0.37569445 + m_LastWindowPixelSize: {x: 1468, y: 562} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 m_XRRenderMode: -1 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1013,49 +1045,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Package Manager - m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 325.6 - y: 73.6 - width: 1174 - height: 700.6 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b730ebd685b28964a9f002593751e98a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 800, y: 600} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: AssetBundle Collector - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 325.6 - y: 73.6 - width: 1174 - height: 700.6 + x: 407 + y: 73 + width: 1468 + height: 562 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1075,21 +1073,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66e43420e95cd0b4bae8803a31e9817b, type: 3} + m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 800, y: 600} + m_MinSize: {x: 455, y: 354} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: AssetBundle Builder - m_Image: {fileID: 0} + m_Text: Asset Store + m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 326.4 - y: 73.6 - width: 1174 - height: 727 + x: 407 + y: 73 + width: 1468 + height: 679 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1101,77 +1100,6 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 --- !u!114 &20 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e68462a09b6ba104abce11d2d157d0b2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 740, y: 450} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: ScreenTest (Input Actions Editor) - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 844 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_AssetObjectForEditing: {fileID: 0} - m_AssetGUID: efc74d62e0aa605438ae41c388786ef8 ---- !u!114 &21 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 455, y: 354} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Asset Store - m_Image: {fileID: -7444545952099596278, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 325.6 - y: 73.6 - width: 1174 - height: 700.6 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1187,15 +1115,15 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 795.2 - width: 1500.6 - height: 396.20007 + y: 773 + width: 1876 + height: 578 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1217,7 +1145,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode + - Assets/Scripts/HotUpdate/Main m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1225,16 +1153,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode + - Assets/Scripts/HotUpdate/Main m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\UnityProject\BlueArchiveMiniGame + m_LastProjectPath: C:\UnityProject\BlueArchiveMiniGame m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: feb40000 - m_LastClickedID: 46334 - m_ExpandedIDs: 000000008c830000c0b4000000b5000002b5000004b5000000ca9a3bffffff7f + m_SelectedIDs: 3a860000 + m_LastClickedID: 34362 + m_ExpandedIDs: 0000000078830000c2850000c88500002886000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1262,7 +1190,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000008c830000 + m_ExpandedIDs: 0000000078830000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1318,7 +1246,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &23 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1334,7 +1262,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1442,7 +1370,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &24 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1458,7 +1386,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1480,7 +1408,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_LastSelectedObjectID: 130480 ---- !u!114 &25 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1496,7 +1424,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Audio Mixer - m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1663,7 +1591,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &26 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1679,15 +1607,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1501.6 - y: 73.6 - width: 545.4 - height: 1117.8 + x: 1877 + y: 73 + width: 682 + height: 1278 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1711,7 +1639,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &27 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1727,7 +1655,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Lighting - m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: