修修补补
This commit is contained in:
@@ -63,7 +63,9 @@ namespace Ichni.Editor
|
||||
for (int i = 1; i <= this.tabLayer; i++)
|
||||
{
|
||||
float lineX = 30 * i - 15;
|
||||
Instantiate(indentationLinePrefab, tabRect).GetComponent<RectTransform>().anchoredPosition = new Vector2(lineX, 0);
|
||||
var d = Instantiate(indentationLinePrefab, tabRect);
|
||||
d.GetComponent<RectTransform>().anchoredPosition = new Vector2(lineX, 0);
|
||||
StartCoroutine(WindowAnim.ShowPanelOnScale(d.gameObject));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,8 +147,8 @@ namespace Ichni.Editor
|
||||
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
AnimationCurveEvaluator.Evaluate(AnimationCurveType.OutCubic, i / 10f);
|
||||
//expandButton.transform.GetComponentInChildren<TMP_Text>().rectTransform.Rotate(new Vector3(0, 0, 18));
|
||||
expandButton.transform.GetComponentInChildren<TMP_Text>().rectTransform.localRotation =
|
||||
Quaternion.Euler(0, 0, isExpanded ? 18 * i : 180 - 18 * i);
|
||||
yield return null;
|
||||
}
|
||||
expandButton.transform.GetComponentInChildren<TMP_Text>().rectTransform.localRotation = Quaternion.Euler(0, 0, isExpanded ? 180 : 0);
|
||||
|
||||
@@ -133,13 +133,22 @@ namespace Ichni.Editor
|
||||
public RectTransform moveTabPoint;
|
||||
public void Elementfind(GameElement element)//在其中添加东西时timelineTab也要写(难受)
|
||||
{
|
||||
|
||||
if (element.submoduleList.Any(w => w is TimeDurationSubmodule))
|
||||
foreach (var i in element.childElementList)
|
||||
{
|
||||
TimeDurationSubmodule sub = (TimeDurationSubmodule)element.submoduleList.Find(w => w is TimeDurationSubmodule);
|
||||
if (sub.isOverridingDuration) Add(sub);
|
||||
if (i is NoteBase)
|
||||
{
|
||||
if (!timelineTabList.ContainsKey(i.GetType()))
|
||||
{
|
||||
Add(i);
|
||||
}
|
||||
else
|
||||
{
|
||||
timelineTabList[i.GetType()].AddElement(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (element is NoteBase)
|
||||
{
|
||||
if (!timelineTabList.ContainsKey(element.GetType()))
|
||||
@@ -157,19 +166,11 @@ namespace Ichni.Editor
|
||||
Add(sub);
|
||||
}
|
||||
|
||||
foreach (var i in element.childElementList)
|
||||
|
||||
if (element.submoduleList.Any(w => w is TimeDurationSubmodule))
|
||||
{
|
||||
if (i is NoteBase)
|
||||
{
|
||||
if (!timelineTabList.ContainsKey(i.GetType()))
|
||||
{
|
||||
Add(i);
|
||||
}
|
||||
else
|
||||
{
|
||||
timelineTabList[i.GetType()].AddElement(i);
|
||||
}
|
||||
}
|
||||
TimeDurationSubmodule sub = (TimeDurationSubmodule)element.submoduleList.Find(w => w is TimeDurationSubmodule);
|
||||
if (sub.isOverridingDuration) Add(sub);
|
||||
}
|
||||
}
|
||||
private void Add(IBaseElement obj)
|
||||
|
||||
@@ -115,7 +115,8 @@ public class FlexibleFloatTab : MonoBehaviour
|
||||
{
|
||||
EventPoint eventPoint = Instantiate(this.eventPoint, Area);
|
||||
eventPoint.FatherTab = this;
|
||||
eventPoint.Initialize(new AnimatedFloat(GetBeat(), GetBeat() + 1f, 0, 0, AnimationCurveType.Linear));
|
||||
eventPoint.Initialize(new AnimatedFloat(GetBeat(),
|
||||
GetBeat() + (float.Parse(FatherWindow.EventMultiplier.text) * FatherWindow.timePerBeat), 0, 0, AnimationCurveType.Linear));
|
||||
eventPoints.Insert(FindInsertIndex(eventPoint.animatedFloat.startTime), eventPoint);
|
||||
LinkNewEventPoint(eventPoint);
|
||||
eventPoint.ReDraw(scalevalue);
|
||||
|
||||
@@ -116,6 +116,8 @@ public partial class GraphicalFlexibleFloatWindow
|
||||
public TMP_InputField EndText;
|
||||
public TMP_InputField StartValueText;
|
||||
public TMP_InputField EndValueText;
|
||||
|
||||
public TMP_InputField EventMultiplier;
|
||||
public EventPoint ConnectedPoint;
|
||||
public TMP_Dropdown animationCurveTypeDropdown;
|
||||
public GameObject VisibleArea;
|
||||
@@ -174,6 +176,11 @@ public partial class GraphicalFlexibleFloatWindow
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (Keyboard.current.deleteKey.isPressed && ConnectedPoint != null)
|
||||
{
|
||||
Removed();
|
||||
}
|
||||
|
||||
if (Keyboard.current.shiftKey.isPressed && Keyboard.current.vKey.wasPressedThisFrame)
|
||||
{
|
||||
Paste();
|
||||
|
||||
Reference in New Issue
Block a user