diff --git a/Assets/Models/Items/Materials/Neon.mat b/Assets/Models/Items/Materials/Neon.mat index f3e28ce..5173e50 100644 --- a/Assets/Models/Items/Materials/Neon.mat +++ b/Assets/Models/Items/Materials/Neon.mat @@ -72,4 +72,4 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0.9632353, g: 0, b: 0.9366635, a: 1} - - _EmissionColor: {r: 10, g: 10, b: 10, a: 1} + - _EmissionColor: {r: 1.0933064, g: 0.61470586, b: 1.1, a: 1} diff --git a/Assets/Models/Items/Materials/NeonSix.mat b/Assets/Models/Items/Materials/NeonSix.mat new file mode 100644 index 0000000..a753319 --- /dev/null +++ b/Assets/Models/Items/Materials/NeonSix.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: NeonSix + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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.16838624, g: 0.8, b: 0.08450003, a: 1} + - _EmissionColor: {r: 0.7215822, g: 1.1, b: 0.67132354, a: 1} diff --git a/Assets/Models/Items/Materials/NeonSix.mat.meta b/Assets/Models/Items/Materials/NeonSix.mat.meta new file mode 100644 index 0000000..9f6ce17 --- /dev/null +++ b/Assets/Models/Items/Materials/NeonSix.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9194ad04a34e04985825e436531de058 +timeCreated: 1495068342 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Items/RevolverSix.blend b/Assets/Models/Items/RevolverSix.blend new file mode 100644 index 0000000..aeaed38 --- /dev/null +++ b/Assets/Models/Items/RevolverSix.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78e13009da96dff29d63d3fe55794ff9f8e0f427e0f30f66cf240ed8a9814139 +size 1159160 diff --git a/Assets/Models/Items/RevolverSix.blend.meta b/Assets/Models/Items/RevolverSix.blend.meta new file mode 100644 index 0000000..cf6077f --- /dev/null +++ b/Assets/Models/Items/RevolverSix.blend.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 3a334cf6e2fd34a64aff355ddb0e4640 +timeCreated: 1495067976 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: Armature + 100002: Cylinder + 100004: Hammer + 100006: Revolver + 100008: //RootNode + 100010: Root + 100012: Trigger + 400000: Armature + 400002: Cylinder + 400004: Hammer + 400006: Revolver + 400008: //RootNode + 400010: Root + 400012: Trigger + 4300000: Revolver + 7400000: Default Take + 7400002: Idle + 7400004: Reload + 7400006: Shoot + 9500000: //RootNode + 13700000: Revolver + 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/Models/WorldObjects/Materials/Lamp.mat b/Assets/Models/WorldObjects/Materials/Lamp.mat index f2c0d02..fae773e 100644 --- a/Assets/Models/WorldObjects/Materials/Lamp.mat +++ b/Assets/Models/WorldObjects/Materials/Lamp.mat @@ -72,4 +72,4 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0.93671393, g: 0.71323526, b: 1, a: 1} - - _EmissionColor: {r: 1.9371197, g: 1.5441178, b: 2, a: 1} + - _EmissionColor: {r: 1.2688134, g: 1.0113971, b: 1.31, a: 1}