diff --git a/Assets/Scenes/WACVR.unity b/Assets/Scenes/WACVR.unity index 9691588..96feb63 100644 --- a/Assets/Scenes/WACVR.unity +++ b/Assets/Scenes/WACVR.unity @@ -365,6 +365,7 @@ GameObject: - component: {fileID: 61320022} - component: {fileID: 61320021} - component: {fileID: 61320020} + - component: {fileID: 61320024} m_Layer: 0 m_Name: Test (Insert) m_TagString: Untagged @@ -400,10 +401,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 259f9860c17d7be48be056658ffa3d1e, type: 3} m_Name: m_EditorClassIdentifier: - Button: {fileID: 61320019} key: 45 key2: 0 isToggle: 0 + doesBeep: 1 isOn: 0 camera: {fileID: 1740661838} --- !u!65 &61320021 @@ -469,6 +470,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 61320018} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!82 &61320024 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61320018} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!114 &63281939 MonoBehaviour: m_ObjectHideFlags: 0 @@ -931,6 +1028,7 @@ GameObject: - component: {fileID: 113329743} - component: {fileID: 113329742} - component: {fileID: 113329741} + - component: {fileID: 113329745} m_Layer: 0 m_Name: Card Scan (Return) m_TagString: Untagged @@ -966,10 +1064,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 259f9860c17d7be48be056658ffa3d1e, type: 3} m_Name: m_EditorClassIdentifier: - Button: {fileID: 113329740} key: 13 key2: 0 isToggle: 0 + doesBeep: 0 isOn: 0 camera: {fileID: 1740661838} --- !u!65 &113329742 @@ -1035,6 +1133,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 113329739} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!82 &113329745 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113329739} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!114 &116177694 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1421,7 +1615,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 655176480} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &139742662 AudioSource: @@ -1435,8 +1629,8 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 + m_Volume: 0.8 + m_Pitch: 0.6 Loop: 0 Mute: 0 Spatialize: 0 @@ -1843,7 +2037,7 @@ GameObject: - component: {fileID: 233990576} - component: {fileID: 233990575} m_Layer: 0 - m_Name: Text (1) + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1866,7 +2060,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.1857341, y: -33.66} + m_AnchoredPosition: {x: -0.1857341, y: -34.15} m_SizeDelta: {x: 20.2, y: 5.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &233990575 @@ -2403,7 +2597,7 @@ RectTransform: - {fileID: 2107425498} - {fileID: 578842717} m_Father: {fileID: 655176480} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3651,6 +3845,7 @@ Transform: m_Children: - {fileID: 1091765649} - {fileID: 233990574} + - {fileID: 1140254197} - {fileID: 383063216} - {fileID: 139742661} m_Father: {fileID: 1681290117} @@ -3736,10 +3931,9 @@ MonoBehaviour: timerRing: {fileID: 578842720} audioSrc: {fileID: 139742662} panelButtons: - - {fileID: 61320020} - - {fileID: 801700136} - - {fileID: 998008749} - - {fileID: 113329741} + - {fileID: 61320018} + - {fileID: 801700134} + - {fileID: 998008747} lockImg: {fileID: 2800000, guid: 0e86a807c3282a442b3915b99b76e30b, type: 3} unlockImg: {fileID: 2800000, guid: 9a39b28f16a08a04db0433e352bf8e26, type: 3} lockSound: {fileID: 8300000, guid: 97d033599d2196d40a3f6d50bf26eeec, type: 3} @@ -4147,6 +4341,7 @@ GameObject: - component: {fileID: 801700138} - component: {fileID: 801700137} - component: {fileID: 801700136} + - component: {fileID: 801700140} m_Layer: 0 m_Name: Service (Delete) m_TagString: Untagged @@ -4182,10 +4377,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 259f9860c17d7be48be056658ffa3d1e, type: 3} m_Name: m_EditorClassIdentifier: - Button: {fileID: 801700135} key: 46 key2: 0 isToggle: 0 + doesBeep: 1 isOn: 0 camera: {fileID: 1740661838} --- !u!65 &801700137 @@ -4251,6 +4446,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801700134} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!82 &801700140 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 801700134} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!114 &802731402 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5214,7 +5505,8 @@ GameObject: - component: {fileID: 998008752} - component: {fileID: 998008751} - component: {fileID: 998008750} - - component: {fileID: 998008749} + - component: {fileID: 998008753} + - component: {fileID: 998008754} m_Layer: 0 m_Name: Third Person Toggle (Home/End) m_TagString: Untagged @@ -5238,24 +5530,6 @@ Transform: m_Father: {fileID: 1681290117} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &998008749 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 998008747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 259f9860c17d7be48be056658ffa3d1e, type: 3} - m_Name: - m_EditorClassIdentifier: - Button: {fileID: 998008748} - key: 36 - key2: 35 - isToggle: 1 - isOn: 0 - camera: {fileID: 1740661838} --- !u!65 &998008750 BoxCollider: m_ObjectHideFlags: 0 @@ -5319,6 +5593,116 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 998008747} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!82 &998008753 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 998008747} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &998008754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 998008747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 447b0e47a465da145b212861d2c70c27, type: 3} + m_Name: + m_EditorClassIdentifier: + isTP: 1 + tpCamera: {fileID: 1740661838} --- !u!114 &1011500967 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5940,6 +6324,178 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1346465864427535432, guid: fe556f8bee4726d418b982f1094ca7d3, type: 3} +--- !u!1 &1140254196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1140254197} + - component: {fileID: 1140254199} + - component: {fileID: 1140254198} + m_Layer: 0 + m_Name: Text (Note) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1140254197 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140254196} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -120.8} + m_LocalScale: {x: 12.382212, y: 12.382212, z: 12.382212} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 655176480} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1857341, y: -33.75} + m_SizeDelta: {x: 20.2, y: 5.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1140254198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140254196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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: (LOCK BEFORE PLAYING!) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 0.3 + m_fontSizeBase: 0.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + 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: 0, y: 0, z: 19.509186, w: 4.8518376} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1140254199} + m_maskType: 0 +--- !u!23 &1140254199 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140254196} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + 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: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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!114 &1148687244 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8238,8 +8794,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1681290113} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.974, y: 1.145, z: -0.522} + m_LocalRotation: {x: -0, y: -0.2412188, z: -0, w: 0.9704708} + m_LocalPosition: {x: 1.055, y: 1.145, z: -0.3} m_LocalScale: {x: 0.66825426, y: 0.66825426, z: 0.66825426} m_ConstrainProportionsScale: 0 m_Children: @@ -8250,7 +8806,7 @@ Transform: - {fileID: 655176480} m_Father: {fileID: 0} m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -27.917, z: 0} --- !u!114 &1686740784 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/PanelButton.cs b/Assets/Script/PanelButton.cs index 8d4126b..b3303ae 100644 --- a/Assets/Script/PanelButton.cs +++ b/Assets/Script/PanelButton.cs @@ -15,6 +15,8 @@ public class PanelButton : MonoBehaviour public VirtualKeyCode key2; public bool isToggle; + public bool doesBeep; + public bool isOn; private int _insideColliderCount = 0; @@ -30,24 +32,39 @@ public class PanelButton : MonoBehaviour audioSrc = GetComponent(); audioSrc.playOnAwake = false; - audioSrc.Stop(); audioSrc.clip = btnSound; if (isToggle) { // initialize toggle state - OnTriggerEnter(new Collider()); - OnTriggerExit(new Collider()); + ButtonPress(); + ButtonRelease(); } } private void OnTriggerEnter(Collider other) { _insideColliderCount += 1; - audioSrc.Play(); + if (doesBeep) + audioSrc.Play(); + ButtonPress(); + } + + private void OnTriggerExit(Collider other) + { + _insideColliderCount = Mathf.Clamp(_insideColliderCount - 1, 0, _insideColliderCount); + + if (_insideColliderCount == 0) + { + ButtonRelease(); + } + } + + private void ButtonPress() + { if (isToggle) { - if(!isOn) + if (!isOn) { cr.material.color = Color.green; keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero); @@ -65,35 +82,16 @@ public class PanelButton : MonoBehaviour } else { + cr.material.color = Color.white; keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero); } } - private void OnTriggerExit(Collider other) + private void ButtonRelease() { - _insideColliderCount = Mathf.Clamp(_insideColliderCount - 1, 0, _insideColliderCount); - - if (_insideColliderCount == 0) - { - keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero); - keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero); - } - } - - - - // Update is called once per frame - void Update() - { - if (Input.GetKeyDown(KeyCode.Home)) - { - camera?.SetActive(true); - } - - if (Input.GetKeyDown(KeyCode.End)) - { - camera?.SetActive(false); - } - + keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero); + keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero); + if (!isToggle) + cr.material.color = Color.gray; } } diff --git a/Assets/Script/PanelLocker.cs b/Assets/Script/PanelLocker.cs index 9ad93e1..fb15577 100644 --- a/Assets/Script/PanelLocker.cs +++ b/Assets/Script/PanelLocker.cs @@ -21,7 +21,7 @@ public class PanelLocker : MonoBehaviour [SerializeField] private AudioSource audioSrc; [SerializeField] - private List panelButtons; + private List panelButtons; [Header("Assets")] [SerializeField] @@ -67,11 +67,10 @@ public class PanelLocker : MonoBehaviour timerRing.color = Color.cyan; statusImg.texture = isLocked ? lockImg : unlockImg; - - // set buttons' state + foreach (var btn in panelButtons) { - btn.GetComponent().enabled = !isLocked; + btn.SetActive(!isLocked); } actionTaken = true; diff --git a/Assets/Script/PanelThirdPersonButton.cs b/Assets/Script/PanelThirdPersonButton.cs new file mode 100644 index 0000000..3308384 --- /dev/null +++ b/Assets/Script/PanelThirdPersonButton.cs @@ -0,0 +1,41 @@ +using System; +using System.Runtime.InteropServices; +using UnityEngine; +using WindowsInput.Native; + +[RequireComponent(typeof(AudioSource))] +public class PanelThirdPersonButton : MonoBehaviour +{ + public bool isTP; + + private Renderer cr; + public GameObject tpCamera; + private AudioSource audioSrc; + private static AudioClip btnSound; + + void Start() + { + btnSound = Resources.Load("Audio/button press"); + audioSrc = GetComponent(); + audioSrc.playOnAwake = false; + audioSrc.clip = btnSound; + + cr = GetComponent(); + + SetTP(isTP); + } + + private void OnTriggerEnter(Collider other) + { + audioSrc.Play(); + isTP = !isTP; + SetTP(isTP); + } + + private void SetTP(bool state) + { + isTP = state; + cr.material.color = state ? Color.green : Color.red; + tpCamera?.SetActive(state); + } +} diff --git a/Assets/Script/PanelThirdPersonButton.cs.meta b/Assets/Script/PanelThirdPersonButton.cs.meta new file mode 100644 index 0000000..f6f3143 --- /dev/null +++ b/Assets/Script/PanelThirdPersonButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 447b0e47a465da145b212861d2c70c27 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 56859a2..4adeb4a 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -41,7 +41,7 @@ GraphicsSettings: m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, + m_CustomRenderPipeline: {fileID: 11400000, guid: d0e2fc18fe036412f8223b3b3d9ad574, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1}