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

---
 Core/Config/AssetSource.cs |  336 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 181 insertions(+), 155 deletions(-)

diff --git a/Core/Config/AssetSource.cs b/Core/Config/AssetSource.cs
index c6c6498..07da27d 100644
--- a/Core/Config/AssetSource.cs
+++ b/Core/Config/AssetSource.cs
@@ -3,165 +3,191 @@
 using UnityEngine;
 
 [XLua.LuaCallCSharp]
-public class AssetSource
+public class AssetSource
 {
 
-    public static bool allFromEditor {
-        get {
-            return audioFromEditor && effectFromEditor && mobFromEditor && refdataFromEditor && sceneFromEditor && shaderFromEditor && uiFromEditor;
-        }
-        set {
-            audioFromEditor = value;
-            effectFromEditor = value;
-            mobFromEditor = value;
-            refdataFromEditor = value;
-            shaderFromEditor = value;
-            sceneFromEditor = value;
-            uiFromEditor = value;
-        }
-    }
-
+    public static bool allFromEditor {
+        get {
+            return audioFromEditor
+                && effectFromEditor
+                && mobFromEditor
+                && refdataFromEditor
+                && sceneFromEditor
+                && shaderFromEditor
+                && uiFromEditor
+                && builtInFromEditor;
+        }
+        set {
+            audioFromEditor = value;
+            effectFromEditor = value;
+            mobFromEditor = value;
+            refdataFromEditor = value;
+            shaderFromEditor = value;
+            sceneFromEditor = value;
+            uiFromEditor = value;
+            builtInFromEditor = value;
+        }
+    }
+
     static bool m_AudioFromEditor = false;
-    public static bool audioFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_AudioFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_AudioFromEditor", value);
-#else
-            m_AudioFromEditor=value;
-#endif
-        }
-    }
-
+    public static bool audioFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_AudioFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_AudioFromEditor", value);
+#else
+            m_AudioFromEditor=value;
+#endif
+        }
+    }
+
     static bool m_EffectFromEditor = false;
-    public static bool effectFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_EffectFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_EffectFromEditor", value);
-#else
-            m_AudioFromEditor=value;
-#endif
-        }
-    }
-
-    static bool m_MobFromEditor = false;
-    public static bool mobFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_MobFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_MobFromEditor", value);
-#else
-            m_MobFromEditor=value;
-#endif
-        }
-    }
-
+    public static bool effectFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_EffectFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_EffectFromEditor", value);
+#else
+            m_AudioFromEditor=value;
+#endif
+        }
+    }
+
+    static bool m_MobFromEditor = false;
+    public static bool mobFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_MobFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_MobFromEditor", value);
+#else
+            m_MobFromEditor=value;
+#endif
+        }
+    }
+
     static bool m_RefdataFromEditor = false;
-    public static bool refdataFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_RefdataFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_RefdataFromEditor", value);
-#else
-            m_RefdataFromEditor=value;
-#endif
-        }
-    }
-
+    public static bool refdataFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_RefdataFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_RefdataFromEditor", value);
+#else
+            m_RefdataFromEditor=value;
+#endif
+        }
+    }
+
     static bool m_SceneFromEditor = false;
-    public static bool sceneFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_SceneFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_SceneFromEditor", value);
-#else
-            m_SceneFromEditor=value;
-#endif
-        }
-    }
-
-    static bool m_ShaderFromEditor = false;
-    public static bool shaderFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_ShaderFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_ShaderFromEditor", value);
-#else
-            m_ShaderFromEditor=value;
-#endif
-        }
-    }
-
-    static bool m_UIFromEditor = false;
-    public static bool uiFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_UIFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_UIFromEditor", value);
-#else
-            m_UIFromEditor=value;
-#endif
-        }
-    }
-
-    static bool m_LuaFromEditor = false;
-    public static bool luaFromEditor {
-        get {
-#if UNITY_EDITOR
-            return LocalSave.GetBool("Asset_LuaFromEditor", true);
-#else
-            return false;
-#endif
-        }
-        set {
-#if UNITY_EDITOR
-            LocalSave.SetBool("Asset_LuaFromEditor", value);
-#else
-            m_LuaFromEditor=value;
-#endif
-        }
-    }
+    public static bool sceneFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_SceneFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_SceneFromEditor", value);
+#else
+            m_SceneFromEditor=value;
+#endif
+        }
+    }
+
+    static bool m_ShaderFromEditor = false;
+    public static bool shaderFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_ShaderFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_ShaderFromEditor", value);
+#else
+            m_ShaderFromEditor=value;
+#endif
+        }
+    }
+
+    static bool m_UIFromEditor = false;
+    public static bool uiFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_UIFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_UIFromEditor", value);
+#else
+            m_UIFromEditor=value;
+#endif
+        }
+    }
+
+    static bool m_BuiltInFromEditor = false;
+    public static bool builtInFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_BuiltInFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_BuiltInFromEditor", value);
+#else
+            m_BuiltInFromEditor=value;
+#endif
+        }
+    }
+
+    static bool m_LuaFromEditor = false;
+    public static bool luaFromEditor {
+        get {
+#if UNITY_EDITOR
+            return LocalSave.GetBool("Asset_LuaFromEditor", true);
+#else
+            return false;
+#endif
+        }
+        set {
+#if UNITY_EDITOR
+            LocalSave.SetBool("Asset_LuaFromEditor", value);
+#else
+            m_LuaFromEditor=value;
+#endif
+        }
+    }
 }

--
Gitblit v1.8.0