refactor: move ghost rain colors into color settings section

- Move ghost rain color pickers into DrawColorSettings()
- Add proper i18n keys ghost_rain_color1/2/3 for all languages
- Unify Chinese format: 第一排鬼键雨滴颜色
- Remove separate DrawGhostRainColorSettings() method

Author: HitMargin

CHANGELOG.md

@@ -0,0 +1,19 @@
+## v1.6.1
+
+### 🚀 Features
+- Custom `RainGraphic` replaces `Image` for normal rain — lighter rendering (solid/gradient quad, 4 verts, no texture sampling)
+- Ghost rain now correctly renders the `GhostRain.png` sprite (child `Image` + Tiled mode)
+- Per-row ghost rain color customization (`GhostRainColor` / `GhostRainColor2` / `GhostRainColor3`)
+- Edge fade slider changed from percentage to pixels (1–200px)
+
+### 🐛 Bug Fixes
+- Ghost rain sprite was loaded but never used for rendering — now displays correctly
+- Release fade and edge fade now work together without conflict
+
+### 🔧 Performance
+- Normal rain: 4 verts / 2 tris, no texture sampling — lighter than old `Image`
+- Ghost rain: child `Image` tiling — negligible overhead (low frequency)
+
+### 🧹 Misc
+- Removed dead code (unused `Init` overloads, pool methods, stale `ghostSprite`)
+- Bumped version to 1.6.1

JipperKeyViewer-FileBased/lang/lang.json

@@ -52,6 +52,9 @@
     { "key": "rain_fade", "en": "Release Fade", "zh": "松开淡出", "ko": "릴리스 페이드" },
     { "key": "fade_duration", "en": "Fade Duration", "zh": "淡出时长", "ko": "페이드 시간" },
     { "key": "ghost_rain", "en": "Ghost Rain", "zh": "鬼键雨滴", "ko": "고스트 빗줄" },
+    { "key": "ghost_rain_color1", "en": "Ghost Rain Color 1", "zh": "第一排鬼键雨滴颜色", "ko": "1열 고스트 빗줄 색상" },
+    { "key": "ghost_rain_color2", "en": "Ghost Rain Color 2", "zh": "第二排鬼键雨滴颜色", "ko": "2열 고스트 빗줄 색상" },
+    { "key": "ghost_rain_color3", "en": "Ghost Rain Color 3", "zh": "第三排鬼键雨滴颜色", "ko": "3열 고스트 빗줄 색상" },
     { "key": "hide_main_count", "en": "Hide Main Key Count", "zh": "隐藏主按键计数", "ko": "메인 키 카운트 숨기기" },
     { "key": "per_key_kps", "en": "Per-Key KPS", "zh": "每键KPS", "ko": "키별 KPS" },
     { "key": "per_key_colors", "en": "Per-Key Colors", "zh": "每键独立颜色", "ko": "키별 색상" },

JipperKeyViewer/KeyViewer/I18n.cs

@@ -36,6 +36,9 @@ public static class I18n
             ["rain_row2"] = "Row 2",
             ["rain_row3"] = "Row 3",
             ["rain_height"] = "Rain Height",
+            ["ghost_rain_color1"] = "Ghost Rain Color 1",
+            ["ghost_rain_color2"] = "Ghost Rain Color 2",
+            ["ghost_rain_color3"] = "Ghost Rain Color 3",
             ["rain_speed"] = "Rain Speed",
             ["rain_fade"] = "Release Fade",
             ["fade_duration"] = "Fade Duration",
@@ -110,6 +113,9 @@ public static class I18n
             ["rain_fade"] = "雨滴松开淡出",
             ["fade_duration"] = "淡出时长",
             ["ghost_rain"] = "鬼键雨滴",
+            ["ghost_rain_color1"] = "第一排鬼键雨滴颜色",
+            ["ghost_rain_color2"] = "第二排鬼键雨滴颜色",
+            ["ghost_rain_color3"] = "第三排鬼键雨滴颜色",
             ["rain_gradient"] = "顶部渐隐",
             ["gradient_percent"] = "渐隐像素",
 
@@ -180,6 +186,9 @@ public static class I18n
             ["rain_fade"] = "빗줄 페이드아웃",
             ["fade_duration"] = "페이드 시간",
             ["ghost_rain"] = "고스트 빗줄",
+            ["ghost_rain_color1"] = "1열 고스트 빗줄 색상",
+            ["ghost_rain_color2"] = "2열 고스트 빗줄 색상",
+            ["ghost_rain_color3"] = "3열 고스트 빗줄 색상",
             ["rain_gradient"] = "끝 페이드",
             ["gradient_percent"] = "페이드 px",
 

JipperKeyViewer/KeyViewer/KeyViewerGUI.cs

@@ -531,8 +531,6 @@ public void DrawSettingsWindow()
                     SaveSettings();
                 }
 
-                if (Settings.EnableGhostRain)
-                    DrawGhostRainColorSettings();
             }
 
             GUILayout.Space(10);
@@ -559,7 +557,7 @@ public void DrawSettingsWindow()
 
             // Color settings section / 颜色设置区域
             bool colorsExpanded = GUILayout.Toggle(ColorExpanded != null, (ColorExpanded != null ? "\u25E2 " : "\u25B6 ") + I18n.Tr("colors"));
-            if (colorsExpanded && ColorExpanded == null) ColorExpanded = new bool[9];
+            if (colorsExpanded && ColorExpanded == null) ColorExpanded = new bool[12];
             if (!colorsExpanded) ColorExpanded = null;
             if (ColorExpanded != null)
             {
@@ -919,62 +917,26 @@ private void DrawTextChangeSection()
             GUILayout.EndVertical();
         }
 
-        /// <summary>
-        /// Draw the color settings section / 绘制颜色设置区域
-        /// RGB-A sliders with preview and reset buttons for each color / 每个颜色的 R/G/B/A 滑块、预览和重置按钮
-        /// </summary>
-        private void DrawGhostRainColorSettings()
-        {
-            GUILayout.BeginVertical("box");
-            string[] rowNames = { I18n.Tr("rain_row1"), I18n.Tr("rain_row2"), I18n.Tr("rain_row3") };
-            Color[] ghostColors = { Settings.GhostRainColor, Settings.GhostRainColor2, Settings.GhostRainColor3 };
-            Color[] ghostDefaults = { GhostRainColorDefault, GhostRainColor2Default, GhostRainColor3Default };
-
-            int rowCount = Settings.KeyViewerStyle == KeyviewerStyle.Key20 ? 3 : 2;
-            for (int r = 0; r < rowCount; r++)
-            {
-                bool expanded = GUILayout.Toggle(ghostRainColorExpanded == r,
-                    (ghostRainColorExpanded == r ? "\u25E2 " : "\u25B6 ") + I18n.Tr("ghost_rain") + " " + rowNames[r]);
-                if (expanded != (ghostRainColorExpanded == r))
-                    ghostRainColorExpanded = expanded ? r : -1;
-
-                if (ghostRainColorExpanded == r)
-                {
-                    GUILayout.BeginVertical("box");
-                    Color cur = ghostColors[r];
-                    Color newColor = DrawColorPicker(rowNames[r], cur, ghostDefaults[r]);
-                    if (newColor != cur)
-                    {
-                        switch (r)
-                        {
-                            case 0: Settings.GhostRainColor = newColor; break;
-                            case 1: Settings.GhostRainColor2 = newColor; break;
-                            case 2: Settings.GhostRainColor3 = newColor; break;
-                        }
-                        SaveSettings();
-                    }
-                    GUILayout.EndVertical();
-                }
-            }
-            GUILayout.EndVertical();
-        }
-
         private void DrawColorSettings()
         {
             GUILayout.BeginVertical("box");
             string[] colorNames = {
                 I18n.Tr("color_bg"), I18n.Tr("color_bg_clicked"), I18n.Tr("color_outline"), I18n.Tr("color_outline_clicked"),
                 I18n.Tr("color_text"), I18n.Tr("color_text_clicked"),
-                I18n.Tr("color_rain1"), I18n.Tr("color_rain2"), I18n.Tr("color_rain3")
+                I18n.Tr("color_rain1"), I18n.Tr("color_rain2"), I18n.Tr("color_rain3"),
+                I18n.Tr("ghost_rain_color1"), I18n.Tr("ghost_rain_color2"), I18n.Tr("ghost_rain_color3")
             };
             Color[] defaultColors = {
                 Background, BackgroundClicked, Outline, OutlineClicked,
                 Text, TextClicked,
-                RainColor, RainColor2, RainColor3
+                RainColor, RainColor2, RainColor3,
+                GhostRainColorDefault, GhostRainColor2Default, GhostRainColor3Default
             };
-            for (int i = 0; i < 9; i++)
+            for (int i = 0; i < 12; i++)
             {
-                if (i >= 6 && !Settings.EnableRainEffect)
+                if (i >= 6 && i < 9 && !Settings.EnableRainEffect)
+                    continue;
+                if (i >= 9 && !Settings.EnableGhostRain)
                     continue;
                 ColorExpanded[i] = GUILayout.Toggle(ColorExpanded[i], ColorExpanded[i] ? $"\u25E2 {colorNames[i]}" : $"\u25B6 {colorNames[i]}");
                 if (ColorExpanded[i])
@@ -1002,8 +964,6 @@ private void DrawColorSettings()
         int kpsColorType = -1;
         int totalColorType = -1;
 
-        int ghostRainColorExpanded = -1;
-
         private void DrawKpsTotalColors(int pi, string label, ref int expandedType)
         {
             bool show = GUILayout.Toggle(expandedType >= 0, (expandedType >= 0 ? "◢ " : "▶ ") + label);

JipperKeyViewer/KeyViewer/KeyViewerLayout.cs

@@ -631,6 +631,9 @@ private Color GetColorByIndex(int index)
                 6 => Settings.RainColor,
                 7 => Settings.RainColor2,
                 8 => Settings.RainColor3,
+                9 => Settings.GhostRainColor,
+                10 => Settings.GhostRainColor2,
+                11 => Settings.GhostRainColor3,
                 _ => Color.white
             };
         }
@@ -649,6 +652,9 @@ private void SetColorByIndex(int index, Color color)
                 case 6: Settings.RainColor = color; break;
                 case 7: Settings.RainColor2 = color; break;
                 case 8: Settings.RainColor3 = color; break;
+                case 9: Settings.GhostRainColor = color; break;
+                case 10: Settings.GhostRainColor2 = color; break;
+                case 11: Settings.GhostRainColor3 = color; break;
             }
         }
 

JipperKeyViewer/lang/lang.json

@@ -52,6 +52,9 @@
     { "key": "rain_fade", "en": "Release Fade", "zh": "松开淡出", "ko": "릴리스 페이드" },
     { "key": "fade_duration", "en": "Fade Duration", "zh": "淡出时长", "ko": "페이드 시간" },
     { "key": "ghost_rain", "en": "Ghost Rain", "zh": "鬼键雨滴", "ko": "고스트 빗줄" },
+    { "key": "ghost_rain_color1", "en": "Ghost Rain Color 1", "zh": "第一排鬼键雨滴颜色", "ko": "1열 고스트 빗줄 색상" },
+    { "key": "ghost_rain_color2", "en": "Ghost Rain Color 2", "zh": "第二排鬼键雨滴颜色", "ko": "2열 고스트 빗줄 색상" },
+    { "key": "ghost_rain_color3", "en": "Ghost Rain Color 3", "zh": "第三排鬼键雨滴颜色", "ko": "3열 고스트 빗줄 색상" },
     { "key": "hide_main_count", "en": "Hide Main Key Count", "zh": "隐藏主按键计数", "ko": "메인 키 카운트 숨기기" },
     { "key": "per_key_kps", "en": "Per-Key KPS", "zh": "每键KPS", "ko": "키별 KPS" },
     { "key": "per_key_colors", "en": "Per-Key Colors", "zh": "每键独立颜色", "ko": "키별 색상" },