diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index 8fead0a0..26731698 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -143,7 +143,7 @@ public static readonly List flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" }; public static readonly List networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" }; public static readonly List kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" }; - public static readonly List coreTypes = new() { "v2fly", "SagerNet", "Xray", "v2fly_v5", "sing_box" }; + public static readonly List coreTypes = new() { "Xray", "sing_box" }; public static readonly List coreTypes4VLESS = new() { "Xray", "sing_box" }; public static readonly List domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" }; public static readonly List domainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" }; diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index 3d2d9c23..a378dc15 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -252,7 +252,7 @@ namespace v2rayN.Handler { coreType = ECoreType.v2fly_v5, coreExes = new List { "v2ray" }, - arguments = "run", + arguments = "run -c config.json -format jsonv5", coreUrl = Global.v2flyCoreUrl, coreReleaseApiUrl = Global.v2flyCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl), coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip", diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index 0588564f..cdcc6d0a 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -147,10 +147,10 @@ namespace v2rayN.ViewModels public ReactiveCommand CheckUpdateNCmd { get; } public ReactiveCommand CheckUpdateV2flyCoreCmd { get; } - public ReactiveCommand CheckUpdateSagerNetCoreCmd { get; } + //public ReactiveCommand CheckUpdateSagerNetCoreCmd { get; } public ReactiveCommand CheckUpdateXrayCoreCmd { get; } - public ReactiveCommand CheckUpdateClashCoreCmd { get; } - public ReactiveCommand CheckUpdateClashMetaCoreCmd { get; } + //public ReactiveCommand CheckUpdateClashCoreCmd { get; } + //public ReactiveCommand CheckUpdateClashMetaCoreCmd { get; } public ReactiveCommand CheckUpdateSingBoxCoreCmd { get; } public ReactiveCommand CheckUpdateGeoCmd { get; } @@ -500,22 +500,22 @@ namespace v2rayN.ViewModels { CheckUpdateCore(ECoreType.v2fly_v5); }); - CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() => - { - CheckUpdateCore(ECoreType.SagerNet); - }); + //CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() => + //{ + // CheckUpdateCore(ECoreType.SagerNet); + //}); CheckUpdateXrayCoreCmd = ReactiveCommand.Create(() => { CheckUpdateCore(ECoreType.Xray); }); - CheckUpdateClashCoreCmd = ReactiveCommand.Create(() => - { - CheckUpdateCore(ECoreType.clash); - }); - CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() => - { - CheckUpdateCore(ECoreType.clash_meta); - }); + //CheckUpdateClashCoreCmd = ReactiveCommand.Create(() => + //{ + // CheckUpdateCore(ECoreType.clash); + //}); + //CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() => + //{ + // CheckUpdateCore(ECoreType.clash_meta); + //}); CheckUpdateSingBoxCoreCmd = ReactiveCommand.Create(() => { CheckUpdateCore(ECoreType.sing_box); diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml index c5340340..01c04451 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml +++ b/v2rayN/v2rayN/Views/MainWindow.xaml @@ -212,15 +212,15 @@ x:Name="menuCheckUpdateV2flyCore" Height="{StaticResource MenuItemHeight}" Header="V2fly v5 Core" /> - + Header="SagerNet Core" />--> - + + Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}"> @@ -751,8 +752,8 @@ + NoLeftClickDelay="True" + ToolTipText="v2rayN"> diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs index b9a588de..2ae46ad7 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs @@ -139,10 +139,10 @@ namespace v2rayN.Views //checkupdate this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.CheckUpdateV2flyCoreCmd, v => v.menuCheckUpdateV2flyCore).DisposeWith(disposables); - this.BindCommand(ViewModel, vm => vm.CheckUpdateSagerNetCoreCmd, v => v.menuCheckUpdateSagerNetCore).DisposeWith(disposables); + //this.BindCommand(ViewModel, vm => vm.CheckUpdateSagerNetCoreCmd, v => v.menuCheckUpdateSagerNetCore).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.CheckUpdateXrayCoreCmd, v => v.menuCheckUpdateXrayCore).DisposeWith(disposables); - this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.menuCheckUpdateClashCore).DisposeWith(disposables); - this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateClashMetaCore).DisposeWith(disposables); + //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.menuCheckUpdateClashCore).DisposeWith(disposables); + //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateClashMetaCore).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.CheckUpdateSingBoxCoreCmd, v => v.menuCheckUpdateSingBoxCore).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoCmd, v => v.menuCheckUpdateGeo).DisposeWith(disposables);