diff --git a/Qwilight/Assets/UI/@Default/@Default.yaml b/Qwilight/Assets/UI/@Default/@Default.yaml index b757448..fe1dc71 100644 --- a/Qwilight/Assets/UI/@Default/@Default.yaml +++ b/Qwilight/Assets/UI/@Default/@Default.yaml @@ -29,7 +29,7 @@ siteDate: DarkGray siteEnter: DeepSkyBlue siteQuit: DeepPink - siteHref: LightGray + siteHref: DodgerBlue siteTitle: White siteArtist: LightGray siteGenre: DarkGray @@ -110,8 +110,8 @@ statusLoadingNoteFile: "#7FFF0000" statusLoadingDefaultEntry: "#7F0000FF" - quit0: Yellow - quit1: Yellow + quit0: Gold + quit1: Gold quit2: Green quit3: Green quit4: Blue diff --git a/Qwilight/Qwilight/System/BaseUI/BaseUI.cs b/Qwilight/Qwilight/System/BaseUI/BaseUI.cs index 89eb937..e18d3c7 100644 --- a/Qwilight/Qwilight/System/BaseUI/BaseUI.cs +++ b/Qwilight/Qwilight/System/BaseUI/BaseUI.cs @@ -756,111 +756,111 @@ DefaultLength = GetCalledValue(formatNode, "defaultLength", "1280"); DefaultHeight = GetCalledValue(formatNode, "defaultHeight", "720"); - SiteDateColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteDate")).GetColor()); - SiteEnterColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteEnter")).GetColor()); - SiteQuitColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteQuit")).GetColor()); - SiteHrefColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteHref")).GetColor()); + SiteDateColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteDate", nameof(Colors.White))).GetColor()); + SiteEnterColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteEnter", nameof(Colors.White))).GetColor()); + SiteQuitColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteQuit", nameof(Colors.White))).GetColor()); + SiteHrefColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteHref", nameof(Colors.White))).GetColor()); SiteTitleColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteTitle", nameof(Colors.White))).GetColor()); - SiteArtistColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteArtist", nameof(Colors.DeepSkyBlue))).GetColor()); - SiteGenreColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteGenre", nameof(Colors.LightGreen))).GetColor()); + SiteArtistColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteArtist", nameof(Colors.White))).GetColor()); + SiteGenreColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteGenre", nameof(Colors.White))).GetColor()); SiteStandColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "siteStand", nameof(Colors.White))).GetColor()); - EventNoteNameColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "eventNoteName")).GetColor()); - TitleColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "title")).GetColor()); - ArtistColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "artist")).GetColor()); - GenreColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "genre")).GetColor()); - WantLevelIDColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "wantLevelID")).GetColor()); - FittedTextColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "fittedText", Colors.ForestGreen.ToString())).GetColor()); + EventNoteNameColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "eventNoteName", nameof(Colors.White))).GetColor()); + TitleColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "title", nameof(Colors.White))).GetColor()); + ArtistColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "artist", nameof(Colors.White))).GetColor()); + GenreColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "genre", nameof(Colors.White))).GetColor()); + WantLevelIDColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "wantLevelID", nameof(Colors.White))).GetColor()); + FittedTextColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "fittedText", nameof(Colors.White))).GetColor()); - FileColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "file")).GetColor()); - JudgmentStageColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "judgmentStage")).GetColor()); - TotalNotesColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "totalNotes")).GetColor()); - HighestInputCountColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "highestInputCount")).GetColor()); - LengthColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "length")).GetColor()); - BPMColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "bpm")).GetColor()); + FileColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "file", nameof(Colors.White))).GetColor()); + JudgmentStageColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "judgmentStage", nameof(Colors.White))).GetColor()); + TotalNotesColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "totalNotes", nameof(Colors.White))).GetColor()); + HighestInputCountColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "highestInputCount", nameof(Colors.White))).GetColor()); + LengthColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "length", nameof(Colors.White))).GetColor()); + BPMColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "bpm", nameof(Colors.White))).GetColor()); - CommentDateColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentDate")).GetColor()); - CommentNameColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentName")).GetColor()); - CommentPointColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentPoint")).GetColor()); - CommentStandColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentStand")).GetColor()); + CommentDateColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentDate", nameof(Colors.White))).GetColor()); + CommentNameColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentName", nameof(Colors.White))).GetColor()); + CommentPointColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentPoint", nameof(Colors.White))).GetColor()); + CommentStandColor = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "commentStand", nameof(Colors.White))).GetColor()); foreach (var pair in new[] { - ("level0", (int)BaseNoteFile.Level.Level0, nameof(Colors.Gray)), - ("level1", (int)BaseNoteFile.Level.Level1, nameof(Colors.MediumSpringGreen)), - ("level2", (int)BaseNoteFile.Level.Level2, nameof(Colors.MediumTurquoise)), - ("level3", (int)BaseNoteFile.Level.Level3, nameof(Colors.Yellow)), - ("level4", (int)BaseNoteFile.Level.Level4, nameof(Colors.MediumVioletRed)), - ("level5", (int)BaseNoteFile.Level.Level5,nameof(Colors.MediumPurple)) + ("level0", (int)BaseNoteFile.Level.Level0), + ("level1", (int)BaseNoteFile.Level.Level1), + ("level2", (int)BaseNoteFile.Level.Level2), + ("level3", (int)BaseNoteFile.Level.Level3), + ("level4", (int)BaseNoteFile.Level.Level4), + ("level5", (int)BaseNoteFile.Level.Level5) }) { - LevelColors[pair.Item2] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, pair.Item1, pair.Item3)).GetColor()); + LevelColors[pair.Item2] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, pair.Item1)).GetColor()); LevelPaints[pair.Item2] = DrawingSystem.Instance.GetDefaultPaint(Utility.ModifyColor(LevelColors[pair.Item2])); D2DLevelColors[pair.Item2] = Utility.ModifyColor(LevelColors[pair.Item2]); } TitleQuitColor = GetCalledText(Utility.GetText(paintNode, "titleQuit", nameof(Colors.White))).GetColor(); - ArtistQuitColor = GetCalledText(Utility.GetText(paintNode, "artistQuit", nameof(Colors.DeepSkyBlue))).GetColor(); - GenreQuitColor = GetCalledText(Utility.GetText(paintNode, "genreQuit", nameof(Colors.LightGreen))).GetColor(); - WantLevelIDQuitColor = GetCalledText(Utility.GetText(paintNode, "wantLevelIDQuit", nameof(Colors.DodgerBlue))).GetColor(); - JudgmentStageQuitColor = GetCalledText(Utility.GetText(paintNode, "judgmentStageQuit", nameof(Colors.Orchid))).GetColor(); - HighestInputCountQuitColor = GetCalledText(Utility.GetText(paintNode, "highestInputCountQuit", nameof(Colors.LightGreen))).GetColor(); - LengthQuitColor = GetCalledText(Utility.GetText(paintNode, "lengthQuit", nameof(Colors.Yellow))).GetColor(); - BPMQuitColor = GetCalledText(Utility.GetText(paintNode, "bpmQuit", nameof(Colors.LightPink))).GetColor(); - StandQuitColor = GetCalledText(Utility.GetText(paintNode, "standQuit", nameof(Colors.Yellow))).GetColor(); - PointQuitColor = GetCalledText(Utility.GetText(paintNode, "pointQuit", nameof(Colors.MediumPurple))).GetColor(); - BandQuitColor = GetCalledText(Utility.GetText(paintNode, "bandQuit", nameof(Colors.MediumSpringGreen))).GetColor(); - CommentPlaceColor = GetCalledText(Utility.GetText(paintNode, "commentPlace", nameof(Colors.White))).GetColor(); + ArtistQuitColor = GetCalledText(Utility.GetText(paintNode, "artistQuit", nameof(Colors.White))).GetColor(); + GenreQuitColor = GetCalledText(Utility.GetText(paintNode, "genreQuit", nameof(Colors.White))).GetColor(); + WantLevelIDQuitColor = GetCalledText(Utility.GetText(paintNode, "wantLevelIDQuit", nameof(Colors.White))).GetColor(); + JudgmentStageQuitColor = GetCalledText(Utility.GetText(paintNode, "judgmentStageQuit", nameof(Colors.White))).GetColor(); + HighestInputCountQuitColor = GetCalledText(Utility.GetText(paintNode, "highestInputCountQuit", nameof(Colors.White))).GetColor(); + LengthQuitColor = GetCalledText(Utility.GetText(paintNode, "lengthQuit", nameof(Colors.White))).GetColor(); + BPMQuitColor = GetCalledText(Utility.GetText(paintNode, "bpmQuit", nameof(Colors.White))).GetColor(); + StandQuitColor = GetCalledText(Utility.GetText(paintNode, "standQuit", nameof(Colors.White))).GetColor(); + PointQuitColor = GetCalledText(Utility.GetText(paintNode, "pointQuit", nameof(Colors.White))).GetColor(); + BandQuitColor = GetCalledText(Utility.GetText(paintNode, "bandQuit", nameof(Colors.White))).GetColor(); + CommentPlaceColor = GetCalledText(Utility.GetText(paintNode, "commentPlace", nameof(Colors.White))).GetColor()); foreach (var pair in new[] { - ("lowestHitPoints", ModeComponent.HitPointsMode.Lowest, nameof(Colors.DarkGreen)), - ("lowerHitPoints", ModeComponent.HitPointsMode.Lower, nameof(Colors.DarkTurquoise)), - ("defaultHitPoints", ModeComponent.HitPointsMode.Default, nameof(Colors.DarkGoldenrod)), - ("higherHitPoints", ModeComponent.HitPointsMode.Higher, nameof(Colors.DarkRed)), - ("highestHitPoints", ModeComponent.HitPointsMode.Highest, nameof(Colors.DarkViolet)), - ("failedHitPoints", ModeComponent.HitPointsMode.Failed,nameof( Colors.DarkViolet)), - ("favorHitPoints", ModeComponent.HitPointsMode.Favor,nameof( Colors.DarkGoldenrod)), - ("testHitPoints", ModeComponent.HitPointsMode.Test, nameof(Colors.DarkGoldenrod)) + ("lowestHitPoints", ModeComponent.HitPointsMode.Lowest), + ("lowerHitPoints", ModeComponent.HitPointsMode.Lower), + ("defaultHitPoints", ModeComponent.HitPointsMode.Default), + ("higherHitPoints", ModeComponent.HitPointsMode.Higher), + ("highestHitPoints", ModeComponent.HitPointsMode.Highest), + ("failedHitPoints", ModeComponent.HitPointsMode.Failed), + ("favorHitPoints", ModeComponent.HitPointsMode.Favor), + ("testHitPoints", ModeComponent.HitPointsMode.Test) }) { parallelItems.Add(() => { - HitPointsColor[(int)pair.Item2] = GetCalledText(Utility.GetText(paintNode, pair.Item1, pair.Item3)).GetColor(); + HitPointsColor[(int)pair.Item2] = GetCalledText(Utility.GetText(paintNode, pair.Item1)).GetColor(); HitPointsPaints[(int)pair.Item2] = DrawingSystem.Instance.GetDefaultPaint(HitPointsColor[(int)pair.Item2]); DrawingSystem.Instance.SetFaintPaints(this, D2DHitPointsPaints[(int)pair.Item2], HitPointsColor[(int)pair.Item2]); }); } - StandStatusViewColor = GetCalledText(Utility.GetText(paintNode, "standStatusView", nameof(Colors.DeepSkyBlue))).GetColor(); - PointStatusViewColor = GetCalledText(Utility.GetText(paintNode, "pointStatusView", nameof(Colors.LightGreen))).GetColor(); - BandStatusViewColor = GetCalledText(Utility.GetText(paintNode, "bandStatusView", nameof(Colors.Orange))).GetColor(); - HitPointsStatusViewColor = GetCalledText(Utility.GetText(paintNode, "hitPointsStatusView", nameof(Colors.Red))).GetColor(); + StandStatusViewColor = GetCalledText(Utility.GetText(paintNode, "standStatusView", nameof(Colors.White))).GetColor(); + PointStatusViewColor = GetCalledText(Utility.GetText(paintNode, "pointStatusView", nameof(Colors.White))).GetColor(); + BandStatusViewColor = GetCalledText(Utility.GetText(paintNode, "bandStatusView", nameof(Colors.White))).GetColor(); + HitPointsStatusViewColor = GetCalledText(Utility.GetText(paintNode, "hitPointsStatusView", nameof(Colors.White))).GetColor(); foreach (var pair in new[] { - ("highestJudgmentV2", Component.Judged.Highest, nameof(Colors.Cyan)), - ("higherJudgmentV2", Component.Judged.Higher, nameof(Colors.DeepSkyBlue)), - ("highJudgmentV2", Component.Judged.High, nameof(Colors.LightGreen)), - ("lowJudgmentV2", Component.Judged.Low, nameof(Colors.Yellow)), - ("lowerJudgmentV2", Component.Judged.Lower, nameof(Colors.Violet)), - ("lowestJudgmentV2", Component.Judged.Lowest,nameof( Colors.Red)) + ("highestJudgmentV2", Component.Judged.Highest), + ("higherJudgmentV2", Component.Judged.Higher), + ("highJudgmentV2", Component.Judged.High), + ("lowJudgmentV2", Component.Judged.Low), + ("lowerJudgmentV2", Component.Judged.Lower), + ("lowestJudgmentV2", Component.Judged.Lowest) }) { var inputMode = (int)(Component.InputMode)pair.Item2; - JudgmentColors[(int)inputMode] = GetCalledText(Utility.GetText(paintNode, pair.Item1, pair.Item3)).GetColor(); + JudgmentColors[(int)inputMode] = GetCalledText(Utility.GetText(paintNode, pair.Item1)).GetColor(); JudgmentPaints[(int)inputMode] = DrawingSystem.Instance.GetDefaultPaint(JudgmentColors[(int)inputMode]); parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, D2DJudgmentPaints[(int)inputMode], JudgmentColors[(int)inputMode])); } - TotalNotesJudgmentQuitColor = GetCalledText(Utility.GetText(paintNode, "totalNotesJudgmentQuit", nameof(Colors.White))).GetColor(); + TotalNotesJudgmentQuitColor = GetCalledText(Utility.GetText(paintNode, "totalNotesJudgmentQuit")).GetColor(); foreach (var pair in new[] { - ("highestJudgmentQuit", Component.Judged.Highest, nameof(Colors.Cyan)), - ("higherJudgmentQuit", Component.Judged.Higher, nameof(Colors.DeepSkyBlue)), - ("highJudgmentQuit", Component.Judged.High, nameof(Colors.LightGreen)), - ("lowJudgmentQuit", Component.Judged.Low, nameof(Colors.Yellow)), - ("lowerJudgmentQuit", Component.Judged.Lower, nameof(Colors.Violet)), - ("lowestJudgmentQuit", Component.Judged.Lowest,nameof( Colors.Red)) + ("highestJudgmentQuit", Component.Judged.Highest), + ("higherJudgmentQuit", Component.Judged.Higher), + ("highJudgmentQuit", Component.Judged.High), + ("lowJudgmentQuit", Component.Judged.Low), + ("lowerJudgmentQuit", Component.Judged.Lower), + ("lowestJudgmentQuit", Component.Judged.Lowest) }) { - JudgmentQuitColors[(int)pair.Item2] = GetCalledText(Utility.GetText(paintNode, pair.Item1, pair.Item3)).GetColor(); + JudgmentQuitColors[(int)pair.Item2] = GetCalledText(Utility.GetText(paintNode, pair.Item1)).GetColor(); } StatusHandlingColor = GetCalledText(Utility.GetText(paintNode, "statusHandling", "#7F008000")).GetColor(); @@ -875,13 +875,13 @@ StatusLoadingDefaultEntryColor = GetCalledText(Utility.GetText(paintNode, "statusLoadingDefaultEntry", "#7F0000FF")).GetColor(); StatusLoadingDefaultEntryPaint = DrawingSystem.Instance.GetDefaultPaint(StatusLoadingDefaultEntryColor); - QuitColors[(int)DefaultCompute.QuitStatus.SPlus] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit0", nameof(Colors.Red))).GetColor()); - QuitColors[(int)DefaultCompute.QuitStatus.S] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit1", nameof(Colors.Silver))).GetColor()); - QuitColors[(int)DefaultCompute.QuitStatus.APlus] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit2", nameof(Colors.Gold))).GetColor()); - QuitColors[(int)DefaultCompute.QuitStatus.A] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit3", nameof(Colors.Turquoise))).GetColor()); - QuitColors[(int)DefaultCompute.QuitStatus.B] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit4", nameof(Colors.Blue))).GetColor()); - QuitColors[(int)DefaultCompute.QuitStatus.C] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit5", nameof(Colors.Magenta))).GetColor()); - QuitColors[(int)DefaultCompute.QuitStatus.D] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit6", nameof(Colors.Crimson))).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.SPlus] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit0")).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.S] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit1")).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.APlus] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit2")).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.A] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit3")).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.B] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit4")).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.C] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit5")).GetColor()); + QuitColors[(int)DefaultCompute.QuitStatus.D] = Utility.ModifyColor(GetCalledText(Utility.GetText(paintNode, "quit6")).GetColor()); for (var i = (int)DefaultCompute.QuitStatus.D; i >= (int)DefaultCompute.QuitStatus.SPlus; --i) { diff --git a/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs b/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs index 159d589..851fbed 100644 --- a/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs +++ b/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs @@ -1050,8 +1050,8 @@ var netPosition0 = drawingComponentValue.netPosition0; var netPosition1 = drawingComponentValue.netPosition1; var altNet = drawingComponentValue.altNet; - var netPaint = UI.Instance.NetPaints[netItemFaintInt]; - var netInPaint = UI.Instance.NetInPaints[netItemFaintInt]; + var netTextPaint = UI.Instance.NetTextPaints[netItemFaintInt]; + var netPaint = UI.Instance.NetWallPaints[netItemFaintInt]; for (var i = quitNetPosition; i >= levyingNetPosition; --i) { foreach (var netItem in netItems) @@ -1133,7 +1133,7 @@ } r.Set(r.Position0 + Levels.StandardEdgeFloat32, r.Position1 + Levels.StandardEdgeFloat32, r.Length - 2 * Levels.StandardEdgeFloat32, r.Height - 2 * Levels.StandardEdgeFloat32); - targetSession.FillRectangle(r, netInPaint); + targetSession.FillRectangle(r, netPaint); r.Position0 += highestNetHeight; r.Length = (highestNetLength - 2 * highestNetHeight) * netItemValue; @@ -1150,19 +1150,19 @@ var position0 = Levels.StandardMargin + textBound0Length; targetSession.PaintText(textItem0, ref r, avatarTitle.Value.TitleColor); r.Position0 += position0; - targetSession.PaintText(textItem1, ref r, netPaint); + targetSession.PaintText(textItem1, ref r, netTextPaint); r.Position0 -= position0; } else { - targetSession.PaintText(textItem1, ref r, netPaint); + targetSession.PaintText(textItem1, ref r, netTextPaint); } r.Position1 += Levels.StandardMargin + textBound1Height; - targetSession.PaintText(textItem2, ref r, netPaint); + targetSession.PaintText(textItem2, ref r, netTextPaint); r.Position0 += Levels.StandardMargin + textBound2Length; - targetSession.PaintText(textItem3, ref r, netPaint); + targetSession.PaintText(textItem3, ref r, netTextPaint); r.Position0 += Levels.StandardMargin + textBound3Length; - targetSession.PaintText(textItem4, ref r, netPaint); + targetSession.PaintText(textItem4, ref r, netTextPaint); r.Set(targetPosition0 + distanceNet + Levels.StandardEdgeFloat32, drawingPosition1 + Levels.StandardEdgeFloat32, highestNetHeight, highestNetHeight); targetSession.PaintDrawing(ref r, avatarDrawing?.Drawing, netItemFaint); diff --git a/Qwilight/Qwilight/System/UI/UI.cs b/Qwilight/Qwilight/System/UI/UI.cs index e284fa6..507f539 100644 --- a/Qwilight/Qwilight/System/UI/UI.cs +++ b/Qwilight/Qwilight/System/UI/UI.cs @@ -122,9 +122,9 @@ public Color WantLevelIDColor { get; set; } - public ICanvasBrush[] NetPaints { get; } = new ICanvasBrush[101]; + public ICanvasBrush[] NetTextPaints { get; } = new ICanvasBrush[101]; - public ICanvasBrush[] NetInPaints { get; } = new ICanvasBrush[101]; + public ICanvasBrush[] NetWallPaints { get; } = new ICanvasBrush[101]; public List DrawingPipeline { get; } = new(); @@ -407,11 +407,11 @@ SaveInt(funcNode, "drawingInputModeSystem", 0); TitleColor = Utility.GetText(paintNode, "title", nameof(Colors.White)).GetColor(); - ArtistColor = Utility.GetText(paintNode, "artist", nameof(Colors.DeepSkyBlue)).GetColor(); - GenreColor = Utility.GetText(paintNode, "genre", nameof(Colors.LightGreen)).GetColor(); - WantLevelIDColor = Utility.GetText(paintNode, "wantLevelID", nameof(Colors.DodgerBlue)).GetColor(); - parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetPaints, Utility.GetText(paintNode, "net", nameof(Colors.White)).GetColor())); - parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetInPaints, Utility.GetText(paintNode, "netIn", nameof(Colors.Black)).GetColor())); + ArtistColor = Utility.GetText(paintNode, "artist", nameof(Colors.White)).GetColor(); + GenreColor = Utility.GetText(paintNode, "genre", nameof(Colors.White)).GetColor(); + WantLevelIDColor = Utility.GetText(paintNode, "wantLevelID", nameof(Colors.White)).GetColor(); + parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetTextPaints, Utility.GetText(paintNode, "netText", nameof(Colors.White)).GetColor())); + parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetWallPaints, Utility.GetText(paintNode, "netWall", nameof(Colors.Black)).GetColor())); SaveValueMap(pointNode, "mainPosition"); SaveValueMap(pointNode, "p2Position");