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

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

@@ -464,6 +464,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 590248849}
+  - component: {fileID: 590248855}
   - component: {fileID: 590248848}
   - component: {fileID: 590248847}
   - component: {fileID: 590248850}
@@ -796,6 +797,46 @@ MonoBehaviour:
   blendDistance: 0
   weight: 1
   priority: 0
+--- !u!114 &590248855
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 590248846}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e8a636f62116c0a40bbfefdf876d4608, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  boost: 3.5
+  positionLerpTime: 0.2
+  mouseSensitivityCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0.5
+      inSlope: 0
+      outSlope: 5
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 2.5
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  rotationLerpTime: 0.01
+  invertY: 0
 --- !u!1 &706372899
 GameObject:
   m_ObjectHideFlags: 0
@@ -1222,7 +1263,10 @@ VisualEffect:
     m_Uint:
       m_Array: []
     m_Int:
-      m_Array: []
+      m_Array:
+      - m_Value: 7
+        m_Name: lifetime
+        m_Overridden: 0
     m_Matrix4x4f:
       m_Array: []
     m_AnimationCurve:
@@ -1792,7 +1836,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1674836084}
-  - component: {fileID: 1674836083}
   m_Layer: 0
   m_Name: UnitySpout
   m_TagString: Untagged
@@ -1800,19 +1843,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1674836083
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1674836082}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _clearAlpha: 1
 --- !u!4 &1674836084
 Transform:
   m_ObjectHideFlags: 0

Unity-19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset

@@ -1377,7 +1377,7 @@ MonoBehaviour:
     value: {x: 0.5, y: 0.5}
   intensity:
     overrideState: 1
-    value: 0.802
+    value: 0.33
   smoothness:
     overrideState: 0
     value: 0.2

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

@@ -76,10 +76,10 @@ public class DebugUI : MonoBehaviour
 
         updateVFX();
 
-        if (Input.GetKeyDown(KeyCode.A))
+        if (Input.GetKeyDown(KeyCode.F1))
         {
             debugMode = !debugMode;
-            debugUI.SetActive(debugMode);
+            debugUI.GetComponent<Canvas>().enabled = debugMode;
             if (debugMode)
             {
                 showObject = true;
@@ -90,7 +90,7 @@ public class DebugUI : MonoBehaviour
                 setObjectVisible(showObject);
             }
         }
-        else if (debugMode && Input.GetKeyDown(KeyCode.D)){
+        else if (debugMode && Input.GetKeyDown(KeyCode.F2)){
             showObject = !showObject;
             setObjectVisible(showObject);
         }