From 83529cfe095675b1b3950e7f9e3abf4e195d02dd Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 24 Aug 2025 00:05:26 +0800
Subject: [PATCH] add:issue #135 #136
---
.../MainWindow_cs/MW_FloatingBarIcons.cs | 2 +-
Ink Canvas/Windows/RandWindow.xaml | 24 ++++++++++++------
Ink Canvas/Windows/RandWindow.xaml.cs | 25 ++++++++++++++++---
3 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 67f0ec06..d16e083f 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -997,7 +997,7 @@ namespace Ink_Canvas
{
Process.Start(new ProcessStartInfo
{
- FileName = "classisland://plugins/IslandCaller/Run",
+ FileName = "classisland://plugins/IslandCaller/Simple/1",
UseShellExecute = true
});
}
diff --git a/Ink Canvas/Windows/RandWindow.xaml b/Ink Canvas/Windows/RandWindow.xaml
index 00ef6d31..f1bada9c 100644
--- a/Ink Canvas/Windows/RandWindow.xaml
+++ b/Ink Canvas/Windows/RandWindow.xaml
@@ -103,14 +103,22 @@
-
-
-
-
-
-
-
-
+
+
+ ClassIsland点名
+ SecRandom点名
+ NamePicker点名
+
+
+
+
+
+
+
+
+
+
diff --git a/Ink Canvas/Windows/RandWindow.xaml.cs b/Ink Canvas/Windows/RandWindow.xaml.cs
index 13cfd923..3e801682 100644
--- a/Ink Canvas/Windows/RandWindow.xaml.cs
+++ b/Ink Canvas/Windows/RandWindow.xaml.cs
@@ -295,13 +295,13 @@ namespace Ink_Canvas
// 将 isIslandCallerFirstClick 设为静态字段，实现全局记录
private static bool isIslandCallerFirstClick = true;
- private void BorderBtnIslandCaller_MouseUp(object sender, MouseButtonEventArgs e)
+ private void BorderBtnExternalCaller_MouseUp(object sender, MouseButtonEventArgs e)
{
if (isIslandCallerFirstClick)
{
MessageBox.Show(
- "首次使用ClassIsland点名功能，请确保已安装ClassIsland和Island caller插件。\n" +
- "如未安装，请前往官网下载并安装后再使用。如果安装请再次点击此按钮。",
+ "首次使用外部点名功能，请确保已安装相应的点名软件。\n" +
+ "如未安装，请前往官网下载并安装后再使用。如果已安装请再次点击此按钮。",
"提示", MessageBoxButton.OK, MessageBoxImage.Information);
isIslandCallerFirstClick = false;
return;
@@ -309,9 +309,26 @@ namespace Ink_Canvas
try
{
+ string protocol = "";
+ switch (ComboBoxCallerType.SelectedIndex)
+ {
+ case 0: // ClassIsland点名
+ protocol = "classisland://plugins/IslandCaller/Simple/1";
+ break;
+ case 1: // SecRandom点名
+ protocol = "secrandom://pumping?action=start";
+ break;
+ case 2: // NamePicker点名
+ protocol = "namepicker://调起没有浮窗的NamePicker";
+ break;
+ default:
+ protocol = "classisland://plugins/IslandCaller/Simple/1";
+ break;
+ }
+
Process.Start(new ProcessStartInfo
{
- FileName = "classisland://plugins/IslandCaller/Run",
+ FileName = protocol,
UseShellExecute = true
});
}