From 723604e6defc7414b0423c3d0d6980233531659b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 09 十一月 2018 09:42:44 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
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