diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity b/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity index face6ed..e518b29 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Normal/WhaleAttackScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:737587783636571775434eec1b9a9363acee72b5f206293e1ddcb66072b7c3e9 +oid sha256:553eadf85d8e5c17c07baf3896656e417766fc5e1a9474118e99dc881b9d6386 size 80728 diff --git a/Assets/05_Textures/UI/menu_panel_REAL_transparent_cropped.png b/Assets/05_Textures/UI/menu_panel_REAL_transparent_cropped.png new file mode 100644 index 0000000..8f1bd3a --- /dev/null +++ b/Assets/05_Textures/UI/menu_panel_REAL_transparent_cropped.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57a6ab4b1f7bb370c7efda9b0a8aefa96003938856bbb19d40b1d15cb8090e57 +size 2011118 diff --git a/Assets/05_Textures/UI/menu_panel_REAL_transparent_cropped.png.meta b/Assets/05_Textures/UI/menu_panel_REAL_transparent_cropped.png.meta new file mode 100644 index 0000000..296f23c --- /dev/null +++ b/Assets/05_Textures/UI/menu_panel_REAL_transparent_cropped.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 0873c0e21270c8b419c3f5652cef9c51 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05_Textures/UI/pinocchio_title_banner_REAL_transparent_cropped.png b/Assets/05_Textures/UI/pinocchio_title_banner_REAL_transparent_cropped.png new file mode 100644 index 0000000..91c98af --- /dev/null +++ b/Assets/05_Textures/UI/pinocchio_title_banner_REAL_transparent_cropped.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a20230fbfa2f34f1d087377ffd494588323ceb0b86a1845f2f4a8bb06d88c6cd +size 2128944 diff --git a/Assets/05_Textures/UI/pinocchio_title_banner_REAL_transparent_cropped.png.meta b/Assets/05_Textures/UI/pinocchio_title_banner_REAL_transparent_cropped.png.meta new file mode 100644 index 0000000..361f52d --- /dev/null +++ b/Assets/05_Textures/UI/pinocchio_title_banner_REAL_transparent_cropped.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: f237e3fa596a6ec42a952e43fa89cd5d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05_Textures/UI/wood_button_plain_REAL_transparent.png b/Assets/05_Textures/UI/wood_button_plain_REAL_transparent.png new file mode 100644 index 0000000..89358ba --- /dev/null +++ b/Assets/05_Textures/UI/wood_button_plain_REAL_transparent.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc398b072a2a8eeab384ea53b9650dc488799ba64845406ffcbec5685e1323b8 +size 1447030 diff --git a/Assets/05_Textures/UI/wood_button_plain_REAL_transparent.png.meta b/Assets/05_Textures/UI/wood_button_plain_REAL_transparent.png.meta new file mode 100644 index 0000000..a7fb37d --- /dev/null +++ b/Assets/05_Textures/UI/wood_button_plain_REAL_transparent.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 8c0e90325ba71004ca264e782d8117aa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta b/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta index 18e2a1f..0bd6afa 100644 --- a/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta +++ b/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e4b6bdaab0b640143bac52cb0be33e54 +======= +guid: 0e533587a03b84940b08e956a8615adf +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,6 +97,22 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 +<<<<<<< HEAD +======= + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta b/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta index e54875b..09f2335 100644 --- a/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta +++ b/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 9e4b854b73fa4c049bae4e53eb60d8d2 +======= +guid: e947b9df5e461fd48a18b65eae417346 +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,6 +97,22 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 +<<<<<<< HEAD +======= + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta b/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta index eb0e213..0c087b8 100644 --- a/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta +++ b/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5d6edb11f11aef3408dc8c42214fcfa2 +======= +guid: 4e0c1ffb4b7796341b9614ba8650b534 +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,6 +97,22 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 +<<<<<<< HEAD +======= + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 7db06b1..0e34b49 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4859dc7f625a8b8ee4419129f119da15e224fe90d79332fc8a86e90c43dfd29c -size 42383 +oid sha256:4a3b094bac18ad2679fe77acd76e52972459b93abae4be5c4c4f3d8c0c7fd803 +size 42556 diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset.meta b/Assets/XR/Settings/OpenXR Package Settings.asset.meta index da38110..c04fced 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset.meta +++ b/Assets/XR/Settings/OpenXR Package Settings.asset.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0ebc173c38e576e46af1152cd6521c4c +======= +guid: 0d7aaa1930bdf854dbc499330b88fc84 +>>>>>>> dace9380396749ea751e95697f4b74adaecb007d NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/XRI Starter Kit/XR/Settings/OpenXR Editor Settings.asset b/Assets/XRI Starter Kit/XR/Settings/OpenXR Editor Settings.asset index 0fcdb80..afe6dce 100644 --- a/Assets/XRI Starter Kit/XR/Settings/OpenXR Editor Settings.asset +++ b/Assets/XRI Starter Kit/XR/Settings/OpenXR Editor Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3074c99c014880bae45db1488b7253077210d0bb6ea31898bf4caa1d600b0e5 -size 568 +oid sha256:b58b98050acbb13a2bc057f32175ca7de6bc4eb066da6dec19e9557143aebd79 +size 607 diff --git a/Packages/manifest.json b/Packages/manifest.json index 4dd9b6c..43c79d7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -34,7 +34,6 @@ "com.unity.timeline": "1.8.12", "com.unity.ugui": "2.0.0", "com.unity.visualeffectgraph": "17.3.0", - "com.unity.xr.androidxr-openxr": "1.2.0", "com.unity.xr.arfoundation": "6.4.1", "com.unity.xr.compositionlayers": "2.4.0", "com.unity.xr.core-utils": "2.5.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 134a5a7..a2d4277 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -334,19 +334,6 @@ "com.unity.render-pipelines.core": "17.3.0" } }, - "com.unity.xr.androidxr-openxr": { - "version": "1.2.0", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.xr.hands": "1.6.1", - "com.unity.xr.openxr": "1.16.0", - "com.unity.xr.management": "4.5.0", - "com.unity.xr.arfoundation": "6.4.0", - "com.unity.xr.compositionlayers": "2.3.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.xr.arfoundation": { "version": "6.5.0", "depth": 1, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7ee9ebc..9527a03 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b595fa1d898c1d4664042b99f968f8ea428237e30412c0e1b535b9845ad09554 +oid sha256:803c4fa2939dfc1de483691a336751a38676d57c271d7e753fae45c93e76f625 size 2072