diff --git a/Vive VR/Assets/DisplayInventory.cs b/Vive VR/Assets/DisplayInventory.cs new file mode 100644 index 00000000..17aceada --- /dev/null +++ b/Vive VR/Assets/DisplayInventory.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class DisplayInventory : MonoBehaviour +{ + public InventoryObject inventory; + + public int X_START; + public int Y_START; + public int X_SPACE_BETWEEN_ITEM; + public int NUMBER_OF_COLUMN; + public int Y_SPACE_BETWEEN_ITEMS; + + Dictionary itemDisplayed = new Dictionary(); + + private void Start() + { + CreateDisplay(); + } + + private void Update() + { + UpdateDisplay(); + } + + public void UpdateDisplay() + { + for (int i = 0; i < inventory.Container.Count; i++) + { + if (itemDisplayed.ContainsKey(inventory.Container[i])) + { + itemDisplayed[inventory.Container[i]].GetComponentInChildren().text = inventory.Container[i].amount.ToString("n0"); + } + else + { + var obj = Instantiate(inventory.Container[i].item.prefab, Vector3.zero, Quaternion.identity, transform); + obj.GetComponent().localPosition = GetPosition(i); + obj.GetComponentInChildren().text = inventory.Container[i].amount.ToString("n0"); + itemDisplayed.Add(inventory.Container[i], obj); + } + } + } + + public void CreateDisplay() + { + for (int i = 0; i < inventory.Container.Count; i++) + { + var obj = Instantiate(inventory.Container[i].item.prefab, Vector3.zero, Quaternion.identity, transform); + obj.GetComponent().localPosition = GetPosition(i); + obj.GetComponentInChildren().text = inventory.Container[i].amount.ToString("n0"); + itemDisplayed.Add(inventory.Container[i], obj); + + } + } + + public Vector3 GetPosition(int i) + { + return new Vector3(X_START + (X_SPACE_BETWEEN_ITEM * (i % NUMBER_OF_COLUMN)), Y_START + (-Y_SPACE_BETWEEN_ITEMS * (i / NUMBER_OF_COLUMN)), 0f); + } +} + diff --git a/Vive VR/Assets/Item.cs b/Vive VR/Assets/Item.cs new file mode 100644 index 00000000..ffd329b5 --- /dev/null +++ b/Vive VR/Assets/Item.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item : MonoBehaviour +{ + public ItemObject item; +} diff --git a/Vive VR/Assets/ItemClickBehavior.cs b/Vive VR/Assets/ItemClickBehavior.cs new file mode 100644 index 00000000..b3584f2f --- /dev/null +++ b/Vive VR/Assets/ItemClickBehavior.cs @@ -0,0 +1,55 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ItemClickBehavior : MonoBehaviour +{ + public InventoryObject inventory; + + // Update is called once per frame + void Update() + { + if (Input.GetMouseButtonDown(0) && Input.GetMouseButtonDown(0)) + { + RaycastHit hit; + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + + if (Physics.Raycast(ray, out hit)) + { + Collider other = hit.collider as Collider; + if ( other.GetComponent("Item") != null ) + { + AddItemOnClick(other); + Destroy(other.gameObject); + Debug.Log("Item successfully added"); + } + } + } + + } + + public void AddItemOnClick(Collider bc) + { + var item = bc.GetComponent(); + if (item) + { + inventory.AddItem(item.item, 1); + } + } + + public void OnItemClicked() + { + ItemDragHandler draghandler = + + gameObject.transform.Find("Border").GetComponent(); + + Debug.Log("Slot plays animation"); + + } + + // This resets the item count to zero upon closing the game. + private void OnApplicationQuit() + { + inventory.Container.Clear(); + } +} diff --git a/Vive VR/Assets/ItemDragHandler.cs b/Vive VR/Assets/ItemDragHandler.cs new file mode 100644 index 00000000..93ef7d31 --- /dev/null +++ b/Vive VR/Assets/ItemDragHandler.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ItemDragHandler : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Vive VR/Assets/Player.cs b/Vive VR/Assets/Player.cs new file mode 100644 index 00000000..3e17bdb8 --- /dev/null +++ b/Vive VR/Assets/Player.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Player : MonoBehaviour + + +{ + public InventoryObject inventory; + + public void OnTriggerEnter(Collider other) + { + var item = other.GetComponent(); + if (item) + { + inventory.AddItem(item.item, 1); + Destroy(other.gameObject); + Debug.Log("Item Successfully Added"); + } + } +} diff --git a/Vive VR/Assets/Prefabs/Image Variant 1.prefab b/Vive VR/Assets/Prefabs/Image Variant 1.prefab new file mode 100644 index 00000000..d8d1919e --- /dev/null +++ b/Vive VR/Assets/Prefabs/Image Variant 1.prefab @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5979329689359008624 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5506508268488860543, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_Name + value: Image Variant 1 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -39.3 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 71.2 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_SizeDelta.x + value: 20.35 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_SizeDelta.y + value: 20.35 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_Pivot.x + value: 0.49999994 + objectReference: {fileID: 0} + - target: {fileID: 5506508268481749371, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5506508268488860540, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_Color.r + value: 0.30980393 + objectReference: {fileID: 0} + - target: {fileID: 5506508268488860540, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_Color.b + value: 0.57084167 + objectReference: {fileID: 0} + - target: {fileID: 5506508268488860540, guid: 6ac353dd06a8d9c4fa5bcde302826962, + type: 3} + propertyPath: m_Color.g + value: 0.6431373 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ac353dd06a8d9c4fa5bcde302826962, type: 3} diff --git a/Vive VR/Assets/Prefabs/Image Variant 1.prefab.meta b/Vive VR/Assets/Prefabs/Image Variant 1.prefab.meta new file mode 100644 index 00000000..dde86e13 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Image Variant 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 839baf4a7f2f54d4e830fb87ef2cceaa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Prefabs/Image Variant.prefab b/Vive VR/Assets/Prefabs/Image Variant.prefab new file mode 100644 index 00000000..f6705957 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Image Variant.prefab @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1129047253158613580 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4881939821228060979, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_Name + value: Image Variant + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -39.3 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 71.2 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_SizeDelta.x + value: 20.35 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_SizeDelta.y + value: 20.35 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_Pivot.x + value: 0.49999994 + objectReference: {fileID: 0} + - target: {fileID: 4881939820852376375, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4881939821228060976, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_Color.r + value: 0.6431373 + objectReference: {fileID: 0} + - target: {fileID: 4881939821228060976, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_Color.g + value: 0.30980393 + objectReference: {fileID: 0} + - target: {fileID: 4881939821228060976, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_Color.b + value: 0.5180395 + objectReference: {fileID: 0} + - target: {fileID: 4881939819862484222, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939819862484222, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939819862484222, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4881939819862484222, guid: 384117904597dae4cacdec186911eeec, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 384117904597dae4cacdec186911eeec, type: 3} diff --git a/Vive VR/Assets/Prefabs/Image Variant.prefab.meta b/Vive VR/Assets/Prefabs/Image Variant.prefab.meta new file mode 100644 index 00000000..38f7e2e5 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Image Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ac353dd06a8d9c4fa5bcde302826962 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Prefabs/Image.prefab b/Vive VR/Assets/Prefabs/Image.prefab new file mode 100644 index 00000000..b5c7bb97 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Image.prefab @@ -0,0 +1,231 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4881939819862484216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4881939819862484217} + - component: {fileID: 4881939819862484223} + - component: {fileID: 4881939819862484222} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4881939819862484217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881939819862484216} + 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_Children: [] + m_Father: {fileID: 4881939820852376375} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0000061989, y: 0.0000030994} + m_SizeDelta: {x: 21.4, y: 19.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4881939819862484223 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881939819862484216} + m_CullTransparentMesh: 0 +--- !u!114 &4881939819862484222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881939819862484216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 514 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: 0 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 4881939819862484222} + characterCount: 1 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4881939821228060979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4881939820852376375} + - component: {fileID: 4881939821228060977} + - component: {fileID: 4881939821228060976} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4881939820852376375 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881939821228060979} + 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_Children: + - {fileID: 4881939819862484217} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -39.3, y: 71.2} + m_SizeDelta: {x: 20.35, y: 20.35} + m_Pivot: {x: 0.49999994, y: 0.5} +--- !u!222 &4881939821228060977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881939821228060979} + m_CullTransparentMesh: 0 +--- !u!114 &4881939821228060976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881939821228060979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.58600813, g: 0.31167677, b: 0.6415094, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Vive VR/Assets/Prefabs/Image.prefab.meta b/Vive VR/Assets/Prefabs/Image.prefab.meta new file mode 100644 index 00000000..3852baa3 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 384117904597dae4cacdec186911eeec +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Prefabs/Inventory.prefab b/Vive VR/Assets/Prefabs/Inventory.prefab new file mode 100644 index 00000000..c6fd47f3 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Inventory.prefab @@ -0,0 +1,193 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2340451057142021010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2340451057142021101} + - component: {fileID: 2340451057142021103} + - component: {fileID: 2340451057142021100} + - component: {fileID: 2340451057142021102} + m_Layer: 5 + m_Name: InventoryScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2340451057142021101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451057142021010} + 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_Children: [] + m_Father: {fileID: 2340451058813032488} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -115.70001} + m_SizeDelta: {x: -217.14, y: -259.99} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2340451057142021103 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451057142021010} + m_CullTransparentMesh: 0 +--- !u!114 &2340451057142021100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451057142021010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.6} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2340451057142021102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451057142021010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b923d2881339165489f1c46c60cd58da, type: 3} + m_Name: + m_EditorClassIdentifier: + inventory: {fileID: 11400000, guid: bbadf1389275baf4587b894060bd2b0c, type: 2} + X_START: -241 + Y_START: 0 + X_SPACE_BETWEEN_ITEM: 65 + NUMBER_OF_COLUMN: 10 + Y_SPACE_BETWEEN_ITEMS: 0 +--- !u!1 &2340451058813032492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2340451058813032488} + - component: {fileID: 2340451058813032489} + - component: {fileID: 2340451058813032494} + - component: {fileID: 2340451058813032495} + m_Layer: 5 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2340451058813032488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451058813032492} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 2340451057142021101} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &2340451058813032489 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451058813032492} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2340451058813032494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451058813032492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &2340451058813032495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340451058813032492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Vive VR/Assets/Prefabs/Player.prefab b/Vive VR/Assets/Prefabs/Player.prefab index 45135a7d..277d964f 100644 --- a/Vive VR/Assets/Prefabs/Player.prefab +++ b/Vive VR/Assets/Prefabs/Player.prefab @@ -29,7 +29,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3030684524960953079} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3141865348179100965 MonoBehaviour: @@ -187,6 +187,7 @@ Transform: - {fileID: 3030684524961004333} - {fileID: 3030684524961005053} - {fileID: 3030684524960993291} + - {fileID: 3030684524961019203} - {fileID: 3026720739311555097} - {fileID: 3030684524960976549} m_Father: {fileID: 3030684524961033555} @@ -476,8 +477,6 @@ GameObject: m_Component: - component: {fileID: 3030684524961033555} - component: {fileID: 3030684524955257951} - - component: {fileID: 1320167974} - - component: {fileID: 1320167975} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -493,7 +492,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3030684524961078571} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.44803756, y: 0.44, z: 6.85} + m_LocalPosition: {x: -0.44803756, y: 0.44, z: 6.63} m_LocalScale: {x: 1, y: 1.5723, z: 1.856} m_Children: - {fileID: 3030684524960953079} @@ -502,7 +501,6 @@ Transform: - {fileID: 3030684524960974913} - {fileID: 3030684524961039711} - {fileID: 3026720739621489545} - - {fileID: 6634542410216482624} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -520,7 +518,7 @@ MonoBehaviour: m_EditorClassIdentifier: trackingOriginTransform: {fileID: 3030684524961033555} hmdTransforms: - - {fileID: 0} + - {fileID: 3030684524961019203} - {fileID: 3030684524960951529} hands: - {fileID: 3030684524955242313} @@ -534,44 +532,6 @@ MonoBehaviour: actionPath: /actions/default/in/HeadsetOnHead needsReinit: 1 allowToggleTo2D: 1 ---- !u!114 &1320167974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3030684524961078571} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30ca8419ca2ca2e4480d54c4145b794f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Sensitivity: 0.1 - m_MaxSpeed: 1 - m_MovePress: - actionPath: - needsReinit: 0 - m_MoveValue: - actionPath: - needsReinit: 0 ---- !u!143 &1320167975 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3030684524961078571} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 2 - m_Radius: 0.5 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 1, z: 0} --- !u!1 &3030684524961080313 GameObject: m_ObjectHideFlags: 0 @@ -719,6 +679,111 @@ MonoBehaviour: m_EditorClassIdentifier: highLightMaterial: {fileID: 2100000, guid: 7b939e5e799d98a469f594828ebab52e, type: 2} fireHapticsOnHightlight: 1 +--- !u!1 &3030684524961092749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3030684524961019203} + - component: {fileID: 3030684524960482889} + - component: {fileID: 3030684524955238431} + - component: {fileID: 3030684524953019991} + - component: {fileID: 3030684524954020509} + m_Layer: 0 + m_Name: VRCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3030684524961019203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3030684524961092749} + 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_Children: [] + m_Father: {fileID: 3030684524960953079} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &3030684524960482889 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3030684524961092749} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.028762981, g: 0.05902014, b: 0.1397059, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.05 + far clip plane: 300 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4160749567 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &3030684524955238431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3030684524961092749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ad1e469d4e3e04489f9a36419f1a4f8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!92 &3030684524953019991 +Behaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3030684524961092749} + m_Enabled: 1 +--- !u!124 &3030684524954020509 +Behaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3030684524961092749} + m_Enabled: 1 --- !u!1 &3030684524961095799 GameObject: m_ObjectHideFlags: 0 @@ -911,7 +976,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3030684524960953079} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3141865389626201465 MonoBehaviour: @@ -1523,74 +1588,3 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] broadcastDeviceChanges: 1 ---- !u!1001 &6634542410216098668 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3030684524961033555} - m_Modifications: - - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_Name - value: '[CameraRig]' - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} ---- !u!4 &6634542410216482624 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, - type: 3} - m_PrefabInstance: {fileID: 6634542410216098668} - m_PrefabAsset: {fileID: 0} diff --git a/Vive VR/Assets/Prefabs/Slot Variant 1.prefab b/Vive VR/Assets/Prefabs/Slot Variant 1.prefab new file mode 100644 index 00000000..44074b89 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Slot Variant 1.prefab @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6731494708398897317 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4851373751786898189, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_Name + value: Slot Variant 1 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -241.1 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_SizeDelta.x + value: 44.25 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_SizeDelta.y + value: 43.79 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898190, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898191, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_Color.r + value: 0.5835462 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898191, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_Color.g + value: 0.6415094 + objectReference: {fileID: 0} + - target: {fileID: 4851373751786898191, guid: 067e1dd9ca575f14cae4e7c4dca66a77, + type: 3} + propertyPath: m_Color.b + value: 0.28746885 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 067e1dd9ca575f14cae4e7c4dca66a77, type: 3} diff --git a/Vive VR/Assets/Prefabs/Slot Variant.prefab b/Vive VR/Assets/Prefabs/Slot Variant.prefab new file mode 100644 index 00000000..66d6bc82 --- /dev/null +++ b/Vive VR/Assets/Prefabs/Slot Variant.prefab @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6835250974410717491 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2128014813904583230, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_Name + value: Slot Variant + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -241.1 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_SizeDelta.x + value: 44.25 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_SizeDelta.y + value: 43.79 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583229, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583228, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_Color.r + value: 0.17755431 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583228, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_Color.g + value: 0.2830189 + objectReference: {fileID: 0} + - target: {fileID: 2128014813904583228, guid: a97774b3aa090d2489b5898f11e31c35, + type: 3} + propertyPath: m_Color.b + value: 0.2288528 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a97774b3aa090d2489b5898f11e31c35, type: 3} diff --git a/Vive VR/Assets/Prefabs/Slot.prefab b/Vive VR/Assets/Prefabs/Slot.prefab new file mode 100644 index 00000000..71bf9d6e --- /dev/null +++ b/Vive VR/Assets/Prefabs/Slot.prefab @@ -0,0 +1,418 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2128014813491752111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2128014813491752110} + - component: {fileID: 2128014813491752106} + - component: {fileID: 2128014813491752107} + - component: {fileID: 2128014813491752108} + - component: {fileID: 2128014813491752109} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2128014813491752110 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813491752111} + 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_Children: [] + m_Father: {fileID: 2128014813904583229} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000032901, y: -0.0000035763} + m_SizeDelta: {x: 44.25, y: 43.79} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2128014813491752106 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813491752111} + m_CullTransparentMesh: 0 +--- !u!114 &2128014813491752107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813491752111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4c9f8d9b3a541294aa4250432e24e229, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2128014813491752108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813491752111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.23366857, g: 0.3663817, b: 0.5566038, a: 1} + m_PressedColor: {r: 0.16313633, g: 0.39849776, b: 0.735849, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2128014813491752107} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2128014813491752111} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!114 &2128014813491752109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813491752111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2a5e87d858facf45a804be337141048, type: 3} + m_Name: + m_EditorClassIdentifier: + inventory: {fileID: 0} +--- !u!1 &2128014813552135877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2128014813552135876} + - component: {fileID: 2128014813552135874} + - component: {fileID: 2128014813552135875} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2128014813552135876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813552135877} + 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_Children: [] + m_Father: {fileID: 2128014813904583229} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2128014813552135874 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813552135877} + m_CullTransparentMesh: 0 +--- !u!114 &2128014813552135875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813552135877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 12 + m_fontSizeBase: 12 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 514 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 2128014813552135875} + characterCount: 1 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2128014813904583230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2128014813904583229} + - component: {fileID: 2128014813904583227} + - component: {fileID: 2128014813904583228} + - component: {fileID: 2128014813904583226} + m_Layer: 5 + m_Name: Slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2128014813904583229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813904583230} + 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_Children: + - {fileID: 2128014813491752110} + - {fileID: 2128014813552135876} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -241.1, y: 0} + m_SizeDelta: {x: 44.25, y: 43.79} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2128014813904583227 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813904583230} + m_CullTransparentMesh: 0 +--- !u!114 &2128014813904583228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813904583230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2128014813904583226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128014813904583230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.5276789, g: 0.9245283, b: 0.91667545, a: 1} + m_PressedColor: {r: 0.39417946, g: 0.8113208, b: 0.80306053, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2128014813491752107} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Vive VR/Assets/Scriptable Objects/Inventory.meta b/Vive VR/Assets/Scriptable Objects/Inventory.meta new file mode 100644 index 00000000..156d3dbb --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Inventory.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e99226d4a935db4488bce6ff5689d093 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Inventory/Player Inventory.asset b/Vive VR/Assets/Scriptable Objects/Inventory/Player Inventory.asset new file mode 100644 index 00000000..eff427ef --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Inventory/Player Inventory.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: 23ddeb1e42f1526428a2b61d4d1b896a, type: 3} + m_Name: Player Inventory + m_EditorClassIdentifier: + Container: [] diff --git a/Vive VR/Assets/Scriptable Objects/Inventory/Player Inventory.asset.meta b/Vive VR/Assets/Scriptable Objects/Inventory/Player Inventory.asset.meta new file mode 100644 index 00000000..284e4dd3 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Inventory/Player Inventory.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbadf1389275baf4587b894060bd2b0c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Inventory/Scripts.meta b/Vive VR/Assets/Scriptable Objects/Inventory/Scripts.meta new file mode 100644 index 00000000..58c9b65e --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Inventory/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3db8b4d97498f9c449c6e076e8327250 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Inventory/Scripts/InventoryObject.cs b/Vive VR/Assets/Scriptable Objects/Inventory/Scripts/InventoryObject.cs new file mode 100644 index 00000000..20f20162 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Inventory/Scripts/InventoryObject.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New Inventory", menuName = "Inventory System/Inventory")] + +public class InventoryObject : ScriptableObject +{ + public List Container = new List(); + public void AddItem(ItemObject _item, int _amount) + { + bool hasItem = false; + for (int i = 0; i < Container.Count; i++) + { + if(Container[i].item == _item) + { + Container[i].AddAmount(_amount); + hasItem = true; + break; + } + } + + if (!hasItem) + { + Container.Add(new InventorySlot(_item, _amount)); + } + } +} + +[System.Serializable] +public class InventorySlot +{ + public ItemObject item; + public int amount; + public InventorySlot(ItemObject _item, int _amount) + { + item = _item; + amount = _amount; + } + public void AddAmount(int value) + { + amount += value; + } +} + diff --git a/Vive VR/Assets/Scriptable Objects/Inventory/Scripts/InventoryObject.cs.meta b/Vive VR/Assets/Scriptable Objects/Inventory/Scripts/InventoryObject.cs.meta new file mode 100644 index 00000000..ef1398b9 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Inventory/Scripts/InventoryObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 23ddeb1e42f1526428a2b61d4d1b896a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items.meta b/Vive VR/Assets/Scriptable Objects/Items.meta new file mode 100644 index 00000000..794d36e8 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e0e46b77941a3b47ab2123ee14e494a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Bones.asset b/Vive VR/Assets/Scriptable Objects/Items/Bones.asset new file mode 100644 index 00000000..3868ed8d --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Bones.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: 75abb2ef5bba36f4f8b752f3ff452bfa, type: 3} + m_Name: Bones + m_EditorClassIdentifier: + prefab: {fileID: 4881939821228060979, guid: 384117904597dae4cacdec186911eeec, type: 3} + type: 1 + description: 'This is a test description + +' diff --git a/Vive VR/Assets/Scriptable Objects/Items/Bones.asset.meta b/Vive VR/Assets/Scriptable Objects/Items/Bones.asset.meta new file mode 100644 index 00000000..5a1c988e --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Bones.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 179f3b3ba958a8e4f80cae8ccd11e4e7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Books.asset b/Vive VR/Assets/Scriptable Objects/Items/Books.asset new file mode 100644 index 00000000..c9b9bf87 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Books.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: 75abb2ef5bba36f4f8b752f3ff452bfa, type: 3} + m_Name: Books + m_EditorClassIdentifier: + prefab: {fileID: 5506508268488860543, guid: 6ac353dd06a8d9c4fa5bcde302826962, type: 3} + type: 1 + description: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Books.asset.meta b/Vive VR/Assets/Scriptable Objects/Items/Books.asset.meta new file mode 100644 index 00000000..a7be5886 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Books.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1b91e46cb327054297a586feadbc834 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Sans.asset b/Vive VR/Assets/Scriptable Objects/Items/Sans.asset new file mode 100644 index 00000000..c40b698c --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Sans.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: 75abb2ef5bba36f4f8b752f3ff452bfa, type: 3} + m_Name: Sans + m_EditorClassIdentifier: + prefab: {fileID: 2202775563414233103, guid: 839baf4a7f2f54d4e830fb87ef2cceaa, type: 3} + type: 1 + description: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Sans.asset.meta b/Vive VR/Assets/Scriptable Objects/Items/Sans.asset.meta new file mode 100644 index 00000000..1e2fdafa --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Sans.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3cf885c1749380b45b1709333d53765b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts.meta b/Vive VR/Assets/Scriptable Objects/Items/Scripts.meta new file mode 100644 index 00000000..1888b09a --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9444cec3dd2fe5c419e5607f72a0737d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts/DefaultObject.cs b/Vive VR/Assets/Scriptable Objects/Items/Scripts/DefaultObject.cs new file mode 100644 index 00000000..91ad42f0 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts/DefaultObject.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New Default Object", menuName = "Inventory System/Items/Default")] + +public class DefaultObject : ItemObject +{ + public void Awake() + { + type = ItemType.Default; + } +} diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts/DefaultObject.cs.meta b/Vive VR/Assets/Scriptable Objects/Items/Scripts/DefaultObject.cs.meta new file mode 100644 index 00000000..50204940 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts/DefaultObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 75abb2ef5bba36f4f8b752f3ff452bfa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts/EquipmentObject.cs b/Vive VR/Assets/Scriptable Objects/Items/Scripts/EquipmentObject.cs new file mode 100644 index 00000000..a4cb0f44 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts/EquipmentObject.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New Equipment Object", menuName = "Inventory System/Items/Equipment")] + +public class EquipmentObject : ItemObject +{ + public float AtkBonus; + + public void Awake() + { + type = ItemType.Equipment; + } +} diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts/EquipmentObject.cs.meta b/Vive VR/Assets/Scriptable Objects/Items/Scripts/EquipmentObject.cs.meta new file mode 100644 index 00000000..6efeb6e6 --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts/EquipmentObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b28b445fe0078364d9a515da60ed9e90 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts/ItemObject.cs b/Vive VR/Assets/Scriptable Objects/Items/Scripts/ItemObject.cs new file mode 100644 index 00000000..25067e1d --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts/ItemObject.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum ItemType +{ + Equipment, + Default +} + +public abstract class ItemObject : ScriptableObject +{ + public GameObject prefab; + public ItemType type; + [TextArea(15,20)] + public string description; + +} diff --git a/Vive VR/Assets/Scriptable Objects/Items/Scripts/ItemObject.cs.meta b/Vive VR/Assets/Scriptable Objects/Items/Scripts/ItemObject.cs.meta new file mode 100644 index 00000000..3466590f --- /dev/null +++ b/Vive VR/Assets/Scriptable Objects/Items/Scripts/ItemObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f941b1a64a161c04190f0321ed716095 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Vive VR/Assets/UIClickHandler.cs b/Vive VR/Assets/UIClickHandler.cs new file mode 100644 index 00000000..a79d2f8a --- /dev/null +++ b/Vive VR/Assets/UIClickHandler.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIClickHandler : MonoBehaviour +{ + public void OnItemClicked() + { + //ItemDragHandler dragHandler = + + //gameObject.transform.Find(GetComponent("Item").GetComp + } +}