diff --git a/Assets/Models/Base_Station.prefab b/Assets/Models/Base_Station.prefab index 8317fe7..860bbf6 100644 --- a/Assets/Models/Base_Station.prefab +++ b/Assets/Models/Base_Station.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &378217906447368849 +--- !u!1001 &7383967699712829140 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -13,47 +13,47 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalScale.x - value: 0.0011996 + value: -0.004334755 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalScale.y - value: 0.0011996 + value: -0.004334755 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalScale.z - value: 0.0011996 + value: -0.0029608852 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 3.254 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalPosition.y - value: 2 + value: 1.742 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 3.246 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.00000003962542 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.000000029820843 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -61,11 +61,49 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 180 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9e3cc82de9ed3af4e8566223b6f3e573, type: 2} - target: {fileID: 919132149155446097, guid: cebc9e68e283d4f438ff552731202af1, type: 3} propertyPath: m_Name value: Base_Station objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cebc9e68e283d4f438ff552731202af1, type: 3} +--- !u!1 &7690026457662905221 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + m_PrefabInstance: {fileID: 7383967699712829140} + m_PrefabAsset: {fileID: 0} +--- !u!54 &9198341609995772460 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690026457662905221} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &458595701713748199 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690026457662905221} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 36.834656, y: 37.323742, z: 110.446754} + m_Center: {x: 3.2069546e-13, y: 0.000008738796, z: 53.660473} diff --git a/Assets/Models/Base_Station.prefab.meta b/Assets/Models/Base_Station.prefab.meta index 80f720a..f209c93 100644 --- a/Assets/Models/Base_Station.prefab.meta +++ b/Assets/Models/Base_Station.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db311a19e9de71343abeaae7f6fb1581 +guid: 7ac4997c5be278c47b274e634226473d PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Models/Blender/Base_Station.blend b/Assets/Models/Blender/Base_Station.blend index 3d76781..f5a3d75 100644 --- a/Assets/Models/Blender/Base_Station.blend +++ b/Assets/Models/Blender/Base_Station.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d65b44cc273400f58a2a597ec846bf76550a1e2d743a83ac3a1ba7b2ec104705 -size 791236 +oid sha256:d9f8e00dca496a428af6f782bcf0fc8264da2650e135047dd2811a4d3764e947 +size 857780 diff --git a/Assets/Models/Blender/Iron Man.blend1 b/Assets/Models/Blender/Iron Man.blend1 deleted file mode 100644 index 9ba67fb..0000000 Binary files a/Assets/Models/Blender/Iron Man.blend1 and /dev/null differ diff --git a/Assets/Models/Blender/LegoDarthVader.blend1 b/Assets/Models/Blender/LegoDarthVader.blend1 deleted file mode 100644 index 3a50524..0000000 Binary files a/Assets/Models/Blender/LegoDarthVader.blend1 and /dev/null differ diff --git a/Assets/Models/Blender/LegoDarthVader.blend1.meta b/Assets/Models/Blender/LegoDarthVader.blend1.meta deleted file mode 100644 index 5320f47..0000000 --- a/Assets/Models/Blender/LegoDarthVader.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8be71a403a306084fa05a1bd52f0c83d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Blender/LegoDeadPool.blend1 b/Assets/Models/Blender/LegoDeadPool.blend1 deleted file mode 100644 index 0b70ff4..0000000 Binary files a/Assets/Models/Blender/LegoDeadPool.blend1 and /dev/null differ diff --git a/Assets/Models/Blender/batman.blend1 b/Assets/Models/Blender/batman.blend1 deleted file mode 100644 index 12a8f0b..0000000 Binary files a/Assets/Models/Blender/batman.blend1 and /dev/null differ diff --git a/Assets/Models/Blender/batman.blend1.meta b/Assets/Models/Blender/batman.blend1.meta deleted file mode 100644 index e32974e..0000000 --- a/Assets/Models/Blender/batman.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8f47cf52770385d48ae56ff398b505b9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Blender/LegoDeadPool.blend1.meta b/Assets/Texture/Materials.meta similarity index 67% rename from Assets/Models/Blender/LegoDeadPool.blend1.meta rename to Assets/Texture/Materials.meta index cb98f31..b30a098 100644 --- a/Assets/Models/Blender/LegoDeadPool.blend1.meta +++ b/Assets/Texture/Materials.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 071114ad6eab97647889154cb475219a +guid: 48b06f3ffe2d5dd4aa925a68f873972f +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Texture/Materials/Keyboard_Texture.mat b/Assets/Texture/Materials/Keyboard_Texture.mat new file mode 100644 index 0000000..3cb6d8e --- /dev/null +++ b/Assets/Texture/Materials/Keyboard_Texture.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Keyboard_Texture + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 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: 2800000, guid: a0fc9ee942198a6478ff47f039befb18, type: 3} + 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_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _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} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Blender/Iron Man.blend1.meta b/Assets/Texture/Materials/Keyboard_Texture.mat.meta similarity index 52% rename from Assets/Models/Blender/Iron Man.blend1.meta rename to Assets/Texture/Materials/Keyboard_Texture.mat.meta index ed4b536..4ce5452 100644 --- a/Assets/Models/Blender/Iron Man.blend1.meta +++ b/Assets/Texture/Materials/Keyboard_Texture.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 997fb0365faa352448c4bf540a894bf6 -DefaultImporter: +guid: 9e3cc82de9ed3af4e8566223b6f3e573 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: