diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity new file mode 100644 index 0000000..e1003e9 --- /dev/null +++ b/Assets/Scenes/PuzzleTest.unity @@ -0,0 +1,1436 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 0} + m_FogMode: 2 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 2100000, guid: b543b13595b5be247a0ef19ffdc5344b, type: 2} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 1 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.13511999, g: 0.18402225, b: 0.29053703, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 5a7649b6bbc0e4f43ad521d0f6b24790, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &98744914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 98744915} + - component: {fileID: 98744916} + m_Layer: 0 + m_Name: Light Probes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &98744915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98744914} + 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: 832575519} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!220 &98744916 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98744914} + m_Enabled: 1 + m_SourcePositions: + - {x: -1.5, y: 1.5, z: 1.5} + - {x: -1.5, y: 1.5, z: 0.5} + - {x: -1.5, y: 0.20000005, z: 1.5} + - {x: -1.5, y: 0.20000005, z: 0.5} + - {x: -3.5, y: 1.5, z: 1.5} + - {x: -3.5, y: 1.5, z: 0.5} + - {x: -3.5, y: 0.20000005, z: 1.5} + - {x: -3.5, y: 0.20000005, z: 0.5} + - {x: 3.5000005, y: 1.5, z: 1.5} + - {x: 3.5000005, y: 1.5, z: 0.5} + - {x: 3.5000005, y: 0.20000005, z: 1.5} + - {x: 3.5000005, y: 0.20000005, z: 0.5} + - {x: -0.5, y: 1.5, z: 1.5} + - {x: -0.5, y: 1.5, z: 0.5} + - {x: -0.5, y: 0.20000005, z: 1.5} + - {x: -0.5, y: 0.20000005, z: 0.5} + - {x: -1.5, y: 1.5, z: 3.4999998} + - {x: -1.5, y: 1.5, z: 2.4999998} + - {x: -1.5, y: 0.20000005, z: 3.4999998} + - {x: -1.5, y: 0.20000005, z: 2.4999998} + - {x: -3.5, y: 1.5, z: 3.4999998} + - {x: -3.5, y: 1.5, z: 2.4999998} + - {x: -3.5, y: 0.20000005, z: 3.4999998} + - {x: -3.5, y: 0.20000005, z: 2.4999998} + - {x: 3.5000005, y: 1.5, z: 3.4999998} + - {x: 3.5000005, y: 1.5, z: 2.4999998} + - {x: 3.5000005, y: 0.20000005, z: 3.4999998} + - {x: 3.5000005, y: 0.20000005, z: 2.4999998} + - {x: -0.5, y: 1.5, z: 3.4999998} + - {x: -0.5, y: 1.5, z: 2.4999998} + - {x: -0.5, y: 0.20000005, z: 3.4999998} + - {x: -0.5, y: 0.20000005, z: 2.4999998} + - {x: 0.49999988, y: 1.5, z: 1.5} + - {x: 0.49999988, y: 1.5, z: 0.5} + - {x: 0.49999988, y: 0.20000005, z: 1.5} + - {x: 0.49999988, y: 0.20000005, z: 0.5} + - {x: 0.49999988, y: 1.5, z: 3.4999998} + - {x: 0.49999988, y: 1.5, z: 2.4999998} + - {x: 0.49999988, y: 0.20000005, z: 3.4999998} + - {x: 0.49999988, y: 0.20000005, z: 2.4999998} + - {x: -1.5, y: 1.5, z: -2.4999998} + - {x: -1.5, y: 1.5, z: -3.4999998} + - {x: -1.5, y: 0.20000005, z: -2.4999998} + - {x: -1.5, y: 0.20000005, z: -3.4999998} + - {x: -3.5, y: 1.5, z: -2.4999998} + - {x: -3.5, y: 1.5, z: -3.4999998} + - {x: -3.5, y: 0.20000005, z: -2.4999998} + - {x: -3.5, y: 0.20000005, z: -3.4999998} + - {x: 3.5000005, y: 1.5, z: -2.4999998} + - {x: 3.5000005, y: 1.5, z: -3.4999998} + - {x: 3.5000005, y: 0.20000005, z: -2.4999998} + - {x: 3.5000005, y: 0.20000005, z: -3.4999998} + - {x: -0.5, y: 1.5, z: -2.4999998} + - {x: -0.5, y: 1.5, z: -3.4999998} + - {x: -0.5, y: 0.20000005, z: -2.4999998} + - {x: -0.5, y: 0.20000005, z: -3.4999998} + - {x: -1.5, y: 1.5, z: -0.5} + - {x: -1.5, y: 1.5, z: -1.5000001} + - {x: -1.5, y: 0.20000005, z: -0.5} + - {x: -1.5, y: 0.20000005, z: -1.5000001} + - {x: -3.5, y: 1.5, z: -0.5} + - {x: -3.5, y: 1.5, z: -1.5000001} + - {x: -3.5, y: 0.20000005, z: -0.5} + - {x: -3.5, y: 0.20000005, z: -1.5000001} + - {x: 3.5000005, y: 1.5, z: -0.5} + - {x: 3.5000005, y: 1.5, z: -1.5000001} + - {x: 3.5000005, y: 0.20000005, z: -0.5} + - {x: 3.5000005, y: 0.20000005, z: -1.5000001} + - {x: -0.5, y: 1.5, z: -0.5} + - {x: -0.5, y: 1.5, z: -1.5000001} + - {x: -0.5, y: 0.20000005, z: -0.5} + - {x: -0.5, y: 0.20000005, z: -1.5000001} + - {x: 0.49999988, y: 1.5, z: -2.4999998} + - {x: 0.49999988, y: 1.5, z: -3.4999998} + - {x: 0.49999988, y: 0.20000005, z: -2.4999998} + - {x: 0.49999988, y: 0.20000005, z: -3.4999998} + - {x: 0.49999988, y: 1.5, z: -0.5} + - {x: 0.49999988, y: 1.5, z: -1.5000001} + - {x: 0.49999988, y: 0.20000005, z: -0.5} + - {x: 0.49999988, y: 0.20000005, z: -1.5000001} + - {x: 1.5000005, y: 1.5, z: 1.5} + - {x: 1.5000005, y: 1.5, z: 0.5} + - {x: 1.5000005, y: 0.20000005, z: 1.5} + - {x: 1.5000005, y: 0.20000005, z: 0.5} + - {x: 1.5000005, y: 1.5, z: 3.4999998} + - {x: 1.5000005, y: 1.5, z: 2.4999998} + - {x: 1.5000005, y: 0.20000005, z: 3.4999998} + - {x: 1.5000005, y: 0.20000005, z: 2.4999998} + - {x: 1.5000005, y: 1.5, z: -2.4999998} + - {x: 1.5000005, y: 1.5, z: -3.4999998} + - {x: 1.5000005, y: 0.20000005, z: -2.4999998} + - {x: 1.5000005, y: 0.20000005, z: -3.4999998} + - {x: 1.5000005, y: 1.5, z: -0.5} + - {x: 1.5000005, y: 1.5, z: -1.5000001} + - {x: 1.5000005, y: 0.20000005, z: -0.5} + - {x: 1.5000005, y: 0.20000005, z: -1.5000001} + - {x: 2.5000005, y: 1.5, z: 1.5} + - {x: 2.5000005, y: 1.5, z: 0.5} + - {x: 2.5000005, y: 0.20000005, z: 1.5} + - {x: 2.5000005, y: 0.20000005, z: 0.5} + - {x: 2.5000005, y: 1.5, z: 3.4999998} + - {x: 2.5000005, y: 1.5, z: 2.4999998} + - {x: 2.5000005, y: 0.20000005, z: 3.4999998} + - {x: 2.5000005, y: 0.20000005, z: 2.4999998} + - {x: 2.5000005, y: 1.5, z: -2.4999998} + - {x: 2.5000005, y: 1.5, z: -3.4999998} + - {x: 2.5000005, y: 0.20000005, z: -2.4999998} + - {x: 2.5000005, y: 0.20000005, z: -3.4999998} + - {x: 2.5000005, y: 1.5, z: -0.5} + - {x: 2.5000005, y: 1.5, z: -1.5000001} + - {x: 2.5000005, y: 0.20000005, z: -0.5} + - {x: 2.5000005, y: 0.20000005, z: -1.5000001} + - {x: -2.5, y: 1.5, z: 1.5} + - {x: -2.5, y: 1.5, z: 0.5} + - {x: -2.5, y: 0.20000005, z: 1.5} + - {x: -2.5, y: 0.20000005, z: 0.5} + - {x: -2.5, y: 1.5, z: 3.4999998} + - {x: -2.5, y: 1.5, z: 2.4999998} + - {x: -2.5, y: 0.20000005, z: 3.4999998} + - {x: -2.5, y: 0.20000005, z: 2.4999998} + - {x: -2.5, y: 1.5, z: -2.4999998} + - {x: -2.5, y: 1.5, z: -3.4999998} + - {x: -2.5, y: 0.20000005, z: -2.4999998} + - {x: -2.5, y: 0.20000005, z: -3.4999998} + - {x: -2.5, y: 1.5, z: -0.5} + - {x: -2.5, y: 1.5, z: -1.5000001} + - {x: -2.5, y: 0.20000005, z: -0.5} + - {x: -2.5, y: 0.20000005, z: -1.5000001} + m_Dering: 1 +--- !u!4 &229080824 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + m_PrefabInstance: {fileID: 742735926} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &272142277 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 5480458432365400826, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_Name + value: Symbol Terminal + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalPosition.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4b1cba03201b02345916ed8d217027f2, type: 3} +--- !u!1001 &348369381 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5061459391527264860, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531324, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_Name + value: Station 46 XR Origin + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} +--- !u!1001 &353929128 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 3968590605239387246, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_Name + value: Hexagon Easy + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} +--- !u!4 &353929129 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, + type: 3} + m_PrefabInstance: {fileID: 353929128} + m_PrefabAsset: {fileID: 0} +--- !u!1 &410087039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 410087041} + - component: {fileID: 410087040} + - component: {fileID: 410087042} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &410087040 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 2 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 5000 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &410087041 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + m_LocalRotation: {x: 0.20288053, y: -0.45803615, z: 0.09526207, w: 0.86021364} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 25.869, y: -56.389, z: -1.399} +--- !u!114 &410087042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 2 +--- !u!4 &438720342 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + m_PrefabInstance: {fileID: 1659621083} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &449668083 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 5218681765336759419, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_Name + value: Holes + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} +--- !u!4 &449668084 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + m_PrefabInstance: {fileID: 449668083} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &588055817 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4826747451102095092, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + propertyPath: m_Name + value: Dispenser + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} +--- !u!1001 &742735926 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 5480458432365400826, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_Name + value: Position Terminal + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c83416abc9544024db244093f8c800dd, type: 3} +--- !u!1 &832575517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 832575519} + - component: {fileID: 832575518} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &832575518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832575517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: a6560a915ef98420e9faacc1c7438823, type: 2} +--- !u!4 &832575519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832575517} + 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: + - {fileID: 98744915} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1028578884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, + type: 3} + m_PrefabInstance: {fileID: 272142277} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1041458546 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 246239776342662160, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_Name + value: Position Ball + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} +--- !u!1001 &1101383440 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 530036027626042966, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + propertyPath: m_Name + value: Holes Dispenser + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} +--- !u!4 &1101383441 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, + type: 3} + m_PrefabInstance: {fileID: 1101383440} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1198940296 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + m_PrefabInstance: {fileID: 1041458546} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1340421037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1340421038} + m_Layer: 0 + m_Name: Elements + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1340421038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1340421037} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 353929129} + - {fileID: 1719705407} + - {fileID: 1930155662} + - {fileID: 1348527227} + - {fileID: 229080824} + - {fileID: 1198940296} + - {fileID: 1028578884} + - {fileID: 438720342} + - {fileID: 1101383441} + - {fileID: 449668084} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1001 &1348527226 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_Name + value: Hoop + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} +--- !u!4 &1348527227 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 1348527226} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1568048333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1568048335} + - component: {fileID: 1568048336} + - component: {fileID: 1568048337} + m_Layer: 0 + m_Name: Engine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1568048335 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1568048333} + 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: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1568048336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1568048333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: debf8d65bda642bc938a94c7639e01a4, type: 3} + m_Name: + m_EditorClassIdentifier: + loggingEnabled: 1 + typeFilter: 00000000 +--- !u!114 &1568048337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1568048333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a9b6b8b557abbb4ab172444615ebf23, type: 3} + m_Name: + m_EditorClassIdentifier: + maxSpaceGenerationTries: 1000 + initialTargetTime: 600 + roomOffset: {x: 0, y: 1000, z: 0} + theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} +--- !u!1001 &1659621083 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 246239776342662160, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_Name + value: Symbol Ball + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalPosition.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} +--- !u!1001 &1719705406 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 4375253467126868621, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_Name + value: Hexagon Medium + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} +--- !u!4 &1719705407 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, + type: 3} + m_PrefabInstance: {fileID: 1719705406} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1930155662 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + m_PrefabInstance: {fileID: 588055817} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Assets/Materials/Textures.meta b/Assets/Scenes/PuzzleTest.unity.meta similarity index 67% rename from Assets/Station46/Assets/Materials/Textures.meta rename to Assets/Scenes/PuzzleTest.unity.meta index 16d1113..c3ddfb7 100644 --- a/Assets/Station46/Assets/Materials/Textures.meta +++ b/Assets/Scenes/PuzzleTest.unity.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 353a21fd072416641ba9dce63e55f835 -folderAsset: yes +guid: 28fffc3bffe300941b5be69cb156f9d2 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/PuzzleTestProfile.asset b/Assets/Scenes/PuzzleTestProfile.asset new file mode 100644 index 0000000..22f8702 --- /dev/null +++ b/Assets/Scenes/PuzzleTestProfile.asset @@ -0,0 +1,109 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7893295128165547882 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 1 + intensity: + m_OverrideState: 1 + m_Value: 1 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &-7011558710299706105 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 0 + color: + m_OverrideState: 0 + m_Value: {r: 0, g: 0, b: 0, a: 1} + center: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0.25 + smoothness: + m_OverrideState: 1 + m_Value: 0.4 + rounded: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: PuzzleTestProfile + m_EditorClassIdentifier: + components: + - {fileID: 849379129802519247} + - {fileID: -7893295128165547882} + - {fileID: -7011558710299706105} +--- !u!114 &849379129802519247 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 1 diff --git a/Assets/Station46/Assets/Animations.meta b/Assets/Scenes/PuzzleTestProfile.asset.meta similarity index 52% rename from Assets/Station46/Assets/Animations.meta rename to Assets/Scenes/PuzzleTestProfile.asset.meta index c6055b6..5ad1eb7 100644 --- a/Assets/Station46/Assets/Animations.meta +++ b/Assets/Scenes/PuzzleTestProfile.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0a36e4c1933d9f545b370f2275418816 -folderAsset: yes -DefaultImporter: +guid: 0511214ed1fd590458b2a77e83f3f382 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Station46/Assets.meta b/Assets/Station46/Assets.meta deleted file mode 100644 index 730b369..0000000 --- a/Assets/Station46/Assets.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2ef3a3f442154e3b9dfd9b5d481da2f3 -timeCreated: 1668944890 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials.meta b/Assets/Station46/Assets/Materials.meta deleted file mode 100644 index fc2493b..0000000 --- a/Assets/Station46/Assets/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 25eb387911f496441b8b585a8a469149 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Ball.meta b/Assets/Station46/Assets/Materials/Textures/Ball.meta deleted file mode 100644 index 2023399..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Ball.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 83948473de5859644af68bb08612d600 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor.meta b/Assets/Station46/Assets/Materials/Textures/Desert Floor.meta deleted file mode 100644 index 57155e4..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Desert Floor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c7b354cabf8d19641aab79bc248754fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser.meta b/Assets/Station46/Assets/Materials/Textures/Dispenser.meta deleted file mode 100644 index 04cbbb4..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Dispenser.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d4f688bc6815b124bb3a6aed9c5dbb23 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand.meta b/Assets/Station46/Assets/Materials/Textures/Hexagon Stand.meta deleted file mode 100644 index 90eef8a..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4bdb2b8a22a17fb46a94a32f5e0d5deb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb.meta b/Assets/Station46/Assets/Materials/Textures/Hole Orb.meta deleted file mode 100644 index 5054a64..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Hole Orb.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0fed53d8054acb744a2694ac6c0f8ad4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Holes.meta b/Assets/Station46/Assets/Materials/Textures/Holes.meta deleted file mode 100644 index 94c4bf5..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Holes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cece6b2150f191b4ea3c48fd610a7a92 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop.meta b/Assets/Station46/Assets/Materials/Textures/Hoop.meta deleted file mode 100644 index f671d95..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Hoop.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7da3f1888725aec47bfaab313783ba55 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor.meta b/Assets/Station46/Assets/Materials/Textures/Space Floor.meta deleted file mode 100644 index dc230ac..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Space Floor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d0c898fbe9ac6e84eb48b0660e6767b6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal.meta b/Assets/Station46/Assets/Materials/Textures/Station 46 Portal.meta deleted file mode 100644 index 39648a6..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1ea978a862c4e43479dabf3010298a7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal.meta b/Assets/Station46/Assets/Materials/Textures/Terminal.meta deleted file mode 100644 index 6aa005f..0000000 --- a/Assets/Station46/Assets/Materials/Textures/Terminal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 41c7988415b3efe46a8fd35a6d89e4a5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Models.meta b/Assets/Station46/Assets/Models.meta deleted file mode 100644 index 770de0d..0000000 --- a/Assets/Station46/Assets/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a158a8d95c3ecb04394faac961747e32 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle.meta b/Assets/Station46/Assets/Modules/Hexagon Puzzle.meta deleted file mode 100644 index af7378b..0000000 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0558edff2d866f6428c81f676abdeab2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy.meta b/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy.meta deleted file mode 100644 index 81ac9ed..0000000 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19649f458ac60a143a97d277f2285575 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium.meta b/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium.meta deleted file mode 100644 index 8fab1ca..0000000 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 24a32e147f3a4dc46b30fcb26b57029d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle.meta b/Assets/Station46/Assets/Modules/Holes Puzzle.meta deleted file mode 100644 index 7206496..0000000 --- a/Assets/Station46/Assets/Modules/Holes Puzzle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a2b46f9faf236c41abb51e88a73132b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle.meta b/Assets/Station46/Assets/Modules/Hoop Fling Puzzle.meta deleted file mode 100644 index 7cb6598..0000000 --- a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 44d5a1e22e7fa4249bbecd0ef88b8907 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Portal.meta b/Assets/Station46/Assets/Modules/Portal.meta deleted file mode 100644 index dcf020e..0000000 --- a/Assets/Station46/Assets/Modules/Portal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 184f6b94f1880f04e8eabcc9e2b2aee1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle.meta b/Assets/Station46/Assets/Modules/Position Order Puzzle.meta deleted file mode 100644 index 7cfb74c..0000000 --- a/Assets/Station46/Assets/Modules/Position Order Puzzle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 983104a38693efd439457130b870aa33 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle.meta b/Assets/Station46/Assets/Modules/Symbol Order Puzzle.meta deleted file mode 100644 index b840759..0000000 --- a/Assets/Station46/Assets/Modules/Symbol Order Puzzle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c26ade15cc19b04c9c62d3b6bd88dbd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Prefabs.meta b/Assets/Station46/Assets/Prefabs.meta deleted file mode 100644 index a264477..0000000 --- a/Assets/Station46/Assets/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c97df6f1342d6543b9d4dd0aca23412 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Prefabs/Ball.meta b/Assets/Station46/Assets/Prefabs/Ball.meta deleted file mode 100644 index 35efbdc..0000000 --- a/Assets/Station46/Assets/Prefabs/Ball.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4ae675b99f06ce047a49b1be706b1053 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Prefabs/Dispenser.meta b/Assets/Station46/Assets/Prefabs/Dispenser.meta deleted file mode 100644 index d0d5373..0000000 --- a/Assets/Station46/Assets/Prefabs/Dispenser.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ed6725b2b4fd4dc429aac3923b6506fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Prefabs/Symbols.meta b/Assets/Station46/Assets/Prefabs/Symbols.meta deleted file mode 100644 index 0b2ed65..0000000 --- a/Assets/Station46/Assets/Prefabs/Symbols.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7e030288848a0744498738256ce9a3c2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Assets/Prefabs/Terminal.meta b/Assets/Station46/Assets/Prefabs/Terminal.meta deleted file mode 100644 index 75350a3..0000000 --- a/Assets/Station46/Assets/Prefabs/Terminal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f9b1dc3124097814db4cf200b14309e0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/CHANGELOG.md b/Assets/Station46/CHANGELOG.md deleted file mode 100644 index ed146ca..0000000 --- a/Assets/Station46/CHANGELOG.md +++ /dev/null @@ -1,13 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## [Unreleased] - -### Added - -- Desert space and environment -- Puzzle A, press buttons when their symbols light up diff --git a/Assets/Station46/CHANGELOG.md.meta b/Assets/Station46/CHANGELOG.md.meta deleted file mode 100644 index ebacb09..0000000 --- a/Assets/Station46/CHANGELOG.md.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5c40d0f295594f1bb8fcff1eafc17107 -timeCreated: 1668939744 \ No newline at end of file diff --git a/Assets/Station46/Environments.meta b/Assets/Station46/Environments.meta new file mode 100644 index 0000000..4ff482b --- /dev/null +++ b/Assets/Station46/Environments.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 07f9af8fb9744da4a7d12e85acf079fd +timeCreated: 1683641590 \ No newline at end of file diff --git a/Assets/Station46/Environments/Desert.meta b/Assets/Station46/Environments/Desert.meta new file mode 100644 index 0000000..1c0080f --- /dev/null +++ b/Assets/Station46/Environments/Desert.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6881461778e747faa5571b1aa09cde81 +timeCreated: 1683641599 \ No newline at end of file diff --git a/Assets/Station46/Assets/Prefabs/Desert Environment.prefab b/Assets/Station46/Environments/Desert/Desert Environment.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Desert Environment.prefab rename to Assets/Station46/Environments/Desert/Desert Environment.prefab diff --git a/Assets/Station46/Assets/Prefabs/Desert Environment.prefab.meta b/Assets/Station46/Environments/Desert/Desert Environment.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Desert Environment.prefab.meta rename to Assets/Station46/Environments/Desert/Desert Environment.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Station 46 Space Tile.prefab b/Assets/Station46/Environments/Desert/Desert Space Tile.prefab similarity index 98% rename from Assets/Station46/Assets/Prefabs/Station 46 Space Tile.prefab rename to Assets/Station46/Environments/Desert/Desert Space Tile.prefab index 7823f02..be0ce5d 100644 --- a/Assets/Station46/Assets/Prefabs/Station 46 Space Tile.prefab +++ b/Assets/Station46/Environments/Desert/Desert Space Tile.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 3229991053255736984} - component: {fileID: 7880032434625960893} m_Layer: 0 - m_Name: Station 46 Space Tile + m_Name: Desert Space Tile m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Station46/Assets/Prefabs/Station 46 Space Tile.prefab.meta b/Assets/Station46/Environments/Desert/Desert Space Tile.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Station 46 Space Tile.prefab.meta rename to Assets/Station46/Environments/Desert/Desert Space Tile.prefab.meta diff --git a/Assets/Station46/Environments/Desert/Materials.meta b/Assets/Station46/Environments/Desert/Materials.meta new file mode 100644 index 0000000..c474227 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 026df523814544c79d243344da458f58 +timeCreated: 1683641599 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Desert Floor.mat b/Assets/Station46/Environments/Desert/Materials/Desert Floor.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Desert Floor.mat rename to Assets/Station46/Environments/Desert/Materials/Desert Floor.mat diff --git a/Assets/Station46/Assets/Materials/Desert Floor.mat.meta b/Assets/Station46/Environments/Desert/Materials/Desert Floor.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Desert Floor.mat.meta rename to Assets/Station46/Environments/Desert/Materials/Desert Floor.mat.meta diff --git a/Assets/Station46/Assets/Materials/Skybox.mat b/Assets/Station46/Environments/Desert/Materials/Desert Skybox.mat similarity index 99% rename from Assets/Station46/Assets/Materials/Skybox.mat rename to Assets/Station46/Environments/Desert/Materials/Desert Skybox.mat index a5c27f4..4042adf 100644 --- a/Assets/Station46/Assets/Materials/Skybox.mat +++ b/Assets/Station46/Environments/Desert/Materials/Desert Skybox.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Skybox + m_Name: Desert Skybox m_Shader: {fileID: 108, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Station46/Assets/Materials/Skybox.mat.meta b/Assets/Station46/Environments/Desert/Materials/Desert Skybox.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Skybox.mat.meta rename to Assets/Station46/Environments/Desert/Materials/Desert Skybox.mat.meta diff --git a/Assets/Station46/Assets/Materials/Space Floor.mat b/Assets/Station46/Environments/Desert/Materials/Space Floor.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Space Floor.mat rename to Assets/Station46/Environments/Desert/Materials/Space Floor.mat diff --git a/Assets/Station46/Assets/Materials/Space Floor.mat.meta b/Assets/Station46/Environments/Desert/Materials/Space Floor.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Space Floor.mat.meta rename to Assets/Station46/Environments/Desert/Materials/Space Floor.mat.meta diff --git a/Assets/Station46/Environments/Desert/Materials/Textures.meta b/Assets/Station46/Environments/Desert/Materials/Textures.meta new file mode 100644 index 0000000..46dc44a --- /dev/null +++ b/Assets/Station46/Environments/Desert/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0ed53a4d6768400cb9eeafc8e4a5e211 +timeCreated: 1683641599 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/skybox.hdr b/Assets/Station46/Environments/Desert/Materials/Textures/skybox.hdr similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/skybox.hdr rename to Assets/Station46/Environments/Desert/Materials/Textures/skybox.hdr diff --git a/Assets/Station46/Assets/Materials/Textures/skybox.hdr.meta b/Assets/Station46/Environments/Desert/Materials/Textures/skybox.hdr.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/skybox.hdr.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/skybox.hdr.meta diff --git a/Assets/Station46/Assets/Materials/Textures/skybox_4k.hdr b/Assets/Station46/Environments/Desert/Materials/Textures/skybox_4k.hdr similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/skybox_4k.hdr rename to Assets/Station46/Environments/Desert/Materials/Textures/skybox_4k.hdr diff --git a/Assets/Station46/Assets/Materials/Textures/skybox_4k.hdr.meta b/Assets/Station46/Environments/Desert/Materials/Textures/skybox_4k.hdr.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/skybox_4k.hdr.meta rename to Assets/Station46/Environments/Desert/Materials/Textures/skybox_4k.hdr.meta diff --git a/Assets/Station46/Environments/Desert/Models.meta b/Assets/Station46/Environments/Desert/Models.meta new file mode 100644 index 0000000..1aedf48 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 74a5a6a4c2d14157a0720463519fdaa5 +timeCreated: 1683641599 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Desert Floor.blend b/Assets/Station46/Environments/Desert/Models/Desert Floor.blend similarity index 100% rename from Assets/Station46/Assets/Models/Desert Floor.blend rename to Assets/Station46/Environments/Desert/Models/Desert Floor.blend diff --git a/Assets/Station46/Assets/Models/Desert Floor.blend.meta b/Assets/Station46/Environments/Desert/Models/Desert Floor.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Desert Floor.blend.meta rename to Assets/Station46/Environments/Desert/Models/Desert Floor.blend.meta diff --git a/Assets/Station46/Assets/Models/Desert Floor.blend1 b/Assets/Station46/Environments/Desert/Models/Desert Floor.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Desert Floor.blend1 rename to Assets/Station46/Environments/Desert/Models/Desert Floor.blend1 diff --git a/Assets/Station46/Assets/Models/Desert Floor.blend1.meta b/Assets/Station46/Environments/Desert/Models/Desert Floor.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Desert Floor.blend1.meta rename to Assets/Station46/Environments/Desert/Models/Desert Floor.blend1.meta diff --git a/Assets/Station46/Assets/Models/Desert Floor.fbx b/Assets/Station46/Environments/Desert/Models/Desert Floor.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Desert Floor.fbx rename to Assets/Station46/Environments/Desert/Models/Desert Floor.fbx diff --git a/Assets/Station46/Assets/Models/Desert Floor.fbx.meta b/Assets/Station46/Environments/Desert/Models/Desert Floor.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Desert Floor.fbx.meta rename to Assets/Station46/Environments/Desert/Models/Desert Floor.fbx.meta diff --git a/Assets/Station46/Assets/Models/Space Floor.blend b/Assets/Station46/Environments/Desert/Models/Space Floor.blend similarity index 100% rename from Assets/Station46/Assets/Models/Space Floor.blend rename to Assets/Station46/Environments/Desert/Models/Space Floor.blend diff --git a/Assets/Station46/Assets/Models/Space Floor.blend.meta b/Assets/Station46/Environments/Desert/Models/Space Floor.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Space Floor.blend.meta rename to Assets/Station46/Environments/Desert/Models/Space Floor.blend.meta diff --git a/Assets/Station46/Assets/Models/Space Floor.blend1 b/Assets/Station46/Environments/Desert/Models/Space Floor.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Space Floor.blend1 rename to Assets/Station46/Environments/Desert/Models/Space Floor.blend1 diff --git a/Assets/Station46/Assets/Models/Space Floor.blend1.meta b/Assets/Station46/Environments/Desert/Models/Space Floor.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Space Floor.blend1.meta rename to Assets/Station46/Environments/Desert/Models/Space Floor.blend1.meta diff --git a/Assets/Station46/Assets/Models/Space Floor.fbx b/Assets/Station46/Environments/Desert/Models/Space Floor.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Space Floor.fbx rename to Assets/Station46/Environments/Desert/Models/Space Floor.fbx diff --git a/Assets/Station46/Assets/Models/Space Floor.fbx.meta b/Assets/Station46/Environments/Desert/Models/Space Floor.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Space Floor.fbx.meta rename to Assets/Station46/Environments/Desert/Models/Space Floor.fbx.meta diff --git a/Assets/Station46/Module Descriptions.meta b/Assets/Station46/Module Descriptions.meta new file mode 100644 index 0000000..5d147f0 --- /dev/null +++ b/Assets/Station46/Module Descriptions.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fbb5bae199a446529adda2a1c8dd1cae +timeCreated: 1683642117 \ No newline at end of file diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.asset b/Assets/Station46/Module Descriptions/D Station 46 Portal Entrance.asset similarity index 94% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.asset rename to Assets/Station46/Module Descriptions/D Station 46 Portal Entrance.asset index ff0ae7c..63dbc96 100644 --- a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.asset +++ b/Assets/Station46/Module Descriptions/D Station 46 Portal Entrance.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5c1202346c34ebc9c3f701a98b50877, type: 3} - m_Name: Station 46 Portal Entrance + m_Name: D Station 46 Portal Entrance m_EditorClassIdentifier: types: 00000000 modulePrefab: {fileID: 3392592227672293041, guid: 0f721fa68edd220438bc7bbbe6ede885, diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.asset.meta b/Assets/Station46/Module Descriptions/D Station 46 Portal Entrance.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.asset.meta rename to Assets/Station46/Module Descriptions/D Station 46 Portal Entrance.asset.meta diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.asset b/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset similarity index 96% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.asset rename to Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset index de8cbcd..a1714b9 100644 --- a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.asset +++ b/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5c1202346c34ebc9c3f701a98b50877, type: 3} - m_Name: Station 46 Portal Exit + m_Name: D Station 46 Portal Exit m_EditorClassIdentifier: types: 01000000 modulePrefab: {fileID: 1047274803835009197, guid: 07cea580d9888d24c84d8d62747839ad, diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.asset.meta b/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.asset.meta rename to Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset.meta diff --git a/Assets/Station46/Assets/Station 46 Spawn.asset b/Assets/Station46/Module Descriptions/D Station 46 Spawn.asset similarity index 95% rename from Assets/Station46/Assets/Station 46 Spawn.asset rename to Assets/Station46/Module Descriptions/D Station 46 Spawn.asset index 0ffdd91..b913cfd 100644 --- a/Assets/Station46/Assets/Station 46 Spawn.asset +++ b/Assets/Station46/Module Descriptions/D Station 46 Spawn.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5c1202346c34ebc9c3f701a98b50877, type: 3} - m_Name: Station 46 Spawn + m_Name: D Station 46 Spawn m_EditorClassIdentifier: types: 00000000 modulePrefab: {fileID: 1834615596445353898, guid: 0f52b7f0ec633bc4d8bc73cfbef29bf9, diff --git a/Assets/Station46/Assets/Station 46 Spawn.asset.meta b/Assets/Station46/Module Descriptions/D Station 46 Spawn.asset.meta similarity index 100% rename from Assets/Station46/Assets/Station 46 Spawn.asset.meta rename to Assets/Station46/Module Descriptions/D Station 46 Spawn.asset.meta diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.asset b/Assets/Station46/Module Descriptions/M Dispenser.asset similarity index 97% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.asset rename to Assets/Station46/Module Descriptions/M Dispenser.asset index c3b467d..dd76e34 100644 --- a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.asset +++ b/Assets/Station46/Module Descriptions/M Dispenser.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Dispenser + m_Name: M Dispenser m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 3942114796521670514, guid: 20c9cfab710bbe04ca6f81d44a01b025, diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.asset.meta b/Assets/Station46/Module Descriptions/M Dispenser.asset.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.asset.meta rename to Assets/Station46/Module Descriptions/M Dispenser.asset.meta diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.asset b/Assets/Station46/Module Descriptions/M Holes Dispenser.asset similarity index 96% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.asset rename to Assets/Station46/Module Descriptions/M Holes Dispenser.asset index a42d561..e3fdef9 100644 --- a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.asset +++ b/Assets/Station46/Module Descriptions/M Holes Dispenser.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Holes Dispenser + m_Name: M Holes Dispenser m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 8291735269762471888, guid: 8253a7c07eeea3b48832a42b847cf0f1, diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.asset.meta b/Assets/Station46/Module Descriptions/M Holes Dispenser.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.asset.meta rename to Assets/Station46/Module Descriptions/M Holes Dispenser.asset.meta diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.asset b/Assets/Station46/Module Descriptions/M Position Ball.asset similarity index 96% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.asset rename to Assets/Station46/Module Descriptions/M Position Ball.asset index 93c13b8..b3ccf7c 100644 --- a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.asset +++ b/Assets/Station46/Module Descriptions/M Position Ball.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Position Ball + m_Name: M Position Ball m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 8532410986149820624, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.asset.meta b/Assets/Station46/Module Descriptions/M Position Ball.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.asset.meta rename to Assets/Station46/Module Descriptions/M Position Ball.asset.meta diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset b/Assets/Station46/Module Descriptions/M Symbol Ball.asset similarity index 96% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset rename to Assets/Station46/Module Descriptions/M Symbol Ball.asset index ff440ff..737cd65 100644 --- a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset +++ b/Assets/Station46/Module Descriptions/M Symbol Ball.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Symbol Ball + m_Name: M Symbol Ball m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 8532410986149820624, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset.meta b/Assets/Station46/Module Descriptions/M Symbol Ball.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset.meta rename to Assets/Station46/Module Descriptions/M Symbol Ball.asset.meta diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset b/Assets/Station46/Module Descriptions/P Hexagon Easy.asset similarity index 97% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset rename to Assets/Station46/Module Descriptions/P Hexagon Easy.asset index 96b65ec..3f81e06 100644 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset +++ b/Assets/Station46/Module Descriptions/P Hexagon Easy.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Hexagon Easy + m_Name: P Hexagon Easy m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 3968590605239387249, guid: e5dce190a8604bc48b04c109b103f8b5, diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset.meta b/Assets/Station46/Module Descriptions/P Hexagon Easy.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset.meta rename to Assets/Station46/Module Descriptions/P Hexagon Easy.asset.meta diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset b/Assets/Station46/Module Descriptions/P Hexagon Medium.asset similarity index 96% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset rename to Assets/Station46/Module Descriptions/P Hexagon Medium.asset index 804e671..08350d3 100644 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset +++ b/Assets/Station46/Module Descriptions/P Hexagon Medium.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Hexagon Medium + m_Name: P Hexagon Medium m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 4375253467126868626, guid: aea74bf9bbeb3e94bba5b275e087b8a9, diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset.meta b/Assets/Station46/Module Descriptions/P Hexagon Medium.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset.meta rename to Assets/Station46/Module Descriptions/P Hexagon Medium.asset.meta diff --git a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset b/Assets/Station46/Module Descriptions/P Hoop Fling.asset similarity index 96% rename from Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset rename to Assets/Station46/Module Descriptions/P Hoop Fling.asset index d0629af..11319b0 100644 --- a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset +++ b/Assets/Station46/Module Descriptions/P Hoop Fling.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Hoop Fling + m_Name: P Hoop Fling m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 6853723365353446933, guid: c6f4a21ce6c0ce84584c90804c96ad80, diff --git a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset.meta b/Assets/Station46/Module Descriptions/P Hoop Fling.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset.meta rename to Assets/Station46/Module Descriptions/P Hoop Fling.asset.meta diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Order.asset b/Assets/Station46/Module Descriptions/P Position Order.asset similarity index 97% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Order.asset rename to Assets/Station46/Module Descriptions/P Position Order.asset index 336a019..eb34e03 100644 --- a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Order.asset +++ b/Assets/Station46/Module Descriptions/P Position Order.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Position Order + m_Name: P Position Order m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 5480458432365400828, guid: c83416abc9544024db244093f8c800dd, diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Order.asset.meta b/Assets/Station46/Module Descriptions/P Position Order.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Order.asset.meta rename to Assets/Station46/Module Descriptions/P Position Order.asset.meta diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset b/Assets/Station46/Module Descriptions/P Symbol Order.asset similarity index 97% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset rename to Assets/Station46/Module Descriptions/P Symbol Order.asset index 619cb25..e191d58 100644 --- a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset +++ b/Assets/Station46/Module Descriptions/P Symbol Order.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Symbol Order + m_Name: P Symbol Order m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 5480458432365400828, guid: 4b1cba03201b02345916ed8d217027f2, diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset.meta b/Assets/Station46/Module Descriptions/P Symbol Order.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset.meta rename to Assets/Station46/Module Descriptions/P Symbol Order.asset.meta diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Relation.asset b/Assets/Station46/Module Descriptions/R Dispenser.asset similarity index 94% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Relation.asset rename to Assets/Station46/Module Descriptions/R Dispenser.asset index 7ac98fa..18063ce 100644 --- a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Relation.asset +++ b/Assets/Station46/Module Descriptions/R Dispenser.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Dispenser Relation + m_Name: R Dispenser m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: 2ae9786d52faa1f4c82b3a3eeae9f538, type: 2} diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Relation.asset.meta b/Assets/Station46/Module Descriptions/R Dispenser.asset.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Relation.asset.meta rename to Assets/Station46/Module Descriptions/R Dispenser.asset.meta diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset b/Assets/Station46/Module Descriptions/R Holes Dispenser.asset similarity index 92% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset rename to Assets/Station46/Module Descriptions/R Holes Dispenser.asset index 8492543..334449c 100644 --- a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset +++ b/Assets/Station46/Module Descriptions/R Holes Dispenser.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Holes Dispenser Relation + m_Name: R Holes Dispenser m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: ddbd764c468d0e042b30bf84d12c7397, type: 2} diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset.meta b/Assets/Station46/Module Descriptions/R Holes Dispenser.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset.meta rename to Assets/Station46/Module Descriptions/R Holes Dispenser.asset.meta diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset b/Assets/Station46/Module Descriptions/R Position Ball.asset similarity index 93% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset rename to Assets/Station46/Module Descriptions/R Position Ball.asset index 5619b3b..073dd05 100644 --- a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset +++ b/Assets/Station46/Module Descriptions/R Position Ball.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Position Ball Relation + m_Name: R Position Ball m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: f22d371376251c04da0c6da8d621356c, type: 2} diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset.meta b/Assets/Station46/Module Descriptions/R Position Ball.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset.meta rename to Assets/Station46/Module Descriptions/R Position Ball.asset.meta diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset b/Assets/Station46/Module Descriptions/R Symbol Ball.asset similarity index 93% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset rename to Assets/Station46/Module Descriptions/R Symbol Ball.asset index 79e8664..9a14a24 100644 --- a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset +++ b/Assets/Station46/Module Descriptions/R Symbol Ball.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Symbol Ball Relation + m_Name: R Symbol Ball m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: 13174855ef6a14a47b47933e9ebbf192, type: 2} diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset.meta b/Assets/Station46/Module Descriptions/R Symbol Ball.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset.meta rename to Assets/Station46/Module Descriptions/R Symbol Ball.asset.meta diff --git a/Assets/Station46/Assets/Modules.meta b/Assets/Station46/Modules.meta similarity index 100% rename from Assets/Station46/Assets/Modules.meta rename to Assets/Station46/Modules.meta diff --git a/Assets/Station46/Modules/Dispenser.meta b/Assets/Station46/Modules/Dispenser.meta new file mode 100644 index 0000000..fff262d --- /dev/null +++ b/Assets/Station46/Modules/Dispenser.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6fb9ea4b7c5943dca69c981189bfe70b +timeCreated: 1683637236 \ No newline at end of file diff --git a/Assets/Station46/Modules/Dispenser/Animations.meta b/Assets/Station46/Modules/Dispenser/Animations.meta new file mode 100644 index 0000000..ae95b4e --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Animations.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e61bec8f9ee247258c0d16327cba23aa +timeCreated: 1683637327 \ No newline at end of file diff --git a/Assets/Station46/Assets/Animations/Dispenser Close.anim b/Assets/Station46/Modules/Dispenser/Animations/Dispenser Close.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Dispenser Close.anim rename to Assets/Station46/Modules/Dispenser/Animations/Dispenser Close.anim diff --git a/Assets/Station46/Assets/Animations/Dispenser Close.anim.meta b/Assets/Station46/Modules/Dispenser/Animations/Dispenser Close.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Dispenser Close.anim.meta rename to Assets/Station46/Modules/Dispenser/Animations/Dispenser Close.anim.meta diff --git a/Assets/Station46/Assets/Animations/Dispenser Open.anim b/Assets/Station46/Modules/Dispenser/Animations/Dispenser Open.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Dispenser Open.anim rename to Assets/Station46/Modules/Dispenser/Animations/Dispenser Open.anim diff --git a/Assets/Station46/Assets/Animations/Dispenser Open.anim.meta b/Assets/Station46/Modules/Dispenser/Animations/Dispenser Open.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Dispenser Open.anim.meta rename to Assets/Station46/Modules/Dispenser/Animations/Dispenser Open.anim.meta diff --git a/Assets/Station46/Assets/Animations/Dispenser.controller b/Assets/Station46/Modules/Dispenser/Animations/Dispenser.controller similarity index 100% rename from Assets/Station46/Assets/Animations/Dispenser.controller rename to Assets/Station46/Modules/Dispenser/Animations/Dispenser.controller diff --git a/Assets/Station46/Assets/Animations/Dispenser.controller.meta b/Assets/Station46/Modules/Dispenser/Animations/Dispenser.controller.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Dispenser.controller.meta rename to Assets/Station46/Modules/Dispenser/Animations/Dispenser.controller.meta diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Light.prefab b/Assets/Station46/Modules/Dispenser/Dispenser Light.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Light.prefab rename to Assets/Station46/Modules/Dispenser/Dispenser Light.prefab diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Light.prefab.meta b/Assets/Station46/Modules/Dispenser/Dispenser Light.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Light.prefab.meta rename to Assets/Station46/Modules/Dispenser/Dispenser Light.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Orb.prefab b/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Orb.prefab rename to Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Orb.prefab.meta b/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser Orb.prefab.meta rename to Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.prefab b/Assets/Station46/Modules/Dispenser/Dispenser.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.prefab rename to Assets/Station46/Modules/Dispenser/Dispenser.prefab diff --git a/Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.prefab.meta b/Assets/Station46/Modules/Dispenser/Dispenser.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Dispenser/Dispenser.prefab.meta rename to Assets/Station46/Modules/Dispenser/Dispenser.prefab.meta diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab b/Assets/Station46/Modules/Dispenser/Holes Dispenser.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab rename to Assets/Station46/Modules/Dispenser/Holes Dispenser.prefab diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab.meta b/Assets/Station46/Modules/Dispenser/Holes Dispenser.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab.meta rename to Assets/Station46/Modules/Dispenser/Holes Dispenser.prefab.meta diff --git a/Assets/Station46/Modules/Dispenser/Materials.meta b/Assets/Station46/Modules/Dispenser/Materials.meta new file mode 100644 index 0000000..d316d64 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a40dfb59b11e4c05b2dd909f20acb0bf +timeCreated: 1683637428 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Dispenser.mat b/Assets/Station46/Modules/Dispenser/Materials/Dispenser.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Dispenser.mat rename to Assets/Station46/Modules/Dispenser/Materials/Dispenser.mat diff --git a/Assets/Station46/Assets/Materials/Dispenser.mat.meta b/Assets/Station46/Modules/Dispenser/Materials/Dispenser.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Dispenser.mat.meta rename to Assets/Station46/Modules/Dispenser/Materials/Dispenser.mat.meta diff --git a/Assets/Station46/Modules/Dispenser/Materials/Textures.meta b/Assets/Station46/Modules/Dispenser/Materials/Textures.meta new file mode 100644 index 0000000..39246d8 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 055dc1dada3e4a8891e28422e293e662 +timeCreated: 1683637532 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_AlbedoTransparency.png b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_AlbedoTransparency.png rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Emission.png b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Emission.png rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Emission.png.meta b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Emission.png.meta rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_MetallicSmoothness.png b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_MetallicSmoothness.png rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Normal.png b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Normal.png rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Normal.png.meta b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Normal.png.meta rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Occlusion.png b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Occlusion.png rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Occlusion.png.meta b/Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Dispenser/Dispenser_Holes_Occlusion.png.meta rename to Assets/Station46/Modules/Dispenser/Materials/Textures/Dispenser_Holes_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Dispenser/Models.meta b/Assets/Station46/Modules/Dispenser/Models.meta new file mode 100644 index 0000000..9a7d34e --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a5dc8c01921e464290572fe473882494 +timeCreated: 1683637459 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Dispenser.blend b/Assets/Station46/Modules/Dispenser/Models/Dispenser.blend similarity index 100% rename from Assets/Station46/Assets/Models/Dispenser.blend rename to Assets/Station46/Modules/Dispenser/Models/Dispenser.blend diff --git a/Assets/Station46/Assets/Models/Dispenser.blend.meta b/Assets/Station46/Modules/Dispenser/Models/Dispenser.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Dispenser.blend.meta rename to Assets/Station46/Modules/Dispenser/Models/Dispenser.blend.meta diff --git a/Assets/Station46/Assets/Models/Dispenser.blend1 b/Assets/Station46/Modules/Dispenser/Models/Dispenser.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Dispenser.blend1 rename to Assets/Station46/Modules/Dispenser/Models/Dispenser.blend1 diff --git a/Assets/Station46/Assets/Models/Dispenser.blend1.meta b/Assets/Station46/Modules/Dispenser/Models/Dispenser.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Dispenser.blend1.meta rename to Assets/Station46/Modules/Dispenser/Models/Dispenser.blend1.meta diff --git a/Assets/Station46/Assets/Models/Dispenser.fbx b/Assets/Station46/Modules/Dispenser/Models/Dispenser.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Dispenser.fbx rename to Assets/Station46/Modules/Dispenser/Models/Dispenser.fbx diff --git a/Assets/Station46/Assets/Models/Dispenser.fbx.meta b/Assets/Station46/Modules/Dispenser/Models/Dispenser.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Dispenser.fbx.meta rename to Assets/Station46/Modules/Dispenser/Models/Dispenser.fbx.meta diff --git a/Assets/Station46/Modules/Dispenser/Scripts.meta b/Assets/Station46/Modules/Dispenser/Scripts.meta new file mode 100644 index 0000000..a8148e8 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3b5df633051d428792e1a2af7beffc87 +timeCreated: 1683637314 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Dispenser/Dispenser.cs b/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs similarity index 92% rename from Assets/Station46/Runtime/Dispenser/Dispenser.cs rename to Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs index 2e7afed..1eab58b 100644 --- a/Assets/Station46/Runtime/Dispenser/Dispenser.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs @@ -1,11 +1,12 @@ using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using NaughtyAttributes; +using Station46.Runtime; using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace EscapeRoomEngine.Station46.Runtime.Dispenser +namespace Station46.Dispenser.Scripts { /// /// The main component for the dispenser module. @@ -36,12 +37,12 @@ namespace EscapeRoomEngine.Station46.Runtime.Dispenser { CloseHatch(); dispenseButton.Disable(); - _light.color = Engine.Runtime.Engine.Theme.solvedColor.hdr; + _light.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; } else { dispenseButton.Enable(); - _light.color = Engine.Runtime.Engine.Theme.puzzleColor.hdr; + _light.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr; } } } diff --git a/Assets/Station46/Runtime/Dispenser/Dispenser.cs.meta b/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Dispenser/Dispenser.cs.meta rename to Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs.meta diff --git a/Assets/Station46/Runtime/Dispenser/DispenserLights.cs b/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs similarity index 95% rename from Assets/Station46/Runtime/Dispenser/DispenserLights.cs rename to Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs index 20b7de1..ed1678f 100644 --- a/Assets/Station46/Runtime/Dispenser/DispenserLights.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs @@ -1,8 +1,9 @@ using System; using NaughtyAttributes; +using Station46.Runtime; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Dispenser +namespace Station46.Dispenser.Scripts { [Serializable] public struct DispenserLightRow diff --git a/Assets/Station46/Runtime/Dispenser/DispenserLights.cs.meta b/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Dispenser/DispenserLights.cs.meta rename to Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs.meta diff --git a/Assets/Station46/Runtime/Dispenser/DispenserOrb.cs b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs similarity index 84% rename from Assets/Station46/Runtime/Dispenser/DispenserOrb.cs rename to Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs index 7bd97c9..3fe284a 100644 --- a/Assets/Station46/Runtime/Dispenser/DispenserOrb.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs @@ -1,6 +1,7 @@ -using UnityEngine; +using Station46.Runtime; +using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Dispenser +namespace Station46.Dispenser.Scripts { [RequireComponent(typeof(Rigidbody), typeof(Collider), typeof(Emission))] public class DispenserOrb : MonoBehaviour diff --git a/Assets/Station46/Runtime/Dispenser/DispenserOrb.cs.meta b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Dispenser/DispenserOrb.cs.meta rename to Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs.meta diff --git a/Assets/Station46/Modules/Hexagon.meta b/Assets/Station46/Modules/Hexagon.meta new file mode 100644 index 0000000..e5e07ae --- /dev/null +++ b/Assets/Station46/Modules/Hexagon.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cbe7ca0f5ef6456f9c0ae40a3187eaad +timeCreated: 1683640587 \ No newline at end of file diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab b/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab similarity index 97% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab rename to Assets/Station46/Modules/Hexagon/Hexagon 3.prefab index 30cda53..a958dca 100644 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab +++ b/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 1568209639435699204} - component: {fileID: 7585276547670451487} m_Layer: 0 - m_Name: Hexagon Easy + m_Name: Hexagon 3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -137,7 +137,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 7388965203256411546} m_Modifications: - target: {fileID: 5606948831786426046, guid: 55d25429e6831ca43a9b623a7eda42ae, @@ -186,7 +186,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55d25429e6831ca43a9b623a7eda42ae, type: 3} --- !u!114 &5712720649417044905 stripped MonoBehaviour: @@ -211,7 +213,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 6478046620493933771} m_Modifications: - target: {fileID: 5606948831786426046, guid: 55d25429e6831ca43a9b623a7eda42ae, @@ -255,7 +257,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55d25429e6831ca43a9b623a7eda42ae, type: 3} --- !u!4 &6604442527333060636 stripped Transform: @@ -280,7 +284,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 7734541192411211649} m_Modifications: - target: {fileID: 2623459329539227524, guid: 3146c8d1328724440938ca1559df4c6d, @@ -309,7 +313,9 @@ PrefabInstance: value: Crystal objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3146c8d1328724440938ca1559df4c6d, type: 3} --- !u!114 &1746957327352144498 stripped MonoBehaviour: @@ -334,7 +340,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 3947475446502552679} m_Modifications: - target: {fileID: 5606948831786426046, guid: 55d25429e6831ca43a9b623a7eda42ae, @@ -378,7 +384,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55d25429e6831ca43a9b623a7eda42ae, type: 3} --- !u!114 &8930576165009101620 stripped MonoBehaviour: @@ -403,7 +411,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 5898508218231257534} m_Modifications: - target: {fileID: 3811057050737857607, guid: 734ee0af65bcf0f46b8ed1b67e188d88, @@ -432,7 +440,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 734ee0af65bcf0f46b8ed1b67e188d88, type: 3} --- !u!4 &629110589767826315 stripped Transform: @@ -457,7 +467,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 4718034710837402400} m_Modifications: - target: {fileID: 3811057050737857607, guid: 734ee0af65bcf0f46b8ed1b67e188d88, @@ -486,7 +496,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 734ee0af65bcf0f46b8ed1b67e188d88, type: 3} --- !u!4 &629110590994703232 stripped Transform: @@ -511,7 +523,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 3493263918085821487} m_Modifications: - target: {fileID: 3811057050737857607, guid: 734ee0af65bcf0f46b8ed1b67e188d88, @@ -540,7 +552,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 734ee0af65bcf0f46b8ed1b67e188d88, type: 3} --- !u!4 &629110591484005939 stripped Transform: @@ -565,7 +579,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 2086065801867321733} m_Modifications: - target: {fileID: 5606948831786426046, guid: 55d25429e6831ca43a9b623a7eda42ae, @@ -629,7 +643,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55d25429e6831ca43a9b623a7eda42ae, type: 3} --- !u!4 &8593048176201676677 stripped Transform: @@ -654,7 +670,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 2733273405665092327} m_Modifications: - target: {fileID: 5606948831786426046, guid: 55d25429e6831ca43a9b623a7eda42ae, @@ -703,7 +719,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55d25429e6831ca43a9b623a7eda42ae, type: 3} --- !u!114 &1006471689366164137 stripped MonoBehaviour: @@ -728,7 +746,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 3968590605239387248} m_Modifications: - target: {fileID: -8679921383154817045, guid: 4b88264faf0bc6d49ad324d6e223146a, @@ -802,6 +820,7 @@ PrefabInstance: value: Hexagon Stand objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -6767189570106248640, guid: 4b88264faf0bc6d49ad324d6e223146a, type: 3} @@ -839,6 +858,7 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 5712720649417044906} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b88264faf0bc6d49ad324d6e223146a, type: 3} --- !u!23 &458321616436583559 stripped MeshRenderer: @@ -917,7 +937,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 7539065164353510698} m_Modifications: - target: {fileID: 5606948831786426046, guid: 55d25429e6831ca43a9b623a7eda42ae, @@ -966,7 +986,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 55d25429e6831ca43a9b623a7eda42ae, type: 3} --- !u!4 &3968590605445818376 stripped Transform: diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab.meta b/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab.meta rename to Assets/Station46/Modules/Hexagon/Hexagon 3.prefab.meta diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab b/Assets/Station46/Modules/Hexagon/Hexagon 5.prefab similarity index 98% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab rename to Assets/Station46/Modules/Hexagon/Hexagon 5.prefab index 3bfddb8..b7987b6 100644 --- a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab +++ b/Assets/Station46/Modules/Hexagon/Hexagon 5.prefab @@ -5,13 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3968590605239387246, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} propertyPath: m_Name - value: Puzzle B2 + value: Hexagon 5 objectReference: {fileID: 0} - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} @@ -239,6 +239,7 @@ PrefabInstance: value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 311784221047932527, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} @@ -248,6 +249,7 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 6455438496867498778} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} --- !u!4 &344007941950238386 stripped Transform: @@ -290,7 +292,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1150933455454464140} m_Modifications: - target: {fileID: 3811057050737857607, guid: 734ee0af65bcf0f46b8ed1b67e188d88, @@ -319,7 +321,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 734ee0af65bcf0f46b8ed1b67e188d88, type: 3} --- !u!114 &604595110344032426 stripped MonoBehaviour: @@ -344,7 +348,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 344007941950238386} m_Modifications: - target: {fileID: 3811057050737857607, guid: 734ee0af65bcf0f46b8ed1b67e188d88, @@ -373,7 +377,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 734ee0af65bcf0f46b8ed1b67e188d88, type: 3} --- !u!4 &6455438496867498778 stripped Transform: diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab.meta b/Assets/Station46/Modules/Hexagon/Hexagon 5.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab.meta rename to Assets/Station46/Modules/Hexagon/Hexagon 5.prefab.meta diff --git a/Assets/Station46/Modules/Hexagon/Materials.meta b/Assets/Station46/Modules/Hexagon/Materials.meta new file mode 100644 index 0000000..2d9e88b --- /dev/null +++ b/Assets/Station46/Modules/Hexagon/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d276391d37f84f0c97360948131467fc +timeCreated: 1683640587 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Hexagon Stand.mat b/Assets/Station46/Modules/Hexagon/Materials/Hexagon Stand.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Hexagon Stand.mat rename to Assets/Station46/Modules/Hexagon/Materials/Hexagon Stand.mat diff --git a/Assets/Station46/Assets/Materials/Hexagon Stand.mat.meta b/Assets/Station46/Modules/Hexagon/Materials/Hexagon Stand.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Hexagon Stand.mat.meta rename to Assets/Station46/Modules/Hexagon/Materials/Hexagon Stand.mat.meta diff --git a/Assets/Station46/Modules/Hexagon/Materials/Textures.meta b/Assets/Station46/Modules/Hexagon/Materials/Textures.meta new file mode 100644 index 0000000..937c816 --- /dev/null +++ b/Assets/Station46/Modules/Hexagon/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 574b5056e95249d3ae689428fae56182 +timeCreated: 1683640587 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Emission.png b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Emission.png rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Emission.png.meta b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Emission.png.meta rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Normal.png b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Normal.png rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Normal.png.meta b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Normal.png.meta rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Occlusion.png b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Occlusion.png rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Occlusion.png.meta b/Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hexagon Stand/Hexagon Stand_Hexagon Stand_Occlusion.png.meta rename to Assets/Station46/Modules/Hexagon/Materials/Textures/Hexagon Stand_Hexagon Stand_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Hexagon/Models.meta b/Assets/Station46/Modules/Hexagon/Models.meta new file mode 100644 index 0000000..694c021 --- /dev/null +++ b/Assets/Station46/Modules/Hexagon/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: eb816860032e4c65afd0bc2b5ac6ecc4 +timeCreated: 1683640587 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Hexagon Stand.blend b/Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend similarity index 100% rename from Assets/Station46/Assets/Models/Hexagon Stand.blend rename to Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend diff --git a/Assets/Station46/Assets/Models/Hexagon Stand.blend.meta b/Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hexagon Stand.blend.meta rename to Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend.meta diff --git a/Assets/Station46/Assets/Models/Hexagon Stand.blend1 b/Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Hexagon Stand.blend1 rename to Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend1 diff --git a/Assets/Station46/Assets/Models/Hexagon Stand.blend1.meta b/Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hexagon Stand.blend1.meta rename to Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.blend1.meta diff --git a/Assets/Station46/Assets/Models/Hexagon Stand.fbx b/Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Hexagon Stand.fbx rename to Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.fbx diff --git a/Assets/Station46/Assets/Models/Hexagon Stand.fbx.meta b/Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hexagon Stand.fbx.meta rename to Assets/Station46/Modules/Hexagon/Models/Hexagon Stand.fbx.meta diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Rotator.prefab b/Assets/Station46/Modules/Hexagon/Rotator.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Rotator.prefab rename to Assets/Station46/Modules/Hexagon/Rotator.prefab diff --git a/Assets/Station46/Assets/Modules/Hexagon Puzzle/Rotator.prefab.meta b/Assets/Station46/Modules/Hexagon/Rotator.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hexagon Puzzle/Rotator.prefab.meta rename to Assets/Station46/Modules/Hexagon/Rotator.prefab.meta diff --git a/Assets/Station46/Modules/Hexagon/Scripts.meta b/Assets/Station46/Modules/Hexagon/Scripts.meta new file mode 100644 index 0000000..6b0c4f3 --- /dev/null +++ b/Assets/Station46/Modules/Hexagon/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6674a11411f147018c5fc8903529c834 +timeCreated: 1683640587 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle B/PuzzleB.cs b/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs similarity index 92% rename from Assets/Station46/Runtime/Puzzle B/PuzzleB.cs rename to Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs index b9162e8..139bb8b 100644 --- a/Assets/Station46/Runtime/Puzzle B/PuzzleB.cs +++ b/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; -using EscapeRoomEngine.Engine.Runtime; using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; -using EscapeRoomEngine.Station46.Runtime.Puzzle_A; using JetBrains.Annotations; using NaughtyAttributes; +using Station46.Runtime.Puzzle_A; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_B +namespace Station46.Runtime.Puzzle_B { [Serializable] internal struct ButtonAction @@ -20,7 +19,7 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_B /// /// The main component for the hexagon module. /// - public class PuzzleB : StatePuzzle + public class Hexagon : StatePuzzle { [Tooltip("How many seconds the buttons should be disabled until another input is accepted.")] [SerializeField] [Min(0)] @@ -47,14 +46,14 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_B switch (type) { case PuzzleEventType.Restarted: - var color = Engine.Runtime.Engine.Theme.puzzleColor; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; crystal.Color = color; lights.ForEach(emission => emission.color = color.hdr); rotators.ForEach(rotator => rotator.Emission.color = color.hdr); buttonActions.ForEach(action => action.button.Enable()); break; case PuzzleEventType.Solved: - color = Engine.Runtime.Engine.Theme.solvedColor; + color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor; crystal.Color = color; lights.ForEach(emission => emission.color = color.hdr); rotators.ForEach(rotator => rotator.Emission.color = color.hdr); diff --git a/Assets/Station46/Runtime/Puzzle B/PuzzleB.cs.meta b/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle B/PuzzleB.cs.meta rename to Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs.meta diff --git a/Assets/Station46/Runtime/Puzzle B/Rotator.cs b/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs similarity index 94% rename from Assets/Station46/Runtime/Puzzle B/Rotator.cs rename to Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs index 48fd1eb..7ef6460 100644 --- a/Assets/Station46/Runtime/Puzzle B/Rotator.cs +++ b/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_B +namespace Station46.Runtime.Puzzle_B { /// /// The rotator component used by the hexagon module. diff --git a/Assets/Station46/Runtime/Puzzle B/Rotator.cs.meta b/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle B/Rotator.cs.meta rename to Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs.meta diff --git a/Assets/Station46/Modules/Holes.meta b/Assets/Station46/Modules/Holes.meta new file mode 100644 index 0000000..cedfb5d --- /dev/null +++ b/Assets/Station46/Modules/Holes.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1f5eee8360e14b73bce62e1a6b46fb50 +timeCreated: 1683637753 \ No newline at end of file diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Hole.prefab b/Assets/Station46/Modules/Holes/Hole.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Hole.prefab rename to Assets/Station46/Modules/Holes/Hole.prefab diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Hole.prefab.meta b/Assets/Station46/Modules/Holes/Hole.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Hole.prefab.meta rename to Assets/Station46/Modules/Holes/Hole.prefab.meta diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes.asset b/Assets/Station46/Modules/Holes/Holes.asset similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes.asset rename to Assets/Station46/Modules/Holes/Holes.asset diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes.asset.meta b/Assets/Station46/Modules/Holes/Holes.asset.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes.asset.meta rename to Assets/Station46/Modules/Holes/Holes.asset.meta diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes.prefab b/Assets/Station46/Modules/Holes/Holes.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes.prefab rename to Assets/Station46/Modules/Holes/Holes.prefab diff --git a/Assets/Station46/Assets/Modules/Holes Puzzle/Holes.prefab.meta b/Assets/Station46/Modules/Holes/Holes.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Holes Puzzle/Holes.prefab.meta rename to Assets/Station46/Modules/Holes/Holes.prefab.meta diff --git a/Assets/Station46/Modules/Holes/Materials.meta b/Assets/Station46/Modules/Holes/Materials.meta new file mode 100644 index 0000000..35f5e71 --- /dev/null +++ b/Assets/Station46/Modules/Holes/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1a552ce47df748679c0ba44d8729aff3 +timeCreated: 1683637753 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Holes.mat b/Assets/Station46/Modules/Holes/Materials/Holes.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Holes.mat rename to Assets/Station46/Modules/Holes/Materials/Holes.mat diff --git a/Assets/Station46/Assets/Materials/Holes.mat.meta b/Assets/Station46/Modules/Holes/Materials/Holes.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Holes.mat.meta rename to Assets/Station46/Modules/Holes/Materials/Holes.mat.meta diff --git a/Assets/Station46/Modules/Holes/Materials/Textures.meta b/Assets/Station46/Modules/Holes/Materials/Textures.meta new file mode 100644 index 0000000..74cf09d --- /dev/null +++ b/Assets/Station46/Modules/Holes/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9ac59fe2d64041af837a7ef05627772b +timeCreated: 1683637753 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_AlbedoTransparency.png b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_AlbedoTransparency.png rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Emission.png b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Emission.png rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Emission.png.meta b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Emission.png.meta rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_MetallicSmoothness.png b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_MetallicSmoothness.png rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Normal.png b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Normal.png rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Normal.png.meta b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Normal.png.meta rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Occlusion.png b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Occlusion.png rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Occlusion.png.meta b/Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holes/Holes_Holes_Occlusion.png.meta rename to Assets/Station46/Modules/Holes/Materials/Textures/Holes_Holes_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Holes/Models.meta b/Assets/Station46/Modules/Holes/Models.meta new file mode 100644 index 0000000..48d1b9a --- /dev/null +++ b/Assets/Station46/Modules/Holes/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0cce36e6fd4747038a2a4e4a5229bc1c +timeCreated: 1683637753 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Holes.blend b/Assets/Station46/Modules/Holes/Models/Holes.blend similarity index 100% rename from Assets/Station46/Assets/Models/Holes.blend rename to Assets/Station46/Modules/Holes/Models/Holes.blend diff --git a/Assets/Station46/Assets/Models/Holes.blend.meta b/Assets/Station46/Modules/Holes/Models/Holes.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Holes.blend.meta rename to Assets/Station46/Modules/Holes/Models/Holes.blend.meta diff --git a/Assets/Station46/Assets/Models/Holes.blend1 b/Assets/Station46/Modules/Holes/Models/Holes.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Holes.blend1 rename to Assets/Station46/Modules/Holes/Models/Holes.blend1 diff --git a/Assets/Station46/Assets/Models/Holes.blend1.meta b/Assets/Station46/Modules/Holes/Models/Holes.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Holes.blend1.meta rename to Assets/Station46/Modules/Holes/Models/Holes.blend1.meta diff --git a/Assets/Station46/Assets/Models/Holes.fbx b/Assets/Station46/Modules/Holes/Models/Holes.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Holes.fbx rename to Assets/Station46/Modules/Holes/Models/Holes.fbx diff --git a/Assets/Station46/Assets/Models/Holes.fbx.meta b/Assets/Station46/Modules/Holes/Models/Holes.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Holes.fbx.meta rename to Assets/Station46/Modules/Holes/Models/Holes.fbx.meta diff --git a/Assets/Station46/Modules/Holes/Scripts.meta b/Assets/Station46/Modules/Holes/Scripts.meta new file mode 100644 index 0000000..d26729e --- /dev/null +++ b/Assets/Station46/Modules/Holes/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9cc0ebec31f44187b2c1b520abe7c9e4 +timeCreated: 1683637753 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle C/Hole.cs b/Assets/Station46/Modules/Holes/Scripts/Hole.cs similarity index 83% rename from Assets/Station46/Runtime/Puzzle C/Hole.cs rename to Assets/Station46/Modules/Holes/Scripts/Hole.cs index dba3d8e..9fd2fdc 100644 --- a/Assets/Station46/Runtime/Puzzle C/Hole.cs +++ b/Assets/Station46/Modules/Holes/Scripts/Hole.cs @@ -1,7 +1,8 @@ -using EscapeRoomEngine.Station46.Runtime.Dispenser; +using Station46.Dispenser.Scripts; +using Station46.Runtime; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C +namespace Station46.Holes.Scripts { /// /// A hole used in the module. @@ -34,7 +35,7 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C { if (Active) { - var color = Engine.Runtime.Engine.Theme.activeColor; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor; orb.Color = color.hdr; Emission.color = color.hdr; @@ -48,7 +49,7 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C var orb = other.GetComponent(); if (orb != null) { - var color = Engine.Runtime.Engine.Theme.puzzleColor; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; if (Active) { diff --git a/Assets/Station46/Runtime/Puzzle C/Hole.cs.meta b/Assets/Station46/Modules/Holes/Scripts/Hole.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle C/Hole.cs.meta rename to Assets/Station46/Modules/Holes/Scripts/Hole.cs.meta diff --git a/Assets/Station46/Runtime/Puzzle C/Holes.cs b/Assets/Station46/Modules/Holes/Scripts/Holes.cs similarity index 85% rename from Assets/Station46/Runtime/Puzzle C/Holes.cs rename to Assets/Station46/Modules/Holes/Scripts/Holes.cs index d2874b4..9facf5a 100644 --- a/Assets/Station46/Runtime/Puzzle C/Holes.cs +++ b/Assets/Station46/Modules/Holes/Scripts/Holes.cs @@ -3,9 +3,10 @@ using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; +using Station46.Runtime; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C +namespace Station46.Holes.Scripts { /// /// The main component for the orb grid module. @@ -16,7 +17,7 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C private Emission frameLight; private List _holes; - private Dispenser.Dispenser _dispenser; + private Dispenser.Scripts.Dispenser _dispenser; protected override void Awake() { @@ -35,7 +36,7 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C switch (type) { case PuzzleEventType.Restarted: - var color = Engine.Runtime.Engine.Theme.puzzleColor; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; _holes.ForEach(hole => { hole.Enable(); @@ -45,8 +46,8 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C _dispenser.Reset(); break; case PuzzleEventType.Solved: - var solvedColor = Engine.Runtime.Engine.Theme.solvedColor; - var activeColor = Engine.Runtime.Engine.Theme.activeColor; + var solvedColor = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor; + var activeColor = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor; _holes.ForEach(hole => { hole.Disable(); @@ -81,7 +82,7 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_C // The holes require a related dispenser module var firstRelatedModule = Module.relatedModules[0]; - if (firstRelatedModule.State is Dispenser.Dispenser dispenser) + if (firstRelatedModule.State is Dispenser.Scripts.Dispenser dispenser) { _dispenser = dispenser; } diff --git a/Assets/Station46/Runtime/Puzzle C/Holes.cs.meta b/Assets/Station46/Modules/Holes/Scripts/Holes.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle C/Holes.cs.meta rename to Assets/Station46/Modules/Holes/Scripts/Holes.cs.meta diff --git a/Assets/Station46/Modules/Hoop.meta b/Assets/Station46/Modules/Hoop.meta new file mode 100644 index 0000000..f0cc288 --- /dev/null +++ b/Assets/Station46/Modules/Hoop.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d99f4ee40b674dcc8ebe78dc84d9a41a +timeCreated: 1683640350 \ No newline at end of file diff --git a/Assets/Station46/Modules/Hoop/Animations.meta b/Assets/Station46/Modules/Hoop/Animations.meta new file mode 100644 index 0000000..c98db30 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d55d3ba6f18d4a5395b7bfed9e3ff5a4 +timeCreated: 1683640350 \ No newline at end of file diff --git a/Assets/Station46/Assets/Animations/Hoop Hover.anim b/Assets/Station46/Modules/Hoop/Animations/Hoop Hover.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Hoop Hover.anim rename to Assets/Station46/Modules/Hoop/Animations/Hoop Hover.anim diff --git a/Assets/Station46/Assets/Animations/Hoop Hover.anim.meta b/Assets/Station46/Modules/Hoop/Animations/Hoop Hover.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Hoop Hover.anim.meta rename to Assets/Station46/Modules/Hoop/Animations/Hoop Hover.anim.meta diff --git a/Assets/Station46/Assets/Animations/Hoop.controller b/Assets/Station46/Modules/Hoop/Animations/Hoop.controller similarity index 100% rename from Assets/Station46/Assets/Animations/Hoop.controller rename to Assets/Station46/Modules/Hoop/Animations/Hoop.controller diff --git a/Assets/Station46/Assets/Animations/Hoop.controller.meta b/Assets/Station46/Modules/Hoop/Animations/Hoop.controller.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Hoop.controller.meta rename to Assets/Station46/Modules/Hoop/Animations/Hoop.controller.meta diff --git a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop.prefab b/Assets/Station46/Modules/Hoop/Hoop.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop.prefab rename to Assets/Station46/Modules/Hoop/Hoop.prefab diff --git a/Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop.prefab.meta b/Assets/Station46/Modules/Hoop/Hoop.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Hoop Fling Puzzle/Hoop.prefab.meta rename to Assets/Station46/Modules/Hoop/Hoop.prefab.meta diff --git a/Assets/Station46/Modules/Hoop/Materials.meta b/Assets/Station46/Modules/Hoop/Materials.meta new file mode 100644 index 0000000..4c85dfd --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 73b2b495ddb14762834a9a856558091d +timeCreated: 1683640350 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Hoop.mat b/Assets/Station46/Modules/Hoop/Materials/Hoop.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Hoop.mat rename to Assets/Station46/Modules/Hoop/Materials/Hoop.mat diff --git a/Assets/Station46/Assets/Materials/Hoop.mat.meta b/Assets/Station46/Modules/Hoop/Materials/Hoop.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Hoop.mat.meta rename to Assets/Station46/Modules/Hoop/Materials/Hoop.mat.meta diff --git a/Assets/Station46/Modules/Hoop/Materials/Textures.meta b/Assets/Station46/Modules/Hoop/Materials/Textures.meta new file mode 100644 index 0000000..d9622fa --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: dc0aa39ea11b48e9a152915909f8cd72 +timeCreated: 1683640350 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_AlbedoTransparency.png b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_AlbedoTransparency.png rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Emission.png b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Emission.png rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Emission.png.meta b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Emission.png.meta rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_MetallicSmoothness.png b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_MetallicSmoothness.png rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Normal.png b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Normal.png rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Normal.png.meta b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Normal.png.meta rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Occlusion.png b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Occlusion.png rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Occlusion.png.meta b/Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hoop/Hoop_Hoop_Occlusion.png.meta rename to Assets/Station46/Modules/Hoop/Materials/Textures/Hoop_Hoop_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Hoop/Models.meta b/Assets/Station46/Modules/Hoop/Models.meta new file mode 100644 index 0000000..8af895b --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c72208e159e5476abb14920ddd31fc0c +timeCreated: 1683640350 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Hoop.blend b/Assets/Station46/Modules/Hoop/Models/Hoop.blend similarity index 100% rename from Assets/Station46/Assets/Models/Hoop.blend rename to Assets/Station46/Modules/Hoop/Models/Hoop.blend diff --git a/Assets/Station46/Assets/Models/Hoop.blend.meta b/Assets/Station46/Modules/Hoop/Models/Hoop.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hoop.blend.meta rename to Assets/Station46/Modules/Hoop/Models/Hoop.blend.meta diff --git a/Assets/Station46/Assets/Models/Hoop.blend1 b/Assets/Station46/Modules/Hoop/Models/Hoop.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Hoop.blend1 rename to Assets/Station46/Modules/Hoop/Models/Hoop.blend1 diff --git a/Assets/Station46/Assets/Models/Hoop.blend1.meta b/Assets/Station46/Modules/Hoop/Models/Hoop.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hoop.blend1.meta rename to Assets/Station46/Modules/Hoop/Models/Hoop.blend1.meta diff --git a/Assets/Station46/Assets/Models/Hoop.fbx b/Assets/Station46/Modules/Hoop/Models/Hoop.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Hoop.fbx rename to Assets/Station46/Modules/Hoop/Models/Hoop.fbx diff --git a/Assets/Station46/Assets/Models/Hoop.fbx.meta b/Assets/Station46/Modules/Hoop/Models/Hoop.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hoop.fbx.meta rename to Assets/Station46/Modules/Hoop/Models/Hoop.fbx.meta diff --git a/Assets/Station46/Modules/Hoop/Scripts.meta b/Assets/Station46/Modules/Hoop/Scripts.meta new file mode 100644 index 0000000..df724eb --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e91fd6196e824bdd9a609b7a914dcb6c +timeCreated: 1683640350 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Hoop.cs b/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs similarity index 88% rename from Assets/Station46/Runtime/Hoop.cs rename to Assets/Station46/Modules/Hoop/Scripts/Hoop.cs index d9cafce..208b180 100644 --- a/Assets/Station46/Runtime/Hoop.cs +++ b/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; -using EscapeRoomEngine.Station46.Runtime.Dispenser; using NaughtyAttributes; +using Station46.Dispenser.Scripts; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// The main component for the orb throwing module. @@ -21,7 +21,7 @@ namespace EscapeRoomEngine.Station46.Runtime private List rings; private readonly HashSet _orbs = new(); - private Dispenser.Dispenser _dispenser; + private Dispenser.Scripts.Dispenser _dispenser; protected override void Start() { @@ -33,12 +33,12 @@ namespace EscapeRoomEngine.Station46.Runtime switch (type) { case PuzzleEventType.Restarted: - var color = Engine.Runtime.Engine.Theme.puzzleColor; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; rings.ForEach(ring => ring.color = color.hdr); _dispenser.Reset(); break; case PuzzleEventType.Solved: - color = Engine.Runtime.Engine.Theme.solvedColor; + color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor; rings.ForEach(ring => ring.color = color.hdr); _dispenser.Solve(); break; @@ -91,7 +91,7 @@ namespace EscapeRoomEngine.Station46.Runtime // The hoop requires a related dispenser module var firstRelatedModule = Module.relatedModules[0]; - if (firstRelatedModule.State is Dispenser.Dispenser dispenser) + if (firstRelatedModule.State is Dispenser.Scripts.Dispenser dispenser) { _dispenser = dispenser; } diff --git a/Assets/Station46/Runtime/Hoop.cs.meta b/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Hoop.cs.meta rename to Assets/Station46/Modules/Hoop/Scripts/Hoop.cs.meta diff --git a/Assets/Station46/Modules/Hover Sphere.meta b/Assets/Station46/Modules/Hover Sphere.meta new file mode 100644 index 0000000..9d54e05 --- /dev/null +++ b/Assets/Station46/Modules/Hover Sphere.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6805add90a5a408b9d2b678116a4fe0e +timeCreated: 1683638097 \ No newline at end of file diff --git a/Assets/Station46/Modules/Hover Sphere/Animations.meta b/Assets/Station46/Modules/Hover Sphere/Animations.meta new file mode 100644 index 0000000..5a4cf65 --- /dev/null +++ b/Assets/Station46/Modules/Hover Sphere/Animations.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4901e1e49ecd4be188edfbe9d5a4fc8b +timeCreated: 1683638097 \ No newline at end of file diff --git a/Assets/Station46/Assets/Animations/Ball Hover.anim b/Assets/Station46/Modules/Hover Sphere/Animations/Ball Hover.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Ball Hover.anim rename to Assets/Station46/Modules/Hover Sphere/Animations/Ball Hover.anim diff --git a/Assets/Station46/Assets/Animations/Ball Hover.anim.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Ball Hover.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Ball Hover.anim.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Ball Hover.anim.meta diff --git a/Assets/Station46/Assets/Animations/Ball.controller b/Assets/Station46/Modules/Hover Sphere/Animations/Ball.controller similarity index 100% rename from Assets/Station46/Assets/Animations/Ball.controller rename to Assets/Station46/Modules/Hover Sphere/Animations/Ball.controller diff --git a/Assets/Station46/Assets/Animations/Ball.controller.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Ball.controller.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Ball.controller.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Ball.controller.meta diff --git a/Assets/Station46/Assets/Animations/Crystal Rotation.anim b/Assets/Station46/Modules/Hover Sphere/Animations/Crystal Rotation.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Crystal Rotation.anim rename to Assets/Station46/Modules/Hover Sphere/Animations/Crystal Rotation.anim diff --git a/Assets/Station46/Assets/Animations/Crystal Rotation.anim.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Crystal Rotation.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Crystal Rotation.anim.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Crystal Rotation.anim.meta diff --git a/Assets/Station46/Assets/Animations/Crystal.controller b/Assets/Station46/Modules/Hover Sphere/Animations/Crystal.controller similarity index 100% rename from Assets/Station46/Assets/Animations/Crystal.controller rename to Assets/Station46/Modules/Hover Sphere/Animations/Crystal.controller diff --git a/Assets/Station46/Assets/Animations/Crystal.controller.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Crystal.controller.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Crystal.controller.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Crystal.controller.meta diff --git a/Assets/Station46/Assets/Animations/Light Flash.anim b/Assets/Station46/Modules/Hover Sphere/Animations/Light Flash.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Light Flash.anim rename to Assets/Station46/Modules/Hover Sphere/Animations/Light Flash.anim diff --git a/Assets/Station46/Assets/Animations/Light Flash.anim.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Light Flash.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Light Flash.anim.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Light Flash.anim.meta diff --git a/Assets/Station46/Assets/Animations/Light On.anim b/Assets/Station46/Modules/Hover Sphere/Animations/Light On.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Light On.anim rename to Assets/Station46/Modules/Hover Sphere/Animations/Light On.anim diff --git a/Assets/Station46/Assets/Animations/Light On.anim.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Light On.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Light On.anim.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Light On.anim.meta diff --git a/Assets/Station46/Assets/Animations/Ring Rotation.anim b/Assets/Station46/Modules/Hover Sphere/Animations/Ring Rotation.anim similarity index 100% rename from Assets/Station46/Assets/Animations/Ring Rotation.anim rename to Assets/Station46/Modules/Hover Sphere/Animations/Ring Rotation.anim diff --git a/Assets/Station46/Assets/Animations/Ring Rotation.anim.meta b/Assets/Station46/Modules/Hover Sphere/Animations/Ring Rotation.anim.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Ring Rotation.anim.meta rename to Assets/Station46/Modules/Hover Sphere/Animations/Ring Rotation.anim.meta diff --git a/Assets/Station46/Assets/Prefabs/Ball/Ball 3 Slots.prefab b/Assets/Station46/Modules/Hover Sphere/Ball 3 Slots.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Ball/Ball 3 Slots.prefab rename to Assets/Station46/Modules/Hover Sphere/Ball 3 Slots.prefab diff --git a/Assets/Station46/Assets/Prefabs/Ball/Ball 3 Slots.prefab.meta b/Assets/Station46/Modules/Hover Sphere/Ball 3 Slots.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Ball/Ball 3 Slots.prefab.meta rename to Assets/Station46/Modules/Hover Sphere/Ball 3 Slots.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Ball/Ball.prefab b/Assets/Station46/Modules/Hover Sphere/Ball.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Ball/Ball.prefab rename to Assets/Station46/Modules/Hover Sphere/Ball.prefab diff --git a/Assets/Station46/Assets/Prefabs/Ball/Ball.prefab.meta b/Assets/Station46/Modules/Hover Sphere/Ball.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Ball/Ball.prefab.meta rename to Assets/Station46/Modules/Hover Sphere/Ball.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Crystal.prefab b/Assets/Station46/Modules/Hover Sphere/Crystal.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Crystal.prefab rename to Assets/Station46/Modules/Hover Sphere/Crystal.prefab diff --git a/Assets/Station46/Assets/Prefabs/Crystal.prefab.meta b/Assets/Station46/Modules/Hover Sphere/Crystal.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Crystal.prefab.meta rename to Assets/Station46/Modules/Hover Sphere/Crystal.prefab.meta diff --git a/Assets/Station46/Modules/Hover Sphere/Materials.meta b/Assets/Station46/Modules/Hover Sphere/Materials.meta new file mode 100644 index 0000000..68f30e3 --- /dev/null +++ b/Assets/Station46/Modules/Hover Sphere/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bafc311908294c3fb1738c7dded19024 +timeCreated: 1683638097 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Light.mat b/Assets/Station46/Modules/Hover Sphere/Materials/Light.mat similarity index 99% rename from Assets/Station46/Assets/Materials/Light.mat rename to Assets/Station46/Modules/Hover Sphere/Materials/Light.mat index 1b02f5d..ee6cedc 100644 --- a/Assets/Station46/Assets/Materials/Light.mat +++ b/Assets/Station46/Modules/Hover Sphere/Materials/Light.mat @@ -87,6 +87,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 diff --git a/Assets/Station46/Assets/Materials/Light.mat.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Light.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Light.mat.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Light.mat.meta diff --git a/Assets/Station46/Assets/Materials/Ring and Crystal.mat b/Assets/Station46/Modules/Hover Sphere/Materials/Ring and Crystal.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Ring and Crystal.mat rename to Assets/Station46/Modules/Hover Sphere/Materials/Ring and Crystal.mat diff --git a/Assets/Station46/Assets/Materials/Ring and Crystal.mat.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Ring and Crystal.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Ring and Crystal.mat.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Ring and Crystal.mat.meta diff --git a/Assets/Station46/Assets/Materials/Sphere.mat b/Assets/Station46/Modules/Hover Sphere/Materials/Sphere.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Sphere.mat rename to Assets/Station46/Modules/Hover Sphere/Materials/Sphere.mat diff --git a/Assets/Station46/Assets/Materials/Sphere.mat.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Sphere.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Sphere.mat.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Sphere.mat.meta diff --git a/Assets/Station46/Modules/Hover Sphere/Materials/Textures.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures.meta new file mode 100644 index 0000000..2c3da91 --- /dev/null +++ b/Assets/Station46/Modules/Hover Sphere/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7508f60122ec457fa2c287715fba79d2 +timeCreated: 1683638097 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Normal.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Normal.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Normal.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Normal.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Occlusion.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Occlusion.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Light_Occlusion.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Ring and Crystal_Occlusion.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Normal.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Normal.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Occlusion.png b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Occlusion.png rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta b/Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta rename to Assets/Station46/Modules/Hover Sphere/Materials/Textures/Ball_Sphere_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Hover Sphere/Models.meta b/Assets/Station46/Modules/Hover Sphere/Models.meta new file mode 100644 index 0000000..15adb42 --- /dev/null +++ b/Assets/Station46/Modules/Hover Sphere/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ba986c3021a942e4bca5978e6a05bc69 +timeCreated: 1683638097 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Ball.blend b/Assets/Station46/Modules/Hover Sphere/Models/Ball.blend similarity index 100% rename from Assets/Station46/Assets/Models/Ball.blend rename to Assets/Station46/Modules/Hover Sphere/Models/Ball.blend diff --git a/Assets/Station46/Assets/Models/Ball.blend.meta b/Assets/Station46/Modules/Hover Sphere/Models/Ball.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Ball.blend.meta rename to Assets/Station46/Modules/Hover Sphere/Models/Ball.blend.meta diff --git a/Assets/Station46/Assets/Models/Ball.blend1 b/Assets/Station46/Modules/Hover Sphere/Models/Ball.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Ball.blend1 rename to Assets/Station46/Modules/Hover Sphere/Models/Ball.blend1 diff --git a/Assets/Station46/Assets/Models/Ball.blend1.meta b/Assets/Station46/Modules/Hover Sphere/Models/Ball.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Ball.blend1.meta rename to Assets/Station46/Modules/Hover Sphere/Models/Ball.blend1.meta diff --git a/Assets/Station46/Assets/Models/Ball.fbx b/Assets/Station46/Modules/Hover Sphere/Models/Ball.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Ball.fbx rename to Assets/Station46/Modules/Hover Sphere/Models/Ball.fbx diff --git a/Assets/Station46/Assets/Models/Ball.fbx.meta b/Assets/Station46/Modules/Hover Sphere/Models/Ball.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Ball.fbx.meta rename to Assets/Station46/Modules/Hover Sphere/Models/Ball.fbx.meta diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.prefab b/Assets/Station46/Modules/Hover Sphere/Position Ball.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.prefab rename to Assets/Station46/Modules/Hover Sphere/Position Ball.prefab diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.prefab.meta b/Assets/Station46/Modules/Hover Sphere/Position Ball.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Position Ball.prefab.meta rename to Assets/Station46/Modules/Hover Sphere/Position Ball.prefab.meta diff --git a/Assets/Station46/Modules/Hover Sphere/Scripts.meta b/Assets/Station46/Modules/Hover Sphere/Scripts.meta new file mode 100644 index 0000000..0ebc3ce --- /dev/null +++ b/Assets/Station46/Modules/Hover Sphere/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 934dfefb404448cf80ae7589e4c017ea +timeCreated: 1683638097 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle A/Ball.cs b/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs similarity index 82% rename from Assets/Station46/Runtime/Puzzle A/Ball.cs rename to Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs index 14a9b9e..ec3075e 100644 --- a/Assets/Station46/Runtime/Puzzle A/Ball.cs +++ b/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs @@ -2,7 +2,7 @@ using EscapeRoomEngine.Engine.Runtime.Modules.State; using NaughtyAttributes; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A +namespace Station46.Runtime.Puzzle_A { /// /// The main component for the symbol ball module. @@ -24,8 +24,8 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A set { statusLight.color = value ? - Engine.Runtime.Engine.Theme.puzzleColor.hdr - : Engine.Runtime.Engine.Theme.solvedColor.hdr; + EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr + : EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; ring.rotating = value; if (!value) { diff --git a/Assets/Station46/Runtime/Puzzle A/Ball.cs.meta b/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle A/Ball.cs.meta rename to Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs.meta diff --git a/Assets/Station46/Runtime/Crystal.cs b/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs similarity index 95% rename from Assets/Station46/Runtime/Crystal.cs rename to Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs index 6626c5a..a3eb87d 100644 --- a/Assets/Station46/Runtime/Crystal.cs +++ b/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs @@ -2,7 +2,7 @@ using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// A rotating crystal that can change colour. diff --git a/Assets/Station46/Runtime/Crystal.cs.meta b/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Crystal.cs.meta rename to Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs.meta diff --git a/Assets/Station46/Runtime/Puzzle A/Ring.cs b/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs similarity index 97% rename from Assets/Station46/Runtime/Puzzle A/Ring.cs rename to Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs index c412fe2..92979c2 100644 --- a/Assets/Station46/Runtime/Puzzle A/Ring.cs +++ b/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A +namespace Station46.Runtime.Puzzle_A { /// /// The rotating ring in the symbol ball module. diff --git a/Assets/Station46/Runtime/Puzzle A/Ring.cs.meta b/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle A/Ring.cs.meta rename to Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs.meta diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab b/Assets/Station46/Modules/Hover Sphere/Symbol Ball.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab rename to Assets/Station46/Modules/Hover Sphere/Symbol Ball.prefab diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab.meta b/Assets/Station46/Modules/Hover Sphere/Symbol Ball.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab.meta rename to Assets/Station46/Modules/Hover Sphere/Symbol Ball.prefab.meta diff --git a/Assets/Station46/Modules/Orb.meta b/Assets/Station46/Modules/Orb.meta new file mode 100644 index 0000000..a3a335a --- /dev/null +++ b/Assets/Station46/Modules/Orb.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d06aef4638594f568031f531b1f91800 +timeCreated: 1683641011 \ No newline at end of file diff --git a/Assets/Station46/Modules/Orb/Materials.meta b/Assets/Station46/Modules/Orb/Materials.meta new file mode 100644 index 0000000..57b89a2 --- /dev/null +++ b/Assets/Station46/Modules/Orb/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d1194518bd374b5e91e2831099ff8986 +timeCreated: 1683641011 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Hole Orb.mat b/Assets/Station46/Modules/Orb/Materials/Hole Orb.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Hole Orb.mat rename to Assets/Station46/Modules/Orb/Materials/Hole Orb.mat diff --git a/Assets/Station46/Assets/Materials/Hole Orb.mat.meta b/Assets/Station46/Modules/Orb/Materials/Hole Orb.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Hole Orb.mat.meta rename to Assets/Station46/Modules/Orb/Materials/Hole Orb.mat.meta diff --git a/Assets/Station46/Modules/Orb/Materials/Textures.meta b/Assets/Station46/Modules/Orb/Materials/Textures.meta new file mode 100644 index 0000000..c9962a1 --- /dev/null +++ b/Assets/Station46/Modules/Orb/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 567ce76bb6c645eaa8bd408521cffc62 +timeCreated: 1683641011 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_AlbedoTransparency.png b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_AlbedoTransparency.png rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Emission.png b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Emission.png rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Emission.png.meta b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Emission.png.meta rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_MetallicSmoothness.png b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_MetallicSmoothness.png rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Normal.png b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Normal.png rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Normal.png.meta b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Normal.png.meta rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Occlusion.png b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Occlusion.png rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Occlusion.png.meta b/Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Hole Orb/Hole Orb_Holes_Occlusion.png.meta rename to Assets/Station46/Modules/Orb/Materials/Textures/Hole Orb_Holes_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Orb/Models.meta b/Assets/Station46/Modules/Orb/Models.meta new file mode 100644 index 0000000..bacaa72 --- /dev/null +++ b/Assets/Station46/Modules/Orb/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: dfccfdf503e44ef0b6e56ecfafdf77e9 +timeCreated: 1683641011 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Hole Orb.blend b/Assets/Station46/Modules/Orb/Models/Hole Orb.blend similarity index 100% rename from Assets/Station46/Assets/Models/Hole Orb.blend rename to Assets/Station46/Modules/Orb/Models/Hole Orb.blend diff --git a/Assets/Station46/Assets/Models/Hole Orb.blend.meta b/Assets/Station46/Modules/Orb/Models/Hole Orb.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hole Orb.blend.meta rename to Assets/Station46/Modules/Orb/Models/Hole Orb.blend.meta diff --git a/Assets/Station46/Assets/Models/Hole Orb.blend1 b/Assets/Station46/Modules/Orb/Models/Hole Orb.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Hole Orb.blend1 rename to Assets/Station46/Modules/Orb/Models/Hole Orb.blend1 diff --git a/Assets/Station46/Assets/Models/Hole Orb.blend1.meta b/Assets/Station46/Modules/Orb/Models/Hole Orb.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hole Orb.blend1.meta rename to Assets/Station46/Modules/Orb/Models/Hole Orb.blend1.meta diff --git a/Assets/Station46/Assets/Models/Hole Orb.fbx b/Assets/Station46/Modules/Orb/Models/Hole Orb.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Hole Orb.fbx rename to Assets/Station46/Modules/Orb/Models/Hole Orb.fbx diff --git a/Assets/Station46/Assets/Models/Hole Orb.fbx.meta b/Assets/Station46/Modules/Orb/Models/Hole Orb.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Hole Orb.fbx.meta rename to Assets/Station46/Modules/Orb/Models/Hole Orb.fbx.meta diff --git a/Assets/Station46/Modules/Portal.meta b/Assets/Station46/Modules/Portal.meta new file mode 100644 index 0000000..4ebd7fa --- /dev/null +++ b/Assets/Station46/Modules/Portal.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 21842f22f132464ea9ca3576d489a931 +timeCreated: 1683637473 \ No newline at end of file diff --git a/Assets/Station46/Modules/Portal/Materials.meta b/Assets/Station46/Modules/Portal/Materials.meta new file mode 100644 index 0000000..665dd63 --- /dev/null +++ b/Assets/Station46/Modules/Portal/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4cfbbfc6b0e74885aa94e98665a9959b +timeCreated: 1683637473 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Station 46 Portal.mat b/Assets/Station46/Modules/Portal/Materials/Station 46 Portal.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Station 46 Portal.mat rename to Assets/Station46/Modules/Portal/Materials/Station 46 Portal.mat diff --git a/Assets/Station46/Assets/Materials/Station 46 Portal.mat.meta b/Assets/Station46/Modules/Portal/Materials/Station 46 Portal.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Station 46 Portal.mat.meta rename to Assets/Station46/Modules/Portal/Materials/Station 46 Portal.mat.meta diff --git a/Assets/Station46/Modules/Portal/Materials/Textures.meta b/Assets/Station46/Modules/Portal/Materials/Textures.meta new file mode 100644 index 0000000..ba0849d --- /dev/null +++ b/Assets/Station46/Modules/Portal/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 068e3ae1c542489894c7b8ff5a20af25 +timeCreated: 1683637536 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Emission.png b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Emission.png rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Emission.png.meta b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Emission.png.meta rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Normal.png b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Normal.png rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Normal.png.meta b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Normal.png.meta rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Occlusion.png b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Occlusion.png rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Occlusion.png.meta b/Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Station 46 Portal/Station 46 Portal_Portal Frame Exit_Occlusion.png.meta rename to Assets/Station46/Modules/Portal/Materials/Textures/Station 46 Portal_Portal Frame Exit_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Portal/Models.meta b/Assets/Station46/Modules/Portal/Models.meta new file mode 100644 index 0000000..878060a --- /dev/null +++ b/Assets/Station46/Modules/Portal/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c06d247d2eb94e6c82f9b45db923a796 +timeCreated: 1683637473 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Station 46 Portal.blend b/Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend similarity index 100% rename from Assets/Station46/Assets/Models/Station 46 Portal.blend rename to Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend diff --git a/Assets/Station46/Assets/Models/Station 46 Portal.blend.meta b/Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Station 46 Portal.blend.meta rename to Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend.meta diff --git a/Assets/Station46/Assets/Models/Station 46 Portal.blend1 b/Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Station 46 Portal.blend1 rename to Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend1 diff --git a/Assets/Station46/Assets/Models/Station 46 Portal.blend1.meta b/Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Station 46 Portal.blend1.meta rename to Assets/Station46/Modules/Portal/Models/Station 46 Portal.blend1.meta diff --git a/Assets/Station46/Assets/Models/Station 46 Portal.fbx b/Assets/Station46/Modules/Portal/Models/Station 46 Portal.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Station 46 Portal.fbx rename to Assets/Station46/Modules/Portal/Models/Station 46 Portal.fbx diff --git a/Assets/Station46/Assets/Models/Station 46 Portal.fbx.meta b/Assets/Station46/Modules/Portal/Models/Station 46 Portal.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Station 46 Portal.fbx.meta rename to Assets/Station46/Modules/Portal/Models/Station 46 Portal.fbx.meta diff --git a/Assets/Station46/Modules/Portal/Scripts.meta b/Assets/Station46/Modules/Portal/Scripts.meta new file mode 100644 index 0000000..a17c8b6 --- /dev/null +++ b/Assets/Station46/Modules/Portal/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: edafbebdd83e450f94de66b54085ecc5 +timeCreated: 1683637473 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Portal/Station46Portal.cs b/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs similarity index 80% rename from Assets/Station46/Runtime/Portal/Station46Portal.cs rename to Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs index f843fd2..08340c9 100644 --- a/Assets/Station46/Runtime/Portal/Station46Portal.cs +++ b/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs @@ -1,7 +1,7 @@ using EscapeRoomEngine.Engine.Runtime.Modules.State; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Portal +namespace Station46.Runtime.Portal { /// /// The Station 46 theme includes its own version of a portal that changes colour when it is unlocked. @@ -23,10 +23,10 @@ namespace EscapeRoomEngine.Station46.Runtime.Portal switch (type) { case DoorEventType.Unlocked: - _emission.color = Engine.Runtime.Engine.Theme.solvedColor.hdr; + _emission.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; break; case DoorEventType.Locked: - _emission.color = Engine.Runtime.Engine.Theme.puzzleColor.hdr; + _emission.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr; break; } }; diff --git a/Assets/Station46/Runtime/Portal/Station46Portal.cs.meta b/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Portal/Station46Portal.cs.meta rename to Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs.meta diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.prefab b/Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.prefab rename to Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.prefab.meta b/Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Entrance.prefab.meta rename to Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab.meta diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.prefab b/Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.prefab rename to Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab diff --git a/Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.prefab.meta b/Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Portal/Station 46 Portal Exit.prefab.meta rename to Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab.meta diff --git a/Assets/Station46/Modules/Spawn.meta b/Assets/Station46/Modules/Spawn.meta new file mode 100644 index 0000000..d0323aa --- /dev/null +++ b/Assets/Station46/Modules/Spawn.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 689c0e5ca4e34f508b97252a09c44d89 +timeCreated: 1683642160 \ No newline at end of file diff --git a/Assets/Station46/Assets/Prefabs/Station 46 Spawn.prefab b/Assets/Station46/Modules/Spawn/Station 46 Spawn.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Station 46 Spawn.prefab rename to Assets/Station46/Modules/Spawn/Station 46 Spawn.prefab diff --git a/Assets/Station46/Assets/Prefabs/Station 46 Spawn.prefab.meta b/Assets/Station46/Modules/Spawn/Station 46 Spawn.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Station 46 Spawn.prefab.meta rename to Assets/Station46/Modules/Spawn/Station 46 Spawn.prefab.meta diff --git a/Assets/Station46/Modules/Symbols.meta b/Assets/Station46/Modules/Symbols.meta new file mode 100644 index 0000000..9ea7ea1 --- /dev/null +++ b/Assets/Station46/Modules/Symbols.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 440a11a53ac24c27b9142e91f36426ac +timeCreated: 1683641320 \ No newline at end of file diff --git a/Assets/Station46/Modules/Symbols/Materials.meta b/Assets/Station46/Modules/Symbols/Materials.meta new file mode 100644 index 0000000..e6b8a43 --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9fcdb5ec789141778b4acca7a122d1d5 +timeCreated: 1683641320 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Holo.mat b/Assets/Station46/Modules/Symbols/Materials/Holo.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Holo.mat rename to Assets/Station46/Modules/Symbols/Materials/Holo.mat diff --git a/Assets/Station46/Assets/Materials/Holo.mat.meta b/Assets/Station46/Modules/Symbols/Materials/Holo.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Holo.mat.meta rename to Assets/Station46/Modules/Symbols/Materials/Holo.mat.meta diff --git a/Assets/Station46/Assets/Materials/Holo.shadergraph b/Assets/Station46/Modules/Symbols/Materials/Holo.shadergraph similarity index 100% rename from Assets/Station46/Assets/Materials/Holo.shadergraph rename to Assets/Station46/Modules/Symbols/Materials/Holo.shadergraph diff --git a/Assets/Station46/Assets/Materials/Holo.shadergraph.meta b/Assets/Station46/Modules/Symbols/Materials/Holo.shadergraph.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Holo.shadergraph.meta rename to Assets/Station46/Modules/Symbols/Materials/Holo.shadergraph.meta diff --git a/Assets/Station46/Assets/Materials/Symbol.mat b/Assets/Station46/Modules/Symbols/Materials/Symbol.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Symbol.mat rename to Assets/Station46/Modules/Symbols/Materials/Symbol.mat diff --git a/Assets/Station46/Assets/Materials/Symbol.mat.meta b/Assets/Station46/Modules/Symbols/Materials/Symbol.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Symbol.mat.meta rename to Assets/Station46/Modules/Symbols/Materials/Symbol.mat.meta diff --git a/Assets/Station46/Modules/Symbols/Materials/Textures.meta b/Assets/Station46/Modules/Symbols/Materials/Textures.meta new file mode 100644 index 0000000..5fb489b --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 853ae9495dce4a94bdc8f24e77a3e08f +timeCreated: 1683641726 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Holo Lines.psd b/Assets/Station46/Modules/Symbols/Materials/Textures/Holo Lines.psd similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holo Lines.psd rename to Assets/Station46/Modules/Symbols/Materials/Textures/Holo Lines.psd diff --git a/Assets/Station46/Assets/Materials/Textures/Holo Lines.psd.meta b/Assets/Station46/Modules/Symbols/Materials/Textures/Holo Lines.psd.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Holo Lines.psd.meta rename to Assets/Station46/Modules/Symbols/Materials/Textures/Holo Lines.psd.meta diff --git a/Assets/Station46/Modules/Symbols/Models.meta b/Assets/Station46/Modules/Symbols/Models.meta new file mode 100644 index 0000000..cfcc18e --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3c30d85c1faa4706bb319e3f5d54b19e +timeCreated: 1683641320 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Symbols.blend b/Assets/Station46/Modules/Symbols/Models/Symbols.blend similarity index 100% rename from Assets/Station46/Assets/Models/Symbols.blend rename to Assets/Station46/Modules/Symbols/Models/Symbols.blend diff --git a/Assets/Station46/Assets/Models/Symbols.blend.meta b/Assets/Station46/Modules/Symbols/Models/Symbols.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Symbols.blend.meta rename to Assets/Station46/Modules/Symbols/Models/Symbols.blend.meta diff --git a/Assets/Station46/Assets/Models/Symbols.blend1 b/Assets/Station46/Modules/Symbols/Models/Symbols.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Symbols.blend1 rename to Assets/Station46/Modules/Symbols/Models/Symbols.blend1 diff --git a/Assets/Station46/Assets/Models/Symbols.blend1.meta b/Assets/Station46/Modules/Symbols/Models/Symbols.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Symbols.blend1.meta rename to Assets/Station46/Modules/Symbols/Models/Symbols.blend1.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 0.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol 0.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 0.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol 0.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 0.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol 0.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 0.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol 0.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 1.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol 1.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 1.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol 1.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 1.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol 1.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 1.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol 1.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 2.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol 2.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 2.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol 2.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 2.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol 2.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol 2.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol 2.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Bottom.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol Bottom.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Bottom.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol Bottom.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Bottom.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol Bottom.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Bottom.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol Bottom.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Center.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol Center.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Center.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol Center.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Center.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol Center.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Center.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol Center.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Top.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol Top.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Top.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol Top.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Top.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol Top.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol Top.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol Top.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol.prefab b/Assets/Station46/Modules/Symbols/Ring Symbol.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol.prefab rename to Assets/Station46/Modules/Symbols/Ring Symbol.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol.prefab.meta b/Assets/Station46/Modules/Symbols/Ring Symbol.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Ring Symbol.prefab.meta rename to Assets/Station46/Modules/Symbols/Ring Symbol.prefab.meta diff --git a/Assets/Station46/Modules/Symbols/Scripts.meta b/Assets/Station46/Modules/Symbols/Scripts.meta new file mode 100644 index 0000000..830fde4 --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 05094d83e6e34d48a1018c909995bcc4 +timeCreated: 1683641320 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle A/Symbol.cs b/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs similarity index 97% rename from Assets/Station46/Runtime/Puzzle A/Symbol.cs rename to Assets/Station46/Modules/Symbols/Scripts/Symbol.cs index 2b41ffa..c94139d 100644 --- a/Assets/Station46/Runtime/Puzzle A/Symbol.cs +++ b/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs @@ -4,7 +4,7 @@ using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A +namespace Station46.Runtime.Puzzle_A { public enum SymbolEventType { diff --git a/Assets/Station46/Runtime/Puzzle A/Symbol.cs.meta b/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle A/Symbol.cs.meta rename to Assets/Station46/Modules/Symbols/Scripts/Symbol.cs.meta diff --git a/Assets/Station46/Runtime/Puzzle A/SymbolButton.cs b/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs similarity index 85% rename from Assets/Station46/Runtime/Puzzle A/SymbolButton.cs rename to Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs index b588ed0..96bae08 100644 --- a/Assets/Station46/Runtime/Puzzle A/SymbolButton.cs +++ b/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A +namespace Station46.Runtime.Puzzle_A { /// /// A that includes the number of its assigned symbol. diff --git a/Assets/Station46/Runtime/Puzzle A/SymbolButton.cs.meta b/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle A/SymbolButton.cs.meta rename to Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 0.prefab b/Assets/Station46/Modules/Symbols/Symbol Button 0.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 0.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button 0.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 0.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button 0.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 0.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button 0.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 1.prefab b/Assets/Station46/Modules/Symbols/Symbol Button 1.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 1.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button 1.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 1.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button 1.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 1.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button 1.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 2.prefab b/Assets/Station46/Modules/Symbols/Symbol Button 2.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 2.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button 2.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 2.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button 2.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button 2.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button 2.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Bottom.prefab b/Assets/Station46/Modules/Symbols/Symbol Button Bottom.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Bottom.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button Bottom.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Bottom.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button Bottom.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Bottom.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button Bottom.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Center.prefab b/Assets/Station46/Modules/Symbols/Symbol Button Center.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Center.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button Center.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Center.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button Center.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Center.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button Center.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Top.prefab b/Assets/Station46/Modules/Symbols/Symbol Button Top.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Top.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button Top.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Top.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button Top.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button Top.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button Top.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button.prefab b/Assets/Station46/Modules/Symbols/Symbol Button.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button.prefab rename to Assets/Station46/Modules/Symbols/Symbol Button.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol Button.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol Button.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol Button.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol Button.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol.prefab b/Assets/Station46/Modules/Symbols/Symbol.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol.prefab rename to Assets/Station46/Modules/Symbols/Symbol.prefab diff --git a/Assets/Station46/Assets/Prefabs/Symbols/Symbol.prefab.meta b/Assets/Station46/Modules/Symbols/Symbol.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Symbols/Symbol.prefab.meta rename to Assets/Station46/Modules/Symbols/Symbol.prefab.meta diff --git a/Assets/Station46/Modules/Terminal.meta b/Assets/Station46/Modules/Terminal.meta new file mode 100644 index 0000000..ea225a2 --- /dev/null +++ b/Assets/Station46/Modules/Terminal.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e25727cbf34f457abc2a7a6908e61c5e +timeCreated: 1683640466 \ No newline at end of file diff --git a/Assets/Station46/Modules/Terminal/Animations.meta b/Assets/Station46/Modules/Terminal/Animations.meta new file mode 100644 index 0000000..8eaef93 --- /dev/null +++ b/Assets/Station46/Modules/Terminal/Animations.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 37a841718bde493bad63ad00bd69b509 +timeCreated: 1683640466 \ No newline at end of file diff --git a/Assets/Station46/Assets/Animations/Terminal.controller b/Assets/Station46/Modules/Terminal/Animations/Terminal.controller similarity index 100% rename from Assets/Station46/Assets/Animations/Terminal.controller rename to Assets/Station46/Modules/Terminal/Animations/Terminal.controller diff --git a/Assets/Station46/Assets/Animations/Terminal.controller.meta b/Assets/Station46/Modules/Terminal/Animations/Terminal.controller.meta similarity index 100% rename from Assets/Station46/Assets/Animations/Terminal.controller.meta rename to Assets/Station46/Modules/Terminal/Animations/Terminal.controller.meta diff --git a/Assets/Station46/Modules/Terminal/Materials.meta b/Assets/Station46/Modules/Terminal/Materials.meta new file mode 100644 index 0000000..71ccb96 --- /dev/null +++ b/Assets/Station46/Modules/Terminal/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2c624db5e90f4f35912456f00781dfbd +timeCreated: 1683640466 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Terminal.mat b/Assets/Station46/Modules/Terminal/Materials/Terminal.mat similarity index 100% rename from Assets/Station46/Assets/Materials/Terminal.mat rename to Assets/Station46/Modules/Terminal/Materials/Terminal.mat diff --git a/Assets/Station46/Assets/Materials/Terminal.mat.meta b/Assets/Station46/Modules/Terminal/Materials/Terminal.mat.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Terminal.mat.meta rename to Assets/Station46/Modules/Terminal/Materials/Terminal.mat.meta diff --git a/Assets/Station46/Modules/Terminal/Materials/Textures.meta b/Assets/Station46/Modules/Terminal/Materials/Textures.meta new file mode 100644 index 0000000..2f4cc8d --- /dev/null +++ b/Assets/Station46/Modules/Terminal/Materials/Textures.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 20a1820dd80f423f9086b8b9cff83ea9 +timeCreated: 1683640466 \ No newline at end of file diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_AlbedoTransparency.png diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png.meta rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Emission.png b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Emission.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Emission.png rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Emission.png diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Emission.png.meta b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Emission.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Emission.png.meta rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Emission.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_MetallicSmoothness.png diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png.meta rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Normal.png b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Normal.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Normal.png rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Normal.png diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Normal.png.meta b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Normal.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Normal.png.meta rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Normal.png.meta diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Occlusion.png similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Occlusion.png diff --git a/Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png.meta b/Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Assets/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png.meta rename to Assets/Station46/Modules/Terminal/Materials/Textures/Terminal_Terminal_Occlusion.png.meta diff --git a/Assets/Station46/Modules/Terminal/Models.meta b/Assets/Station46/Modules/Terminal/Models.meta new file mode 100644 index 0000000..b4901de --- /dev/null +++ b/Assets/Station46/Modules/Terminal/Models.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 33a9d39c4d0b4c268e21f7e1c6ff80e9 +timeCreated: 1683640466 \ No newline at end of file diff --git a/Assets/Station46/Assets/Models/Terminal.blend b/Assets/Station46/Modules/Terminal/Models/Terminal.blend similarity index 100% rename from Assets/Station46/Assets/Models/Terminal.blend rename to Assets/Station46/Modules/Terminal/Models/Terminal.blend diff --git a/Assets/Station46/Assets/Models/Terminal.blend.meta b/Assets/Station46/Modules/Terminal/Models/Terminal.blend.meta similarity index 100% rename from Assets/Station46/Assets/Models/Terminal.blend.meta rename to Assets/Station46/Modules/Terminal/Models/Terminal.blend.meta diff --git a/Assets/Station46/Assets/Models/Terminal.blend1 b/Assets/Station46/Modules/Terminal/Models/Terminal.blend1 similarity index 100% rename from Assets/Station46/Assets/Models/Terminal.blend1 rename to Assets/Station46/Modules/Terminal/Models/Terminal.blend1 diff --git a/Assets/Station46/Assets/Models/Terminal.blend1.meta b/Assets/Station46/Modules/Terminal/Models/Terminal.blend1.meta similarity index 100% rename from Assets/Station46/Assets/Models/Terminal.blend1.meta rename to Assets/Station46/Modules/Terminal/Models/Terminal.blend1.meta diff --git a/Assets/Station46/Assets/Models/Terminal.fbx b/Assets/Station46/Modules/Terminal/Models/Terminal.fbx similarity index 100% rename from Assets/Station46/Assets/Models/Terminal.fbx rename to Assets/Station46/Modules/Terminal/Models/Terminal.fbx diff --git a/Assets/Station46/Assets/Models/Terminal.fbx.meta b/Assets/Station46/Modules/Terminal/Models/Terminal.fbx.meta similarity index 100% rename from Assets/Station46/Assets/Models/Terminal.fbx.meta rename to Assets/Station46/Modules/Terminal/Models/Terminal.fbx.meta diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Terminal.prefab b/Assets/Station46/Modules/Terminal/Position Terminal.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Terminal.prefab rename to Assets/Station46/Modules/Terminal/Position Terminal.prefab diff --git a/Assets/Station46/Assets/Modules/Position Order Puzzle/Terminal.prefab.meta b/Assets/Station46/Modules/Terminal/Position Terminal.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Position Order Puzzle/Terminal.prefab.meta rename to Assets/Station46/Modules/Terminal/Position Terminal.prefab.meta diff --git a/Assets/Station46/Modules/Terminal/Scripts.meta b/Assets/Station46/Modules/Terminal/Scripts.meta new file mode 100644 index 0000000..da717fe --- /dev/null +++ b/Assets/Station46/Modules/Terminal/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fec5d022aa374c4181db4c357892db47 +timeCreated: 1683640466 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle A/Terminal.cs b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs similarity index 95% rename from Assets/Station46/Runtime/Puzzle A/Terminal.cs rename to Assets/Station46/Modules/Terminal/Scripts/Terminal.cs index b0af5ef..57d6c71 100644 --- a/Assets/Station46/Runtime/Puzzle A/Terminal.cs +++ b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs @@ -9,7 +9,7 @@ using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A +namespace Station46.Runtime.Puzzle_A { /// /// The main component for the terminal module. @@ -51,12 +51,12 @@ namespace EscapeRoomEngine.Station46.Runtime.Puzzle_A { case PuzzleEventType.Restarted: _ball.Active = true; - terminalLight.color = Engine.Runtime.Engine.Theme.puzzleColor.hdr; + terminalLight.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr; symbols.ForEach(symbol => symbol.Enable()); break; case PuzzleEventType.Solved: _ball.Active = false; - terminalLight.color = Engine.Runtime.Engine.Theme.solvedColor.hdr; + terminalLight.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; symbols.ForEach(symbol => symbol.Disable()); break; case PuzzleEventType.WrongInput: diff --git a/Assets/Station46/Runtime/Puzzle A/Terminal.cs.meta b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Puzzle A/Terminal.cs.meta rename to Assets/Station46/Modules/Terminal/Scripts/Terminal.cs.meta diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Terminal.prefab b/Assets/Station46/Modules/Terminal/Symbol Terminal.prefab similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Terminal.prefab rename to Assets/Station46/Modules/Terminal/Symbol Terminal.prefab diff --git a/Assets/Station46/Assets/Modules/Symbol Order Puzzle/Terminal.prefab.meta b/Assets/Station46/Modules/Terminal/Symbol Terminal.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Modules/Symbol Order Puzzle/Terminal.prefab.meta rename to Assets/Station46/Modules/Terminal/Symbol Terminal.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Terminal/Terminal 3 Slots.prefab b/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Terminal/Terminal 3 Slots.prefab rename to Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab diff --git a/Assets/Station46/Assets/Prefabs/Terminal/Terminal 3 Slots.prefab.meta b/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Terminal/Terminal 3 Slots.prefab.meta rename to Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Terminal/Terminal.prefab b/Assets/Station46/Modules/Terminal/Terminal.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Terminal/Terminal.prefab rename to Assets/Station46/Modules/Terminal/Terminal.prefab diff --git a/Assets/Station46/Assets/Prefabs/Terminal/Terminal.prefab.meta b/Assets/Station46/Modules/Terminal/Terminal.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Terminal/Terminal.prefab.meta rename to Assets/Station46/Modules/Terminal/Terminal.prefab.meta diff --git a/Assets/Station46/Player.meta b/Assets/Station46/Player.meta new file mode 100644 index 0000000..837eb5a --- /dev/null +++ b/Assets/Station46/Player.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c7565c1983fd45038db46e3a86f9e399 +timeCreated: 1683642190 \ No newline at end of file diff --git a/Assets/Station46/Assets/Prefabs/Holo Hand.prefab b/Assets/Station46/Player/Holo Hand.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Holo Hand.prefab rename to Assets/Station46/Player/Holo Hand.prefab diff --git a/Assets/Station46/Assets/Prefabs/Holo Hand.prefab.meta b/Assets/Station46/Player/Holo Hand.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Holo Hand.prefab.meta rename to Assets/Station46/Player/Holo Hand.prefab.meta diff --git a/Assets/Station46/Assets/Prefabs/Station 46 XR Origin.prefab b/Assets/Station46/Player/Station 46 XR Origin.prefab similarity index 100% rename from Assets/Station46/Assets/Prefabs/Station 46 XR Origin.prefab rename to Assets/Station46/Player/Station 46 XR Origin.prefab diff --git a/Assets/Station46/Assets/Prefabs/Station 46 XR Origin.prefab.meta b/Assets/Station46/Player/Station 46 XR Origin.prefab.meta similarity index 100% rename from Assets/Station46/Assets/Prefabs/Station 46 XR Origin.prefab.meta rename to Assets/Station46/Player/Station 46 XR Origin.prefab.meta diff --git a/Assets/Station46/README.md b/Assets/Station46/README.md deleted file mode 100644 index 2d1b0ef..0000000 --- a/Assets/Station46/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Station 46 - -A Station 46 theme for the VR escape room engine. \ No newline at end of file diff --git a/Assets/Station46/README.md.meta b/Assets/Station46/README.md.meta deleted file mode 100644 index 6ce97fc..0000000 --- a/Assets/Station46/README.md.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 22c108ee7cba4c8da59abc65012143ea -timeCreated: 1668940013 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Dispenser.meta b/Assets/Station46/Runtime/Dispenser.meta deleted file mode 100644 index 935ed5c..0000000 --- a/Assets/Station46/Runtime/Dispenser.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 073fb5180fa20564bb163c47ccafc413 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Runtime/Portal.meta b/Assets/Station46/Runtime/Portal.meta deleted file mode 100644 index 3b88847..0000000 --- a/Assets/Station46/Runtime/Portal.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 788a501fd6ac4d74bc34a49c99b02fc2 -timeCreated: 1670792890 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle A.meta b/Assets/Station46/Runtime/Puzzle A.meta deleted file mode 100644 index 58041cb..0000000 --- a/Assets/Station46/Runtime/Puzzle A.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a6aa1e96d6564ba419a84d5bcb635568 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Runtime/Puzzle B.meta b/Assets/Station46/Runtime/Puzzle B.meta deleted file mode 100644 index c65e23f..0000000 --- a/Assets/Station46/Runtime/Puzzle B.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d97e612b38c148c1a988eefa9af29b75 -timeCreated: 1669687251 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Puzzle C.meta b/Assets/Station46/Runtime/Puzzle C.meta deleted file mode 100644 index 91a575f..0000000 --- a/Assets/Station46/Runtime/Puzzle C.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3ec2f8925bad45d189d951bc02b39c11 -timeCreated: 1669815308 \ No newline at end of file diff --git a/Assets/Station46/Runtime/Station46.asmdef b/Assets/Station46/Runtime/Station46.asmdef deleted file mode 100644 index 96958aa..0000000 --- a/Assets/Station46/Runtime/Station46.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Station46", - "rootNamespace": "EscapeRoomEngine", - "references": [ - "GUID:2d68e204354e44f2a2ecf3cfa9213c5f", - "GUID:ba4c7dba98ca4c31818cc46276b5dea1", - "GUID:776d03a35f1b52c4a9aed9f56d7b4229" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/Station46/Runtime/Station46.asmdef.meta b/Assets/Station46/Runtime/Station46.asmdef.meta deleted file mode 100644 index cee3a8b..0000000 --- a/Assets/Station46/Runtime/Station46.asmdef.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 20d0c4bd521546c7859e37019a165e38 -timeCreated: 1668940232 \ No newline at end of file diff --git a/Assets/Station46/Runtime.meta b/Assets/Station46/Scripts.meta similarity index 100% rename from Assets/Station46/Runtime.meta rename to Assets/Station46/Scripts.meta diff --git a/Assets/Station46/Runtime/Button.cs b/Assets/Station46/Scripts/Button.cs similarity index 98% rename from Assets/Station46/Runtime/Button.cs rename to Assets/Station46/Scripts/Button.cs index 77c2c2a..a176406 100644 --- a/Assets/Station46/Runtime/Button.cs +++ b/Assets/Station46/Scripts/Button.cs @@ -5,7 +5,7 @@ using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { public enum ButtonEventType { diff --git a/Assets/Station46/Runtime/Button.cs.meta b/Assets/Station46/Scripts/Button.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Button.cs.meta rename to Assets/Station46/Scripts/Button.cs.meta diff --git a/Assets/Station46/Runtime/CyclicStepPuzzle.cs b/Assets/Station46/Scripts/CyclicStepPuzzle.cs similarity index 96% rename from Assets/Station46/Runtime/CyclicStepPuzzle.cs rename to Assets/Station46/Scripts/CyclicStepPuzzle.cs index 96a088e..d7d9090 100644 --- a/Assets/Station46/Runtime/CyclicStepPuzzle.cs +++ b/Assets/Station46/Scripts/CyclicStepPuzzle.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// A whose steps are considered a cycle that can be started anywhere and must be stepped through once. diff --git a/Assets/Station46/Runtime/CyclicStepPuzzle.cs.meta b/Assets/Station46/Scripts/CyclicStepPuzzle.cs.meta similarity index 100% rename from Assets/Station46/Runtime/CyclicStepPuzzle.cs.meta rename to Assets/Station46/Scripts/CyclicStepPuzzle.cs.meta diff --git a/Assets/Station46/Runtime/Emission.cs b/Assets/Station46/Scripts/Emission.cs similarity index 97% rename from Assets/Station46/Runtime/Emission.cs rename to Assets/Station46/Scripts/Emission.cs index a20b7ac..e35be27 100644 --- a/Assets/Station46/Runtime/Emission.cs +++ b/Assets/Station46/Scripts/Emission.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// A general component for controlling the emission of an object. diff --git a/Assets/Station46/Runtime/Emission.cs.meta b/Assets/Station46/Scripts/Emission.cs.meta similarity index 100% rename from Assets/Station46/Runtime/Emission.cs.meta rename to Assets/Station46/Scripts/Emission.cs.meta diff --git a/Assets/Station46/Runtime/HoloButton.cs b/Assets/Station46/Scripts/HoloButton.cs similarity index 77% rename from Assets/Station46/Runtime/HoloButton.cs rename to Assets/Station46/Scripts/HoloButton.cs index ec5b259..5d6a0e0 100644 --- a/Assets/Station46/Runtime/HoloButton.cs +++ b/Assets/Station46/Scripts/HoloButton.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// A holographic that changes its colour when it is pressed. @@ -26,13 +26,13 @@ namespace EscapeRoomEngine.Station46.Runtime ButtonEvent += (_, _) => { - var color = Engine.Runtime.Engine.Theme.puzzleColor; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; if (!Active) { - color = Engine.Runtime.Engine.Theme.solvedColor; + color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor; } else if (Pressed) { - color = Engine.Runtime.Engine.Theme.activeColor; + color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor; } _material.SetColor(FresnelColor, color.hdr); diff --git a/Assets/Station46/Runtime/HoloButton.cs.meta b/Assets/Station46/Scripts/HoloButton.cs.meta similarity index 100% rename from Assets/Station46/Runtime/HoloButton.cs.meta rename to Assets/Station46/Scripts/HoloButton.cs.meta diff --git a/Assets/Station46/Runtime/StatePuzzle.cs b/Assets/Station46/Scripts/StatePuzzle.cs similarity index 98% rename from Assets/Station46/Runtime/StatePuzzle.cs rename to Assets/Station46/Scripts/StatePuzzle.cs index 030a913..0069953 100644 --- a/Assets/Station46/Runtime/StatePuzzle.cs +++ b/Assets/Station46/Scripts/StatePuzzle.cs @@ -5,7 +5,7 @@ using JetBrains.Annotations; using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// The of a puzzle that requires a specific state to be solved. diff --git a/Assets/Station46/Runtime/StatePuzzle.cs.meta b/Assets/Station46/Scripts/StatePuzzle.cs.meta similarity index 100% rename from Assets/Station46/Runtime/StatePuzzle.cs.meta rename to Assets/Station46/Scripts/StatePuzzle.cs.meta diff --git a/Assets/Station46/Runtime/StepPuzzle.cs b/Assets/Station46/Scripts/StepPuzzle.cs similarity index 98% rename from Assets/Station46/Runtime/StepPuzzle.cs rename to Assets/Station46/Scripts/StepPuzzle.cs index 339c793..d9d2280 100644 --- a/Assets/Station46/Runtime/StepPuzzle.cs +++ b/Assets/Station46/Scripts/StepPuzzle.cs @@ -5,7 +5,7 @@ using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace EscapeRoomEngine.Station46.Runtime +namespace Station46.Runtime { /// /// The of a puzzle that includes a number of steps that need to be completed to solve it. diff --git a/Assets/Station46/Runtime/StepPuzzle.cs.meta b/Assets/Station46/Scripts/StepPuzzle.cs.meta similarity index 100% rename from Assets/Station46/Runtime/StepPuzzle.cs.meta rename to Assets/Station46/Scripts/StepPuzzle.cs.meta diff --git a/Assets/Station46/Assets/Station 46.asset b/Assets/Station46/Station 46.asset similarity index 100% rename from Assets/Station46/Assets/Station 46.asset rename to Assets/Station46/Station 46.asset diff --git a/Assets/Station46/Assets/Station 46.asset.meta b/Assets/Station46/Station 46.asset.meta similarity index 100% rename from Assets/Station46/Assets/Station 46.asset.meta rename to Assets/Station46/Station 46.asset.meta diff --git a/Assets/Station46/package.json b/Assets/Station46/package.json deleted file mode 100644 index 4e715b7..0000000 --- a/Assets/Station46/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "displayName": "Escape Room Engine Theme - Station 46", - "name": "wtf.milan.escape-room-engine.station-46", - "version": "0.0.1", - "description": "A Station 46 theme for the VR escape room engine.", - "unity": "2022.1", - "author": { - "name": "Milan van Zanten", - "email": "milan@milan.wtf", - "url": "https://milan.wtf" - }, - "hideInEditor": false, - "keywords": ["vr", "virtual reality", "modular", "escape room"], - "dependencies": {} -} diff --git a/Assets/Station46/package.json.meta b/Assets/Station46/package.json.meta deleted file mode 100644 index 350bd4e..0000000 --- a/Assets/Station46/package.json.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 720aa805e8204bab88c42fd946331244 -timeCreated: 1668939945 \ No newline at end of file