From 7cd4eee939cdf4700a7eac8d3b5e27650a370776 Mon Sep 17 00:00:00 2001
From: art_dzg <66456565@qq.com>
Date: 星期四, 10 一月 2019 21:12:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/master
---
Maps/Model/Map136_Bzjdc/Effect/Texture/guodu002.tga.meta | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/Role/M013/Effect/Texture/Guang_1001.png.meta b/Maps/Model/Map136_Bzjdc/Effect/Texture/guodu002.tga.meta
similarity index 66%
copy from Role/M013/Effect/Texture/Guang_1001.png.meta
copy to Maps/Model/Map136_Bzjdc/Effect/Texture/guodu002.tga.meta
index b06c77a..2497039 100644
--- a/Role/M013/Effect/Texture/Guang_1001.png.meta
+++ b/Maps/Model/Map136_Bzjdc/Effect/Texture/guodu002.tga.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
-guid: 43dee1e1bea2d52458884dabbc43709f
-timeCreated: 1526636081
+guid: d945da4a267700845a08015d97b4ad26
+timeCreated: 1479277091
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -24,7 +24,7 @@
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
- textureFormat: 1
+ textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
@@ -58,6 +58,30 @@
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 64
+ textureFormat: 12
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: iPhone
+ maxTextureSize: 64
+ textureFormat: 33
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ - buildTarget: Android
+ maxTextureSize: 64
+ textureFormat: 47
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
spriteSheet:
serializedVersion: 2
sprites: []
--
Gitblit v1.8.0