eckertnoah/Mission_Rosetta_2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

almost perfect version!

Browse Source
This commit is contained in:
Marlon Portmann 2023-01-09 15:03:15 +01:00
parent f4b7dc9063
commit c4ebf84539
28 changed files with 2445 additions and 1517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1197
Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity
View File

File diff suppressed because one or more lines are too long

2
Assets/Assets/00_Shared/05_Scripts/SceneChanger.asset
View File

@ -13,6 +13,6 @@ MonoBehaviour:
m_Name: SceneChanger
m_EditorClassIdentifier:
_data:
_json: '{"graph":{"variables":{"Kind":"Flow","collection":{"$content":[],"$version":"A"},"$version":"A"},"controlInputDefinitions":[],"controlOutputDefinitions":[],"valueInputDefinitions":[],"valueOutputDefinitions":[],"title":"SceneLoader","summary":null,"pan":{"x":96.99799,"y":-11.00029},"zoom":1.0,"elements":[{"coroutine":false,"defaultValues":{},"position":{"x":-204.0,"y":-144.0},"guid":"97941533-14fa-4d1d-b03a-3cb626604143","$version":"A","$type":"Unity.VisualScripting.Start"},{"coroutine":false,"defaultValues":{},"position":{"x":-204.0,"y":60.0},"guid":"879646e6-b681-471f-a6eb-0f735ee9407e","$version":"A","$type":"Unity.VisualScripting.Update"},{"coroutine":false,"defaultValues":{"target":null},"position":{"x":29.0,"y":-247.0},"guid":"6b27334d-28c8-454c-8143-af919a34a79a","$version":"A","$type":"Unity.VisualScripting.OnButtonClick","$id":"13"},{"chainable":false,"member":{"name":"LoadScene","parameterTypes":["System.Int32"],"targetType":"UnityEngine.SceneManagement.SceneManager","targetTypeName":"UnityEngine.SceneManagement.SceneManager","$version":"A"},"defaultValues":{"%sceneBuildIndex":{"$content":3,"$type":"System.Int32"}},"position":{"x":332.0,"y":-260.0},"guid":"f142cdda-c203-4aee-89d2-47d52b74dd17","$version":"A","$type":"Unity.VisualScripting.InvokeMember","$id":"15"},{"specifyFallback":false,"kind":"Object","defaultValues":{"name":{"$content":"SceneToLoad
_json: '{"graph":{"variables":{"Kind":"Flow","collection":{"$content":[],"$version":"A"},"$version":"A"},"controlInputDefinitions":[],"controlOutputDefinitions":[],"valueInputDefinitions":[],"valueOutputDefinitions":[],"title":"SceneLoader","summary":null,"pan":{"x":213.998,"y":-81.00029},"zoom":1.0,"elements":[{"coroutine":false,"defaultValues":{},"position":{"x":-204.0,"y":-144.0},"guid":"97941533-14fa-4d1d-b03a-3cb626604143","$version":"A","$type":"Unity.VisualScripting.Start"},{"coroutine":false,"defaultValues":{},"position":{"x":-204.0,"y":60.0},"guid":"879646e6-b681-471f-a6eb-0f735ee9407e","$version":"A","$type":"Unity.VisualScripting.Update"},{"coroutine":false,"defaultValues":{"target":null},"position":{"x":29.0,"y":-247.0},"guid":"6b27334d-28c8-454c-8143-af919a34a79a","$version":"A","$type":"Unity.VisualScripting.OnButtonClick","$id":"13"},{"chainable":false,"member":{"name":"LoadScene","parameterTypes":["System.Int32"],"targetType":"UnityEngine.SceneManagement.SceneManager","targetTypeName":"UnityEngine.SceneManagement.SceneManager","$version":"A"},"defaultValues":{"%sceneBuildIndex":{"$content":3,"$type":"System.Int32"}},"position":{"x":328.0,"y":-126.0},"guid":"f142cdda-c203-4aee-89d2-47d52b74dd17","$version":"A","$type":"Unity.VisualScripting.InvokeMember","$id":"15"},{"specifyFallback":false,"kind":"Object","defaultValues":{"name":{"$content":"SceneToLoad
(index)","$type":"System.String"},"object":null},"position":{"x":-18.0,"y":-59.0},"guid":"9b2ceda4-96e2-4449-993c-9fb22cadc6ff","$version":"A","$type":"Unity.VisualScripting.GetVariable","$id":"18"},{"sourceUnit":{"$ref":"13"},"sourceKey":"trigger","destinationUnit":{"$ref":"15"},"destinationKey":"enter","guid":"be634559-8e49-41d4-b2c3-45e75f41a66b","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"18"},"sourceKey":"value","destinationUnit":{"$ref":"15"},"destinationKey":"%sceneBuildIndex","guid":"9ed3afee-36e0-471c-b22d-853abdbc8a15","$type":"Unity.VisualScripting.ValueConnection"}],"$version":"A"}}'
_objectReferences: []

19
Assets/Assets/00_Shared/05_Scripts/controlWatchMain.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/Assets/00_Shared/05_Scripts/controlWatchMain.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9cf16d06628274912819d319377d7c56
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

12
Assets/Assets/01_Marlon/05_Scripts/Coordinator Control Room.asset
View File

File diff suppressed because one or more lines are too long

6
Assets/Assets/01_Marlon/05_Scripts/Coordinator_AbstractRoom_1.asset
View File

File diff suppressed because one or more lines are too long

23
Assets/Assets/01_Marlon/05_Scripts/controlPanelButton.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/Assets/01_Marlon/05_Scripts/controlPanelButton.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 81794c85b18324df9af05127734f889b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Assets/01_Marlon/05_Scripts/final_button.asset
View File

File diff suppressed because one or more lines are too long

31
Assets/Assets/01_Marlon/05_Scripts/hapticInteractable.cs Normal file
View File

@ -0,0 +1,31 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.XR.Interaction.Toolkit;
public class hapticInteractable : MonoBehaviour
{
[Range(0,1)]
public float intensity;
public float duration;
// Start is called before the first frame update
void Start()
{
}
public void TriggerHaptic(BaseInteractionEventArgs eventArgs)
{
if(eventArgs.interactorObject is XRBaseControllerInteractor controllerInteractor)
{
TriggerHaptic(controllerInteractor.xrController);
}
}
public void TriggerHaptic(XRBaseController controller)
{
if(intensity>0)
controller.SendHapticImpulse(intensity, duration);
}
}

11
Assets/Assets/01_Marlon/05_Scripts/hapticInteractable.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c052c5144c39c4940a9cc242429ea3ff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Assets/01_Marlon/05_Scripts/main_light.asset
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/controlPanel_emission_red.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 250 KiB

12
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/pic left.mat
View File

@ -36,7 +36,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: f31cf06c4390542e5b9c731ac17fd8db, type: 3}
m_Texture: {fileID: 2800000, guid: 553c91bfa7cb641cb84786c15c995c82, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
@ -56,11 +56,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 2800000, guid: f31cf06c4390542e5b9c731ac17fd8db, type: 3}
m_Texture: {fileID: 2800000, guid: 553c91bfa7cb641cb84786c15c995c82, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: f31cf06c4390542e5b9c731ac17fd8db, type: 3}
m_Texture: {fileID: 2800000, guid: 553c91bfa7cb641cb84786c15c995c82, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@ -120,8 +120,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1}
- _Color: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1}
- _EmissionColor: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/rosetta.jpeg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 162 KiB

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/rosetta.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 437 KiB

4
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/rosetta.jpeg.meta → Assets/Assets/01_Marlon/Control_Room_Marlon/materials/rosetta.jpg.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f31cf06c4390542e5b9c731ac17fd8db
guid: 553c91bfa7cb641cb84786c15c995c82
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 8
aniso: 10
mipBias: 0
wrapU: 0
wrapV: 0

130
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/weiterLayout.mat Normal file
View File

@ -0,0 +1,130 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-56897074538642954
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: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: weiterLayout
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords:
- _EMISSION
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: d38fadf69e5104201aba5f4dd1dbc42e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 2800000, guid: d38fadf69e5104201aba5f4dd1dbc42e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: d38fadf69e5104201aba5f4dd1dbc42e, type: 3}
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}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.156
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

8
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/weiterLayout.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17dc1f392170f48e0a4670f077948847
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/weiterLayout_alpha.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 KiB

135
Assets/Assets/01_Marlon/Control_Room_Marlon/materials/weiterLayout_alpha.png.meta Normal file
View File

@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: d38fadf69e5104201aba5f4dd1dbc42e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/models/control_panel.fbx
View File

Binary file not shown.

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/rocket_launch.mp3
View File

Binary file not shown.

BIN
Assets/Assets/01_Marlon/Control_Room_Marlon/wrongButtonPush.mp3 Normal file
View File

Binary file not shown.

22
Assets/Assets/01_Marlon/Control_Room_Marlon/wrongButtonPush.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: f837327379c0d4e59b793c861623652c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

40
Assets/Samples/XR Interaction Toolkit/2.0.3/Starter Assets/XRI Default Input Actions.inputactions
View File

@ -278,6 +278,24 @@
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "pressedX",
"type": "Button",
"id": "723629f0-8d0c-48a4-9326-e1d075de54f7",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "pressedA",
"type": "Button",
"id": "85e8f2f5-28ec-40dd-88d2-294ce283561b",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@ -456,6 +474,28 @@
"action": "Translate Anchor",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "3a364c74-23a1-4b62-9678-631011dad57f",
"path": "<OculusTouchController>{LeftHand}/primaryButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "pressedX",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3ccfd634-a1f8-416e-a407-818312a3666b",
"path": "<OculusTouchController>{RightHand}/primaryButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "pressedA",
"isComposite": false,
"isPartOfComposite": false
}
]
},

5
ProjectSettings/ProjectSettings.asset
View File

@ -226,6 +226,11 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1

4
ProjectSettings/TagManager.asset
View File

@ -3,7 +3,9 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
tags: []
tags:
- nextSceneText
- controlPanel
layers:
- Default
- TransparentFX