From 3cd7aaa2229ef3c01da415944e0cfc824b93590d Mon Sep 17 00:00:00 2001 From: teascade Date: Thu, 18 May 2017 06:52:26 +0300 Subject: [PATCH] Add trash can #14 --- Assets/Models/Items/Can.blend1.meta | 8 -- .../Models/WorldObjects/BarChair.blend1.meta | 8 -- .../WorldObjects/Materials/DarkMetal.mat | 75 +++++++++++++++++ .../WorldObjects/Materials/DarkMetal.mat.meta | 9 ++ Assets/Models/WorldObjects/TrashCan.blend | 3 + .../Models/WorldObjects/TrashCan.blend.meta | 84 +++++++++++++++++++ 6 files changed, 171 insertions(+), 16 deletions(-) delete mode 100644 Assets/Models/Items/Can.blend1.meta delete mode 100644 Assets/Models/WorldObjects/BarChair.blend1.meta create mode 100644 Assets/Models/WorldObjects/Materials/DarkMetal.mat create mode 100644 Assets/Models/WorldObjects/Materials/DarkMetal.mat.meta create mode 100644 Assets/Models/WorldObjects/TrashCan.blend create mode 100644 Assets/Models/WorldObjects/TrashCan.blend.meta diff --git a/Assets/Models/Items/Can.blend1.meta b/Assets/Models/Items/Can.blend1.meta deleted file mode 100644 index 503ce73..0000000 --- a/Assets/Models/Items/Can.blend1.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 50d7beb7eaf6bec4fbb04b0dc7deafb9 -timeCreated: 1495077364 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/WorldObjects/BarChair.blend1.meta b/Assets/Models/WorldObjects/BarChair.blend1.meta deleted file mode 100644 index 53557bf..0000000 --- a/Assets/Models/WorldObjects/BarChair.blend1.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 93d76c181d3457745b0b482b49e2d309 -timeCreated: 1495061357 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/WorldObjects/Materials/DarkMetal.mat b/Assets/Models/WorldObjects/Materials/DarkMetal.mat new file mode 100644 index 0000000..dc600df --- /dev/null +++ b/Assets/Models/WorldObjects/Materials/DarkMetal.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: DarkMetal + 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.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: 0.1107, g: 0.1107, b: 0.1107, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/WorldObjects/Materials/DarkMetal.mat.meta b/Assets/Models/WorldObjects/Materials/DarkMetal.mat.meta new file mode 100644 index 0000000..725cd18 --- /dev/null +++ b/Assets/Models/WorldObjects/Materials/DarkMetal.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6923029bc2c54b74b977f2ea37153ae7 +timeCreated: 1495079334 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/WorldObjects/TrashCan.blend b/Assets/Models/WorldObjects/TrashCan.blend new file mode 100644 index 0000000..ca92bb4 --- /dev/null +++ b/Assets/Models/WorldObjects/TrashCan.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:deec5a65d29d520e0a9776c282970c580cf40698903f1aac62d96592edef656f +size 479536 diff --git a/Assets/Models/WorldObjects/TrashCan.blend.meta b/Assets/Models/WorldObjects/TrashCan.blend.meta new file mode 100644 index 0000000..d1f3a81 --- /dev/null +++ b/Assets/Models/WorldObjects/TrashCan.blend.meta @@ -0,0 +1,84 @@ +fileFormatVersion: 2 +guid: a15eb123bf293b646b22ae0c36833b4c +timeCreated: 1495079334 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: TrashCan + 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: