From bb5842a39739ba511eb8b8bb362f6c114a4e06a8 Mon Sep 17 00:00:00 2001
From: Xingwei Zhu <etzhu192@hotmail.com>
Date: Fri, 6 Aug 2021 16:59:34 +0800
Subject: [PATCH] fallback to simpler rules

---
 README-ZH.md                                  |  4 ++-
 README.md                                     |  4 ++-
 .../Runtime/foundation/debug.cs               | 29 +++----------------
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/README-ZH.md b/README-ZH.md
index a661f41c..975bbc9a 100644
--- a/README-ZH.md
+++ b/README-ZH.md
@@ -209,7 +209,9 @@ UIWidgets也支持Gif！
 
 ## 调试UIWidgets应用程序
 
-在编辑器菜单栏选择```UIWidgets->EnableDebug```
+在Editor模式下，编辑器菜单栏选择```UIWidgets->EnableDebug```。
+
+在Runtime模式下，Debug/Development build会自动开启Debug，Release build则会自动关闭Debug。
 
 ## 使用Window Scope保护外部调用
 如果您在调试时遇到 `AssertionError: Window.instance is null` 或者在调用 `Window.instance` 时得到空指针, 那么您需要
diff --git a/README.md b/README.md
index c17776fa..ed08a0f8 100644
--- a/README.md
+++ b/README.md
@@ -220,7 +220,9 @@ Long time garbage collection may cause App to stuck frequently. You can enable i
 
 ## Debug UIWidgets Application
 
-You can switch debug/release mode by “UIWidgets->EnableDebug” in the Unity Editor.
+In the Editor, you can switch debug/release mode by “UIWidgets->EnableDebug”.
+
+In the Player, the debug/development build will enable debug mode. The release build will disable debug mode automatically.
 
 ## Using Window Scope
 If you see the error `AssertionError: Window.instance is null` or null pointer error of `Window.instance`,
diff --git a/com.unity.uiwidgets/Runtime/foundation/debug.cs b/com.unity.uiwidgets/Runtime/foundation/debug.cs
index 41fa8d9d..f2c405ab 100644
--- a/com.unity.uiwidgets/Runtime/foundation/debug.cs
+++ b/com.unity.uiwidgets/Runtime/foundation/debug.cs
@@ -54,8 +54,6 @@ namespace Unity.UIWidgets.foundation {
 
         public static bool debugPrintMouseHoverEvents = false;
 
-        public const string debugScriptingDefineSymbol = "DebugUIWidgets";
-
         public static HSVColor debugCurrentRepaintColor =
             HSVColor.fromAHSV(0.4f, 60.0f, 1.0f, 1.0f);
 
@@ -65,14 +63,14 @@ namespace Unity.UIWidgets.foundation {
             Debug.LogException(new AssertionError(message: message, innerException: ex));
         }
 
-        [Conditional(debugScriptingDefineSymbol)]
+        [Conditional("UNITY_ASSERTIONS")]
         public static void assert(Func<bool> result, Func<string> message = null) {
             if ( enableDebug && !result() ) {
                 throw new AssertionError(message != null ? message() : "");
             }
         }
         
-        [Conditional(debugScriptingDefineSymbol)]
+        [Conditional("UNITY_ASSERTIONS")]
         public static void assert(bool result, Func<string> message = null) {
             if ( enableDebug && !result ) {
                 throw new AssertionError(message != null ? message() : "");
@@ -82,23 +80,6 @@ namespace Unity.UIWidgets.foundation {
 #if UNITY_EDITOR
         static bool? _enableDebug = null;
 
-        private static void setRuntimeSymbolsForTarget(BuildTargetGroup targetGroup, bool enabled) {
-            string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup);
-            var defineList = defines.Split(';');
-            var newDefineList = new List<string>();
-            foreach (var define in defineList) {
-                if (define != debugScriptingDefineSymbol) {
-                    newDefineList.Add(define);
-                }
-            }
-
-            if (enabled) {
-                newDefineList.Add(debugScriptingDefineSymbol);
-            }
-            
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup, String.Join(";", newDefineList));
-        }
-        
         public static bool enableDebug {
             get {
                 if (_enableDebug == null) {
@@ -112,13 +93,11 @@ namespace Unity.UIWidgets.foundation {
                 }
                 _enableDebug = value;
                 EditorPrefs.SetInt("UIWidgetsDebug",value ? 1 : 0);
-                setRuntimeSymbolsForTarget(BuildTargetGroup.Android, value);
-                setRuntimeSymbolsForTarget(BuildTargetGroup.iOS, value);
-                setRuntimeSymbolsForTarget(BuildTargetGroup.Standalone, value);
             }
         }
 #else
-        //In runtime, we use the Conditional decorator "debugScriptingDefineSymbol" instead of this to enable/disable debug mode 
+        //In the runtime, we use the Conditional decorator instead of this to enable/disable debug mode
+        //The rule is simple: the debug mode is on for Debug/Development build, and is off for Release build
         public static bool enableDebug => true;
 #endif