diff --git a/Assets/LaiBinFanDian/Indoor/Materials/No Name.mat b/Assets/LaiBinFanDian/Indoor/Materials/No Name.mat index c82fb63..0e90f26 100644 Binary files a/Assets/LaiBinFanDian/Indoor/Materials/No Name.mat and b/Assets/LaiBinFanDian/Indoor/Materials/No Name.mat differ diff --git a/Assets/LaiBinFanDian/Texture/CJ_WenZi.png.meta b/Assets/LaiBinFanDian/Texture/CJ_WenZi.png.meta index 3b6db9f..7913d54 100644 --- a/Assets/LaiBinFanDian/Texture/CJ_WenZi.png.meta +++ b/Assets/LaiBinFanDian/Texture/CJ_WenZi.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 2d3f368c82999334f94f4a595b8f4cd1 -timeCreated: 1554712614 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 4 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,42 +30,59 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 35af6a2631b576c439884536ee09dcff + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/LaiBinFanDian/Texture/Floor_color.jpg b/Assets/LaiBinFanDian/Texture/Floor_color.jpg index 16e99f5..01bc432 100644 Binary files a/Assets/LaiBinFanDian/Texture/Floor_color.jpg and b/Assets/LaiBinFanDian/Texture/Floor_color.jpg differ diff --git a/Assets/LaiBinFanDian/ZhuTi/Materials/lbfd-gg.mat b/Assets/LaiBinFanDian/ZhuTi/Materials/lbfd-gg.mat index 6d616d4..4b83b03 100644 Binary files a/Assets/LaiBinFanDian/ZhuTi/Materials/lbfd-gg.mat and b/Assets/LaiBinFanDian/ZhuTi/Materials/lbfd-gg.mat differ diff --git a/Assets/SandTablePublic b/Assets/SandTablePublic index 230c95d..561c437 160000 --- a/Assets/SandTablePublic +++ b/Assets/SandTablePublic @@ -1 +1 @@ -Subproject commit 230c95da1efbd1159943471a5d6de1e5aa6a1a33 +Subproject commit 561c437b26af18fffe52587f4fce24843ed73c03