@@ -109,18 +109,19 @@ namespace Ichni.RhythmGame
|
||||
|
||||
if ((attachedGameElement as IHaveColorSubmodule).haveBaseColor)
|
||||
{
|
||||
// var baseColor = inspector.GenerateBaseColorPicker(this, subcontainer, "Base Color", nameof(originalBaseColor));
|
||||
// baseColor.AddListenerFunction(Refresh);
|
||||
var baseColor = inspector.GenerateBaseColorPicker(this, subcontainer, "Base Color", nameof(originalBaseColor));
|
||||
baseColor.AddListenerFunction(Refresh);
|
||||
// 新增:HSV轮盘
|
||||
var hsvDrawer = inspector.GenerateHsvDrawer(this, subcontainer, "HSV", nameof(originalBaseColor));
|
||||
hsvDrawer.AddListenerFunction(Refresh);
|
||||
|
||||
baseColor.hsvDrawer = hsvDrawer;
|
||||
hsvDrawer.baseColorPicker = baseColor;
|
||||
if (attachedGameElement.childElementList.Exists(x => x is BaseColorChange))
|
||||
{
|
||||
// baseColor.title.text += " (Occupied by Animation)";
|
||||
// baseColor.canvasGroup.interactable = false;
|
||||
baseColor.title.text += " (Occupied by Animation)";
|
||||
baseColor.canvasGroup.interactable = false;
|
||||
hsvDrawer.title.text += " (Occupied by Animation)";
|
||||
hsvDrawer.canvasGroup.interactable = false;
|
||||
hsvDrawer.gameObject.SetActive(false); // 隐藏HSV轮盘
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,12 +60,17 @@ namespace Ichni.RhythmGame
|
||||
{
|
||||
(EditorManager.instance.beatmapContainer).lowPriorityActions.Add(() =>
|
||||
{
|
||||
effectList.Add(effectBM.ConvertToGameType(attachedGameElement));
|
||||
var a = effectBM.ConvertToGameType(attachedGameElement);
|
||||
effectList.Add(a);
|
||||
a.AccommodatingList = effectList;
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
effectList.Add(effectBM.ConvertToGameType(attachedGameElement));
|
||||
|
||||
var a = effectBM.ConvertToGameType(attachedGameElement);
|
||||
effectList.Add(a);
|
||||
a.AccommodatingList = effectList;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,6 +108,7 @@ namespace Ichni.RhythmGame
|
||||
{
|
||||
newEffect.attachedGameElement = attachedGameElement;
|
||||
effectCollection[effect.Key].Add(newEffect);
|
||||
newEffect.AccommodatingList = effectCollection[effect.Key];
|
||||
inspectorMain.SetInspector(attachedGameElement);
|
||||
}
|
||||
else
|
||||
@@ -173,6 +179,7 @@ namespace Ichni.RhythmGame
|
||||
foreach (var effectBase in effect.Value)
|
||||
{
|
||||
effectList.Add(effectBase.ConvertToBM());
|
||||
|
||||
}
|
||||
effectCollection.Add(effect.Key, effectList);
|
||||
}
|
||||
@@ -349,7 +356,21 @@ namespace Ichni.RhythmGame
|
||||
|
||||
}
|
||||
|
||||
public List<EffectBase> AccommodatingList;
|
||||
public abstract void SetUpInspector();
|
||||
|
||||
public void SetRemove(DynamicUISubcontainer effectSettings)
|
||||
{
|
||||
IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
|
||||
|
||||
var RemoveButtom = inspector.GenerateButton(this, effectSettings, "Remove", () =>
|
||||
{
|
||||
nowEffectState = EffectState.Before;
|
||||
AccommodatingList.Remove(this);
|
||||
EditorManager.instance.uiManager.inspector.SetInspector(attachedGameElement);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace Beatmap
|
||||
|
||||
Reference in New Issue
Block a user