diff --git a/Assets/Fonts.meta b/Assets/Fonts.meta new file mode 100755 index 0000000..19e3355 --- /dev/null +++ b/Assets/Fonts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c9a1b6ec5a2e0d6429b2577039884509 +folderAsset: yes +timeCreated: 1464026083 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/ARIAL Depth 256.mat b/Assets/Fonts/ARIAL Depth 256.mat new file mode 100755 index 0000000..1c4a1ae Binary files /dev/null and b/Assets/Fonts/ARIAL Depth 256.mat differ diff --git a/Assets/Furniture Prefabs/bed1.prefab.meta b/Assets/Fonts/ARIAL Depth 256.mat.meta similarity index 65% rename from Assets/Furniture Prefabs/bed1.prefab.meta rename to Assets/Fonts/ARIAL Depth 256.mat.meta index 32189ec..b4ab08c 100755 --- a/Assets/Furniture Prefabs/bed1.prefab.meta +++ b/Assets/Fonts/ARIAL Depth 256.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 20f750e5957fb9f439c9216bbf14c569 -timeCreated: 1463689741 +guid: 4330f0e761e0d1345a8d7590f8d7954f +timeCreated: 1464025991 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Fonts/ARIAL.TTF b/Assets/Fonts/ARIAL.TTF new file mode 100755 index 0000000..80bb0f6 Binary files /dev/null and b/Assets/Fonts/ARIAL.TTF differ diff --git a/Assets/Fonts/ARIAL.TTF.meta b/Assets/Fonts/ARIAL.TTF.meta new file mode 100755 index 0000000..1ea5641 --- /dev/null +++ b/Assets/Fonts/ARIAL.TTF.meta @@ -0,0 +1,20 @@ +fileFormatVersion: 2 +guid: a8b81d3342751554b9217e5f07c6e86b +timeCreated: 1464027391 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 3 + fontSize: 256 + forceTextureCase: 0 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + fontNames: [] + fallbackFontReferences: + - {fileID: 12800000, guid: e201ce4f474f0c14981abdac6bf8860c, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/ARIALBD.TTF b/Assets/Fonts/ARIALBD.TTF new file mode 100755 index 0000000..16e54f6 Binary files /dev/null and b/Assets/Fonts/ARIALBD.TTF differ diff --git a/Assets/Fonts/ARIALBD.TTF.meta b/Assets/Fonts/ARIALBD.TTF.meta new file mode 100755 index 0000000..4b4edd1 --- /dev/null +++ b/Assets/Fonts/ARIALBD.TTF.meta @@ -0,0 +1,19 @@ +fileFormatVersion: 2 +guid: e201ce4f474f0c14981abdac6bf8860c +timeCreated: 1464027392 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 3 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/OpenSans-Bold Depth 256.mat b/Assets/Fonts/OpenSans-Bold Depth 256.mat new file mode 100755 index 0000000..5ca44dc Binary files /dev/null and b/Assets/Fonts/OpenSans-Bold Depth 256.mat differ diff --git a/Assets/Furniture Prefabs/bed2.prefab.meta b/Assets/Fonts/OpenSans-Bold Depth 256.mat.meta similarity index 65% rename from Assets/Furniture Prefabs/bed2.prefab.meta rename to Assets/Fonts/OpenSans-Bold Depth 256.mat.meta index e6c0f30..dbfe343 100755 --- a/Assets/Furniture Prefabs/bed2.prefab.meta +++ b/Assets/Fonts/OpenSans-Bold Depth 256.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d050741419ef7064cbbf53934a7f7353 -timeCreated: 1463689745 +guid: f28664ecb5ca3d64b909e516ad1cdd71 +timeCreated: 1464027449 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Fonts/OpenSans-Bold.ttf b/Assets/Fonts/OpenSans-Bold.ttf new file mode 100755 index 0000000..fd79d43 Binary files /dev/null and b/Assets/Fonts/OpenSans-Bold.ttf differ diff --git a/Assets/Fonts/OpenSans-Bold.ttf.meta b/Assets/Fonts/OpenSans-Bold.ttf.meta new file mode 100755 index 0000000..e05c75b --- /dev/null +++ b/Assets/Fonts/OpenSans-Bold.ttf.meta @@ -0,0 +1,19 @@ +fileFormatVersion: 2 +guid: 4ab566410b504b4438b6382339277631 +timeCreated: 1464026598 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 3 + fontSize: 256 + forceTextureCase: 0 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/OpenSans-Regular Depth 256.mat b/Assets/Fonts/OpenSans-Regular Depth 256.mat new file mode 100755 index 0000000..3590aba Binary files /dev/null and b/Assets/Fonts/OpenSans-Regular Depth 256.mat differ diff --git a/Assets/Fonts/OpenSans-Regular Depth 256.mat.meta b/Assets/Fonts/OpenSans-Regular Depth 256.mat.meta new file mode 100755 index 0000000..a307ecf --- /dev/null +++ b/Assets/Fonts/OpenSans-Regular Depth 256.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b169001aae2ade4ab847648fa6f3161 +timeCreated: 1464027130 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/OpenSans-Regular.ttf b/Assets/Fonts/OpenSans-Regular.ttf new file mode 100755 index 0000000..db43334 Binary files /dev/null and b/Assets/Fonts/OpenSans-Regular.ttf differ diff --git a/Assets/Fonts/OpenSans-Regular.ttf.meta b/Assets/Fonts/OpenSans-Regular.ttf.meta new file mode 100755 index 0000000..99e92f5 --- /dev/null +++ b/Assets/Fonts/OpenSans-Regular.ttf.meta @@ -0,0 +1,19 @@ +fileFormatVersion: 2 +guid: 82d579c5a2c97954d8f0f0b3f7d2d7b8 +timeCreated: 1464026599 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 3 + fontSize: 256 + forceTextureCase: 0 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/TextWithDepth.shader b/Assets/Fonts/TextWithDepth.shader new file mode 100755 index 0000000..09e4bc1 --- /dev/null +++ b/Assets/Fonts/TextWithDepth.shader @@ -0,0 +1,18 @@ +Shader "GUI/TextWithDepth" { + Properties{ + _MainTex("Font Texture", 2D) = "white" {} + _Color("Text Color", Color) = (1, 1, 1, 1) + } + + SubShader{ + Tags{ "Queue" = "Transparent" "IgnoreProjector" = "True" "RenderType" = "Transparent" } + Lighting Off Cull Off ZWrite Off Fog{ Mode Off } + Blend SrcAlpha OneMinusSrcAlpha + Pass{ + Color[_Color] + SetTexture[_MainTex]{ + combine primary, texture * primary + } + } + } +} \ No newline at end of file diff --git a/Assets/Fonts/TextWithDepth.shader.meta b/Assets/Fonts/TextWithDepth.shader.meta new file mode 100755 index 0000000..585cb23 --- /dev/null +++ b/Assets/Fonts/TextWithDepth.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 51af322cb585ad744afc1c60957cb4c8 +timeCreated: 1464025853 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain.meta b/Assets/FreeMountain.meta new file mode 100755 index 0000000..90b62fd --- /dev/null +++ b/Assets/FreeMountain.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2b181a21ef1fe9d4db8730525cf41b67 +folderAsset: yes +timeCreated: 1464030294 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox.meta b/Assets/FreeMountain/Skybox.meta new file mode 100755 index 0000000..927a594 --- /dev/null +++ b/Assets/FreeMountain/Skybox.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: fa548e7cac28abf4495e909965a7fb52 +folderAsset: yes +timeCreated: 1450547173 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/Free_skybox.mat b/Assets/FreeMountain/Skybox/Free_skybox.mat new file mode 100755 index 0000000..ab5af79 Binary files /dev/null and b/Assets/FreeMountain/Skybox/Free_skybox.mat differ diff --git a/Assets/FreeMountain/Skybox/Free_skybox.mat.meta b/Assets/FreeMountain/Skybox/Free_skybox.mat.meta new file mode 100755 index 0000000..4d456cb --- /dev/null +++ b/Assets/FreeMountain/Skybox/Free_skybox.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4468cf691a0d9e74183ca9beb3c7c990 +timeCreated: 1450547251 +licenseType: Store +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/skybox_back.psd b/Assets/FreeMountain/Skybox/skybox_back.psd new file mode 100755 index 0000000..330fd06 Binary files /dev/null and b/Assets/FreeMountain/Skybox/skybox_back.psd differ diff --git a/Assets/FreeMountain/Skybox/skybox_back.psd.meta b/Assets/FreeMountain/Skybox/skybox_back.psd.meta new file mode 100755 index 0000000..f894720 --- /dev/null +++ b/Assets/FreeMountain/Skybox/skybox_back.psd.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 09485c71d5564f24f92d4244bc27b5fc +timeCreated: 1450547176 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/skybox_down.psd b/Assets/FreeMountain/Skybox/skybox_down.psd new file mode 100755 index 0000000..368bb6a Binary files /dev/null and b/Assets/FreeMountain/Skybox/skybox_down.psd differ diff --git a/Assets/FreeMountain/Skybox/skybox_down.psd.meta b/Assets/FreeMountain/Skybox/skybox_down.psd.meta new file mode 100755 index 0000000..f16e1d5 --- /dev/null +++ b/Assets/FreeMountain/Skybox/skybox_down.psd.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 1b733cade4c3ad644b02226637e1cd09 +timeCreated: 1450547176 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/skybox_front.psd b/Assets/FreeMountain/Skybox/skybox_front.psd new file mode 100755 index 0000000..7a9bcbe Binary files /dev/null and b/Assets/FreeMountain/Skybox/skybox_front.psd differ diff --git a/Assets/FreeMountain/Skybox/skybox_front.psd.meta b/Assets/FreeMountain/Skybox/skybox_front.psd.meta new file mode 100755 index 0000000..f0fc6d1 --- /dev/null +++ b/Assets/FreeMountain/Skybox/skybox_front.psd.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: e816a17296a9d184ebfff0f3b41205ef +timeCreated: 1450547183 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/skybox_left.psd b/Assets/FreeMountain/Skybox/skybox_left.psd new file mode 100755 index 0000000..8500a34 Binary files /dev/null and b/Assets/FreeMountain/Skybox/skybox_left.psd differ diff --git a/Assets/FreeMountain/Skybox/skybox_left.psd.meta b/Assets/FreeMountain/Skybox/skybox_left.psd.meta new file mode 100755 index 0000000..d6c26e6 --- /dev/null +++ b/Assets/FreeMountain/Skybox/skybox_left.psd.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: f6f3a44b2b12e9a45bc02ff2350c2873 +timeCreated: 1450547185 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/skybox_right.psd b/Assets/FreeMountain/Skybox/skybox_right.psd new file mode 100755 index 0000000..60e01f0 Binary files /dev/null and b/Assets/FreeMountain/Skybox/skybox_right.psd differ diff --git a/Assets/FreeMountain/Skybox/skybox_right.psd.meta b/Assets/FreeMountain/Skybox/skybox_right.psd.meta new file mode 100755 index 0000000..70048d8 --- /dev/null +++ b/Assets/FreeMountain/Skybox/skybox_right.psd.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 76cfeb5d9a2650144902a599ec509800 +timeCreated: 1450547179 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FreeMountain/Skybox/skybox_up.psd b/Assets/FreeMountain/Skybox/skybox_up.psd new file mode 100755 index 0000000..d19864b Binary files /dev/null and b/Assets/FreeMountain/Skybox/skybox_up.psd differ diff --git a/Assets/FreeMountain/Skybox/skybox_up.psd.meta b/Assets/FreeMountain/Skybox/skybox_up.psd.meta new file mode 100755 index 0000000..d0f8a9f --- /dev/null +++ b/Assets/FreeMountain/Skybox/skybox_up.psd.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: a6202455a7a564340b2dd1deb92aaa75 +timeCreated: 1450547180 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Furniture Prefabs/bed1.prefab b/Assets/Furniture Prefabs/Bed 1.prefab similarity index 81% rename from Assets/Furniture Prefabs/bed1.prefab rename to Assets/Furniture Prefabs/Bed 1.prefab index aaad1a1..2461a42 100755 Binary files a/Assets/Furniture Prefabs/bed1.prefab and b/Assets/Furniture Prefabs/Bed 1.prefab differ diff --git a/Assets/Furniture Prefabs/Bed 1.prefab.meta b/Assets/Furniture Prefabs/Bed 1.prefab.meta new file mode 100755 index 0000000..57c51c1 --- /dev/null +++ b/Assets/Furniture Prefabs/Bed 1.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 833f94a1676337c44bab918d55c563e3 +timeCreated: 1464029441 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Furniture Prefabs/bed2.prefab b/Assets/Furniture Prefabs/Bed 2.prefab similarity index 76% rename from Assets/Furniture Prefabs/bed2.prefab rename to Assets/Furniture Prefabs/Bed 2.prefab index a434e12..def041c 100755 Binary files a/Assets/Furniture Prefabs/bed2.prefab and b/Assets/Furniture Prefabs/Bed 2.prefab differ diff --git a/Assets/Furniture Prefabs/Bed 2.prefab.meta b/Assets/Furniture Prefabs/Bed 2.prefab.meta new file mode 100755 index 0000000..c06db5b --- /dev/null +++ b/Assets/Furniture Prefabs/Bed 2.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbe36515364eb1147877c8671b6f5128 +timeCreated: 1464029183 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Furniture Prefabs/Sofa 1.prefab b/Assets/Furniture Prefabs/Sofa 1.prefab new file mode 100755 index 0000000..7771aee Binary files /dev/null and b/Assets/Furniture Prefabs/Sofa 1.prefab differ diff --git a/Assets/Furniture Prefabs/Sofa 1.prefab.meta b/Assets/Furniture Prefabs/Sofa 1.prefab.meta new file mode 100755 index 0000000..7311815 --- /dev/null +++ b/Assets/Furniture Prefabs/Sofa 1.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd4d9c447da788945a48d29d63db76b2 +timeCreated: 1464029568 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Test.unity b/Assets/Test.unity index c2ba08d..ee59065 100755 Binary files a/Assets/Test.unity and b/Assets/Test.unity differ diff --git a/Assets/Warehouse Row.prefab b/Assets/Warehouse Row.prefab new file mode 100755 index 0000000..16a6097 Binary files /dev/null and b/Assets/Warehouse Row.prefab differ diff --git a/Assets/Warehouse Row.prefab.meta b/Assets/Warehouse Row.prefab.meta new file mode 100755 index 0000000..3d8ab3b --- /dev/null +++ b/Assets/Warehouse Row.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e48cc47058f70a40832134fa11986fd +timeCreated: 1464030617 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WarehouseColumn.cs b/Assets/WarehouseColumn.cs new file mode 100755 index 0000000..6b534b6 --- /dev/null +++ b/Assets/WarehouseColumn.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +[ExecuteInEditMode] +public class WarehouseColumn : MonoBehaviour { + + private BezierCurve curve; + private Transform rows; + + private float offset = 0.0f; + + void Awake() { + curve = transform.Find("Curve").GetComponent(); + rows = transform.Find("Rows"); + } + + void Start () { + + } + + void Update() { + if (Application.isPlaying) { + offset += Time.deltaTime; + } + + foreach (Transform row in rows) { + var i = row.GetSiblingIndex(); + var distance = (float)i / (rows.childCount) * curve.length + offset; + distance = Mathf.Repeat(distance, curve.length); + var pos = curve.GetPointAtDistance(distance); + row.position = pos; + } + } +} diff --git a/Assets/WarehouseColumn.cs.meta b/Assets/WarehouseColumn.cs.meta new file mode 100755 index 0000000..5f7598f --- /dev/null +++ b/Assets/WarehouseColumn.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c88cdd3c5a01be746a69b3b3cc95d136 +timeCreated: 1464021754 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WarehouseRow.cs b/Assets/WarehouseRow.cs index 4ae5bd6..ccd9eef 100755 --- a/Assets/WarehouseRow.cs +++ b/Assets/WarehouseRow.cs @@ -5,83 +5,48 @@ using UnityEditor; [ExecuteInEditMode] public class WarehouseRow : MonoBehaviour { - public GameObject[] Prefabs; - public bool ShowInEditor = false; + public string Category; BezierCurve curve; - - List furnitures; + Transform furniture; float offset = 0; - // Use this for initialization + void Awake() { + curve = transform.Find("Curve").GetComponent(); + furniture = transform.Find("Furniture"); + } + void Start() { - curve = GetComponent(); - furnitures = new List(); - -#if UNITY_EDITOR - EditorApplication.playmodeStateChanged += StateChange; -#endif - spawnPrefabs(); + // Set up text + transform.Find("Text/Number").GetComponent().text = (transform.GetSiblingIndex() + 1).ToString(); + transform.Find("Text/Category").GetComponent().text = Category; } - public void OnEnable() { - spawnPrefabs(); - } + //void spawnPrefabs() { + // if (furnitures.Count == 0) { + // for (int i = 0; i < Prefabs.Length; i++) { + // var prefab = Prefabs[i]; - void OnDisable() { - foreach (var item in furnitures) { - GameObject.DestroyImmediate(item); - } - furnitures.Clear(); - } + // GameObject furniture = Instantiate(prefab); + // furniture.transform.SetParent(transform); + // furniture.layer = 8; + // furnitures.Add(furniture); + // } + // } + //} - void OnDestroy() { - foreach (var item in furnitures) { - GameObject.DestroyImmediate(item); - } - furnitures.Clear(); - } - - void StateChange() { - if (EditorApplication.isPlayingOrWillChangePlaymode && !EditorApplication.isPlaying) { - OnDisable(); - } - } - - void OnValidate() { - foreach (var item in furnitures) { - GameObject.DestroyImmediate(item); - } - furnitures.Clear(); - spawnPrefabs(); - } - - void spawnPrefabs() { - if (furnitures.Count == 0) { - for (int i = 0; i < Prefabs.Length; i++) { - var prefab = Prefabs[i]; - - GameObject furniture = Instantiate(prefab); - furniture.transform.SetParent(transform); - furnitures.Add(furniture); - } - } - } - - // Update is called once per frame void Update() { if (Application.isPlaying) { - offset += Time.deltaTime; + //offset += Time.deltaTime; } - for (int i = 0; i < furnitures.Count; i++) { - var furniture = furnitures[i]; - - var distance = (float)i / (furnitures.Count - 1) * curve.length + offset; + foreach (Transform t in furniture) { + var i = t.GetSiblingIndex(); + var distance = (float)i / (furniture.childCount) * curve.length + offset; distance = Mathf.Repeat(distance, curve.length); var pos = curve.GetPointAtDistance(distance); - furniture.transform.position = pos; + t.position = pos; } } }