diff --git a/Assets/Piper/Plugins/Windows/espeak-ng.dll b/Assets/Piper/Plugins/Windows/espeak-ng.dll deleted file mode 100644 index e795388..0000000 Binary files a/Assets/Piper/Plugins/Windows/espeak-ng.dll and /dev/null differ diff --git a/Assets/Piper/Plugins/macOS.meta b/Assets/Piper/Plugins/macOS.meta new file mode 100644 index 0000000..e0dd43e --- /dev/null +++ b/Assets/Piper/Plugins/macOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd11b30fd715f4179bc6b0a89d7b57f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Piper/Plugins/macOS/libpiper_phonemize.dylib b/Assets/Piper/Plugins/macOS/libpiper_phonemize.dylib new file mode 100755 index 0000000..70347f2 Binary files /dev/null and b/Assets/Piper/Plugins/macOS/libpiper_phonemize.dylib differ diff --git a/Assets/Piper/Plugins/Windows/espeak-ng.dll.meta b/Assets/Piper/Plugins/macOS/libpiper_phonemize.dylib.meta similarity index 50% rename from Assets/Piper/Plugins/Windows/espeak-ng.dll.meta rename to Assets/Piper/Plugins/macOS/libpiper_phonemize.dylib.meta index b3712d2..ea56d0a 100644 --- a/Assets/Piper/Plugins/Windows/espeak-ng.dll.meta +++ b/Assets/Piper/Plugins/macOS/libpiper_phonemize.dylib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e243ffcb464b31e42a5ed3e8a9b49040 +guid: 67a26b68de9474a5481d98806ba55fba PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,53 +11,23 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 1 - Exclude Win64: 0 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor second: enabled: 1 settings: - CPU: x86_64 DefaultValueInitialized: true - OS: Windows - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - first: Standalone: OSXUniversal second: enabled: 1 settings: CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Piper/Samples/PiperSample.cs b/Assets/Piper/Samples/PiperSample.cs index 4051a71..278a27f 100644 --- a/Assets/Piper/Samples/PiperSample.cs +++ b/Assets/Piper/Samples/PiperSample.cs @@ -14,7 +14,7 @@ public class PiperSample : MonoBehaviour private AudioSource _source; - private void Awake() + private void Awake() { _source = GetComponent(); input.onSubmit.AddListener(OnInputSubmit); diff --git a/Assets/Piper/Samples/PiperSample.unity b/Assets/Piper/Samples/PiperSample.unity index 146fde8..e02e641 100644 --- a/Assets/Piper/Samples/PiperSample.unity +++ b/Assets/Piper/Samples/PiperSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 12 - m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -367,9 +363,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -419,8 +414,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -639,6 +638,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -840,6 +842,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -1159,9 +1162,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: backend: 512 - model: {fileID: 5022602860645237092, guid: 808a451b47032994c9dc7906b4c27ec7, type: 3} + model: {fileID: 5022602860645237092, guid: 4e2afd77f290c4dd68adb6d86976ace9, type: 3} voice: en-us - sampleRate: 22050 + sampleRate: 16000 --- !u!1 &1795061063 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Piper/Scripts/PiperManager.cs b/Assets/Piper/Scripts/PiperManager.cs index 829b283..3b092c9 100644 --- a/Assets/Piper/Scripts/PiperManager.cs +++ b/Assets/Piper/Scripts/PiperManager.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.IO; -using System.Linq; using System.Threading.Tasks; using Unity.Sentis; using UnityEngine; @@ -16,7 +15,7 @@ public class PiperManager : MonoBehaviour public int sampleRate = 22050; private Model _runtimeModel; - private IWorker _worker; + private Worker _worker; private void Awake() { @@ -24,7 +23,8 @@ private void Awake() PiperWrapper.InitPiper(espeakPath); _runtimeModel = ModelLoader.Load(model); - _worker = WorkerFactory.CreateWorker(backend, _runtimeModel); + _worker = new Worker(_runtimeModel, backend); + } public async Task TextToSpeech(string text) @@ -41,30 +41,28 @@ public async Task TextToSpeech(string text) var inputLengthsShape = new TensorShape(1); var scalesShape = new TensorShape(3); - using var scalesTensor = new TensorFloat(scalesShape, new float[] { 0.667f, 1f, 0.8f }); + using var scalesTensor = new Tensor(scalesShape, new [] { 1f, 1f, 1f }); var audioBuffer = new List(); - for (int i = 0; i < phonemes.Sentences.Length; i++) + foreach (var sentence in phonemes.Sentences) { - var sentence = phonemes.Sentences[i]; - var inputPhonemes = sentence.PhonemesIds; var inputShape = new TensorShape(1, inputPhonemes.Length); - using var inputTensor = new TensorInt(inputShape, inputPhonemes); - using var inputLengthsTensor = new TensorInt(inputLengthsShape, new int[] { inputPhonemes.Length }); - - var input = new Dictionary(); - input.Add("input", inputTensor); - input.Add("input_lengths", inputLengthsTensor); - input.Add("scales", scalesTensor); + using var inputTensor = new Tensor(inputShape, inputPhonemes); + using var inputLengthsTensor = new Tensor(inputLengthsShape, new [] { inputPhonemes.Length }); - _worker.Execute(input); + _worker.Schedule(inputTensor, inputLengthsTensor, scalesTensor); - using var outputTensor = _worker.PeekOutput() as TensorFloat; - await outputTensor.MakeReadableAsync(); + using var outputTensor = _worker.PeekOutput() as Tensor; + if (outputTensor != null) + { + await outputTensor.ReadbackAndCloneAsync(); + + var output = outputTensor.DownloadToArray(); + Debug.Log(output.Length); - var output = outputTensor.ToReadOnlyArray(); - audioBuffer.AddRange(output); + audioBuffer.AddRange(output); + } } Debug.Log($"Finished piper inference: {sw.ElapsedMilliseconds} ms"); diff --git a/Assets/Piper/Scripts/PiperNative.cs b/Assets/Piper/Scripts/PiperNative.cs index 90a64ae..1876cfb 100644 --- a/Assets/Piper/Scripts/PiperNative.cs +++ b/Assets/Piper/Scripts/PiperNative.cs @@ -1,5 +1,6 @@ using System; using System.Runtime.InteropServices; +using UnityEngine; namespace Piper.Native { @@ -20,8 +21,15 @@ public unsafe struct PiperProcessedTextNative public static unsafe class PiperNative { - private const string LibraryName = "piper_phonemize"; - + private const string LibraryName = + +#if UNITY_STANDALONE_OSX + "libpiper_phonemize"; + +#elif UNITY_STANDALONE_WIN + "piper_phonemize"; +#endif + [DllImport(LibraryName)] public static extern int init_piper(string dataPath); @@ -33,6 +41,10 @@ public static unsafe class PiperNative [DllImport(LibraryName)] public static extern void free_piper(); + public static void PrintLibraryName() + { + Debug.Log(LibraryName); + } } } diff --git a/Assets/Piper/Scripts/PiperWrapper.cs b/Assets/Piper/Scripts/PiperWrapper.cs index c65b78d..7c1e08d 100644 --- a/Assets/Piper/Scripts/PiperWrapper.cs +++ b/Assets/Piper/Scripts/PiperWrapper.cs @@ -46,7 +46,7 @@ public static bool InitPiper(string datapath) Debug.LogError($"Provided espeak data path \"{datapath}\" doesn't exist!"); return false; } - + PiperNative.PrintLibraryName(); var code = PiperNative.init_piper(datapath); if (code < 0) { diff --git a/Assets/Piper/Scripts/en_US-danny-low.onnx b/Assets/Piper/Scripts/en_US-danny-low.onnx new file mode 100644 index 0000000..01b3bfe Binary files /dev/null and b/Assets/Piper/Scripts/en_US-danny-low.onnx differ diff --git a/Assets/Piper/Scripts/en_US-danny-low.onnx.meta b/Assets/Piper/Scripts/en_US-danny-low.onnx.meta new file mode 100644 index 0000000..61ac422 --- /dev/null +++ b/Assets/Piper/Scripts/en_US-danny-low.onnx.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4e2afd77f290c4dd68adb6d86976ace9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 683b6cb6d0a474744822c888b46772c9, type: 3} diff --git a/Assets/Piper/Scripts/en_US-lessac-medium.onnx b/Assets/Piper/Scripts/en_US-lessac-medium.onnx new file mode 100644 index 0000000..27ff835 Binary files /dev/null and b/Assets/Piper/Scripts/en_US-lessac-medium.onnx differ diff --git a/Assets/Piper/Scripts/en_US-lessac-medium.onnx.meta b/Assets/Piper/Scripts/en_US-lessac-medium.onnx.meta new file mode 100644 index 0000000..0100545 --- /dev/null +++ b/Assets/Piper/Scripts/en_US-lessac-medium.onnx.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9aa98f58e7c784e319063a14ce7e8c4d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 683b6cb6d0a474744822c888b46772c9, type: 3} + optimizeModel: 1 diff --git a/Assets/StreamingAssets/en_US-danny-low.sentis b/Assets/StreamingAssets/en_US-danny-low.sentis new file mode 100644 index 0000000..31d2f7d Binary files /dev/null and b/Assets/StreamingAssets/en_US-danny-low.sentis differ diff --git a/Assets/StreamingAssets/en_US-danny-low.sentis.meta b/Assets/StreamingAssets/en_US-danny-low.sentis.meta new file mode 100644 index 0000000..9dd6f6a --- /dev/null +++ b/Assets/StreamingAssets/en_US-danny-low.sentis.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5aa4ddfd8b2794a1db8b6b300d297a99 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/en_US-lessac-medium.sentis b/Assets/StreamingAssets/en_US-lessac-medium.sentis new file mode 100644 index 0000000..c7f3542 Binary files /dev/null and b/Assets/StreamingAssets/en_US-lessac-medium.sentis differ diff --git a/Assets/StreamingAssets/en_US-lessac-medium.sentis.meta b/Assets/StreamingAssets/en_US-lessac-medium.sentis.meta new file mode 100644 index 0000000..b02eede --- /dev/null +++ b/Assets/StreamingAssets/en_US-lessac-medium.sentis.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6286ed6d4a8804b4393e04eade6c5993 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 8acfe9e..8f75ea1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,10 +1,10 @@ { "dependencies": { - "com.unity.feature.development": "1.0.1", - "com.unity.sentis": "1.3.0-pre.3", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.6", - "com.unity.ugui": "1.0.0", + "com.unity.feature.development": "1.0.2", + "com.unity.sentis": "2.1.2", + "com.unity.timeline": "1.8.6", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0f228f7..3f22d5b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,24 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.11", + "version": "1.8.17", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "2.4.3", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.13", + "com.unity.test-framework": "1.4.3", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, @@ -17,28 +30,27 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.feature.development": { - "version": "1.0.1", + "version": "1.0.2", "depth": 0, "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.rider": "3.0.26", - "com.unity.ide.vscode": "1.2.5", + "com.unity.ide.rider": "3.0.28", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", - "com.unity.test-framework": "1.1.33", - "com.unity.testtools.codecoverage": "1.2.4" + "com.unity.test-framework": "1.4.3", + "com.unity.testtools.codecoverage": "1.2.5" } }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 1, "source": "registry", "dependencies": { @@ -55,15 +67,15 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 1, + "com.unity.mathematics": { + "version": "1.3.1", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.mathematics": { - "version": "1.2.6", + "com.unity.nuget.mono-cecil": { + "version": "1.11.4", "depth": 2, "source": "registry", "dependencies": {}, @@ -77,12 +89,12 @@ "url": "https://packages.unity.com" }, "com.unity.sentis": { - "version": "1.3.0-pre.3", + "version": "2.1.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.10", - "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.burst": "1.8.17", + "com.unity.collections": "2.4.3", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" @@ -95,49 +107,50 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.4.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.2.4", - "depth": 1, + "com.unity.test-framework.performance": { + "version": "3.0.3", + "depth": 2, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.0.16", - "com.unity.settings-manager": "1.0.1" + "com.unity.test-framework": "1.1.31", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, + "com.unity.testtools.codecoverage": { + "version": "1.2.5", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.test-framework": "1.0.16", + "com.unity.settings-manager": "1.0.1" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -145,6 +158,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -192,6 +211,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -280,7 +305,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000..2a93664 --- /dev/null +++ b/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/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fca5692..fd8b99f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -76,6 +76,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -83,6 +84,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -136,6 +138,8 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -182,8 +186,10 @@ PlayerSettings: strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 + iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 VisionOSSdkVersion: 0 @@ -230,6 +236,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -280,7 +287,196 @@ PlayerSettings: AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -533,6 +729,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 1 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -695,6 +892,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2e7bb8a..1069f07 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.15f1 -m_EditorVersionWithRevision: 2022.3.15f1 (b58023a2b463) +m_EditorVersion: 6000.0.0f1 +m_EditorVersionWithRevision: 6000.0.0f1 (4ff56b3ea44c) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json index 5e97f83..1edced2 100644 --- a/ProjectSettings/SceneTemplateSettings.json +++ b/ProjectSettings/SceneTemplateSettings.json @@ -61,6 +61,11 @@ "type": "UnityEngine.PhysicMaterial", "defaultInstantiationMode": 0 }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 + }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D",