From 038699f5a5bf446d3dd17642f97d9c297a2d4a35 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期三, 22 八月 2018 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/Skill/Fs/Skill14/Texture/08.tga.meta |   36 +++++++++++++-----------------------
 1 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/Role/A_Zs_Cb01/Materials/A_Zs_Cb01_addTex.png.meta b/Effects/Skill/Fs/Skill14/Texture/08.tga.meta
similarity index 62%
copy from Role/A_Zs_Cb01/Materials/A_Zs_Cb01_addTex.png.meta
copy to Effects/Skill/Fs/Skill14/Texture/08.tga.meta
index 98f2b1d..b56ffd4 100644
--- a/Role/A_Zs_Cb01/Materials/A_Zs_Cb01_addTex.png.meta
+++ b/Effects/Skill/Fs/Skill14/Texture/08.tga.meta
@@ -1,15 +1,15 @@
 fileFormatVersion: 2
-guid: 31b48347650174e47b584c13a5355184
-timeCreated: 1526635985
+guid: 4c92c0c6d63cdcc42b3748342efbbaa7
+timeCreated: 1498648101
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 4
+  serializedVersion: 2
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
+    enableMipMap: 1
     linearTexture: 0
+    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,18 +21,21 @@
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 6
+  generateCubemap: 0
   cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
-  textureFormat: 1
+  textureFormat: -1
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: -1
+    wrapMode: 1
   nPOTScale: 1
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   spriteMode: 0
   spriteExtrude: 1
@@ -41,23 +44,10 @@
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
+  textureType: -1
+  buildTargetSettings: []
   spriteSheet:
     serializedVersion: 2
     sprites: []

--
Gitblit v1.8.0