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/02.png.meta | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Role/M013/Effect/Texture/Guang_1001.png.meta b/Maps/Model/Map136_Bzjdc/Effect/Texture/02.png.meta
similarity index 82%
copy from Role/M013/Effect/Texture/Guang_1001.png.meta
copy to Maps/Model/Map136_Bzjdc/Effect/Texture/02.png.meta
index b06c77a..384cc41 100644
--- a/Role/M013/Effect/Texture/Guang_1001.png.meta
+++ b/Maps/Model/Map136_Bzjdc/Effect/Texture/02.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 43dee1e1bea2d52458884dabbc43709f
-timeCreated: 1526636081
+guid: 44391d76049512449bf3fa504dde071a
+timeCreated: 1526635848
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
@@ -42,7 +42,7 @@
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
@@ -58,6 +58,14 @@
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
--
Gitblit v1.8.0