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/buff_1.png.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/UI/Fight/buff_1.png.meta b/Assets/UI/Fight/buff_1.png.meta
index 25123f8..bc7c5a8 100644
--- a/Assets/UI/Fight/buff_1.png.meta
+++ b/Assets/UI/Fight/buff_1.png.meta
@@ -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