Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2

01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity

@@ -1341,8 +1341,8 @@ MonoBehaviour:
   m_ExecuteInEditor: 1
   m_Bindings:
   - {fileID: 1090188929}
-  - {fileID: 1090188931}
   - {fileID: 1090188930}
+  - {fileID: 1090188931}
   m_VisualEffect: {fileID: 1090188927}
 --- !u!114 &1090188933
 MonoBehaviour:
@@ -1810,7 +1810,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3d9a54ec27de1e74484ba710356b1a50, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  debugMode: 1
   canvas: {fileID: 396373727}
   vfx: {fileID: 1090188927}
   baseEmitter: {fileID: 706372899}
@@ -1818,6 +1817,7 @@ MonoBehaviour:
   emitter: {fileID: 1324214445}
   button: {fileID: 562864505}
   stat: 
+  debugMode: 0
   Emitter_x: 3.5
   Target_x: -3
   growing_speed: 0.008

01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs

@@ -8,7 +8,7 @@ using TUIO;
 
 public class DebugUI : MonoBehaviour
 {
-    public bool debugMode = true;
+    
     public GameObject canvas;
     public VisualEffect vfx;
     public GameObject baseEmitter;
@@ -17,6 +17,9 @@ public class DebugUI : MonoBehaviour
     public GameObject button;
     public string stat = "wait";
 
+    [Config]
+    public bool debugMode = false;
+
     [Config]
     [Range(0f, 5f)]
     public float Emitter_x = 2.5f;
@@ -42,15 +45,31 @@ public class DebugUI : MonoBehaviour
     {
         QualitySettings.vSyncCount = 0;
         stat = "wait";
-        canvas.SetActive(debugMode);
+        //canvas.GetComponent<Canvas>().ena(debugMode);
         button.GetComponent<Text>().text = stat;
         lerp_val = 0;
         cur_blob_count = 0;
+        setObjectVisible(debugMode);
     }
 
     // Update is called once per frame
     void Update()
     {
+        if (Input.GetKeyDown(KeyCode.F1))
+        {
+            debugMode = !debugMode;
+            //canvas.GetComponent<Canvas>().enabled = debugMode;
+            if (debugMode)
+            {
+                showObject = true;
+                setObjectVisible(showObject);
+            }
+            else
+            {
+                showObject = false;
+                setObjectVisible(showObject);
+            }
+        }
         cur_blob_count = TUIOManager.Instance.touches.Count;
 
         if (button.GetComponentInParent<Button>().interactable)
@@ -66,26 +85,13 @@ public class DebugUI : MonoBehaviour
             }
         }
 
-        if (Input.GetKeyDown(KeyCode.F1))
-        {
-            debugMode = !debugMode;
-            canvas.GetComponent<Canvas>().enabled = debugMode;
-            if (debugMode)
-            {
-                showObject = true;
-                setObjectVisible(showObject);
-            }
-            else
-            {
-                showObject = false;
-                setObjectVisible(showObject);
-            }
-        }
+        
+        /*
         else if (debugMode && Input.GetKeyDown(KeyCode.F2))
         {
             showObject = !showObject;
             setObjectVisible(showObject);
-        }
+        }*/
 
         if (stat == "growing")
         {
@@ -167,6 +173,7 @@ public class DebugUI : MonoBehaviour
         baseEmitter.GetComponent<Renderer>().enabled = isShowed;
         target.GetComponent<Renderer>().enabled = isShowed;
         emitter.GetComponent<Renderer>().enabled = isShowed;
+        button.GetComponentInParent<Button>().image.enabled = isShowed;
     }
 
     private void switchButtonStat()