Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-01-19 05:36:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

sync cg3s

Browse source
This commit is contained in:
koll zhu 2024-11-19 23:33:49 +08:00
parent b11e68cfd8
commit 9c9076d70d
17 changed files with 39 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
v2rayN/AmazTool/AmazTool.csproj
View file

@ -8,6 +8,14 @@
<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright> <Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
<FileVersion>1.3.0</FileVersion> <FileVersion>1.3.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Assets\en-US.json" /> <EmbeddedResource Include="Assets\en-US.json" />

8
v2rayN/PacLib/PacLib.csproj
View file

@ -5,6 +5,14 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Resources.Designer.cs"> <Compile Update="Resources.Designer.cs">
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>

3
v2rayN/ServiceLib/Global.cs
View file

@ -9,7 +9,7 @@
public const string GithubApiUrl = "https://api.github.com/repos"; public const string GithubApiUrl = "https://api.github.com/repos";
public const string V2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases"; public const string V2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases";
public const string XrayCoreUrl = "https://github.com/XTLS/Xray-core/releases"; public const string XrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
public const string NUrl = @"https://github.com/2dust/v2rayN/releases"; public const string NUrl = @"https://github.com/cg3s/v2rayN/releases";
public const string MihomoCoreUrl = "https://github.com/MetaCubeX/mihomo/releases"; public const string MihomoCoreUrl = "https://github.com/MetaCubeX/mihomo/releases";
public const string HysteriaCoreUrl = "https://github.com/apernet/hysteria/releases"; public const string HysteriaCoreUrl = "https://github.com/apernet/hysteria/releases";
public const string NaiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases"; public const string NaiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
@ -22,7 +22,6 @@
public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs"; public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
public const string IPAPIUrl = "https://ipapi.co/json"; public const string IPAPIUrl = "https://ipapi.co/json";
public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
public const string ConfigFileName = "guiNConfig.json"; public const string ConfigFileName = "guiNConfig.json";
public const string CoreConfigFileName = "config.json"; public const string CoreConfigFileName = "config.json";
public const string CorePreConfigFileName = "configPre.json"; public const string CorePreConfigFileName = "configPre.json";

9
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View file

@ -1167,15 +1167,6 @@ namespace ServiceLib.Resx {
} }
} }
/// <summary>
/// 查找类似 Promotion 的本地化字符串。
/// </summary>
public static string menuPromotion {
get {
return ResourceManager.GetString("menuPromotion", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Latency Test 的本地化字符串。 /// 查找类似 Latency Test 的本地化字符串。
/// </summary> /// </summary>

3
v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
View file

@ -430,9 +430,6 @@
<data name="menuOptionSetting" xml:space="preserve"> <data name="menuOptionSetting" xml:space="preserve">
<value>تنظیمات پارامتر</value> <value>تنظیمات پارامتر</value>
</data> </data>
<data name="menuPromotion" xml:space="preserve">
<value>ترفیع</value>
</data>
<data name="menuReload" xml:space="preserve"> <data name="menuReload" xml:space="preserve">
<value>بارگذاری مجدد</value> <value>بارگذاری مجدد</value>
</data> </data>

3
v2rayN/ServiceLib/Resx/ResUI.resx
View file

@ -430,9 +430,6 @@
<data name="menuOptionSetting" xml:space="preserve"> <data name="menuOptionSetting" xml:space="preserve">
<value>Option Setting</value> <value>Option Setting</value>
</data> </data>
<data name="menuPromotion" xml:space="preserve">
<value>Promotion</value>
</data>
<data name="menuReload" xml:space="preserve"> <data name="menuReload" xml:space="preserve">
<value>Reload</value> <value>Reload</value>
</data> </data>

3
v2rayN/ServiceLib/Resx/ResUI.ru.resx
View file

@ -430,9 +430,6 @@
<data name="menuOptionSetting" xml:space="preserve"> <data name="menuOptionSetting" xml:space="preserve">
<value>Настройка параметров</value> <value>Настройка параметров</value>
</data> </data>
<data name="menuPromotion" xml:space="preserve">
<value>Содействие</value>
</data>
<data name="menuReload" xml:space="preserve"> <data name="menuReload" xml:space="preserve">
<value>Перезагрузка</value> <value>Перезагрузка</value>
</data> </data>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
View file

@ -430,9 +430,6 @@
<data name="menuOptionSetting" xml:space="preserve"> <data name="menuOptionSetting" xml:space="preserve">
<value>参数设置</value> <value>参数设置</value>
</data> </data>
<data name="menuPromotion" xml:space="preserve">
<value>推广</value>
</data>
<data name="menuReload" xml:space="preserve"> <data name="menuReload" xml:space="preserve">
<value>重启服务</value> <value>重启服务</value>
</data> </data>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
View file

@ -429,9 +429,6 @@
<data name="menuOptionSetting" xml:space="preserve"> <data name="menuOptionSetting" xml:space="preserve">
<value>參數設定</value> <value>參數設定</value>
</data> </data>
<data name="menuPromotion" xml:space="preserve">
<value>推廣</value>
</data>
<data name="menuReload" xml:space="preserve"> <data name="menuReload" xml:space="preserve">
<value>重啟服務</value> <value>重啟服務</value>
</data> </data>

8
v2rayN/ServiceLib/ServiceLib.csproj
View file

@ -6,6 +6,14 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>7.1.3</Version> <Version>7.1.3</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Downloader" Version="3.2.1" /> <PackageReference Include="Downloader" Version="3.2.1" />

8
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
View file

@ -103,14 +103,6 @@
</MenuItem.Header> </MenuItem.Header>
</MenuItem> </MenuItem>
<MenuItem x:Name="menuPromotion" Padding="8,0">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem x:Name="menuClose" Padding="8,0"> <MenuItem x:Name="menuClose" Padding="8,0">
<MenuItem.Header> <MenuItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

6
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View file

@ -31,7 +31,6 @@ namespace v2rayN.Desktop.Views
this.KeyDown += MainWindow_KeyDown; this.KeyDown += MainWindow_KeyDown;
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click; menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click;
menuCheckUpdate.Click += MenuCheckUpdate_Click; menuCheckUpdate.Click += MenuCheckUpdate_Click;
menuBackupAndRestore.Click += MenuBackupAndRestore_Click; menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
menuClose.Click += MenuClose_Click; menuClose.Click += MenuClose_Click;
@ -321,11 +320,6 @@ namespace v2rayN.Desktop.Views
} }
} }
private void menuPromotion_Click(object? sender, RoutedEventArgs e)
{
Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
}
private void menuSettingsSetUWP_Click(object? sender, RoutedEventArgs e) private void menuSettingsSetUWP_Click(object? sender, RoutedEventArgs e)
{ {
Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe")); Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));

6
v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
View file

@ -10,6 +10,12 @@
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault> <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<AssemblyName>v2rayN</AssemblyName> <AssemblyName>v2rayN</AssemblyName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />

10
v2rayN/v2rayN/Properties/Resources.Designer.cs generated
View file

@ -170,16 +170,6 @@ namespace v2rayN.Properties {
} }
} }
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap promotion {
get {
object obj = ResourceManager.GetObject("promotion", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>

14
v2rayN/v2rayN/Views/MainWindow.xaml
View file

@ -248,20 +248,6 @@
</MenuItem> </MenuItem>
</Menu> </Menu>
<Separator /> <Separator />
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
<MenuItem x:Name="menuPromotion" Padding="8,0">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon
Margin="{StaticResource MarginRight8}"
VerticalAlignment="Center"
Kind="VolumeHigh" />
<TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
</StackPanel>
</MenuItem.Header>
</MenuItem>
</Menu>
<Separator />
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}"> <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
<MenuItem x:Name="menuClose" Padding="8,0"> <MenuItem x:Name="menuClose" Padding="8,0">
<MenuItem.Header> <MenuItem.Header>

6
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View file

@ -31,7 +31,6 @@ namespace v2rayN.Views
this.Closing += MainWindow_Closing; this.Closing += MainWindow_Closing;
this.PreviewKeyDown += MainWindow_PreviewKeyDown; this.PreviewKeyDown += MainWindow_PreviewKeyDown;
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click; menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click;
menuClose.Click += menuClose_Click; menuClose.Click += menuClose_Click;
menuCheckUpdate.Click += MenuCheckUpdate_Click; menuCheckUpdate.Click += MenuCheckUpdate_Click;
menuBackupAndRestore.Click += MenuBackupAndRestore_Click; menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
@ -310,11 +309,6 @@ namespace v2rayN.Views
ShowHideWindow(false); ShowHideWindow(false);
} }
private void menuPromotion_Click(object sender, RoutedEventArgs e)
{
Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
}
private void menuSettingsSetUWP_Click(object sender, RoutedEventArgs e) private void menuSettingsSetUWP_Click(object sender, RoutedEventArgs e)
{ {
Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe")); Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));

8
v2rayN/v2rayN/v2rayN.csproj
View file

@ -12,6 +12,14 @@
<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright> <Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="5.1.0" /> <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />