From 8933b2db13f48baef17b204cbc311697fb1dcb0a Mon Sep 17 00:00:00 2001 From: EthanPisani Date: Sat, 15 Mar 2025 22:24:29 -0400 Subject: [PATCH] modify door unlock tablet --- Assets/Scenes/level1.unity | 372 ++++++++++++++++-- Assets/Scenes/level1.unity.orig.meta | 7 + Assets/Scenes/level1/Door1_005.controller | 33 +- Assets/Scripts/OpenDoor.cs | 15 +- Assets/Settings/PC_RPAsset.asset | 4 +- .../EmergencyLever Variant.mat | 2 +- .../level1/tablet/tablet_asset Variant 1.mat | 47 +++ .../tablet/tablet_asset Variant 1.mat.meta | 8 + .../level1/tablet/tablet_asset Variant 2.mat | 47 +++ .../tablet/tablet_asset Variant 2.mat.meta | 8 + .../level1/tablet/tablet_asset Variant.mat | 47 +++ .../tablet/tablet_asset Variant.mat.meta | 8 + Assets/tablet/TabletScript.cs | 14 + 13 files changed, 567 insertions(+), 45 deletions(-) create mode 100644 Assets/Scenes/level1.unity.orig.meta create mode 100644 Assets/levels/level1/tablet/tablet_asset Variant 1.mat create mode 100644 Assets/levels/level1/tablet/tablet_asset Variant 1.mat.meta create mode 100644 Assets/levels/level1/tablet/tablet_asset Variant 2.mat create mode 100644 Assets/levels/level1/tablet/tablet_asset Variant 2.mat.meta create mode 100644 Assets/levels/level1/tablet/tablet_asset Variant.mat create mode 100644 Assets/levels/level1/tablet/tablet_asset Variant.mat.meta diff --git a/Assets/Scenes/level1.unity b/Assets/Scenes/level1.unity index 559a816f..6e019b75 100644 --- a/Assets/Scenes/level1.unity +++ b/Assets/Scenes/level1.unity @@ -289,7 +289,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 270f972f71fdf3b0693981f4ed095079, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7027e3e495975744db871710a08f8c65, type: 2} - target: {fileID: 919132149155446097, guid: 270f972f71fdf3b0693981f4ed095079, type: 3} @@ -2591,6 +2591,8 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 577540825} + - {fileID: 1391752086} + - {fileID: 544848025} m_Father: {fileID: 6245686338140249568} m_LocalEulerAnglesHint: {x: -180, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2784,9 +2786,146 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 9152753087472305912} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_013 playTabletAnimation: 0 +--- !u!1 &544848024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 544848025} + - component: {fileID: 544848027} + - component: {fileID: 544848026} + m_Layer: 5 + m_Name: enter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &544848025 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544848024} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 504373671} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 47, y: -293} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &544848026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544848024} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Press Enter + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d607a69b62bb2708c86faf03b8741c5c, type: 2} + m_sharedMaterial: {fileID: -8096372269568449945, guid: d607a69b62bb2708c86faf03b8741c5c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278255409 + m_fontColor: {r: 0.19215687, g: 1, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 80 + m_fontSizeBase: 80 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -851.49084, y: -124.32894, z: -776.7826, w: -54.628525} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &544848027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544848024} + m_CullTransparentMesh: 1 --- !u!1 &562732526 GameObject: m_ObjectHideFlags: 0 @@ -3177,7 +3316,7 @@ GameObject: - component: {fileID: 577540827} - component: {fileID: 577540826} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Program text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3222,17 +3361,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Test text + m_text: Manual Override Door Program m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 309930f7cbb51c6dd83a1bfb91d90824, type: 2} - m_sharedMaterial: {fileID: 2413281982550926387, guid: 309930f7cbb51c6dd83a1bfb91d90824, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7b2580bdc852e1317abe1e2230348975, type: 2} + m_sharedMaterial: {fileID: 4369202036407883034, guid: 7b2580bdc852e1317abe1e2230348975, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4278255409 + m_fontColor: {r: 0.19140029, g: 1, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3249,8 +3388,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 200 - m_fontSizeBase: 200 + m_fontSize: 80 + m_fontSizeBase: 80 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3287,7 +3426,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -504.64587, y: -7.91938, z: -420.26346, w: -341.887} + m_margin: {x: -851.49084, y: -124.32894, z: -578.5165, w: -54.628525} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -3335,6 +3474,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 8397024728336634652} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_011 playTabletAnimation: 1 @@ -4407,6 +4547,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 5890013396033327233} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_007 playTabletAnimation: 1 @@ -5969,8 +6110,8 @@ Transform: m_GameObject: {fileID: 1004732702} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0.86, y: -2.1002104, z: 4.38} - m_LocalScale: {x: 6.331153, y: 3.846864, z: 5.7295194} + m_LocalPosition: {x: -1.52, y: -2.1002104, z: 4.38} + m_LocalScale: {x: 3.7131577, y: 3.846864, z: 1.7728316} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1705324410} @@ -5989,6 +6130,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 8162456655974308160} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_004 playTabletAnimation: 1 @@ -6758,6 +6900,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 922a396435c2e5095955687048102b72, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1228075555 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 453084650579209848, guid: 035bf1ba97d19214580cfe6f5a29fdc3, type: 3} + m_PrefabInstance: {fileID: 1548820267} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228075543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55919ac34a26952479f3fc91f777b2fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1228075557 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6771,17 +6924,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TabletAnimator: {fileID: 3186753343756854306} ---- !u!114 &1228075555 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 453084650579209848, guid: 035bf1ba97d19214580cfe6f5a29fdc3, type: 3} - m_PrefabInstance: {fileID: 1548820267} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1228075543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55919ac34a26952479f3fc91f777b2fa, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1228447398 GameObject: m_ObjectHideFlags: 0 @@ -7632,6 +7774,142 @@ Transform: m_Children: [] m_Father: {fileID: 2027928313} m_LocalEulerAnglesHint: {x: 180, y: 0, z: -180} +--- !u!1 &1391752085 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1391752086} + - component: {fileID: 1391752088} + - component: {fileID: 1391752087} + m_Layer: 5 + m_Name: DoorTargetText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1391752086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391752085} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 504373671} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 47, y: -5} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1391752087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391752085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Target Door: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7b2580bdc852e1317abe1e2230348975, type: 2} + m_sharedMaterial: {fileID: 4369202036407883034, guid: 7b2580bdc852e1317abe1e2230348975, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278255409 + m_fontColor: {r: 0.19215687, g: 1, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 80 + m_fontSizeBase: 80 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -718.9937, y: -124.32894, z: -522.3525, w: -54.628525} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1391752088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391752085} + m_CullTransparentMesh: 1 --- !u!1 &1395995261 GameObject: m_ObjectHideFlags: 0 @@ -7787,6 +8065,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 8781739312773607485} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_008 playTabletAnimation: 1 @@ -7908,8 +8187,8 @@ Transform: m_GameObject: {fileID: 1439335086} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0.86, y: -2.1002104, z: 4.38} - m_LocalScale: {x: 6.331153, y: 3.846864, z: 5.7295194} + m_LocalPosition: {x: 2.86, y: -2.1002104, z: 4.15} + m_LocalScale: {x: 2.9465904, y: 3.846864, z: 2.0779297} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1705324410} @@ -7928,6 +8207,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 3886418751670862336} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_005 playTabletAnimation: 1 @@ -8172,6 +8452,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 8891972661028221741} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_009 playTabletAnimation: 1 @@ -8667,13 +8948,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8010959150875249093, guid: 035bf1ba97d19214580cfe6f5a29fdc3, type: 3} - propertyPath: m_Cameras.Array.data[0] + propertyPath: 'm_Cameras.Array.data[0]' value: objectReference: {fileID: 754092518} - - target: {fileID: 8010959150875249093, guid: 035bf1ba97d19214580cfe6f5a29fdc3, type: 3} - propertyPath: m_RenderPostProcessing - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7400677500434752734, guid: 035bf1ba97d19214580cfe6f5a29fdc3, type: 3} @@ -10272,6 +10549,7 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 7964168368217083649} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 0 animationFile: DoorAnimation_010 playTabletAnimation: 1 @@ -10908,7 +11186,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &1955711446 BoxCollider: m_ObjectHideFlags: 0 @@ -11012,9 +11290,10 @@ MonoBehaviour: m_EditorClassIdentifier: myDoor: {fileID: 8654248028678319316} tabletAnimator: {fileID: 3186753343756854306} + tabletObject: {fileID: 2842422158378548891} openTrigger: 1 animationFile: DoorAnimation_012 - playTabletAnimation: 1 + playTabletAnimation: 0 --- !u!1 &1967739989 GameObject: m_ObjectHideFlags: 0 @@ -11841,13 +12120,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098701625} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -42.5} + m_LocalRotation: {x: 0.5735764, y: 0, z: 0, w: 0.8191521} + m_LocalPosition: {x: 0, y: 0, z: -42.500004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1129608549} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: 70, y: 0, z: 0} --- !u!114 &2098701627 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11882,7 +12161,7 @@ Light: serializedVersion: 11 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Intensity: 0.5 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -13011,6 +13290,7 @@ GameObject: m_Component: - component: {fileID: 3186753343756854305} - component: {fileID: 3186753343756854306} + - component: {fileID: 3186753343756854307} m_Layer: 5 m_Name: tablet_asset m_TagString: Untagged @@ -13075,6 +13355,20 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3186753343756854307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2842422158378548891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39c08e86483efeb2191b621ccf275895, type: 3} + m_Name: + m_EditorClassIdentifier: + puzzleComplete: 0 + targetText: {fileID: 1391752087} --- !u!1 &3355433959725797597 GameObject: m_ObjectHideFlags: 0 @@ -13218,7 +13512,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: -848609979075828377, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} - - {fileID: -8951631571974876431, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} + - {fileID: 2100000, guid: bbb6282707c07a360b8e7d253c3cbaff, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13659,7 +13953,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: -848609979075828377, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} - - {fileID: -8951631571974876431, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} + - {fileID: 2100000, guid: debcd00d80debdf6bb46ac558764a471, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14564,7 +14858,7 @@ MeshRenderer: m_RenderingLayerMask: 4 m_RendererPriority: 0 m_Materials: - - {fileID: -8951631571974876431, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} + - {fileID: 2100000, guid: a06b939a42edb5beaaab93e33f1b4f00, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scenes/level1.unity.orig.meta b/Assets/Scenes/level1.unity.orig.meta new file mode 100644 index 00000000..c5f58eaa --- /dev/null +++ b/Assets/Scenes/level1.unity.orig.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5328c65424ff16eaba58183e307091f8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/level1/Door1_005.controller b/Assets/Scenes/level1/Door1_005.controller index 5e48a4b0..52ecad57 100644 --- a/Assets/Scenes/level1/Door1_005.controller +++ b/Assets/Scenes/level1/Door1_005.controller @@ -11,7 +11,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -6440472229253251005} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 370, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5145030169991862889} + m_Position: {x: 370, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,7 +24,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -6440472229253251005} + m_DefaultState: {fileID: -5145030169991862889} --- !u!1102 &-6440472229253251005 AnimatorState: serializedVersion: 6 @@ -48,6 +51,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-5145030169991862889 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/OpenDoor.cs b/Assets/Scripts/OpenDoor.cs index f13ef855..ded82a4f 100644 --- a/Assets/Scripts/OpenDoor.cs +++ b/Assets/Scripts/OpenDoor.cs @@ -30,6 +30,14 @@ public class OpenDoor : MonoBehaviour // open door or play tablet open animation if (playTabletAnimation) { + // set puzzleComplete to false + var puzzleScript = tabletObject.GetComponent(); // Assuming the script is named "TabletScript" + if (puzzleScript == null) + { + Debug.LogError("TabletScript component not found on tabletObject"); + return; + } + puzzleScript.puzzleComplete = false; tabletAnimator.Play("Tablet_Open", 0, 0.0f); } else @@ -52,6 +60,11 @@ public class OpenDoor : MonoBehaviour yield break; } + // set the text of the tablet to the current door number, will be last 3 letter of the door name + var doorNumber = gameObject.name.Substring(gameObject.name.Length - 3); + string doorText = "Target Door: " + doorNumber; + puzzleScript.SetTargetText(doorText); + // Wait until the puzzle is complete yield return new WaitUntil(() => puzzleScript.puzzleComplete); @@ -61,12 +74,12 @@ public class OpenDoor : MonoBehaviour if (playTabletAnimation) { tabletAnimator.Play("Tablet_Close", 0, 0.0f); - yield return new WaitForSeconds(1f); } // Play the door open animation myDoor.Play(animationFile, 0, 0.0f); gameObject.SetActive(false); + yield return null; } } diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 3347ed79..5bc4fa79 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -43,11 +43,11 @@ MonoBehaviour: m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 2048 + m_MainLightShadowmapResolution: 4096 m_AdditionalLightsRenderingMode: 1 m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 1 - m_AdditionalLightsShadowmapResolution: 2048 + m_AdditionalLightsShadowmapResolution: 4096 m_AdditionalLightsShadowResolutionTierLow: 256 m_AdditionalLightsShadowResolutionTierMedium: 512 m_AdditionalLightsShadowResolutionTierHigh: 1024 diff --git a/Assets/levels/level1/emergencyLeveler/EmergencyLever Variant.mat b/Assets/levels/level1/emergencyLeveler/EmergencyLever Variant.mat index cced7976..039038f1 100644 --- a/Assets/levels/level1/emergencyLeveler/EmergencyLever Variant.mat +++ b/Assets/levels/level1/emergencyLeveler/EmergencyLever Variant.mat @@ -61,7 +61,7 @@ Material: m_Ints: [] m_Floats: [] m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.38857278, g: 0.38857278, b: 0.38857278, a: 1} - _EmissionColor: {r: 128, g: 128, b: 128, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/levels/level1/tablet/tablet_asset Variant 1.mat b/Assets/levels/level1/tablet/tablet_asset Variant 1.mat new file mode 100644 index 00000000..0a8e1672 --- /dev/null +++ b/Assets/levels/level1/tablet/tablet_asset Variant 1.mat @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3740378156582196115 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: tablet_asset Variant 1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -8951631571974876431, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _BaseColor: {r: 0, g: 0.06364912, b: 0.33962262, a: 1} + - _Color: {r: 0, g: 0.063649096, b: 0.3396226, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/levels/level1/tablet/tablet_asset Variant 1.mat.meta b/Assets/levels/level1/tablet/tablet_asset Variant 1.mat.meta new file mode 100644 index 00000000..06049b16 --- /dev/null +++ b/Assets/levels/level1/tablet/tablet_asset Variant 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbb6282707c07a360b8e7d253c3cbaff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/levels/level1/tablet/tablet_asset Variant 2.mat b/Assets/levels/level1/tablet/tablet_asset Variant 2.mat new file mode 100644 index 00000000..52eef717 --- /dev/null +++ b/Assets/levels/level1/tablet/tablet_asset Variant 2.mat @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1338700269886545466 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: tablet_asset Variant 2 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -8951631571974876431, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _BaseColor: {r: 0, g: 0.06666667, b: 0.34117648, a: 1} + - _Color: {r: 0, g: 0.06666665, b: 0.34117645, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/levels/level1/tablet/tablet_asset Variant 2.mat.meta b/Assets/levels/level1/tablet/tablet_asset Variant 2.mat.meta new file mode 100644 index 00000000..a7d04978 --- /dev/null +++ b/Assets/levels/level1/tablet/tablet_asset Variant 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: debcd00d80debdf6bb46ac558764a471 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/levels/level1/tablet/tablet_asset Variant.mat b/Assets/levels/level1/tablet/tablet_asset Variant.mat new file mode 100644 index 00000000..b9e14528 --- /dev/null +++ b/Assets/levels/level1/tablet/tablet_asset Variant.mat @@ -0,0 +1,47 @@ +%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: tablet_asset Variant + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -8951631571974876431, guid: 528d19f4c4fddf559b4b7f020b866f02, type: 3} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &9052954798406023323 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/levels/level1/tablet/tablet_asset Variant.mat.meta b/Assets/levels/level1/tablet/tablet_asset Variant.mat.meta new file mode 100644 index 00000000..8b6176a9 --- /dev/null +++ b/Assets/levels/level1/tablet/tablet_asset Variant.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a06b939a42edb5beaaab93e33f1b4f00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/tablet/TabletScript.cs b/Assets/tablet/TabletScript.cs index 052075c7..7fb7337c 100644 --- a/Assets/tablet/TabletScript.cs +++ b/Assets/tablet/TabletScript.cs @@ -1,9 +1,11 @@ +using TMPro; using UnityEngine; public class TabletScript : MonoBehaviour { // Start is called once before the first execution of Update after the MonoBehaviour is created public bool puzzleComplete = false; + [SerializeField] private TextMeshProUGUI targetText = null; void Start() { @@ -12,6 +14,18 @@ public class TabletScript : MonoBehaviour // Update is called once per frame void Update() { + // if user press enter + if (Input.GetKeyDown(KeyCode.Return)) + { + // set puzzleComplete to true + puzzleComplete = true; + } + + + } + public void SetTargetText(string text) + { + targetText.text = text; } }