diff --git a/Assets/Models/Materials/Hologram_Edge.mat b/Assets/Models/Materials/Hologram_Edge.mat index 00954c2..88808df 100644 --- a/Assets/Models/Materials/Hologram_Edge.mat +++ b/Assets/Models/Materials/Hologram_Edge.mat @@ -74,5 +74,5 @@ Material: - _ZWrite: 0 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 0} - - _EmissionColor: {r: 0.4863379, g: 0.3585, b: 0.5, a: 1} + - _EmissionColor: {r: 0.72950685, g: 0.53775007, b: 0.75, a: 1} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.19607843} diff --git a/Assets/Models/Materials/Holograms/InventoryLayout.mat b/Assets/Models/Materials/Holograms/InventoryLayout.mat index 54f635d..bfcb436 100644 --- a/Assets/Models/Materials/Holograms/InventoryLayout.mat +++ b/Assets/Models/Materials/Holograms/InventoryLayout.mat @@ -74,5 +74,5 @@ Material: - _ZWrite: 0 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 1.3871332, g: 1.0396501, b: 1.45, a: 1} + - _EmissionColor: {r: 1.339301, g: 1.0038, b: 1.4, a: 1} - _TintColor: {r: 0.9759962, g: 0.647, b: 1, a: 0.21568628} diff --git a/Assets/Models/Materials/Material.mat b/Assets/Models/Materials/Material.mat new file mode 100644 index 0000000..2d0a382 --- /dev/null +++ b/Assets/Models/Materials/Material.mat @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/Materials/Material.mat.meta b/Assets/Models/Materials/Material.mat.meta new file mode 100644 index 0000000..2bcb9b8 --- /dev/null +++ b/Assets/Models/Materials/Material.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: cac55f0f5d2b94909899376ddfca7276 +timeCreated: 1494578350 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/TwoFacedQuad.blend b/Assets/Models/TwoFacedQuad.blend new file mode 100644 index 0000000..b1770e7 --- /dev/null +++ b/Assets/Models/TwoFacedQuad.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d40658d3c5498ae77a1d703cbca79e5aa07e9b6c57ac3105976f2a259edd2c +size 458588 diff --git a/Assets/Models/TwoFacedQuad.blend.meta b/Assets/Models/TwoFacedQuad.blend.meta new file mode 100644 index 0000000..276a899 --- /dev/null +++ b/Assets/Models/TwoFacedQuad.blend.meta @@ -0,0 +1,84 @@ +fileFormatVersion: 2 +guid: 8d9188969010c44ce935ad4421c967df +timeCreated: 1494573133 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Two_Faced_Quad + 7400000: Default Take + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Hologram.prefab b/Assets/Prefabs/Hologram.prefab index 1e58710..c50f8d9 100644 --- a/Assets/Prefabs/Hologram.prefab +++ b/Assets/Prefabs/Hologram.prefab @@ -52,27 +52,27 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1149177136626514} - m_LocalRotation: {x: -0.5000007, y: -0.49999928, z: -0.49999928, w: 0.5000007} + m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] m_Father: {fileID: 4689370038551000} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: -90.00001} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -90} --- !u!4 &4689370038551000 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1322065614505358} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.39999998, z: 0} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: -0.199, y: 0.337, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4184625238098062} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!23 &23583528089297200 MeshRenderer: m_ObjectHideFlags: 1 @@ -80,8 +80,8 @@ MeshRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1149177136626514} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -144,9 +144,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TextProperties: - Text: + Text: \n\n Toggle Door + OffsetX: 18 + OffsetY: 18 Background: {r: 0, g: 0, b: 0, a: 0} - FontSize: 32 + FontSize: 36 Width: 256 Height: 256 Mesh: {fileID: 23583528089297200} @@ -164,6 +166,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b128d3bedf18c46f6b23cf529a954f59, type: 3} m_Name: m_EditorClassIdentifier: - ID: 0 - Visible: 1 - Text: {fileID: 0} + Visible: 0 + Text: {fileID: 114171175549544602} diff --git a/Assets/Prefabs/PC.prefab b/Assets/Prefabs/PC.prefab index 75276d8..0d37c0e 100644 --- a/Assets/Prefabs/PC.prefab +++ b/Assets/Prefabs/PC.prefab @@ -11,6 +11,24 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1297568499365208} m_IsPrefabParent: 1 +--- !u!1 &1118036843494872 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4390841286282626} + - component: {fileID: 33855553013256190} + - component: {fileID: 23929481531100956} + - component: {fileID: 95587483016877570} + m_Layer: 0 + m_Name: Hologram Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1297568499365208 GameObject: m_ObjectHideFlags: 0 @@ -29,6 +47,111 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1355516313789472 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4164543123855502} + - component: {fileID: 33337063842811222} + - component: {fileID: 64730419328261050} + - component: {fileID: 23114746529417128} + m_Layer: 0 + m_Name: Icon Floppy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1373682370141446 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4508297394169232} + - component: {fileID: 33540133742758052} + - component: {fileID: 64705548599298680} + - component: {fileID: 23853909658500366} + m_Layer: 0 + m_Name: Icon Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1422896068271308 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4236387573765288} + - component: {fileID: 114633016952828368} + - component: {fileID: 114884373532918326} + m_Layer: 0 + m_Name: Inventory Hologram + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1473348076947890 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4099946104317490} + - component: {fileID: 114383476058023772} + m_Layer: 0 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1631579676868556 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4686712969109052} + - component: {fileID: 33947386320701838} + - component: {fileID: 64847462003953176} + - component: {fileID: 23740621205513838} + m_Layer: 0 + m_Name: Inventory Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1660701953044296 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4638548974480200} + - component: {fileID: 33521042049071656} + - component: {fileID: 64624223168060348} + - component: {fileID: 23512526763929976} + m_Layer: 0 + m_Name: Icon Globe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1666724255178126 GameObject: m_ObjectHideFlags: 1 @@ -66,6 +189,43 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1822302617919868 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4530634180654324} + - component: {fileID: 33683376200718996} + - component: {fileID: 64013687062017004} + - component: {fileID: 23360414563318538} + m_Layer: 0 + m_Name: Icon Social + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1892519892396820 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4825258285747792} + - component: {fileID: 33067661023441796} + - component: {fileID: 64094174428785204} + - component: {fileID: 23765266521109446} + - component: {fileID: 114989760931913584} + m_Layer: 0 + m_Name: Inventory List + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1934077548447990 GameObject: m_ObjectHideFlags: 0 @@ -98,6 +258,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &4099946104317490 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1473348076947890} + m_LocalRotation: {x: -0, y: -0.7071056, z: -0, w: 0.7071081} + m_LocalPosition: {x: 0, y: -0.6, z: 0.65} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4236387573765288} + m_Father: {fileID: 4883048021777868} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0} --- !u!4 &4126889091672100 Transform: m_ObjectHideFlags: 1 @@ -111,6 +285,39 @@ Transform: m_Father: {fileID: 4883048021777868} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4164543123855502 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1355516313789472} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: 0.225} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!4 &4236387573765288 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1422896068271308} + 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: 4390841286282626} + - {fileID: 4825258285747792} + - {fileID: 4686712969109052} + - {fileID: 4164543123855502} + - {fileID: 4508297394169232} + - {fileID: 4530634180654324} + - {fileID: 4638548974480200} + m_Father: {fileID: 4099946104317490} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4243620059187726 Transform: m_ObjectHideFlags: 1 @@ -124,6 +331,19 @@ Transform: m_Father: {fileID: 4883048021777868} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4390841286282626 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118036843494872} + m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -90} --- !u!4 &4400199165588268 Transform: m_ObjectHideFlags: 1 @@ -137,13 +357,39 @@ Transform: m_Father: {fileID: 4586682446228250} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4508297394169232 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1373682370141446} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: 0.075} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!4 &4530634180654324 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1822302617919868} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: -0.075} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!4 &4586682446228250 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1297568499365208} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: @@ -152,6 +398,45 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4638548974480200 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1660701953044296} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.06, y: 0.25, z: -0.2250001} + m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!4 &4686712969109052 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1631579676868556} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.02, y: 0.70000005, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} +--- !u!4 &4825258285747792 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1892519892396820} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0.035, y: 0.685, z: 0.175} + m_LocalScale: {x: 0.06, y: 0.01, z: 0.07} + m_Children: [] + m_Father: {fileID: 4236387573765288} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!4 &4883048021777868 Transform: m_ObjectHideFlags: 1 @@ -164,6 +449,7 @@ Transform: m_Children: - {fileID: 4243620059187726} - {fileID: 4126889091672100} + - {fileID: 4099946104317490} m_Father: {fileID: 4586682446228250} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -203,6 +489,70 @@ Camera: m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 +--- !u!23 &23114746529417128 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1355516313789472} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 4fa61405fcf634bdcad4ae56f8083fb9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23360414563318538 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1822302617919868} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 96b1a97d0f6b843f29723adb8b3f1f71, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!23 &23436966457259662 MeshRenderer: m_ObjectHideFlags: 1 @@ -235,6 +585,169 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!23 &23512526763929976 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1660701953044296} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2e2bb54edc0544095bfb5a74adee6cf3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23740621205513838 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1631579676868556} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: a2f13121dc57b415d929aae5ea8fd85a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23765266521109446 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1892519892396820} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: bc07ff2ef266a4661adc506da3430c31, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23853909658500366 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1373682370141446} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 24ae1dd653e644f6193e6f6696e03ef7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23929481531100956 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118036843494872} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 0512e7921046d4372ac4b499027cfca4, type: 2} + - {fileID: 2100000, guid: cc4c08d204a79447484ac0feba2a009b, type: 2} + - {fileID: 2100000, guid: d0e06f49f789848479496513ddc9d4a6, type: 2} + - {fileID: 2100000, guid: bc07ff2ef266a4661adc506da3430c31, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!23 &23982704159771918 MeshRenderer: m_ObjectHideFlags: 1 @@ -267,6 +780,13 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!33 &33067661023441796 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1892519892396820} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33272790934557900 MeshFilter: m_ObjectHideFlags: 1 @@ -274,6 +794,34 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1938407866563824} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33337063842811222 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1355516313789472} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33521042049071656 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1660701953044296} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33540133742758052 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1373682370141446} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33683376200718996 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1822302617919868} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33797246170962224 MeshFilter: m_ObjectHideFlags: 1 @@ -281,6 +829,104 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1676210427351718} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33855553013256190 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118036843494872} + m_Mesh: {fileID: 4300000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} +--- !u!33 &33947386320701838 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1631579676868556} + m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} +--- !u!64 &64013687062017004 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1822302617919868} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &64094174428785204 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1892519892396820} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &64624223168060348 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1660701953044296} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &64705548599298680 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1373682370141446} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &64730419328261050 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1355516313789472} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &64847462003953176 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1631579676868556} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} --- !u!81 &81660614106265848 AudioListener: m_ObjectHideFlags: 1 @@ -295,6 +941,38 @@ Behaviour: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1666724255178126} m_Enabled: 1 +--- !u!95 &95587483016877570 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118036843494872} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 +--- !u!114 &114383476058023772 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1473348076947890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb0d2e67bf4cd4c6b97d2572ce00fc41, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 20678872378488080} + Hologram: {fileID: 114633016952828368} + ItemListText: {fileID: 114989760931913584} + ItemsPerScreen: 8 --- !u!114 &114385213279389382 MonoBehaviour: m_ObjectHideFlags: 1 @@ -336,6 +1014,65 @@ MonoBehaviour: InteractionDistance: 2 CharacterController: {fileID: 143869468979164672} Head: {fileID: 4883048021777868} +--- !u!114 &114633016952828368 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1422896068271308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b128d3bedf18c46f6b23cf529a954f59, type: 3} + m_Name: + m_EditorClassIdentifier: + Visible: 0 + Text: {fileID: 114884373532918326} +--- !u!114 &114884373532918326 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1422896068271308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e0b8f69a817648969bf8ecd70b13d4d, type: 3} + m_Name: + m_EditorClassIdentifier: + TextProperties: + Text: Local Storage + OffsetX: 18 + OffsetY: 18 + Background: {r: 0, g: 0, b: 0, a: 0} + FontSize: 33 + Width: 256 + Height: 256 + Mesh: {fileID: 23929481531100956} + MaterialIndex: 3 + Emissive: 0 + Brightness: 1 +--- !u!114 &114989760931913584 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1892519892396820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e0b8f69a817648969bf8ecd70b13d4d, type: 3} + m_Name: + m_EditorClassIdentifier: + TextProperties: + Text: + OffsetX: 55 + OffsetY: 10 + Background: {r: 0, g: 0, b: 0, a: 0} + FontSize: 32 + Width: 219 + Height: 256 + Mesh: {fileID: 23765266521109446} + MaterialIndex: 0 + Emissive: 0 + Brightness: 1 --- !u!124 &124775686376978134 Behaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Quad.prefab b/Assets/Prefabs/Quad.prefab new file mode 100644 index 0000000..b78a978 --- /dev/null +++ b/Assets/Prefabs/Quad.prefab @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1223457877321036} + m_IsPrefabParent: 1 +--- !u!1 &1223457877321036 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4190095747787814} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1590534819538616 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4465189759450890} + - component: {fileID: 33325577593549846} + - component: {fileID: 23274431195750466} + - component: {fileID: 95416650383238754} + m_Layer: 0 + m_Name: TwoFacedQuad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4190095747787814 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1223457877321036} + 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: 4465189759450890} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4465189759450890 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1590534819538616} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4190095747787814} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90.00001, y: 90, z: 0} +--- !u!23 &23274431195750466 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1590534819538616} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 0512e7921046d4372ac4b499027cfca4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33325577593549846 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1590534819538616} + m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} +--- !u!95 &95416650383238754 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1590534819538616} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 diff --git a/Assets/Prefabs/Quad.prefab.meta b/Assets/Prefabs/Quad.prefab.meta new file mode 100644 index 0000000..629339f --- /dev/null +++ b/Assets/Prefabs/Quad.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 39e310a1a69f94e4b9bc74cc0401aecf +timeCreated: 1494573168 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestMap.unity b/Assets/Scenes/TestMap.unity index c01f169..851124c 100644 --- a/Assets/Scenes/TestMap.unity +++ b/Assets/Scenes/TestMap.unity @@ -139,198 +139,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &27615709 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 27615710} - - component: {fileID: 27615714} - - component: {fileID: 27615713} - - component: {fileID: 27615712} - - component: {fileID: 27615711} - m_Layer: 0 - m_Name: Inventory List - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &27615710 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 27615709} - m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.02, y: 0.685, z: 0.185} - m_LocalScale: {x: 0.06, y: 1, z: 0.067} - m_Children: [] - m_Father: {fileID: 229498030} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!114 &27615711 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 27615709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0e0b8f69a817648969bf8ecd70b13d4d, type: 3} - m_Name: - m_EditorClassIdentifier: - TextProperties: - Text: '- Testing\n- A Nice List\n- Spicy Hat' - OffsetX: 0 - OffsetY: 0 - Background: {r: 0, g: 0, b: 0, a: 0} - FontSize: 32 - Width: 256 - Height: 229 - Mesh: {fileID: 27615712} - MaterialIndex: 0 - Emissive: 0 - Brightness: 1 ---- !u!23 &27615712 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 27615709} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: bc07ff2ef266a4661adc506da3430c31, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &27615713 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 27615709} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &27615714 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 27615709} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &97891002 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 97891003} - - component: {fileID: 97891006} - - component: {fileID: 97891005} - - component: {fileID: 97891004} - m_Layer: 0 - m_Name: Icon Social - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &97891003 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 97891002} - m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.06, y: 0.25, z: -0.075} - m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} - m_Children: [] - m_Father: {fileID: 229498030} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!23 &97891004 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 97891002} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 96b1a97d0f6b843f29723adb8b3f1f71, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &97891005 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 97891002} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &97891006 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 97891002} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &100803251 GameObject: m_ObjectHideFlags: 0 @@ -439,138 +247,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 438898519} - - {fileID: 144407926} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &144407925 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 144407926} - m_Layer: 0 - m_Name: Inventory - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &144407926 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 144407925} - m_LocalRotation: {x: -0, y: -0.7071056, z: -0, w: 0.7071081} - m_LocalPosition: {x: 0, y: 1, z: 0.65} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 229498030} - m_Father: {fileID: 132238582} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0} ---- !u!1001 &229498029 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 144407926} - m_Modifications: - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.x - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.y - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.z - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.w - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1322065614505358, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_Name - value: Inventory Hologram - objectReference: {fileID: 0} - - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: TextProperties.Text - value: Local Storage - objectReference: {fileID: 0} - - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: TextProperties.OffsetX - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: TextProperties.OffsetY - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: TextProperties.FontSize - value: 33 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - m_IsPrefabParent: 0 ---- !u!4 &229498030 stripped -Transform: - m_PrefabParentObject: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - m_PrefabInternal: {fileID: 229498029} --- !u!1 &248140502 GameObject: m_ObjectHideFlags: 0 @@ -898,6 +577,48 @@ Transform: m_Father: {fileID: 949094013} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &368999678 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1988211392} + m_Modifications: + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalPosition.x + value: -0.199 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalPosition.y + value: 0.337 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} + m_IsPrefabParent: 0 --- !u!1 &375619905 GameObject: m_ObjectHideFlags: 0 @@ -1778,7 +1499,7 @@ MeshFilter: MonoBehaviour: m_PrefabParentObject: {fileID: 114295198600795518, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - m_PrefabInternal: {fileID: 1203899440} + m_PrefabInternal: {fileID: 368999678} m_Script: {fileID: 11500000, guid: b128d3bedf18c46f6b23cf529a954f59, type: 3} --- !u!1 &949094012 GameObject: @@ -2043,79 +1764,6 @@ Transform: m_Father: {fileID: 949094013} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1203899440 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1988211392} - m_Modifications: - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalPosition.x - value: -0.199 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalPosition.y - value: 0.337 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114295198600795518, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: Visible - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalScale.x - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalScale.y - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 4184625238098062, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalScale.z - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: TextProperties.Text - value: \n\n Toggle Door - objectReference: {fileID: 0} - - target: {fileID: 4689370038551000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 114171175549544602, guid: 3da42b42c71f841c2a977cfb5255b00f, - type: 2} - propertyPath: TextProperties.FontSize - value: 36 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3da42b42c71f841c2a977cfb5255b00f, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1304969965 GameObject: m_ObjectHideFlags: 0 @@ -2280,90 +1928,6 @@ Transform: m_Father: {fileID: 949094013} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1410873969 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1410873970} - - component: {fileID: 1410873973} - - component: {fileID: 1410873972} - - component: {fileID: 1410873971} - m_Layer: 0 - m_Name: Icon Floppy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1410873970 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1410873969} - m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.06, y: 0.25, z: 0.225} - m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} - m_Children: [] - m_Father: {fileID: 229498030} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!23 &1410873971 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1410873969} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 4fa61405fcf634bdcad4ae56f8083fb9, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1410873972 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1410873969} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1410873973 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1410873969} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1444061381 GameObject: m_ObjectHideFlags: 0 @@ -2707,7 +2271,7 @@ TextMesh: m_Text: m_OffsetZ: 0 m_CharacterSize: 1 - m_LineSpacing: 0.85 + m_LineSpacing: 1 m_Anchor: 0 m_Alignment: 0 m_TabSize: 4 @@ -3092,90 +2656,6 @@ Transform: m_Father: {fileID: 344272455} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1944717508 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1944717509} - - component: {fileID: 1944717512} - - component: {fileID: 1944717511} - - component: {fileID: 1944717510} - m_Layer: 0 - m_Name: Icon Globe - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1944717509 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1944717508} - m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.06, y: 0.25, z: -0.2250001} - m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} - m_Children: [] - m_Father: {fileID: 229498030} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!23 &1944717510 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1944717508} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 2e2bb54edc0544095bfb5a74adee6cf3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1944717511 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1944717508} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1944717512 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1944717508} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1988211392 stripped Transform: m_PrefabParentObject: {fileID: 4974430339442808, guid: 660bef6a67fed4941b963e96ff20a5e0, @@ -3292,90 +2772,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 500} m_SizeDelta: {x: 0, y: -1000} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2110329893 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2110329894} - - component: {fileID: 2110329897} - - component: {fileID: 2110329896} - - component: {fileID: 2110329895} - m_Layer: 0 - m_Name: Icon Heart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2110329894 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2110329893} - m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.06, y: 0.25, z: 0.075} - m_LocalScale: {x: 0.0115, y: 1, z: 0.0115} - m_Children: [] - m_Father: {fileID: 229498030} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!23 &2110329895 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2110329893} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 24ae1dd653e644f6193e6f6696e03ef7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &2110329896 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2110329893} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &2110329897 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2110329893} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2130629203 GameObject: m_ObjectHideFlags: 0 @@ -3465,90 +2861,6 @@ Camera: m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 ---- !u!1 &2130760163 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2130760164} - - component: {fileID: 2130760167} - - component: {fileID: 2130760166} - - component: {fileID: 2130760165} - m_Layer: 0 - m_Name: Inventory Layout - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2130760164 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2130760163} - m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.03, y: 0.70000005, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 229498030} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!23 &2130760165 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2130760163} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: a2f13121dc57b415d929aae5ea8fd85a, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &2130760166 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2130760163} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &2130760167 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2130760163} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &2139315739 Prefab: m_ObjectHideFlags: 0 @@ -3588,10 +2900,6 @@ Prefab: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 1297568499365208, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/Controls/CursorHandler.cs b/Assets/Scripts/Controls/CursorHandler.cs index b5ad54a..043cc7f 100644 --- a/Assets/Scripts/Controls/CursorHandler.cs +++ b/Assets/Scripts/Controls/CursorHandler.cs @@ -23,15 +23,30 @@ namespace Cyber.Controls { public float MouseSensitivityY = 2.5f; private bool CursorLocked = true; + private bool RequestedLockState = true; + private bool Requested = false; + + public void RequestLockState(bool locked) { + RequestedLockState = locked; + Requested = true; + } + + public bool Locked() { + return Term.IsVisible() || RequestedLockState; + } private void Start() { UpdateCursor(); } private void Update() { - if (CursorLocked == Term.IsVisible()) { - CursorLocked = !CursorLocked; + if (Term.IsVisible()) { + CursorLocked = false; UpdateCursor(); + } else if (Requested) { + CursorLocked = RequestedLockState; + UpdateCursor(); + Requested = false; } } diff --git a/Assets/Scripts/Controls/InventoryInterface.cs b/Assets/Scripts/Controls/InventoryInterface.cs new file mode 100644 index 0000000..16b2b9a --- /dev/null +++ b/Assets/Scripts/Controls/InventoryInterface.cs @@ -0,0 +1,102 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Cyber.Util; + +namespace Cyber.Controls { + + /// + /// Handles displaying and interacting with the inventory. + /// + public class InventoryInterface : MonoBehaviour { + + /// + /// The camera that is displaying this inventory interface. + /// + public Camera Camera; + + /// + /// The hologram that acts as the root for the inventory. + /// + public Hologram Hologram; + + /// + /// The text that contains the item list. + /// + public TextTextureApplier ItemListText; + + /// + /// How many items can be shown on the screen at the same time. + /// + public int ItemsPerScreen; + + private CursorHandler CursorHandler; + private bool InventoryOpen = false; + private int TestingInventorySize = 20; + private int ScrollingIndex = 0; + private int SelectedIndex = -1; + + private void Start() { + CursorHandler = GameObject.Find("/Systems/CursorHandler").GetComponent(); + RebuildItemList(-1); + } + + private void Update() { + if (Input.GetButtonDown("Inventory")) { + InventoryOpen = !InventoryOpen; + Hologram.Visible = InventoryOpen; + CursorHandler.RequestLockState(!InventoryOpen); + } + + RaycastHit LookedAt = CameraUtil.GetLookedAtHit(Camera, 1f, true); + if (LookedAt.collider != null) { + TextTextureApplier Text = LookedAt.collider.GetComponent(); + if (Text != null && Text == ItemListText) { + // Interacting with the item list + // Calculate the index + float ScaledY = (Text.transform.InverseTransformPoint(LookedAt.point).z * 0.1f) + 0.5f; + int CurrentIndex = ScrollingIndex + (int)(ScaledY * ItemsPerScreen); + + // Update inputs + if (Input.GetAxis("Mouse ScrollWheel") > 0 && ScrollingIndex > 0) { + ScrollingIndex--; + } + if (Input.GetAxis("Mouse ScrollWheel") < 0 && ScrollingIndex < TestingInventorySize - 1) { + ScrollingIndex++; + } + if (Input.GetButtonDown("Activate")) { + SelectedIndex = CurrentIndex; + } + + // Rebuild the list + RebuildItemList(CurrentIndex); + } + } else { + // Outside of the inventory, clicking will unselect + if (Input.GetButtonDown("Activate")) { + SelectedIndex = -1; + RebuildItemList(-1); + } + } + } + + private void RebuildItemList(int focused) { + string Inv = ""; + for (int i = ScrollingIndex; i < TestingInventorySize; i++) { + if (i == focused) { + Inv += ""; + } + if (i == SelectedIndex) { + Inv += "·"; + } + Inv += "Item #" + i + "\n"; + if (i == focused) { + Inv += ""; + } + } + TextTextureProperties NewProps = ItemListText.TextProperties; + NewProps.Text = Inv; + ItemListText.SetTextProperties(NewProps); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Controls/InventoryInterface.cs.meta b/Assets/Scripts/Controls/InventoryInterface.cs.meta new file mode 100644 index 0000000..d021768 --- /dev/null +++ b/Assets/Scripts/Controls/InventoryInterface.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: bb0d2e67bf4cd4c6b97d2572ce00fc41 +timeCreated: 1494574508 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Controls/PlayerController.cs b/Assets/Scripts/Controls/PlayerController.cs index 7e18d07..e6c66c9 100644 --- a/Assets/Scripts/Controls/PlayerController.cs +++ b/Assets/Scripts/Controls/PlayerController.cs @@ -5,6 +5,7 @@ using Cyber.Networking.Clientside; using Cyber.Networking; using Cyber.Networking.Messages; using Cyber.Entities; +using Cyber.Util; namespace Cyber.Controls { @@ -45,13 +46,15 @@ namespace Cyber.Controls { Character.Stop(); } - // Rotation - Rotation.y += Input.GetAxis("Mouse X") * CursorHandler.MouseSensitivityX; - Rotation.x = Mathf.Clamp(Rotation.x - Input.GetAxis("Mouse Y") * CursorHandler.MouseSensitivityY, -89, 89); - Character.SetRotation(Rotation); + // Rotation (only when cursor is locked + if (CursorHandler.Locked()) { + Rotation.y += Input.GetAxis("Mouse X") * CursorHandler.MouseSensitivityX; + Rotation.x = Mathf.Clamp(Rotation.x - Input.GetAxis("Mouse Y") * CursorHandler.MouseSensitivityY, -89, 89); + Character.SetRotation(Rotation); + } // Interactions - GameObject LookedAtObject = GetLookedAtGameObject(); + GameObject LookedAtObject = CameraUtil.GetLookedAtGameObject(Camera, Character.InteractionDistance); if (LookedAtObject != null) { Interactable LookingAt = LookedAtObject.GetComponent(); if (LookingAt != null && (LookingAt.transform.position - Character.GetPosition()).magnitude < Character.InteractionDistance) { @@ -85,15 +88,5 @@ namespace Cyber.Controls { Client.Send(PktType.Interact, new InteractionPkt(interactable.ID, type)); } } - - private GameObject GetLookedAtGameObject() { - RaycastHit Hit; - Physics.Raycast(Camera.transform.position, Camera.transform.forward, out Hit, Character.InteractionDistance); - if (Hit.collider != null) { - return Hit.collider.gameObject; - } else { - return null; - } - } } } \ No newline at end of file diff --git a/Assets/Scripts/Util/CameraUtil.cs b/Assets/Scripts/Util/CameraUtil.cs new file mode 100644 index 0000000..31b1dd5 --- /dev/null +++ b/Assets/Scripts/Util/CameraUtil.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Cyber.Util { + + /// + /// Static utility functions related to cameras. + /// + public class CameraUtil { + + /// + /// Gets the first hit of a ray from the middle of the camera hits. + /// + /// The looked at game object. + /// Camera. + /// Distance. + /// Whether the raycast should use the + /// mouse position on the screen (as opposed to the center). + public static RaycastHit GetLookedAtHit(Camera camera, + float distance, bool useMousePosition = false) { + RaycastHit Hit; + Ray Ray; + if (useMousePosition) { + Ray = camera.ScreenPointToRay(Input.mousePosition); + } else { + Ray = new Ray(camera.transform.position, camera.transform.forward); + } + Physics.Raycast(Ray, out Hit, distance); + return Hit; + } + + /// + /// Gets the first game object a ray from the middle of the camera hits. + /// + /// The looked at game object. + /// Camera. + /// Distance. + /// Whether the raycast should use the + /// mouse position on the screen (as opposed to the center). + public static GameObject GetLookedAtGameObject(Camera camera, + float distance, bool useMousePosition = false) { + RaycastHit Result = GetLookedAtHit(camera, distance, useMousePosition); + if (Result.collider != null) { + return Result.collider.gameObject; + } else { + return null; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/CameraUtil.cs.meta b/Assets/Scripts/Util/CameraUtil.cs.meta new file mode 100644 index 0000000..2479a9b --- /dev/null +++ b/Assets/Scripts/Util/CameraUtil.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: abd75ae449935471f903dc8ef1efed17 +timeCreated: 1494576498 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Util/Hologram.cs b/Assets/Scripts/Util/Hologram.cs index d11b7b3..8141a6d 100644 --- a/Assets/Scripts/Util/Hologram.cs +++ b/Assets/Scripts/Util/Hologram.cs @@ -35,7 +35,7 @@ namespace Cyber.Util { private void UpdateScale() { float Scale = GetTargetScale(); CurrentScale = Mathf.Lerp(CurrentScale, Scale, 8f * Time.deltaTime); - if (Mathf.Abs(Scale - CurrentScale) < 0.05) { + if (Mathf.Abs(Scale - CurrentScale) < 0.001) { CurrentScale = Scale; } transform.localScale = diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index e32e17b..d710ef2 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -101,6 +101,22 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Inventory + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: q + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 - serializedVersion: 3 m_Name: Console Toggle descriptiveName: