diff --git a/Assets/KeyInsertMinigameAssets/Scripts.meta b/Assets/KeyInsertMinigameAssets/Scripts.meta new file mode 100644 index 0000000..c6ccc49 --- /dev/null +++ b/Assets/KeyInsertMinigameAssets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 018181274a5e0dd4e94629d9bf4fc143 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/KeyInsertMinigameAssets/Scripts/KeyHole.cs b/Assets/KeyInsertMinigameAssets/Scripts/KeyHole.cs new file mode 100644 index 0000000..0a364b3 --- /dev/null +++ b/Assets/KeyInsertMinigameAssets/Scripts/KeyHole.cs @@ -0,0 +1,24 @@ +using UnityEngine; + +public class KeyHole : MonoBehaviour +{ + public int index; + + void Start() + { + + } + + + void Update() + { + + } + + private void OnMouseDown() + { + Debug.Log("KeyHole " + index + " was tapped!"); + } +} + + diff --git a/Assets/KeyInsertMinigameAssets/Scripts/KeyHole.cs.meta b/Assets/KeyInsertMinigameAssets/Scripts/KeyHole.cs.meta new file mode 100644 index 0000000..3d97eed --- /dev/null +++ b/Assets/KeyInsertMinigameAssets/Scripts/KeyHole.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b0bafb5095ab5f74bac503b56548b6c9 \ No newline at end of file diff --git a/Assets/Scenes/MiniGame-insertkeys.unity b/Assets/Scenes/MiniGame-insertkeys.unity index 702a470..07eb94a 100644 --- a/Assets/Scenes/MiniGame-insertkeys.unity +++ b/Assets/Scenes/MiniGame-insertkeys.unity @@ -181,7 +181,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} propertyPath: m_Name - value: KeyHole (4) + value: KeyHole (6) objectReference: {fileID: 0} - target: {fileID: 7202271454713460447, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -194,9 +194,12 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 708483876} + addedObject: {fileID: 201444427} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 201444426} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} --- !u!1 &191909593 GameObject: @@ -259,7 +262,7 @@ Camera: far clip plane: 10000 field of view: 55 orthographic: 1 - orthographic size: 1146.8583 + orthographic size: 1114 m_Depth: 100 m_CullingMask: serializedVersion: 2 @@ -290,6 +293,45 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 1.111, y: -1.463, z: -0.194} +--- !u!1 &201444422 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 117654248} + m_PrefabAsset: {fileID: 0} +--- !u!114 &201444426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201444422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 6 +--- !u!65 &201444427 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201444422} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: 0.0000000074505815, y: -0.000000008847572, z: 0.000000026309863} --- !u!1001 &253702551 PrefabInstance: m_ObjectHideFlags: 0 @@ -365,9 +407,12 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 1903069843} + addedObject: {fileID: 1035961571} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1035961570} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} --- !u!1 &425617991 GameObject: @@ -536,56 +581,101 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 1679050721} + addedObject: {fileID: 530549045} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 530549044} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} ---- !u!1 &526702061 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 1471754987} - m_PrefabAsset: {fileID: 0} --- !u!4 &526702062 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 1471754987} m_PrefabAsset: {fileID: 0} ---- !u!114 &526702063 +--- !u!1 &530549040 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 431163017} + m_PrefabAsset: {fileID: 0} +--- !u!114 &530549044 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526702061} + m_GameObject: {fileID: 530549040} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 7 ---- !u!1 &708483874 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 117654248} + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 3 +--- !u!65 &530549045 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530549040} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: 5.219075e-16, y: -0.000000012572862, z: 0.000000026309863} +--- !u!1 &672204608 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 1762355858} + m_PrefabAsset: {fileID: 0} +--- !u!114 &672204612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672204608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 2 +--- !u!65 &672204613 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672204608} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: -0.00000000745058, y: -0.000000010710217, z: 0.0000000402797} --- !u!4 &708483875 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 117654248} m_PrefabAsset: {fileID: 0} ---- !u!114 &708483876 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 708483874} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 4 --- !u!1001 &714650111 PrefabInstance: m_ObjectHideFlags: 0 @@ -661,15 +751,96 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 1180725408} + addedObject: {fileID: 739154330} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 739154329} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} +--- !u!1 &739154325 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 714650111} + m_PrefabAsset: {fileID: 0} +--- !u!114 &739154329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739154325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 1 +--- !u!65 &739154330 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739154325} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: -0.00000001490116, y: -0.000000008847572, z: 0.00000001792796} --- !u!4 &907505012 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 56e0065a74e418b4fb1e4e7d2236b645, type: 3} m_PrefabInstance: {fileID: 1269638069} m_PrefabAsset: {fileID: 0} +--- !u!1 &914661679 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 1471754987} + m_PrefabAsset: {fileID: 0} +--- !u!114 &914661683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914661679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 7 +--- !u!65 &914661684 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914661679} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: 5.219075e-16, y: -0.000000008847572, z: 0.00000001792796} --- !u!1001 &932291142 PrefabInstance: m_ObjectHideFlags: 0 @@ -745,79 +916,67 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 1079640189} + addedObject: {fileID: 1706075445} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1706075444} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} ---- !u!1 &976309014 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 1408526234} - m_PrefabAsset: {fileID: 0} --- !u!4 &976309015 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 1408526234} m_PrefabAsset: {fileID: 0} ---- !u!114 &976309016 +--- !u!1 &1035961566 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 253702551} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1035961570 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 976309014} + m_GameObject: {fileID: 1035961566} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 6 ---- !u!1 &1079640187 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 932291142} + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 8 +--- !u!65 &1035961571 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035961566} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: 0.0000000074505815, y: -0.000000010710217, z: 0.0000000402797} --- !u!4 &1079640188 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 932291142} m_PrefabAsset: {fileID: 0} ---- !u!114 &1079640189 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079640187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 0 ---- !u!1 &1180725406 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 714650111} - m_PrefabAsset: {fileID: 0} --- !u!4 &1180725407 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 714650111} m_PrefabAsset: {fileID: 0} ---- !u!114 &1180725408 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180725406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 1 --- !u!1001 &1269638069 PrefabInstance: m_ObjectHideFlags: 0 @@ -962,29 +1121,50 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 56e0065a74e418b4fb1e4e7d2236b645, type: 3} ---- !u!1 &1336769710 stripped +--- !u!1 &1306081367 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 1762355858} + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 1902528218} m_PrefabAsset: {fileID: 0} ---- !u!4 &1336769711 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 1762355858} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1336769712 +--- !u!114 &1306081371 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336769710} + m_GameObject: {fileID: 1306081367} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 2 + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 4 +--- !u!65 &1306081372 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306081367} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: -0.00000000745058, y: -0.000000008847572, z: 0.00000001792796} +--- !u!4 &1336769711 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 1762355858} + m_PrefabAsset: {fileID: 0} --- !u!1 &1373860630 GameObject: m_ObjectHideFlags: 0 @@ -1018,9 +1198,9 @@ Transform: - {fileID: 1180725407} - {fileID: 1336769711} - {fileID: 1679050720} - - {fileID: 708483875} - {fileID: 2054857059} - {fileID: 976309015} + - {fileID: 708483875} - {fileID: 526702062} - {fileID: 1903069842} - {fileID: 907505012} @@ -1088,7 +1268,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} propertyPath: m_Name - value: KeyHole (6) + value: KeyHole (5) objectReference: {fileID: 0} - target: {fileID: 7202271454713460447, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -1101,9 +1281,12 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 976309016} + addedObject: {fileID: 1943575596} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1943575595} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} --- !u!1001 &1471754987 PrefabInstance: @@ -1180,33 +1363,57 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 526702063} + addedObject: {fileID: 914661684} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 914661683} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} ---- !u!1 &1679050719 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 431163017} - m_PrefabAsset: {fileID: 0} --- !u!4 &1679050720 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 431163017} m_PrefabAsset: {fileID: 0} ---- !u!114 &1679050721 +--- !u!1 &1706075440 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 932291142} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1706075444 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679050719} + m_GameObject: {fileID: 1706075440} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 3 + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 0 +--- !u!65 &1706075445 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1706075440} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: -0.00000000745058, y: -0.000000008847572, z: 0.000000026309863} --- !u!1001 &1762355858 PrefabInstance: m_ObjectHideFlags: 0 @@ -1282,9 +1489,12 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 1336769712} + addedObject: {fileID: 672204613} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 672204612} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} --- !u!1001 &1902528218 PrefabInstance: @@ -1348,7 +1558,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} propertyPath: m_Name - value: KeyHole (5) + value: KeyHole (4) objectReference: {fileID: 0} - target: {fileID: 7202271454713460447, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -1361,33 +1571,57 @@ PrefabInstance: - {fileID: -8700617353114198275, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} insertIndex: -1 - addedObject: {fileID: 2054857060} + addedObject: {fileID: 1306081372} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1306081371} m_SourcePrefab: {fileID: 100100000, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} ---- !u!1 &1903069841 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 253702551} - m_PrefabAsset: {fileID: 0} --- !u!4 &1903069842 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 253702551} m_PrefabAsset: {fileID: 0} ---- !u!114 &1903069843 +--- !u!1 &1943575591 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} + m_PrefabInstance: {fileID: 1408526234} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1943575595 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1903069841} + m_GameObject: {fileID: 1943575591} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} + m_Script: {fileID: 11500000, guid: b0bafb5095ab5f74bac503b56548b6c9, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 8 + m_EditorClassIdentifier: Assembly-CSharp::KeyHole + index: 5 +--- !u!65 &1943575596 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943575591} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.015721833, y: 0.015728435, z: 0.013296423} + m_Center: {x: 5.219075e-16, y: -0.000000010710217, z: 0.0000000402797} --- !u!1 &1996894822 GameObject: m_ObjectHideFlags: 0 @@ -1414,7 +1648,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1996894822} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2396} + m_LocalPosition: {x: 0, y: 0, z: 4900} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1438,7 +1672,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.8553459, g: 0.8553459, b: 0.8553459, a: 1} + m_Color: {r: 0.4250623, g: 0.4528302, b: 0.43879867, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1463,29 +1697,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1996894822} m_CullTransparentMesh: 1 ---- !u!1 &2054857058 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} - m_PrefabInstance: {fileID: 1902528218} - m_PrefabAsset: {fileID: 0} --- !u!4 &2054857059 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cb302613fc70fa48b0d1ab0b0783be5, type: 3} m_PrefabInstance: {fileID: 1902528218} m_PrefabAsset: {fileID: 0} ---- !u!114 &2054857060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2054857058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f5eef97f16bb6b47ba88f96f9d051e9, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::KeySlot - correctKeyID: 5 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/keyslot.cs b/Assets/Scripts/keyslot.cs deleted file mode 100644 index 5ad5767..0000000 --- a/Assets/Scripts/keyslot.cs +++ /dev/null @@ -1,28 +0,0 @@ -using UnityEngine; -using UnityEngine.EventSystems; -using UnityEngine.SceneManagement; - -public class KeySlot : MonoBehaviour, IDropHandler -{ - public string correctKeyID; - - public void OnDrop(PointerEventData eventData) - { - DraggableKey key = eventData.pointerDrag.GetComponent(); - - if (key != null) - { - if (key.keyID == correctKeyID) - { - key.transform.position = transform.position; - key.enabled = false; - - KeyminigameManager.Instance.CheckWin(); - } - else - { - KeyminigameManager.Instance.Fail(); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/keyslot.cs.meta b/Assets/Scripts/keyslot.cs.meta deleted file mode 100644 index 6fb36b5..0000000 --- a/Assets/Scripts/keyslot.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 4f5eef97f16bb6b47ba88f96f9d051e9 \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 3bf274b..9cab4b9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.unity.ide.visualstudio": "2.0.27", + "com.unity.inputsystem": "1.14.2", "com.unity.multiplayer.center": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.ugui": "2.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6e7fcf1..b257d37 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,6 +15,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.14.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.multiplayer.center": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 306db23..3975013 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -920,7 +920,7 @@ PlayerSettings: qnxGraphicConfPath: apiCompatibilityLevel: 6 captureStartupLogs: {} - activeInputHandler: 1 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: 8feb5b9d-fe4c-4652-bc44-283fb1a29892 framebufferDepthMemorylessMode: 0