diff --git a/Assets/Game Kit Controller/Shaders/World Canvas.mat b/Assets/Game Kit Controller/Shaders/World Canvas.mat index e2aedb40..012bcdf2 100644 --- a/Assets/Game Kit Controller/Shaders/World Canvas.mat +++ b/Assets/Game Kit Controller/Shaders/World Canvas.mat @@ -26,7 +26,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - - _SPECULAR_COLOR - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -38,6 +37,7 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -158,6 +158,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _UseUIAlphaClip: 0 + - _XRMotionVectorsPass: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Game Kit Controller/Textures/Render Texture/Save Camera.renderTexture b/Assets/Game Kit Controller/Textures/Render Texture/Save Camera.renderTexture index d1ac5294..e317acd4 100644 --- a/Assets/Game Kit Controller/Textures/Render Texture/Save Camera.renderTexture +++ b/Assets/Game Kit Controller/Textures/Render Texture/Save Camera.renderTexture @@ -3,20 +3,29 @@ --- !u!84 &8400000 RenderTexture: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Save Camera m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 + m_MipCount: -1 + m_DepthStencilFormat: 92 + m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -27,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Game.meta b/Assets/Game.meta new file mode 100644 index 00000000..228fe855 --- /dev/null +++ b/Assets/Game.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64397b771e664a640835b25cca42a91b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/House.meta b/Assets/Game/House.meta new file mode 100644 index 00000000..aaf58210 --- /dev/null +++ b/Assets/Game/House.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbfcb4715cd01244d9fc7c1e8cbe96ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/House/CasaExample.fbx b/Assets/Game/House/CasaExample.fbx new file mode 100644 index 00000000..f40eac09 --- /dev/null +++ b/Assets/Game/House/CasaExample.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85383698a8af2d29d5f69005d328ecf8c95ed014bc9448875865faef10938bf1 +size 272737020 diff --git a/Assets/Game/House/CasaExample.fbx.meta b/Assets/Game/House/CasaExample.fbx.meta new file mode 100644 index 00000000..81bf8c9b --- /dev/null +++ b/Assets/Game/House/CasaExample.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 09ebc47aa0271094eace0a1c8b072892 +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 20285435..bb160549 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2f9533511a95e75a9386d7175554fedd74c495ac2d0742f0d82cb76320cd72e -size 28229854 +oid sha256:56edc327c29adb9fcabf9e18af76d07a5415b61fdb5b8b06e82bf90208ec911a +size 28240480 diff --git a/Packages/manifest.json b/Packages/manifest.json index 79618076..43e4dbea 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,10 +1,10 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.9", - "com.unity.collab-proxy": "2.10.2", - "com.unity.ide.rider": "3.0.38", - "com.unity.ide.visualstudio": "2.0.25", - "com.unity.inputsystem": "1.17.0", + "com.unity.ai.navigation": "2.0.10", + "com.unity.collab-proxy": "2.11.3", + "com.unity.ide.rider": "3.0.39", + "com.unity.ide.visualstudio": "2.0.26", + "com.unity.inputsystem": "1.18.0", "com.unity.multiplayer.center": "1.0.1", "com.unity.render-pipelines.universal": "17.3.0", "com.unity.test-framework": "1.6.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ebef4802..fffacc24 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "2.0.9", + "version": "2.0.10", "depth": 0, "source": "registry", "dependencies": { @@ -20,7 +20,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.10.2", + "version": "2.11.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -46,7 +46,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.38", + "version": "3.0.39", "depth": 0, "source": "registry", "dependencies": { @@ -55,16 +55,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.25", + "version": "2.0.26", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31" + "com.unity.test-framework": "1.1.33" }, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.17.0", + "version": "1.18.0", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f454e15c..f12db5b2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68afd1e7b86adc93d085d32f3a472a1e16bf57cb86764f9d5b5d65a7df254bb8 +oid sha256:be8efe65e89471aa467f3a62c194c53a97346326c6a553b78240ac0f9dcbe491 size 25381 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e7263709..aad22bec 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.3.3f1 -m_EditorVersionWithRevision: 6000.3.3f1 (ef04196de0d6) +m_EditorVersion: 6000.3.8f1 +m_EditorVersionWithRevision: 6000.3.8f1 (1c7db571dde0)