From 5560912cc3b3165964ee9c111a82130ff00be012 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 06 十一月 2018 17:27:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

---
 Assets/Editor/SpritePacking/SpriteSettings.asset |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index c0abe58..80bfccb 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -476,3 +476,19 @@
       maxTextureSize: 1024
       textureFormat: 4
       compressionQuality: 1
+  - folderName: zDog
+    meshType: 0
+    alphaSource: 1
+    platformSettings:
+    - name: Standalone
+      maxTextureSize: 1024
+      textureFormat: 4
+      compressionQuality: 1
+    - name: Android
+      maxTextureSize: 1024
+      textureFormat: 47
+      compressionQuality: 1
+    - name: iPhone
+      maxTextureSize: 1024
+      textureFormat: 33
+      compressionQuality: 1

--
Gitblit v1.8.0