From aa0adc3cfeb7b91216a166ed2e3cfaad19ff5489 Mon Sep 17 00:00:00 2001 From: bnco <33021110+bnco-dev@users.noreply.github.com> Date: Thu, 9 May 2024 11:39:04 +0100 Subject: [PATCH] Fix shader uniform name in firework box affordance --- .../Assets/Prefabs/Fireworks Box.prefab | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Unity/Assets/Ubiq/Samples/Demo (XRI)/Assets/Prefabs/Fireworks Box.prefab b/Unity/Assets/Ubiq/Samples/Demo (XRI)/Assets/Prefabs/Fireworks Box.prefab index 7db189b15..5861a583b 100644 --- a/Unity/Assets/Ubiq/Samples/Demo (XRI)/Assets/Prefabs/Fireworks Box.prefab +++ b/Unity/Assets/Ubiq/Samples/Demo (XRI)/Assets/Prefabs/Fireworks Box.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509411235045699198} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 3070695493358685514} m_Father: {fileID: 8245267067570120123} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4945879630741660818 MonoBehaviour: @@ -108,13 +108,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3240370694413710550} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.32551, y: 0.32551, z: 0.32551} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8245267067570120123} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3240370694413710570 MeshFilter: @@ -174,9 +174,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3240370694413710550} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8107293676157753161 @@ -204,13 +212,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8107293676157753161} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8901737113673820539} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6184804017631619495 MonoBehaviour: @@ -299,7 +307,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_MaterialPropertyBlockHelper: {fileID: 6184804017631619495} - m_ColorPropertyName: + m_ColorPropertyName: _Color --- !u!1 &8245267067570120064 GameObject: m_ObjectHideFlags: 0 @@ -326,6 +334,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8245267067570120064} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 1.463, y: 0.484, z: -1.358} m_LocalScale: {x: 1, y: 1, z: 1} @@ -334,7 +343,6 @@ Transform: - {fileID: 8901737113673820539} - {fileID: 3240370694413710573} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1716084023271190560 Rigidbody: @@ -343,10 +351,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8245267067570120064} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1