From 515d6439e79793dc903b249cfeb8fc2f217f2e4e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 11 Nov 2020 18:57:47 +0800
Subject: [PATCH] Merge commit 'f2f4e1e45981bb294a5221ade7b4646cc3e29d35' into master
---
Assets/UI/Fight/01效果图-战斗.jpg.meta | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta" "b/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta"
index 84a8e03..75019fa 100644
--- "a/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta"
+++ "b/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta"
@@ -6,7 +6,7 @@
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -35,8 +35,8 @@
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: 1
- wrapV: 1
+ wrapU: -1
+ wrapV: -1
wrapW: -1
nPOTScale: 0
lightmap: 0
@@ -50,9 +50,9 @@
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 1
+ alphaIsTransparency: 0
spriteTessellationDetail: -1
- textureType: 8
+ textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
--
Gitblit v1.9.1