diff --git a/.gitmodules b/.gitmodules index f506487..5f0ed89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,7 @@ [submodule "_Package/jp.keijiro.klak.spout"] path = _Package/jp.keijiro.klak.spout url = "https://github.com/keijiro/KlakSpout#upm" +[submodule "_Package/com.ultracombos.configuration"] + path = _Package/com.ultracombos.configuration + url = https://github.com/UltraCombos/com.ultracombos.configuration.git + branch = master diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs index cea0147..0b13202 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Experimental.VFX; using UnityEngine.UI; +using UltraCombos.Configuration; public class DebugUI : MonoBehaviour { @@ -13,9 +14,20 @@ public class DebugUI : MonoBehaviour public GameObject target; public GameObject emitter; public GameObject button; - public float growingSpeed; public string stat = "wait"; + [Config] + [Range(0f, 0.02f)] + public float growingSpeed; + + [Config] + [Range(10, 30)] + public float fadeSpeed; + + [Config] + [Range(0f, 0.5f)] + public float smooth; + float spawn_t; float total_t; float lerp_val; @@ -35,6 +47,7 @@ public class DebugUI : MonoBehaviour // Update is called once per frame void Update() { + updateVFX(); if (Input.GetKeyDown(KeyCode.A)) { debugMode = !debugMode; @@ -62,7 +75,6 @@ public class DebugUI : MonoBehaviour { lerp_val = 1; stat = "completed"; - //vfx.SendEvent("Completed"); StartCoroutine("sendCompleted"); setButtonInteractable(true); button.GetComponent().text = stat; @@ -86,30 +98,9 @@ public class DebugUI : MonoBehaviour lerp_val = Mathf.Clamp(lerp_val, 0, 1); vfx.SetFloat("_LerpVal", lerp_val); - Vector3 base_pos = baseEmitter.GetComponent().position; Vector3 target_pos = target.GetComponent().position; - emitter.GetComponent().position = Vector3.Lerp(base_pos, target_pos, lerp_val); - /* - if (debugMode && Input.GetMouseButtonDown(0)) - { - ray = Camera.main.ScreenPointToRay(Input.mousePosition); - - GameObject selected_obj = null; - - if (Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out hit, 200.0f)) - { - selected_obj = hit.collider.gameObject; - Debug.Log("hit!!" + selected_obj.name); - } - - if(selected_obj != null) - { - selected_obj.GetComponent().material.color = new Color(255, 100, 100); - } - } - */ } IEnumerator sendCompleted() @@ -161,9 +152,12 @@ public class DebugUI : MonoBehaviour private void setButtonInteractable(bool _stat) { - //GameObject g = GameObject.Find("Grow"); - //GameObject v = GameObject.Find("Vanish"); - //g.GetComponent