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

@@ -467,11 +467,11 @@ GameObject:
   - component: {fileID: 590248848}
   - component: {fileID: 590248847}
   - component: {fileID: 590248850}
-  - component: {fileID: 590248851}
   - component: {fileID: 590248852}
   - component: {fileID: 590248853}
   - component: {fileID: 590248854}
   - component: {fileID: 590248855}
+  - component: {fileID: 590248851}
   m_Layer: 8
   m_Name: 01FrostCamera
   m_TagString: MainCamera
@@ -620,10 +620,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 590248846}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3}
+  m_Script: {fileID: 11500000, guid: b5cf9d5827877014ba6331a64e1b4fe2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _clearAlpha: 1
+  vignette_intensity: 0.3
 --- !u!82 &590248852
 AudioSource:
   m_ObjectHideFlags: 0
@@ -631,10 +631,10 @@ AudioSource:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 590248846}
-  m_Enabled: 0
+  m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: a4262e40263883544a1d847d5a920591, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 1
   m_Pitch: 1
@@ -1220,6 +1220,24 @@ VisualEffect:
       - m_Value: 0
         m_Name: Lerp_Val
         m_Overridden: 0
+      - m_Value: 0.1
+        m_Name: max_flake_size
+        m_Overridden: 0
+      - m_Value: 0.5
+        m_Name: max_frost_size
+        m_Overridden: 0
+      - m_Value: 0.3
+        m_Name: max_spike_size
+        m_Overridden: 0
+      - m_Value: 0
+        m_Name: min_flake_size
+        m_Overridden: 0
+      - m_Value: 0.3
+        m_Name: min_frost_size
+        m_Overridden: 0
+      - m_Value: 0.1
+        m_Name: min_spike_size
+        m_Overridden: 0
     m_Vector2f:
       m_Array: []
     m_Vector3f:
@@ -1239,6 +1257,15 @@ VisualEffect:
       m_Array: []
     m_Int:
       m_Array:
+      - m_Value: 0
+        m_Name: flying_flake_spawn_rate
+        m_Overridden: 0
+      - m_Value: 0
+        m_Name: ground_flake_spawn_rate
+        m_Overridden: 0
+      - m_Value: 0
+        m_Name: ground_ice_spawn_rate
+        m_Overridden: 0
       - m_Value: 7
         m_Name: lifetime
         m_Overridden: 0
@@ -1328,9 +1355,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_ExecuteInEditor: 1
   m_Bindings:
-  - {fileID: 1090188930}
-  - {fileID: 1090188929}
   - {fileID: 1090188931}
+  - {fileID: 1090188929}
+  - {fileID: 1090188930}
   m_VisualEffect: {fileID: 1090188927}
 --- !u!1 &1216109995
 GameObject:
@@ -1775,7 +1802,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   debugMode: 1
-  debugUI: {fileID: 396373727}
+  canvas: {fileID: 396373727}
   vfx: {fileID: 1090188927}
   baseEmitter: {fileID: 706372899}
   target: {fileID: 2032731583}
@@ -1786,7 +1813,16 @@ MonoBehaviour:
   Target_x: -3
   growing_speed: 0.008
   delay_sec: 2
-  lifetime: 5
+  vfx_lifetime: 5
+  vfx_ground_ice_spawn_rate: 30000
+  vfx_ground_flake_spawn_rate: 1500
+  vfx_flying_flake_spawn_rate: 1000
+  vfx_min_frost_size: 0.3
+  vfx_max_frost_size: 0.5
+  vfx_min_spike_size: 0.1
+  vfx_max_spike_size: 0.3
+  vfx_min_flake_size: 0
+  vfx_max_flake_size: 0.1
 --- !u!4 &1482770261
 Transform:
   m_ObjectHideFlags: 0

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

@@ -9,7 +9,7 @@ using TUIO;
 public class DebugUI : MonoBehaviour
 {
     public bool debugMode = true;
-    public GameObject debugUI;
+    public GameObject canvas;
     public VisualEffect vfx;
     public GameObject baseEmitter;
     public GameObject target;
@@ -35,7 +35,43 @@ public class DebugUI : MonoBehaviour
 
     [Config]
     [Range(1, 10)]
-    public int lifetime = 5;
+    public int vfx_lifetime = 5;
+
+    [Config]
+    [Range(10000, 60000)]
+    public int vfx_ground_ice_spawn_rate = 30000;
+
+    [Config]
+    [Range(1000, 10000)]
+    public int vfx_ground_flake_spawn_rate = 5000;
+
+    [Config]
+    [Range(100, 3000)]
+    public int vfx_flying_flake_spawn_rate = 1000;
+
+    [Config]
+    [Range(0.1f, 0.8f)]
+    public float vfx_min_frost_size = 0.3f;
+
+    [Config]
+    [Range(0.3f, 1f)]
+    public float vfx_max_frost_size = 0.5f;
+
+    [Config]
+    [Range(0.01f, 0.5f)]
+    public float vfx_min_spike_size = 0.1f;
+
+    [Config]
+    [Range(0.1f, 1f)]
+    public float vfx_max_spike_size = 0.3f;
+
+    [Config]
+    [Range(0f, 0.1f)]
+    public float vfx_min_flake_size = 0f;
+
+    [Config]
+    [Range(0.05f, 0.3f)]
+    public float vfx_max_flake_size = 0.1f;
 
     float lerp_val;
     Vector3 final_pos;
@@ -46,7 +82,7 @@ public class DebugUI : MonoBehaviour
     {
         QualitySettings.vSyncCount = 0;
         stat = "wait";
-        debugUI.SetActive(debugMode);
+        canvas.SetActive(debugMode);
         button.GetComponent<Text>().text = stat;
         lerp_val = 0;
         cur_blob_count = 0;
@@ -75,18 +111,20 @@ public class DebugUI : MonoBehaviour
         if (Input.GetKeyDown(KeyCode.F1))
         {
             debugMode = !debugMode;
-            debugUI.GetComponent<Canvas>().enabled = debugMode;
+            canvas.GetComponent<Canvas>().enabled = debugMode;
             if (debugMode)
             {
                 showObject = true;
                 setObjectVisible(showObject);
-            } else
+            }
+            else
             {
                 showObject = false;
                 setObjectVisible(showObject);
             }
         }
-        else if (debugMode && Input.GetKeyDown(KeyCode.F2)){
+        else if (debugMode && Input.GetKeyDown(KeyCode.F2))
+        {
             showObject = !showObject;
             setObjectVisible(showObject);
         }
@@ -99,7 +137,7 @@ public class DebugUI : MonoBehaviour
                 lerp_val = 1;
                 stat = "completed";
                 StartCoroutine("sendCompleted");
-                Invoke("setButtonInteractable", delay_sec);
+                Invoke("switchButtonStat", delay_sec);
                 button.GetComponent<Text>().text = stat;
                 Debug.Log(stat);
             }
@@ -111,7 +149,7 @@ public class DebugUI : MonoBehaviour
             {
                 lerp_val = 0;
                 stat = "wait";
-                Invoke("setButtonInteractable", delay_sec);
+                Invoke("switchButtonStat", delay_sec);
                 button.GetComponent<Text>().text = stat;
                 Debug.Log(stat);
             }
@@ -148,8 +186,8 @@ public class DebugUI : MonoBehaviour
 
     public void enterGrow()
     {
-
+        switchButtonStat();
-        setButtonInteractable();
+        Camera.main.GetComponent<AudioSource>().Play();
         stat = "growing";
         vfx.SendEvent("Emit");
         vfx.SetBool("isGrowing", true);
@@ -159,7 +197,7 @@ public class DebugUI : MonoBehaviour
 
     public void enterVanish()
     {
-        setButtonInteractable();
+        switchButtonStat();
         stat = "vanishing";
         vfx.SetBool("isGrowing", false);
         button.GetComponent<Text>().text = stat;
@@ -173,7 +211,7 @@ public class DebugUI : MonoBehaviour
         emitter.GetComponent<Renderer>().enabled = isShowed;
     }
 
-    private void setButtonInteractable()
+    private void switchButtonStat()
     {
         bool _stat = button.GetComponentInParent<Button>().interactable;
         button.GetComponentInParent<Button>().interactable = !_stat;
@@ -181,6 +219,15 @@ public class DebugUI : MonoBehaviour
 
     void updateVFX()
     {
-        vfx.SetInt("lifetime", lifetime);
+        vfx.SetInt("lifetime", vfx_lifetime);
+        vfx.SetInt("ground_ice_spawn_rate", vfx_ground_ice_spawn_rate);
+        vfx.SetInt("ground_flake_spawn_rate", vfx_ground_flake_spawn_rate);
+        vfx.SetInt("flying_flake_spawn_rate", vfx_flying_flake_spawn_rate);
+        vfx.SetFloat("min_frost_size", vfx_min_frost_size);
+        vfx.SetFloat("max_frost_size", vfx_max_frost_size);
+        vfx.SetFloat("min_spike_size", vfx_min_spike_size);
+        vfx.SetFloat("max_spike_size", vfx_max_spike_size);
+        vfx.SetFloat("min_flake_size", vfx_min_flake_size);
+        vfx.SetFloat("max_flake_size", vfx_max_flake_size);
     }
 }

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

@@ -0,0 +1,65 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering.PostProcessing;
+using UltraCombos.Configuration;
+
+public class PostProcessController : MonoBehaviour
+{
+    [Config]
+    [Range(-2f, 2f)]
+    public float post_exposure = -0.6f;
+
+    [Config]
+    [Range(-100f, 100f)]
+    public float contrast = 100f;
+
+    [Config]
+    [Range(-100f, 100f)]
+    public float saturation = -20f;
+
+    [Config]
+    [Range(0, 1f)]
+    public float bloom_intensity = 1f;
+
+    [Config]
+    [Range(0, 1f)]
+    public float bloom_threshold = 0.6f;
+
+    [Config]
+    [Range(0, 1f)]
+    public float vignette_intensity = 0.3f;
+
+    PostProcessVolume volume;
+    // Start is called before the first frame update
+    void Start()
+    {
+        volume = GetComponent<PostProcessVolume>();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+        ColorGrading col_grad;
+        if (volume.profile.TryGetSettings(out col_grad))
+        {
+            col_grad.postExposure.value = post_exposure;
+            col_grad.contrast.value = contrast;
+            col_grad.saturation.value = saturation;
+        }
+
+        Bloom bloom;
+        if(volume.profile.TryGetSettings(out bloom))
+        {
+            bloom.intensity.value = bloom_intensity;
+            bloom.threshold.value = bloom_threshold;
+        }
+
+        Vignette vig;
+        if (volume.profile.TryGetSettings(out vig))
+        {
+            vig.intensity.value = vignette_intensity;
+        }
+    }
+}

01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scripts/PostProcessController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b5cf9d5827877014ba6331a64e1b4fe2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Sounds.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 94263f3d18893304fa8910633da1b24f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json

@@ -4,16 +4,16 @@
     "com.ultracombos.grpc": "file:<project>/../../../../../_Package/com.ultracombos.grpc",
     "com.ultracombos.osc": "file:<project>/../../../../../_Package/com.ultracombos.osc",
     "com.ultracombos.tuio": "file:<project>/../../../../../_Package/com.ultracombos.tuio",
-    "jp.keijiro.klak.spout": "file:<project>/../../../../../_Package/KlakSpout",	
     "com.unity.ads": "2.0.8",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",
     "com.unity.package-manager-ui": "2.0.8",
-    "com.unity.postprocessing": "2.2.2",
+    "com.unity.postprocessing": "2.1.7",
     "com.unity.purchasing": "2.0.3",
     "com.unity.render-pipelines.high-definition": "4.10.0-preview",
     "com.unity.textmeshpro": "1.4.1",
     "com.unity.visualeffectgraph": "4.10.0-preview",
+    "jp.keijiro.klak.spout": "file:<project>/../../../../../_Package/KlakSpout",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",