From c436a1318ee89ad041bd8ae5f9c2b992f062efda Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 09 一月 2019 09:36:11 +0800
Subject: [PATCH] Merge branch 'master' into CrossServerBoss
---
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index b0cd43b..66221d4 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -100,6 +100,7 @@
};
int[] m_CompressionValues = { 0, 1, 2 };
+ int rechargeSkin = 1;
public AssetBundleBuildTab()
{
@@ -414,6 +415,9 @@
EditorGUILayout.Space();
#endif
GUILayout.BeginHorizontal();
+
+
+
ClientPackage.AssetPrior = EditorGUILayout.IntField("AssetPrior", ClientPackage.AssetPrior, GUILayout.Height(50), GUILayout.Width(250));
publishers = EditorGUILayout.TextField("Publishers", publishers, GUILayout.Height(50));
GUILayout.EndHorizontal();
@@ -455,6 +459,17 @@
EditorApplication.delayCall += ExecuteSwitchVersionConfig;
}
+ GUILayout.Space(20);
+ GUILayout.BeginHorizontal();
+ rechargeSkin = EditorGUILayout.IntField("Recharge Skin", rechargeSkin, GUILayout.Width(250));
+ if (GUILayout.Button("Switch"))
+ {
+ UpdateSpriteSetting.SetRechargeSkin(rechargeSkin);
+ AssetDatabase.Refresh();
+ UpdateSpritePackingSetting.UpdateAllSpritePackingSetting();
+ }
+ GUILayout.EndHorizontal();
+
GUILayout.EndVertical();
EditorGUILayout.EndScrollView();
}
--
Gitblit v1.8.0