diff --git a/.gitignore b/.gitignore index 16dfad5fc..d7073708f 100644 --- a/.gitignore +++ b/.gitignore @@ -78,9 +78,6 @@ crashlytics-build.properties # Local Save Files /[Aa]ssets/[Ss]treamingAssets/SaveFiles/* -# DevSaveFiles lives outside Assets; Unity metadata from the old location is not needed. -/DevSaveFiles/**/*.meta - # Never ignore DLLs in the FMOD subfolder. !/[Aa]ssets/Plugins/FMOD/**/lib/* diff --git a/Assets/Editor/DeveloperMode/DeveloperModePanelBuilder.cs b/Assets/Editor/DeveloperMode/DeveloperModePanelBuilder.cs index 21099cc57..260685419 100644 --- a/Assets/Editor/DeveloperMode/DeveloperModePanelBuilder.cs +++ b/Assets/Editor/DeveloperMode/DeveloperModePanelBuilder.cs @@ -15,6 +15,7 @@ namespace AibisDream.DeveloperMode.Editor { private const string PrefabPath = "Assets/GameContent/Feature_MainUI/Prefabs/DeveloperModePanel.prefab"; private const string ScenePath = "Assets/Scenes/Persistence.unity"; + private const string FontAssetPath = "Assets/Font/Assets/WenQuanYi Bitmap Song 14px SDF.asset"; private static readonly Color Background = new(0.025f, 0.045f, 0.065f, 0.97f); private static readonly Color Surface = new(0.055f, 0.085f, 0.11f, 0.96f); private static readonly Color Accent = new(0.16f, 0.75f, 0.88f, 1f); @@ -82,7 +83,7 @@ namespace AibisDream.DeveloperMode.Editor var tabs = CreateHorizontal("Tabs", root.transform, 4f, new RectOffset(4, 4, 3, 3)); SetAnchors(tabs.GetComponent(), new Vector2(0f, 1f), new Vector2(1f, 1f), new Vector2(0f, -88f), new Vector2(0f, -46f)); - var tabNames = new[] { "概览", "日志", "Yarn 变量", "存档跳转", "显示与控制" }; + var tabNames = new[] { "概览", "日志", "Yarn 变量", "存档槽位", "显示与控制" }; var tabButtons = tabNames.Select(name => CreateButton($"Tab {name}", tabs.transform, name, 0f, 34f)).ToArray(); foreach (var button in tabButtons) { @@ -214,31 +215,17 @@ namespace AibisDream.DeveloperMode.Editor var page = CreateVertical("Saves Page", parent, 6f, new RectOffset(8, 8, 8, 8)); var toolbar = CreateHorizontal("Toolbar", page.transform, 6f, new RectOffset(0, 0, 0, 0)); AddLayout(toolbar, 38f); - var search = CreateInput("Save Search", toolbar.transform, "搜索开发检查点...", 350f); var reload = CreateButton("Reload Saves", toolbar.transform, "重新扫描", 110f, 34f); var status = CreateText("Save Status", toolbar.transform, "Ready", 14f); AddFlexible(status.gameObject); status.alignment = TextAlignmentOptions.MidlineRight; - var columns = CreateHorizontal("Save Columns", page.transform, 8f, new RectOffset(0, 0, 0, 0)); - var columnsLayout = columns.AddComponent(); - columnsLayout.flexibleHeight = 1f; - - var slotColumn = CreateVertical("Official Slots", columns.transform, 4f, new RectOffset(0, 0, 0, 0)); + var slotColumn = CreateVertical("Official Slots", page.transform, 4f, new RectOffset(0, 0, 0, 0)); var slotLayout = slotColumn.AddComponent(); - slotLayout.preferredWidth = 330f; slotLayout.flexibleHeight = 1f; var slotTitle = CreateText("Title", slotColumn.transform, "正式槽位(点击读档)", 16f, FontStyles.Bold); AddLayout(slotTitle.gameObject, 28f); - CreateList("Slot List", slotColumn.transform, 430f, out var slotContent, out var slotTemplate); - - var devColumn = CreateVertical("Dev Saves", columns.transform, 4f, new RectOffset(0, 0, 0, 0)); - var devLayout = devColumn.AddComponent(); - devLayout.flexibleWidth = 1f; - devLayout.flexibleHeight = 1f; - var devTitle = CreateText("Title", devColumn.transform, "开发检查点(严格恢复)", 16f, FontStyles.Bold); - AddLayout(devTitle.gameObject, 28f); - CreateList("Dev Save List", devColumn.transform, 430f, out var devContent, out var devTemplate); + CreateList("Slot List", slotColumn.transform, 500f, out var slotContent, out var slotTemplate); var paths1 = CreateHorizontal("Paths 1", page.transform, 5f, new RectOffset(0, 0, 0, 0)); AddLayout(paths1, 34f); @@ -246,26 +233,17 @@ namespace AibisDream.DeveloperMode.Editor var copySave = CreateButton("Copy Saves", paths1.transform, "复制存档路径", 130f, 30f); var openLog = CreateButton("Open Logs", paths1.transform, "打开日志目录", 130f, 30f); var copyLog = CreateButton("Copy Logs", paths1.transform, "复制日志路径", 130f, 30f); - var paths2 = CreateHorizontal("Paths 2", page.transform, 5f, new RectOffset(0, 0, 0, 0)); - AddLayout(paths2, 34f); - var openDev = CreateButton("Open Dev Saves", paths2.transform, "打开检查点目录", 140f, 30f); - var copyDev = CreateButton("Copy Dev Saves", paths2.transform, "复制检查点路径", 140f, 30f); - var openCurrent = CreateButton("Open Current Log", paths2.transform, "定位当前日志", 130f, 30f); - var copyCurrent = CreateButton("Copy Current Log", paths2.transform, "复制当前日志", 130f, 30f); + var openCurrent = CreateButton("Open Current Log", paths1.transform, "定位当前日志", 130f, 30f); + var copyCurrent = CreateButton("Copy Current Log", paths1.transform, "复制当前日志", 130f, 30f); - refs.Add("saveSearchInput", search); refs.Add("reloadSavesButton", reload.GetComponent