diff --git a/.gitmodules b/.gitmodules index ee5b7e5..9ea41e5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,7 @@ path = Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc url = https://github.com/UltraCombos/com.ultracombos.osc.git branch = master +[submodule "Unity-19050-01_ForstCoronation/Packages/KlakSpout"] + path = Unity-19050-01_ForstCoronation/Packages/KlakSpout + url = https://github.com/UltraCombos/KlakSpout + branch = upm diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity index 24646aa..4e20dd6 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity @@ -466,6 +466,7 @@ GameObject: - component: {fileID: 590248848} - component: {fileID: 590248847} - component: {fileID: 590248850} + - component: {fileID: 590248851} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -637,6 +638,20 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 +--- !u!114 &590248851 +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: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} + m_Name: + m_EditorClassIdentifier: + _sourceTexture: {fileID: 0} + _alphaSupport: 1 --- !u!1 &706372899 GameObject: m_ObjectHideFlags: 0 @@ -1116,82 +1131,6 @@ MonoBehaviour: m_Parameter: m_Name: _Emitter Target: {fileID: 1324214450} ---- !u!114 &1303207246 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1324214445 GameObject: m_ObjectHideFlags: 0 @@ -1381,6 +1320,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} +--- !u!114 &1332094250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + sunSize: + m_OverrideState: 0 + m_Value: 0.04 + min: 0 + max: 1 + sunSizeConvergence: + m_OverrideState: 0 + m_Value: 5 + min: 1 + max: 10 + atmosphereThickness: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 5 + skyTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + groundColor: + m_OverrideState: 0 + m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + enableSunDisk: + m_OverrideState: 0 + m_Value: 1 --- !u!1 &1473451370 GameObject: m_ObjectHideFlags: 0 @@ -1719,7 +1734,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1303207246} + m_SkySettings: {fileID: 1332094250} m_SkySettingsFromProfile: {fileID: -3409118194237871670, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} --- !u!114 &1937584651 diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset index 458d6b3..988954d 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset @@ -163,6 +163,59 @@ MonoBehaviour: - {fileID: 2685292015111452430} - {fileID: 8851631403484906882} - {fileID: -7706924051335538638} + - {fileID: 2589166041149462673} +--- !u!114 &2589166041149462673 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c1be1b6c95cd2e41b27903b9270817f, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + mode: + m_OverrideState: 1 + m_Value: 0 + color: + m_OverrideState: 0 + m_Value: {r: 0, g: 0, b: 0, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + center: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0.706 + min: 0 + max: 1 + smoothness: + m_OverrideState: 1 + m_Value: 0.147 + min: 0.01 + max: 1 + roundness: + m_OverrideState: 1 + m_Value: 0.847 + min: 0 + max: 1 + rounded: + m_OverrideState: 0 + m_Value: 0 + mask: + m_OverrideState: 0 + m_Value: {fileID: 0} + opacity: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 1 --- !u!114 &2685292015111452430 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs index 6fac0fc..e20dacc 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs @@ -61,6 +61,7 @@ public class DebugUI : MonoBehaviour lerp_val = 1; stat = "completed"; vfx.SendEvent("Completed"); + setButtonInteractable(true); Debug.Log(stat); } } @@ -72,6 +73,7 @@ public class DebugUI : MonoBehaviour { lerp_val = 0; stat = "wait"; + setButtonInteractable(true); Debug.Log(stat); } } @@ -107,6 +109,7 @@ public class DebugUI : MonoBehaviour public void enterGrow() { + setButtonInteractable(false); spawn_t = total_t; stat = "growing"; vfx.SendEvent("MouseDown"); @@ -116,11 +119,11 @@ public class DebugUI : MonoBehaviour public void enterVanish() { + setButtonInteractable(false); vfx.SetBool("isEnteringVanish", true); stat = "vanishing"; vfx.SendEvent("MouseUp"); vfx.SetBool("growing", false); - Debug.Log(stat); } @@ -130,4 +133,12 @@ public class DebugUI : MonoBehaviour target.GetComponent().enabled = isShowed; emitter.GetComponent().enabled = isShowed; } + + private void setButtonInteractable(bool _stat) + { + GameObject g = GameObject.Find("Grow"); + GameObject v = GameObject.Find("Vanish"); + g.GetComponent