diff --git a/Assets/Materials/Metal/M_RoughBrass.mat b/Assets/Materials/Metal/M_RoughBrass.mat new file mode 100644 index 0000000..db77a60 --- /dev/null +++ b/Assets/Materials/Metal/M_RoughBrass.mat @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_RoughBrass + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: 54f405d3720bc99438b459aeac9dbf1d, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Glossiness: 0.85 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Metal/M_RoughBrass.mat.meta b/Assets/Materials/Metal/M_RoughBrass.mat.meta new file mode 100644 index 0000000..1fe98ef --- /dev/null +++ b/Assets/Materials/Metal/M_RoughBrass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd33b7e8a1d3cd74b8059a1a4602033a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Metal/M_RoughSteel.mat b/Assets/Materials/Metal/M_RoughSteel.mat deleted file mode 100644 index 4cae59d..0000000 --- a/Assets/Materials/Metal/M_RoughSteel.mat +++ /dev/null @@ -1,89 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: M_RoughSteel - m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SPECULARHIGHLIGHTS_OFF - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Bicubic: 0 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EnableGeometricSpecularAA: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _LightmapType: 0 - - _Metallic: 1 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularAAScreenSpaceVariance: 0.1 - - _SpecularAAThreshold: 0.2 - - _SpecularHighlights: 0 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - - _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Metal/M_SmoothBrass.mat b/Assets/Materials/Metal/M_SmoothBrass.mat new file mode 100644 index 0000000..1565538 --- /dev/null +++ b/Assets/Materials/Metal/M_SmoothBrass.mat @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_SmoothBrass + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0.91, g: 0.777777, b: 0.423, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Metal/M_SmoothBrass.mat.meta b/Assets/Materials/Metal/M_SmoothBrass.mat.meta new file mode 100644 index 0000000..9dcd891 --- /dev/null +++ b/Assets/Materials/Metal/M_SmoothBrass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54f405d3720bc99438b459aeac9dbf1d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Metal/M_VeryRoughBrass.mat b/Assets/Materials/Metal/M_VeryRoughBrass.mat new file mode 100644 index 0000000..6754e14 --- /dev/null +++ b/Assets/Materials/Metal/M_VeryRoughBrass.mat @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VeryRoughBrass + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Glossiness: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Metal/M_VeryRoughBrass.mat.meta b/Assets/Materials/Metal/M_VeryRoughBrass.mat.meta new file mode 100644 index 0000000..2d4dcb6 --- /dev/null +++ b/Assets/Materials/Metal/M_VeryRoughBrass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Metal/M_VeryRoughSteel.mat b/Assets/Materials/Metal/M_VeryRoughSteel.mat new file mode 100644 index 0000000..be0612a --- /dev/null +++ b/Assets/Materials/Metal/M_VeryRoughSteel.mat @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VeryRoughSteel + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Glossiness: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Metal/M_RoughSteel.mat.meta b/Assets/Materials/Metal/M_VeryRoughSteel.mat.meta similarity index 100% rename from Assets/Materials/Metal/M_RoughSteel.mat.meta rename to Assets/Materials/Metal/M_VeryRoughSteel.mat.meta diff --git a/Assets/Models/SM_ClueVideoScreen.fbx b/Assets/Models/SM_ClueVideoScreen.fbx index 4652919..e046946 100644 Binary files a/Assets/Models/SM_ClueVideoScreen.fbx and b/Assets/Models/SM_ClueVideoScreen.fbx differ diff --git a/Assets/Models/SM_ClueVideoScreen.fbx.meta b/Assets/Models/SM_ClueVideoScreen.fbx.meta index 98d14dc..a5ab7b8 100644 --- a/Assets/Models/SM_ClueVideoScreen.fbx.meta +++ b/Assets/Models/SM_ClueVideoScreen.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 617e6da..5a206c2 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -40033,8 +40033,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 775417519} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.00000014901161, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000017881393} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -45267,7 +45267,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 960509806} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.00000014901161, z: -0, w: 1} + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000017881393} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -53415,26 +53415,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2057791822} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 8f6b12b65d231274da30d54f25d42821, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8f6b12b65d231274da30d54f25d42821, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8f6b12b65d231274da30d54f25d42821, - type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8f6b12b65d231274da30d54f25d42821, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8f6b12b65d231274da30d54f25d42821, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -53460,11 +53440,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 8f6b12b65d231274da30d54f25d42821, + type: 3} + propertyPath: m_ScaleInLightmap + value: 4 + objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 8f6b12b65d231274da30d54f25d42821, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - target: {fileID: -7511558181221131132, guid: 8f6b12b65d231274da30d54f25d42821, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - target: {fileID: -4284111194744636985, guid: 8f6b12b65d231274da30d54f25d42821, type: 3} propertyPath: m_LocalPosition.y @@ -61181,8 +61171,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.2904044, y: 1.7576077, z: 0.81712574} - m_Center: {x: 0, y: 0.87880373, z: 0.0000005364418} + m_Size: {x: 1.1, y: 1.7246948, z: 0.81712574} + m_Center: {x: 1.9332414e-14, y: 0.86235017, z: 0.00000053644186} --- !u!1 &1404849345 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8130541693384049610, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -77408,7 +77398,7 @@ Transform: m_GameObject: {fileID: 1707197901} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.00000014901161, z: -0, w: 1} - m_LocalPosition: {x: 0.6404039, y: 1.342, z: -0.34089684} + m_LocalPosition: {x: 0.546, y: 1.342, z: -0.285} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -97015,7 +97005,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 58751263447961079, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 80821567528657958, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _GameManager @@ -97056,7 +97047,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 452919422491480820, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 588346164712826730, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97081,7 +97073,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 726323644716322304, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 1015601904965085104, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Enabled @@ -97096,7 +97089,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1102374755087244169, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 1404028407276514926, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab @@ -97112,12 +97106,18 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1504960742921478003, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 1524702978354208097, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 1550040870999304811, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - target: {fileID: 1573628203499097948, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -97172,7 +97172,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1573628203499097948, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 1695991269533387695, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab @@ -97183,7 +97184,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 1741514669110734123, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 2559763098573375856, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97193,12 +97195,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2845206351269567731, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 3076536086879573909, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3076536086879573909, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 3330747334225842060, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -97218,7 +97222,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3330747334225842060, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 3384182854593636784, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab @@ -97234,7 +97239,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3421125724988035285, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 3526816431969051823, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Enabled @@ -97249,12 +97255,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3537659100669947658, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 3570402238585782694, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3570402238585782694, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 3632187355813178589, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97306,6 +97314,11 @@ PrefabInstance: value: objectReference: {fileID: 3913204954530748888, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} + - target: {fileID: 4075719645676944071, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - target: {fileID: 4127964025273293390, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Enabled @@ -97336,17 +97349,20 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4414994814809830398, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 4454589696669392210, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4454589696669392210, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 4602213079777283840, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4602213079777283840, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 4605470272665443769, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97381,7 +97397,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4876535358910585744, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 4889659009165448422, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -97436,12 +97453,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4889659009165448422, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5053110847077661367, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5053110847077661367, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5113755177093265511, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_LocalPosition.x @@ -97496,17 +97515,25 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5127299086739014537, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5398102939325204719, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5398102939325204719, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + - target: {fileID: 5434144733408633734, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - target: {fileID: 5471443456604221905, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5471443456604221905, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5721054344082319816, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -97526,12 +97553,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5721054344082319816, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5783817801726363982, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5783817801726363982, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5885555223809852139, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Enabled @@ -97546,17 +97575,24 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5929981177332701980, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 5943683676964080037, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 6088936695716551493, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - target: {fileID: 6259319050550777421, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 6259319050550777421, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 6274089036449431452, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _GameManager @@ -97587,7 +97623,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 6431496006643515443, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 6433862435333071631, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Name @@ -97597,7 +97634,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 6636410243696383418, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 6683215197363043250, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab @@ -97618,7 +97656,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 6810056136061823300, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 6903524417335291283, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97628,12 +97667,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7029217859449187251, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 7122924259360788373, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7122924259360788373, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 7178360350568838262, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _AudioManager @@ -97684,22 +97725,26 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7625561862797120698, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 7873813777115306475, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7873813777115306475, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 7930872406509518285, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7930872406509518285, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8174346062729463625, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8174346062729463625, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8391508851889765157, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97759,7 +97804,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8397756536373291288, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8661575988827493430, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -97779,7 +97825,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8661575988827493430, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8665902722513017664, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -97834,7 +97881,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8665902722513017664, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8700122528064686461, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -97844,12 +97892,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8752587330127989615, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8988944271241464879, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8988944271241464879, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -98377,7 +98427,7 @@ PrefabInstance: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalPosition.x - value: 0.6499994 + value: 0.552 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -98387,7 +98437,7 @@ PrefabInstance: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalPosition.z - value: -0.09999871 + value: -0.041 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -100068,7 +100118,7 @@ MonoBehaviour: - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 0} - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} @@ -105394,12 +105444,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 326636881158060420, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} - target: {fileID: 2709651636561636857, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2709651636561636857, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: sleepFlag @@ -105409,12 +105461,14 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} - target: {fileID: 4381179943779608182, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 4381179943779608182, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalPosition.x @@ -105469,7 +105523,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5848948944498296662, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} - target: {fileID: 7432768604034164340, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: _GameManager diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 3b1cd22..7b07027 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index dfea981..efc3b86 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 990d9c6..cc50b84 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 4736c39..bf52ab7 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index d30a24f..58b12aa 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 720e920..29ecb7e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index 2a6b085..9e10fc6 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 6cc7ead..c6862b8 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/Raw Files/TVScreen.blend b/Raw Files/TVScreen.blend index 5282a0e..480a8be 100644 Binary files a/Raw Files/TVScreen.blend and b/Raw Files/TVScreen.blend differ