diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity index c395d5e..8659cad 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity +++ b/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 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs index 0938671..9b52502 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs +++ b/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 = stat; lerp_val = 0; cur_blob_count = 0; @@ -75,43 +111,45 @@ public class DebugUI : MonoBehaviour if (Input.GetKeyDown(KeyCode.F1)) { debugMode = !debugMode; - debugUI.GetComponent().enabled = debugMode; + canvas.GetComponent().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); } - if(stat == "growing") + if (stat == "growing") { lerp_val += growing_speed; - if(lerp_val >= 1) + if (lerp_val >= 1) { lerp_val = 1; stat = "completed"; StartCoroutine("sendCompleted"); - Invoke("setButtonInteractable", delay_sec); + Invoke("switchButtonStat", delay_sec); button.GetComponent().text = stat; Debug.Log(stat); } } - else if(stat == "vanishing") + else if (stat == "vanishing") { lerp_val -= growing_speed; - if(lerp_val <= 0) + if (lerp_val <= 0) { lerp_val = 0; stat = "wait"; - Invoke("setButtonInteractable", delay_sec); + Invoke("switchButtonStat", delay_sec); button.GetComponent().text = stat; Debug.Log(stat); } @@ -135,11 +173,11 @@ public class DebugUI : MonoBehaviour public void switchStat() { - if(stat == "wait") + if (stat == "wait") { enterGrow(); } - else if(stat == "completed") + else if (stat == "completed") { enterVanish(); } @@ -148,8 +186,8 @@ public class DebugUI : MonoBehaviour public void enterGrow() { - - setButtonInteractable(); + switchButtonStat(); + Camera.main.GetComponent().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 = stat; @@ -173,7 +211,7 @@ public class DebugUI : MonoBehaviour emitter.GetComponent().enabled = isShowed; } - private void setButtonInteractable() + private void switchButtonStat() { bool _stat = button.GetComponentInParent