diff --git a/SkiaUnity/Assets/SkiaSharp/Editor/HBTextBlockEditor.cs b/SkiaUnity/Assets/SkiaSharp/Editor/HBTextBlockEditor.cs index f1c3bcac..07e8953b 100644 --- a/SkiaUnity/Assets/SkiaSharp/Editor/HBTextBlockEditor.cs +++ b/SkiaUnity/Assets/SkiaSharp/Editor/HBTextBlockEditor.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR +#if UNITY_EDITOR && !UNITY_WEBGL using SkiaSharp.Unity.HB; using UnityEngine; @@ -264,4 +264,4 @@ private static void RenderTextures() { } } -#endif \ No newline at end of file +#endif diff --git a/SkiaUnity/Assets/SkiaSharp/Editor/SVGEditor.cs b/SkiaUnity/Assets/SkiaSharp/Editor/SVGEditor.cs index 95b0216e..b7007faa 100644 --- a/SkiaUnity/Assets/SkiaSharp/Editor/SVGEditor.cs +++ b/SkiaUnity/Assets/SkiaSharp/Editor/SVGEditor.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR +#if UNITY_EDITOR && !UNITY_WEBGL using SkiaSharp.Unity; using SkiaSharp.Unity.HB; diff --git a/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerEditor.cs b/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerEditor.cs index 339bfd6e..fdfdce3c 100644 --- a/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerEditor.cs +++ b/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerEditor.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR +#if UNITY_EDITOR && !UNITY_WEBGL using System.Reflection; using SkiaSharp.Unity; using UnityEditor; @@ -146,4 +146,4 @@ private static void RenderTextures() { } } -#endif \ No newline at end of file +#endif diff --git a/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerV2Editor.cs b/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerV2Editor.cs index dfe97d28..662c5ba4 100644 --- a/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerV2Editor.cs +++ b/SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerV2Editor.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR +#if UNITY_EDITOR && !UNITY_WEBGL using System.Reflection; using SkiaSharp.Unity; using UnityEditor; @@ -177,4 +177,4 @@ private static void RenderTextures() { } } -#endif \ No newline at end of file +#endif diff --git a/SkiaUnity/Assets/SkiaSharp/Library/win-x64/libSkiaSharp.dll.meta b/SkiaUnity/Assets/SkiaSharp/Library/win-x64/libSkiaSharp.dll.meta index 47885b7e..16a26dbd 100644 --- a/SkiaUnity/Assets/SkiaSharp/Library/win-x64/libSkiaSharp.dll.meta +++ b/SkiaUnity/Assets/SkiaSharp/Library/win-x64/libSkiaSharp.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 219015a164ea4416eb240b05623abb19 PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -11,9 +11,13 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - : Any - second: + Android: + enabled: 0 + settings: + AndroidLibraryDependee: UnityLibrary + AndroidSharedLibraryType: Executable + CPU: ARMv7 + Any: enabled: 0 settings: Exclude Android: 1 @@ -22,79 +26,33 @@ PluginImporter: Exclude Linux64: 0 Exclude LinuxUniversal: 0 Exclude OSXUniversal: 0 + Exclude WebGL: 1 Exclude Win: 1 Exclude Win64: 0 Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 1 settings: CPU: x86_64 DefaultValueInitialized: true OS: Windows - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: + Linux64: enabled: 1 settings: CPU: AnyCPU - - first: - Standalone: LinuxUniversal - second: + OSXUniversal: enabled: 1 settings: CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: + Win: enabled: 0 settings: CPU: None - - first: - Standalone: Win64 - second: + Win64: enabled: 1 settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: + CPU: x86_64 + iOS: enabled: 0 settings: AddToEmbeddedBinaries: false diff --git a/SkiaUnity/Assets/SkiaSharp/Library/win-x86/libSkiaSharp.dll.meta b/SkiaUnity/Assets/SkiaSharp/Library/win-x86/libSkiaSharp.dll.meta index 72c9acb9..7ba13946 100644 --- a/SkiaUnity/Assets/SkiaSharp/Library/win-x86/libSkiaSharp.dll.meta +++ b/SkiaUnity/Assets/SkiaSharp/Library/win-x86/libSkiaSharp.dll.meta @@ -23,11 +23,12 @@ PluginImporter: Exclude Android: 1 Exclude Editor: 1 Exclude Linux: 0 - Exclude Linux64: 0 + Exclude Linux64: 1 Exclude LinuxUniversal: 0 - Exclude OSXUniversal: 0 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 Exclude Win: 0 - Exclude Win64: 0 + Exclude Win64: 1 Exclude iOS: 1 Editor: enabled: 0 @@ -36,19 +37,19 @@ PluginImporter: DefaultValueInitialized: true OS: Windows Linux64: - enabled: 1 + enabled: 0 settings: - CPU: AnyCPU + CPU: None OSXUniversal: - enabled: 1 + enabled: 0 settings: CPU: AnyCPU Win: enabled: 1 settings: - CPU: AnyCPU + CPU: x86 Win64: - enabled: 1 + enabled: 0 settings: CPU: x86_64 iOS: diff --git a/SkiaUnity/Assets/SkiaSharp/Runtime/HB_TEXTBlock.cs b/SkiaUnity/Assets/SkiaSharp/Runtime/HB_TEXTBlock.cs index 682e2f89..ef90a5e6 100644 --- a/SkiaUnity/Assets/SkiaSharp/Runtime/HB_TEXTBlock.cs +++ b/SkiaUnity/Assets/SkiaSharp/Runtime/HB_TEXTBlock.cs @@ -1,3 +1,4 @@ +#if !UNITY_WEBGL using System; using System.Collections; using System.Collections.Generic; @@ -744,4 +745,5 @@ public void RefreshFontFamily() { } } } -} \ No newline at end of file +} +#endif diff --git a/SkiaUnity/Assets/SkiaSharp/Runtime/SVGLoader.cs b/SkiaUnity/Assets/SkiaSharp/Runtime/SVGLoader.cs index 9354896c..87397192 100644 --- a/SkiaUnity/Assets/SkiaSharp/Runtime/SVGLoader.cs +++ b/SkiaUnity/Assets/SkiaSharp/Runtime/SVGLoader.cs @@ -1,3 +1,4 @@ +#if !UNITY_WEBGL using System; using UnityEngine; using Svg.Skia; @@ -80,4 +81,5 @@ public void CalculateLayoutInputVertical() { } public float flexibleHeight { get; } public int layoutPriority { get; } } -} \ No newline at end of file +} +#endif diff --git a/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayer.cs b/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayer.cs index a79c5a3f..5f3d7ba5 100644 --- a/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayer.cs +++ b/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayer.cs @@ -1,3 +1,4 @@ +#if !UNITY_WEBGL using System; using Newtonsoft.Json; using UnityEngine; @@ -223,4 +224,5 @@ private void OnDestroy() { } } -} \ No newline at end of file +} +#endif diff --git a/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayerV2.cs b/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayerV2.cs index 9196ab1b..ae5e8536 100644 --- a/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayerV2.cs +++ b/SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayerV2.cs @@ -1,3 +1,4 @@ +#if !UNITY_WEBGL using System; using System.IO; using System.Text; @@ -236,4 +237,5 @@ private void OnDestroy() { } } -} \ No newline at end of file +} +#endif diff --git a/SkiaUnity/Packages/manifest.json b/SkiaUnity/Packages/manifest.json index 90a7b890..bedf4d0c 100644 --- a/SkiaUnity/Packages/manifest.json +++ b/SkiaUnity/Packages/manifest.json @@ -1,14 +1,14 @@ { "dependencies": { - "com.unity.2d.animation": "10.1.4", - "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "9.0.3", + "com.unity.2d.animation": "11.0.0", + "com.unity.2d.pixel-perfect": "5.1.0", + "com.unity.2d.psdimporter": "10.1.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "10.0.7", + "com.unity.2d.spriteshape": "11.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ai.navigation": "2.0.6", - "com.unity.collab-proxy": "2.7.1", - "com.unity.ide.rider": "3.0.35", + "com.unity.ai.navigation": "2.0.8", + "com.unity.collab-proxy": "2.8.2", + "com.unity.ide.rider": "3.0.36", "com.unity.ide.visualstudio": "2.0.23", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.center": "1.0.0", diff --git a/SkiaUnity/Packages/packages-lock.json b/SkiaUnity/Packages/packages-lock.json index b219f32e..e5e636c0 100644 --- a/SkiaUnity/Packages/packages-lock.json +++ b/SkiaUnity/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "10.1.4", + "version": "11.0.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.7", + "com.unity.2d.common": "10.0.0", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "1.2.4", "com.unity.modules.animation": "1.0.0", @@ -14,32 +14,35 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "9.0.7", + "version": "10.0.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.4", "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", + "com.unity.modules.uielements": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.burst": "1.8.4" }, "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { - "version": "5.0.3", + "version": "5.1.0", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.imgui": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "9.0.3", + "version": "10.1.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.4", - "com.unity.2d.sprite": "1.0.0" + "com.unity.2d.common": "10.0.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -50,11 +53,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "10.0.7", + "version": "11.0.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.7", + "com.unity.2d.common": "10.0.0", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -70,7 +73,7 @@ } }, "com.unity.ai.navigation": { - "version": "2.0.6", + "version": "2.0.8", "depth": 0, "source": "registry", "dependencies": { @@ -79,7 +82,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.19", + "version": "1.8.21", "depth": 2, "source": "registry", "dependencies": { @@ -89,7 +92,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.7.1", + "version": "2.8.2", "depth": 0, "source": "registry", "dependencies": {}, @@ -114,7 +117,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.35", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -178,11 +181,11 @@ } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.1.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" diff --git a/SkiaUnity/ProjectSettings/MultiplayerManager.asset b/SkiaUnity/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 00000000..2a936644 --- /dev/null +++ b/SkiaUnity/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/SkiaUnity/ProjectSettings/ProjectVersion.txt b/SkiaUnity/ProjectSettings/ProjectVersion.txt index 8678d93f..d5813609 100644 --- a/SkiaUnity/ProjectSettings/ProjectVersion.txt +++ b/SkiaUnity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.46f1 -m_EditorVersionWithRevision: 6000.0.46f1 (fb93bc360d3a) +m_EditorVersion: 6000.1.7f1 +m_EditorVersionWithRevision: 6000.1.7f1 (13a8ffad9172) diff --git a/SkiaUnity/ProjectSettings/boot.config b/SkiaUnity/ProjectSettings/boot.config deleted file mode 100644 index e69de29b..00000000