diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions index 854fc57..2644b02 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions +++ b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions @@ -292,6 +292,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "ebba1d02-1b2b-44ea-bd06-4119a8786cfa", + "path": "{LeftHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "49a23327-a116-48c0-8af9-0d2c50c15a88", @@ -314,6 +325,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "f6063498-4e99-46b5-a275-c0729f91e65f", + "path": "{LeftHand}/gripPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Activate", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "3b8b1b59-2fdc-4998-8259-50341075d9a2", @@ -810,6 +832,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "2148d269-925c-46b3-ac7e-603e7db245fc", + "path": "{RightHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "dd433817-216c-46b9-8dd3-f3a4ea1767b9", @@ -832,6 +865,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "f3a72be0-2ae1-4123-8dd1-87e32739b9ec", + "path": "{RightHand}/gripPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Activate", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "150f414f-61bf-47b1-b4f8-f772a2a40565", diff --git a/Assets/Scenes/ImpossibleSpacesProfile.asset b/Assets/Scenes/ImpossibleSpacesProfile.asset deleted file mode 100644 index d25fd78..0000000 --- a/Assets/Scenes/ImpossibleSpacesProfile.asset +++ /dev/null @@ -1,103 +0,0 @@ -%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 - 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 - skipIterations: - m_OverrideState: 0 - m_Value: 1 - 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: 1 - 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: ImpossibleSpacesProfile - 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/Scenes/ImpossibleSpacesProfile.asset.meta b/Assets/Scenes/ImpossibleSpacesProfile.asset.meta deleted file mode 100644 index b350c95..0000000 --- a/Assets/Scenes/ImpossibleSpacesProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dc63b0ce40036614b8465acd6a78bc8e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/PortalSceneProfile.asset b/Assets/Scenes/PortalSceneProfile.asset deleted file mode 100644 index 87b1d0d..0000000 --- a/Assets/Scenes/PortalSceneProfile.asset +++ /dev/null @@ -1,103 +0,0 @@ -%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 - 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 - skipIterations: - m_OverrideState: 0 - m_Value: 1 - 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: 1 - 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: PortalSceneProfile - 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/Scenes/PortalSceneProfile.asset.meta b/Assets/Scenes/PortalSceneProfile.asset.meta deleted file mode 100644 index 6a3f72e..0000000 --- a/Assets/Scenes/PortalSceneProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1888441282c158b4a9de7cfa7d778320 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/PuzzleTestProfile.asset b/Assets/Scenes/PuzzleTestProfile.asset deleted file mode 100644 index 22f8702..0000000 --- a/Assets/Scenes/PuzzleTestProfile.asset +++ /dev/null @@ -1,109 +0,0 @@ -%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/Scenes/PuzzleTestProfile.asset.meta b/Assets/Scenes/PuzzleTestProfile.asset.meta deleted file mode 100644 index 5ad1eb7..0000000 --- a/Assets/Scenes/PuzzleTestProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0511214ed1fd590458b2a77e83f3f382 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/EscapeRoomEngineProfile.asset b/Assets/Scenes/Station 46 Volume Profile.asset similarity index 97% rename from Assets/Scenes/EscapeRoomEngineProfile.asset rename to Assets/Scenes/Station 46 Volume Profile.asset index 4a0f6ad..7e18d27 100644 --- a/Assets/Scenes/EscapeRoomEngineProfile.asset +++ b/Assets/Scenes/Station 46 Volume Profile.asset @@ -21,9 +21,9 @@ MonoBehaviour: m_Value: 1 intensity: m_OverrideState: 1 - m_Value: 1 + m_Value: 0.2 scatter: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0.7 clamp: m_OverrideState: 0 @@ -85,7 +85,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: EscapeRoomEngineProfile + m_Name: Station 46 Volume Profile m_EditorClassIdentifier: components: - {fileID: 849379129802519247} diff --git a/Assets/Scenes/EscapeRoomEngineProfile.asset.meta b/Assets/Scenes/Station 46 Volume Profile.asset.meta similarity index 100% rename from Assets/Scenes/EscapeRoomEngineProfile.asset.meta rename to Assets/Scenes/Station 46 Volume Profile.asset.meta diff --git a/Assets/Scenes/StencilPortalSceneProfile.asset b/Assets/Scenes/StencilPortalSceneProfile.asset deleted file mode 100644 index 22a3638..0000000 --- a/Assets/Scenes/StencilPortalSceneProfile.asset +++ /dev/null @@ -1,109 +0,0 @@ -%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: StencilPortalSceneProfile - 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/Scenes/StencilPortalSceneProfile.asset.meta b/Assets/Scenes/StencilPortalSceneProfile.asset.meta deleted file mode 100644 index b9b7dea..0000000 --- a/Assets/Scenes/StencilPortalSceneProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1686cdfabf14e21438f3226ab4435279 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend b/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend index 41c7118..df7dc1c 100644 --- a/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend +++ b/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d81c9ab5bec5581fac21cf37944fc1be5c7e54f48888dcda5553fbb28d817a4a -size 922656 +oid sha256:ab7cb782b0aa70b58bdeac35ad85c152de16526408e80473a5b1ab3080fbdf5e +size 922864 diff --git a/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend1 b/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend1 index 989578c..2944483 100644 Binary files a/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend1 and b/Assets/Station46/Modules/Elevated Platform/Models/Elevated Platform.blend1 differ diff --git a/Assets/Station46/Modules/Hoop/Fling Hoop.prefab b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab index 750b15c..720a0c9 100644 --- a/Assets/Station46/Modules/Hoop/Fling Hoop.prefab +++ b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab @@ -8,11 +8,41 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 278324090529111625, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: color.g + value: 3.5137255 + objectReference: {fileID: 0} + - target: {fileID: 278324090529111625, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: color.r + value: 8 + objectReference: {fileID: 0} - target: {fileID: 1431476700248791042, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_LocalPosition.z value: -5 objectReference: {fileID: 0} + - target: {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: color.g + value: 3.5137255 + objectReference: {fileID: 0} + - target: {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: color.r + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 2714932768293234240, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: color.g + value: 3.5137255 + objectReference: {fileID: 0} + - target: {fileID: 2714932768293234240, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: color.r + value: 8 + objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_RootOrder @@ -52,6 +82,42 @@ PrefabInstance: insertIndex: 1 addedObject: {fileID: 3033697766135085348} m_SourcePrefab: {fileID: 100100000, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} +--- !u!114 &1316217964380187900 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2714932768293234240, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 4028827982112082620} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2343766496756531927 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 4028827982112082620} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3762066982927209717 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 278324090529111625, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 4028827982112082620} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6011687638040384697 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, @@ -77,6 +143,6 @@ MonoBehaviour: correctStates: 0 updateDelay: 1 rings: - - {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} - - {fileID: 2714932768293234240, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} - - {fileID: 278324090529111625, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} + - {fileID: 2343766496756531927} + - {fileID: 1316217964380187900} + - {fileID: 3762066982927209717} diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index b1d74e4..a78e3b4 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} m_Name: Station 46 m_EditorClassIdentifier: - minRoomSize: {x: 2, y: 3} - playSpace: {x: 2, y: 3} + minRoomSize: {x: 2, y: 4} + playSpace: {x: 2, y: 4} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 44a1dde..a879ef0 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -32,4 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2} + - {fileID: 11400000, guid: ee5a44432e80cd64689be3ff34750339, type: 2}