From 31c2cebbccba45a00a755981dd6d0cdd0a0459e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 17:28:38 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Editor/Tool/SpriteSettingConfig.cs | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/Assets/Editor/Tool/SpriteSettingConfig.cs b/Assets/Editor/Tool/SpriteSettingConfig.cs
index 858ff8c..1fb580a 100644
--- a/Assets/Editor/Tool/SpriteSettingConfig.cs
+++ b/Assets/Editor/Tool/SpriteSettingConfig.cs
@@ -2,65 +2,65 @@
using UnityEditor;
[CreateAssetMenu(menuName = "Config/SpriteSettingConfig")]
-public class SpriteSettingConfig : ScriptableObject
-{
- public SpriteSetting[] spriteSettings;
-
- [System.Serializable]
- public class SpriteSetting
- {
- public string folderName;
- public SpriteMeshType meshType = SpriteMeshType.Tight;
- public TextureImporterAlphaSource alphaSource = TextureImporterAlphaSource.FromInput;
- public PlatformSetting[] platformSettings;
+public class SpriteSettingConfig : ScriptableObject
+{
+ public SpriteSetting[] spriteSettings;
+
+ [System.Serializable]
+ public class SpriteSetting
+ {
+ public string folderName;
+ public SpriteMeshType meshType = SpriteMeshType.Tight;
+ public TextureImporterAlphaSource alphaSource = TextureImporterAlphaSource.FromInput;
+ public PlatformSetting[] platformSettings;
}
- [System.Serializable]
- public class PlatformSetting
- {
- public string name;
- public int maxTextureSize = 2048;
- public TextureImporterFormat textureFormat = TextureImporterFormat.RGBA32;
- public int compressionQuality = 1;
+ [System.Serializable]
+ public class PlatformSetting
+ {
+ public string name;
+ public int maxTextureSize = 2048;
+ public TextureImporterFormat textureFormat = TextureImporterFormat.RGBA32;
+ public int compressionQuality = 1;
}
}
-public static class SpriteSettingUtility
-{
- public static bool Equal(this SpriteSettingConfig.SpriteSetting _spriteSetting, TextureImporter _textureImporter)
- {
- if (_spriteSetting.alphaSource != _textureImporter.alphaSource)
- {
- return false;
- }
-
- foreach (var platformSetting in _spriteSetting.platformSettings)
- {
- var nowPlatformSetting = _textureImporter.GetPlatformTextureSettings(platformSetting.name);
- if (nowPlatformSetting == null)
- {
- continue;
- }
-
- if (platformSetting.maxTextureSize != nowPlatformSetting.maxTextureSize)
- {
- return false;
- }
-
- if (platformSetting.textureFormat != nowPlatformSetting.format)
- {
- return false;
- }
-
- if (platformSetting.compressionQuality != nowPlatformSetting.compressionQuality)
- {
- return false;
- }
- }
-
- return true;
- }
-
+public static class SpriteSettingUtility
+{
+ public static bool Equal(this SpriteSettingConfig.SpriteSetting _spriteSetting, TextureImporter _textureImporter)
+ {
+ if (_spriteSetting.alphaSource != _textureImporter.alphaSource)
+ {
+ return false;
+ }
+
+ foreach (var platformSetting in _spriteSetting.platformSettings)
+ {
+ var nowPlatformSetting = _textureImporter.GetPlatformTextureSettings(platformSetting.name);
+ if (nowPlatformSetting == null)
+ {
+ continue;
+ }
+
+ if (platformSetting.maxTextureSize != nowPlatformSetting.maxTextureSize)
+ {
+ return false;
+ }
+
+ if (platformSetting.textureFormat != nowPlatformSetting.format)
+ {
+ return false;
+ }
+
+ if (platformSetting.compressionQuality != nowPlatformSetting.compressionQuality)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0