diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 4b087ac..a5b5e76 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -134,11 +134,13 @@ + + @@ -158,6 +160,7 @@ + diff --git a/Assets/Animations/ACME Crimenet Computer/Swooce Right Back Out Again.anim b/Assets/Animations/ACME Crimenet Computer/Swooce Right Back Out Again.anim index 95aea31..72996e1 100644 --- a/Assets/Animations/ACME Crimenet Computer/Swooce Right Back Out Again.anim +++ b/Assets/Animations/ACME Crimenet Computer/Swooce Right Back Out Again.anim @@ -19,13 +19,13 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -30, z: 0} + value: {x: 0, y: 2.985, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 value: {x: 0, y: 0, z: 0} @@ -33,8 +33,8 @@ AnimationClip: outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -45,7 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 3.901, y: 0, z: 4.394} + value: {x: 3.537, y: 0, z: 4.792} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -160,7 +160,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 3.901 + value: 3.537 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -220,7 +220,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 4.394 + value: 4.792 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -255,8 +255,8 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -271,7 +271,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -30 + value: 2.985 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -306,8 +306,8 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Animations/ACME Crimenet Computer/Swooce Right In.anim b/Assets/Animations/ACME Crimenet Computer/Swooce Right In.anim index ee7b7f1..372a75d 100644 --- a/Assets/Animations/ACME Crimenet Computer/Swooce Right In.anim +++ b/Assets/Animations/ACME Crimenet Computer/Swooce Right In.anim @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 0, y: -30, z: 0} + value: {x: 0, y: 2.985, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -54,7 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 3.901, y: 0, z: 4.394} + value: {x: 3.537, y: 0, z: 4.792} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -160,7 +160,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 3.901 + value: 3.537 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -220,7 +220,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 4.394 + value: 4.792 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -280,7 +280,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -30 + value: 2.985 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/Door.meta b/Assets/Animations/Round 1 Door.meta similarity index 100% rename from Assets/Animations/Door.meta rename to Assets/Animations/Round 1 Door.meta diff --git a/Assets/Animations/Door/Close.anim b/Assets/Animations/Round 1 Door/Close.anim similarity index 70% rename from Assets/Animations/Door/Close.anim rename to Assets/Animations/Round 1 Door/Close.anim index b5b76aa..0178522 100644 --- a/Assets/Animations/Door/Close.anim +++ b/Assets/Animations/Round 1 Door/Close.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -90, y: 0, z: 195} + value: {x: -180, y: 0, z: -150} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -28,17 +28,17 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: -90, y: 0, z: 90} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -180, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 649.9599} + outSlope: {x: 0, y: 0, z: 649.9599} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.052268386} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: Door m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: @@ -68,7 +68,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Enabled - path: + path: Door classID: 65 script: {fileID: 0} flags: 0 @@ -81,7 +81,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 718797587 attribute: 4 script: {fileID: 0} typeID: 4 @@ -90,7 +90,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 0 + path: 718797587 attribute: 3305885265 script: {fileID: 0} typeID: 65 @@ -120,66 +120,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: -90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 195 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: - classID: 4 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -206,11 +146,137 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Enabled - path: + path: Door classID: 65 script: {fileID: 0} flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Door + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Door + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -150 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 649.9599 + outSlope: 649.9599 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.052268386 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Door + classID: 4 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Door + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Door + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Door + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Animations/Door/Close.anim.meta b/Assets/Animations/Round 1 Door/Close.anim.meta similarity index 100% rename from Assets/Animations/Door/Close.anim.meta rename to Assets/Animations/Round 1 Door/Close.anim.meta diff --git a/Assets/Animations/Door/Open.anim b/Assets/Animations/Round 1 Door/Open.anim similarity index 66% rename from Assets/Animations/Door/Open.anim rename to Assets/Animations/Round 1 Door/Open.anim index 63dc850..bb77d0d 100644 --- a/Assets/Animations/Door/Open.anim +++ b/Assets/Animations/Round 1 Door/Open.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -90, y: 0, z: 90} + value: {x: -180, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -28,17 +28,17 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: -90, y: 0, z: 195} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -180, y: 0, z: -150} + inSlope: {x: 0, y: 0, z: -541.8361} + outSlope: {x: 0, y: 0, z: -541.8361} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.045365006} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: Door m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: @@ -68,7 +68,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Enabled - path: + path: Door classID: 65 script: {fileID: 0} flags: 0 @@ -81,7 +81,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 718797587 attribute: 4 script: {fileID: 0} typeID: 4 @@ -90,7 +90,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 0 + path: 718797587 attribute: 3305885265 script: {fileID: 0} typeID: 65 @@ -126,7 +126,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 90 + value: -180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -135,7 +135,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 195 + value: -180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -145,32 +145,71 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: + attribute: localEulerAnglesRaw.x + path: Door classID: 4 script: {fileID: 0} - flags: 0 + flags: 16 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: -90 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: + attribute: localEulerAnglesRaw.y + path: Door classID: 4 script: {fileID: 0} - flags: 8 + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -150 + inSlope: -541.8361 + outSlope: -541.8361 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.045365006 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Door + classID: 4 + script: {fileID: 0} + flags: 16 - serializedVersion: 2 curve: serializedVersion: 2 @@ -197,11 +236,47 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Enabled - path: + path: Door classID: 65 script: {fileID: 0} flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Door + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Door + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Door + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Animations/Door/Open.anim.meta b/Assets/Animations/Round 1 Door/Open.anim.meta similarity index 100% rename from Assets/Animations/Door/Open.anim.meta rename to Assets/Animations/Round 1 Door/Open.anim.meta diff --git a/Assets/Animations/Door/Door.controller b/Assets/Animations/Round 1 Door/Round 1 Door.controller similarity index 99% rename from Assets/Animations/Door/Door.controller rename to Assets/Animations/Round 1 Door/Round 1 Door.controller index 81a3f57..91f8308 100644 --- a/Assets/Animations/Door/Door.controller +++ b/Assets/Animations/Round 1 Door/Round 1 Door.controller @@ -111,7 +111,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Door + m_Name: Round 1 Door serializedVersion: 5 m_AnimatorParameters: - m_Name: Open diff --git a/Assets/Animations/Door/Door.controller.meta b/Assets/Animations/Round 1 Door/Round 1 Door.controller.meta similarity index 100% rename from Assets/Animations/Door/Door.controller.meta rename to Assets/Animations/Round 1 Door/Round 1 Door.controller.meta diff --git a/Assets/Materials/Glass.meta b/Assets/Materials/Glass.meta new file mode 100644 index 0000000..bf6dbd9 --- /dev/null +++ b/Assets/Materials/Glass.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2afda16b64cf1da429435a81274299f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Glass/M_WhiteGlass.mat b/Assets/Materials/Glass/M_WhiteGlass.mat new file mode 100644 index 0000000..60d1f9f --- /dev/null +++ b/Assets/Materials/Glass/M_WhiteGlass.mat @@ -0,0 +1,90 @@ +%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_WhiteGlass + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _NORMALMAP + - _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: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} + 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: 1 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _Metallic: 0.619 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Glass/M_WhiteGlass.mat.meta b/Assets/Materials/Glass/M_WhiteGlass.mat.meta new file mode 100644 index 0000000..7efe619 --- /dev/null +++ b/Assets/Materials/Glass/M_WhiteGlass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53b84df3db050264db8132d12d59ac74 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_AcmeCrimenet.mat b/Assets/Materials/M_AcmeCrimenet.mat index 6c3b914..be74db7 100644 --- a/Assets/Materials/M_AcmeCrimenet.mat +++ b/Assets/Materials/M_AcmeCrimenet.mat @@ -8,19 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_AcmeCrimenet - m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ENABLE_GEOMETRIC_SPECULAR_AA + - _ALPHABLEND_ON - _GLOSSYREFLECTIONS_OFF - - _SPECULARHIGHLIGHTS_OFF - m_InvalidKeywords: [] + m_InvalidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -58,21 +59,33 @@ Material: 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: 10 - _EnableGeometricSpecularAA: 1 - - _Glossiness: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 - _GlossyReflections: 0 - _LightmapType: 0 - - _Metallic: 1 + - _Metallic: 0 + - _Mode: 2 - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularHighlights: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 - _UVSec: 0 + - _ZWrite: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/SM_DrywallPanel5x7.1.fbx b/Assets/Models/SM_DrywallPanel5x7.1.fbx index 6ffa425..5122292 100644 Binary files a/Assets/Models/SM_DrywallPanel5x7.1.fbx and b/Assets/Models/SM_DrywallPanel5x7.1.fbx differ diff --git a/Assets/Models/SM_Round1DoorNew.fbx b/Assets/Models/SM_Round1DoorNew.fbx new file mode 100644 index 0000000..b586b73 Binary files /dev/null and b/Assets/Models/SM_Round1DoorNew.fbx differ diff --git a/Assets/Models/SM_Round1DoorNew.fbx.meta b/Assets/Models/SM_Round1DoorNew.fbx.meta new file mode 100644 index 0000000..a68c6f7 --- /dev/null +++ b/Assets/Models/SM_Round1DoorNew.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 9748eb992b23eac4582c91e24d840bef +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + 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 + 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: 0 + 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: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.lighting b/Assets/Scenes/witwics.lighting index b7ab6e5..722445c 100644 --- a/Assets/Scenes/witwics.lighting +++ b/Assets/Scenes/witwics.lighting @@ -19,7 +19,7 @@ LightingSettings: m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_BakeResolution: 16 - m_Padding: 32 + m_Padding: 16 m_LightmapCompression: 3 m_AO: 1 m_AOMaxDistance: 1 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index d7a7a5e..8e18965 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1415,7 +1415,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 635617284} + m_TransformParent: {fileID: 647022021} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1506,7 +1506,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: field of view - value: 41.5 + value: 13 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1516,7 +1516,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: far clip plane - value: 16 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1571,21 +1571,56 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 48.063 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag @@ -1614,17 +1649,17 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1797,6 +1832,89 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &74992034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 74992035} + - component: {fileID: 74992037} + - component: {fileID: 74992036} + m_Layer: 0 + m_Name: ACME Logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &74992035 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74992034} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000012377873, y: 0.7071066, z: 0.707107, w: -0.0000002555429} + m_LocalPosition: {x: 0.461, y: 0.0211, z: 1.468} + m_LocalScale: {x: -0.45338, y: 0.45338, z: 0.45338} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 496593647} + m_LocalEulerAnglesHint: {x: 270, y: 0, z: -180} +--- !u!23 &74992036 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74992034} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &74992037 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74992034} + m_Mesh: {fileID: -462981019419857548, guid: 0a9bbff6014b2d64fa5a051d50c141f6, type: 3} --- !u!1 &75821837 stripped GameObject: m_CorrespondingSourceObject: {fileID: 204461781981923518, guid: be33bc7f6c414e6409becfa348b9310d, @@ -3330,12 +3448,12 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} propertyPath: m_LocalPosition.z - value: -0.111 + value: -0.026 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} @@ -20488,6 +20606,271 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!1001 &496593645 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 760334291} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.213 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.36 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.057 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071069 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7946244652993024178, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7500911422627883393, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: -7500911422627883393, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: -6398997995166298115, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -5930041980729405407, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -5930041980729405407, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5930041980729405407, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - target: {fileID: -5930041980729405407, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: -4936600590795356303, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1622270277757557612, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: -687283891362634407, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: -305091885687274788, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -305091885687274788, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -305091885687274788, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: -305091885687274788, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: -305091885687274788, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - target: {fileID: 919132149155446097, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Name + value: SM_Round1DoorNew + objectReference: {fileID: 0} + - target: {fileID: 3383922302558626419, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: 3831827510232965585, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3831827510232965585, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3831827510232965585, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: 5573856123396839050, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: 5573856123396839050, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: 8450866071054797498, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -1950733119399844177, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1678181440} + - targetCorrespondingSourceObject: {fileID: -1950733119399844177, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 74992035} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 496593649} + - targetCorrespondingSourceObject: {fileID: -8068073526183931155, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 496593651} + m_SourcePrefab: {fileID: 100100000, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} +--- !u!4 &496593646 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + m_PrefabInstance: {fileID: 496593645} + m_PrefabAsset: {fileID: 0} +--- !u!4 &496593647 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1950733119399844177, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + m_PrefabInstance: {fileID: 496593645} + m_PrefabAsset: {fileID: 0} +--- !u!1 &496593648 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + m_PrefabInstance: {fileID: 496593645} + m_PrefabAsset: {fileID: 0} +--- !u!95 &496593649 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496593648} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9a7df6f6d8cc2704f9668641a56037b4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &496593650 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8068073526183931155, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + m_PrefabInstance: {fileID: 496593645} + m_PrefabAsset: {fileID: 0} +--- !u!65 &496593651 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496593650} + 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: 3 + m_Size: {x: 0.9144002, y: 0.039783347, z: 2.032} + m_Center: {x: 0.4587871, y: 0.02314019, z: 1.0287001} --- !u!1 &497231630 GameObject: m_ObjectHideFlags: 0 @@ -25583,11 +25966,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 70805495} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &635617284 stripped @@ -25878,6 +26257,90 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &647022020 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 966631265} + m_Modifications: + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FOV + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FarClippingPlane + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_Name + value: Modem Camera Anchor + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.81 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.z + value: 12.515 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000019470718 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 70805495} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} +--- !u!4 &647022021 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 647022020} + m_PrefabAsset: {fileID: 0} --- !u!1 &648149265 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8341718854610640972, guid: 126991d511ca61841a0ef899b6c038a6, @@ -27705,7 +28168,11 @@ PrefabInstance: objectReference: {fileID: 966631269} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1358503112} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!114 &709364350 stripped @@ -29680,7 +30147,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} insertIndex: -1 - addedObject: {fileID: 1803544114} + addedObject: {fileID: 496593646} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} insertIndex: -1 @@ -32838,9 +33305,9 @@ MonoBehaviour: _CameraAnchors: - {fileID: 783795840} - {fileID: 739684421} - - {fileID: 1358503113} - - {fileID: 1922829039} - {fileID: 1117826905} + - {fileID: 1922829039} + - {fileID: 1358503113} - {fileID: 593766641} _Modem: {fileID: 966631266} _ArrivalDisplay: {fileID: 2013644315} @@ -37223,6 +37690,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &1035342647 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 647022020} + m_PrefabAsset: {fileID: 0} --- !u!1 &1035978671 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, @@ -42559,7 +43032,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -49101,17 +49574,17 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1967712740} + m_TransformParent: {fileID: 709364351} m_Modifications: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 15 + value: 13 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -49122,27 +49595,27 @@ PrefabInstance: - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_Name - value: Host Camera Anchor + value: Modem Camera Anchor objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -1.5701671 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.388 + value: 1.81 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 3.1385448 + value: 12.515 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.46353847 + value: 0.00000023841855 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -49152,7 +49625,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.88607687 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -65661,6 +66134,132 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1678181439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1678181440} + - component: {fileID: 1678181444} + - component: {fileID: 1678181443} + - component: {fileID: 1678181442} + - component: {fileID: 1678181441} + m_Layer: 0 + m_Name: Door Knob Interact + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1678181440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678181439} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.861, y: 0.0233, z: 0.8736} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 496593647} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1678181441 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678181439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 0.25 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 2138b77da40b35b4b8f957515d529500, + type: 2} + programSource: {fileID: 11400000, guid: 2118cf66f42d9284b90e4d87c3c1905a, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1678181442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678181439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 552ea6bbc0e69e24aa64abf9034a965f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1678181441} + _OpenAnimation: {fileID: 496593649} +--- !u!135 &1678181443 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678181439} + 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: 3 + m_Radius: 0.042196568 + m_Center: {x: -0.000006914417, y: -0.04628275, z: -0.000000018023167} +--- !u!135 &1678181444 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678181439} + 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: 3 + m_Radius: 0.043024424 + m_Center: {x: 0.0000016385604, y: 0.047076453, z: 0.000000018332246} --- !u!1 &1680033006 GameObject: m_ObjectHideFlags: 0 @@ -69106,203 +69705,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801735036} m_CullTransparentMesh: 1 ---- !u!1001 &1803544113 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 760334291} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.7432 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.3603 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.0065 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.49999994 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.5000001 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.5000001 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.49999982 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - target: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_Name - value: SM_Round1Door - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1803544121} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1803544120} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1803544117} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1803544116} - m_SourcePrefab: {fileID: 100100000, guid: 899800e653b50104b9eaf32d2ec50019, type: 3} ---- !u!4 &1803544114 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - m_PrefabInstance: {fileID: 1803544113} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1803544115 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 899800e653b50104b9eaf32d2ec50019, - type: 3} - m_PrefabInstance: {fileID: 1803544113} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1803544116 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803544115} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 2138b77da40b35b4b8f957515d529500, - type: 2} - programSource: {fileID: 11400000, guid: 2118cf66f42d9284b90e4d87c3c1905a, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &1803544117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803544115} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 552ea6bbc0e69e24aa64abf9034a965f, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 1803544116} - _OpenAnimation: {fileID: 1803544120} ---- !u!95 &1803544120 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803544115} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 9a7df6f6d8cc2704f9668641a56037b4, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!65 &1803544121 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803544115} - 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: 3 - m_Size: {x: 0.10160001, y: 0.9144001, z: 2.032} - m_Center: {x: 0.050801914, y: 0.45720005, z: 1.016} --- !u!1001 &1804159804 PrefabInstance: m_ObjectHideFlags: 0 @@ -74271,9 +74673,8 @@ Transform: m_Children: - {fileID: 783795839} - {fileID: 739684420} - - {fileID: 1358503112} - - {fileID: 1922829038} - {fileID: 1117826904} + - {fileID: 1922829038} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1968326128 stripped @@ -81899,7 +82300,11 @@ PrefabInstance: objectReference: {fileID: 1034723246} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 647022021} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!224 &2324181848945583116 @@ -85396,6 +85801,11 @@ PrefabInstance: value: objectReference: {fileID: 6023267236643729197, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} + - target: {fileID: 6321558138055300978, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6353091236350794994, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: m_Enabled @@ -86088,6 +86498,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1451322102} m_Modifications: + - target: {fileID: 165281433678564029, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 322415831587147598, guid: d31a80d8d627ccf4dbe74f28d7061f7c, type: 3} propertyPath: serializationData.Prefab @@ -86117,7 +86532,7 @@ PrefabInstance: - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, type: 3} propertyPath: m_LocalPosition.y - value: 3.5 + value: 2.9 objectReference: {fileID: 0} - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, type: 3} @@ -86813,61 +87228,65 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: 68d52ca36879f8942ab6e0fb16fe541d, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -91349,10 +91768,6 @@ MonoBehaviour: ID: 1108 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1803544115} - ID: 1109 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 171824892} ID: 1110 SerializedTypeNames: @@ -91557,6 +91972,14 @@ MonoBehaviour: ID: 1448 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1678181439} + ID: 1449 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1035342647} + ID: 1450 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 3580b0f..b60c736 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 6bd7b86..8764958 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 750c049..a227a1f 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 c865369..6debdb8 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 a364505..9ce1ea9 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 b1e2b75..978f4a6 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 99250f5..dfdfafc 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 e69de03..730093e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/Door.cs b/Assets/UdonSharp/Door.cs index 4173cb5..67eae71 100644 --- a/Assets/UdonSharp/Door.cs +++ b/Assets/UdonSharp/Door.cs @@ -15,12 +15,25 @@ public class Door : UdonSharpBehaviour public override void Interact() { - OpenDoor = !OpenDoor; - RequestSerialization(); + Networking.SetOwner(Networking.LocalPlayer, gameObject); + + if (!OpenDoor) + { + OpenDoor = true; + RequestSerialization(); + + SendCustomEventDelayedSeconds(nameof(CloseDoorAfterDelay), 1.5f); + } base.Interact(); } + public void CloseDoorAfterDelay() + { + OpenDoor = false; + RequestSerialization(); + } + public bool OpenDoor { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 2b1b5f6..ddc9245 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -1205,7 +1205,7 @@ public class GameManagerRound1 : GameManagerBase private void ActivateModem() { _Modem.Teleport(); - SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 5.0f); + SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 2.5f); } public void _ContinueToRound2_Private() { diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 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: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 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: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 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: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 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: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 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: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 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: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 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: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Credits And License Requirements.txt b/Credits And License Requirements.txt index fe883fc..d26d215 100644 --- a/Credits And License Requirements.txt +++ b/Credits And License Requirements.txt @@ -3,7 +3,8 @@ - Mancunian dot matrix printer by azumarill -- https://freesound.org/s/322125/ -- License: Attribution 3.0 - ImagesWriter II Power-On Sound by jewettg -- https://freesound.org/s/662715/ -- License: Creative Commons 0 - Stromberg Carlson 1543.wav by Hockinfinger -- https://freesound.org/s/274436/ -- License: Creative Commons 0 -- Zanussi Z930 drier - last minutes of drying with buzzer by tryl -- https://freesound.org/s/449829/ -- License: Attribution 4.0 +- Zanussi Z930 drier - last minutes of drying with buzzer by tryl -- https://freesound.org/s/449829/ -- License: Creative Commons Attribution 4.0 +- Interior Trim Assets (https://skfb.ly/oPWt6) by Roman -- License: Creative Commons Attribution 4.0 ------------------------------------------------------------------------------- diff --git a/Raw Files/DrywallPanel5x7.1WithDoor.blend b/Raw Files/DrywallPanel5x7.1WithDoor.blend new file mode 100644 index 0000000..7c18ac0 Binary files /dev/null and b/Raw Files/DrywallPanel5x7.1WithDoor.blend differ diff --git a/Raw Files/Round1Door.blend b/Raw Files/Round1Door.blend new file mode 100644 index 0000000..7ff5fb6 Binary files /dev/null and b/Raw Files/Round1Door.blend differ