From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Debug/DebugAsset.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/System/Debug/DebugAsset.cs b/System/Debug/DebugAsset.cs
index 5f921d8..10407cf 100644
--- a/System/Debug/DebugAsset.cs
+++ b/System/Debug/DebugAsset.cs
@@ -13,6 +13,7 @@
[SerializeField] Toggle m_Refdata;
[SerializeField] Toggle m_Shader;
[SerializeField] Toggle m_UI;
+ [SerializeField] Toggle m_BuiltIn;
private void OnEnable()
{
@@ -24,6 +25,7 @@
m_Refdata.isOn = AssetSource.refdataFromEditor;
m_Shader.isOn = AssetSource.shaderFromEditor;
m_UI.isOn = AssetSource.uiFromEditor;
+ m_BuiltIn.isOn = AssetSource.builtInFromEditor;
m_AllAsset.AddListener(OnAllAssetValueChange);
m_Audio.AddListener(OnAudioValueChange);
@@ -33,6 +35,7 @@
m_Refdata.AddListener(OnRefdataValueChange);
m_Shader.AddListener(OnShaderValueChange);
m_UI.AddListener(OnUIValueChange);
+ m_BuiltIn.AddListener(OnBuildInValueChange);
}
private void OnDisable()
@@ -95,4 +98,9 @@
AssetSource.uiFromEditor = _value;
}
+ private void OnBuildInValueChange(bool _value)
+ {
+ AssetSource.builtInFromEditor = _value;
+ }
+
}
--
Gitblit v1.8.0