diff --git a/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_BaseMap.1001.png b/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_BaseMap.1001.png index 48db8d3c..f211ef7c 100644 Binary files a/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_BaseMap.1001.png and b/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_BaseMap.1001.png differ diff --git a/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_Emissive.1001.png b/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_Emissive.1001.png index f1369e17..bd203753 100644 Binary files a/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_Emissive.1001.png and b/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_Emissive.1001.png differ diff --git a/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_MaskMap.1001.png b/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_MaskMap.1001.png index f0342a36..9007fe91 100644 Binary files a/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_MaskMap.1001.png and b/Assets/Artwork/city/buildings/KKZ/kkz_lambert1_MaskMap.1001.png differ diff --git a/Assets/Artwork/city/buildings/kvartal/1/kvartal_1.mat b/Assets/Artwork/city/buildings/kvartal/1/kvartal_1.mat index 3ff20b43..0a183573 100644 --- a/Assets/Artwork/city/buildings/kvartal/1/kvartal_1.mat +++ b/Assets/Artwork/city/buildings/kvartal/1/kvartal_1.mat @@ -34,7 +34,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 2800000, guid: 1784f2085e68b8e49be528b48cad3b12, type: 3} + m_Texture: {fileID: 2800000, guid: 392f9dff70267d041a087275129b5241, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -54,7 +54,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissiveColorMap: - m_Texture: {fileID: 2800000, guid: ac60fcc3e8d0bd94abaf1c57a09845b3, type: 3} + m_Texture: {fileID: 2800000, guid: 89f4db111d25cdf4d84448d33f0c368d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _HeightMap: @@ -70,11 +70,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 1784f2085e68b8e49be528b48cad3b12, type: 3} + m_Texture: {fileID: 2800000, guid: 392f9dff70267d041a087275129b5241, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: - m_Texture: {fileID: 2800000, guid: 07eee7c790de9a647b201771839296db, type: 3} + m_Texture: {fileID: 2800000, guid: 2d992f738d9e38b4d8ac641e92bd7550, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: diff --git a/Assets/Artwork/city/buildings/kvartal/2/kvartal_2.mat b/Assets/Artwork/city/buildings/kvartal/2/kvartal_2.mat index 972363a6..53a9e1a7 100644 --- a/Assets/Artwork/city/buildings/kvartal/2/kvartal_2.mat +++ b/Assets/Artwork/city/buildings/kvartal/2/kvartal_2.mat @@ -34,7 +34,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 2800000, guid: becdf5d351cce6a4fb241e170c4e40b1, type: 3} + m_Texture: {fileID: 2800000, guid: 68d3e59d8d39c2c43a9a7f048eb0199b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -54,7 +54,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissiveColorMap: - m_Texture: {fileID: 2800000, guid: 5ed2d4296692e8d40ade1088bcb14e61, type: 3} + m_Texture: {fileID: 2800000, guid: 55bbeb2b60f17594b911c1ed48dbaa05, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _HeightMap: @@ -70,11 +70,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: becdf5d351cce6a4fb241e170c4e40b1, type: 3} + m_Texture: {fileID: 2800000, guid: 68d3e59d8d39c2c43a9a7f048eb0199b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: - m_Texture: {fileID: 2800000, guid: 12f0fbccc39a59a4b91ff81bc1f56957, type: 3} + m_Texture: {fileID: 2800000, guid: c1924080a7a57ac4dbe3a1490d3244d8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: diff --git a/Assets/_Monuments/Models/NEW/zvezda.fbx b/Assets/_Monuments/Models/NEW/zvezda.fbx new file mode 100644 index 00000000..4639626f Binary files /dev/null and b/Assets/_Monuments/Models/NEW/zvezda.fbx differ diff --git a/Assets/_Monuments/Models/NEW/zvezda.fbx.meta b/Assets/_Monuments/Models/NEW/zvezda.fbx.meta new file mode 100644 index 00000000..af9d96c0 --- /dev/null +++ b/Assets/_Monuments/Models/NEW/zvezda.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: b5ace125abe6d82448b1ddf74aa39bf3 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Monuments/Textures/zvezda.meta b/Assets/_Monuments/Textures/zvezda.meta new file mode 100644 index 00000000..706cf52c --- /dev/null +++ b/Assets/_Monuments/Textures/zvezda.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d371ea4d01dd594bbe81482936e87d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_BaseMap.1001.png b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_BaseMap.1001.png new file mode 100644 index 00000000..94eabe64 Binary files /dev/null and b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_BaseMap.1001.png differ diff --git a/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_BaseMap.1001.png.meta b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_BaseMap.1001.png.meta new file mode 100644 index 00000000..5b0e6b4b --- /dev/null +++ b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_BaseMap.1001.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: a14d65fd97789514b9a9addeff215b78 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_MaskMap.1001.png b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_MaskMap.1001.png new file mode 100644 index 00000000..3b6266cb Binary files /dev/null and b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_MaskMap.1001.png differ diff --git a/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_MaskMap.1001.png.meta b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_MaskMap.1001.png.meta new file mode 100644 index 00000000..abffa96e --- /dev/null +++ b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_MaskMap.1001.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 5b0a7fd9179c56e4d98f213b01713475 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_Normal.1001.png b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_Normal.1001.png new file mode 100644 index 00000000..abe146ff Binary files /dev/null and b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_Normal.1001.png differ diff --git a/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_Normal.1001.png.meta b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_Normal.1001.png.meta new file mode 100644 index 00000000..ec6ce96b --- /dev/null +++ b/Assets/_Monuments/Textures/zvezda/zvezda_lambert1_Normal.1001.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 04b12605658406a4886d0ff71adbdfbc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: