Compare commits

...

8 Commits
5.35 ... 5.36

Author SHA1 Message Date
2dust
4dfb0fa213 Update v2rayN.csproj 2022-09-20 20:25:35 +08:00
2dust
dcda8fc773 Update StatisticsHandler.cs 2022-09-20 20:25:32 +08:00
2dust
9c3fff8510 fix sing-box support 2022-09-20 20:19:31 +08:00
2dust
c3526ebfa3 Merge pull request #2640 from chika0801/master
add sing-box support
2022-09-20 20:04:15 +08:00
chika0801
28ba47a2f5 add sing-box support 2022-09-19 22:57:15 +08:00
chika0801
55a8b9085e add sing-box support 2022-09-19 22:56:15 +08:00
chika0801
2f250c5569 add sing-box support 2022-09-19 22:54:05 +08:00
2dust
e9d0565e6a fix ui 2022-09-13 20:42:30 +08:00
6 changed files with 28 additions and 17 deletions

View File

@@ -125,9 +125,9 @@
<data name="scServers.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 21</value>
</data>
<data name="cmsLv.TrayLocation" type="System.Drawing.Point, System.Drawing">
<metadata name="cmsLv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>226, 19</value>
</data>
</metadata>
<data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing">
<value>423, 24</value>
</data>
@@ -368,10 +368,10 @@
</value>
</data>
<data name="lvServers.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 20</value>
<value>0, 24</value>
</data>
<data name="lvServers.Size" type="System.Drawing.Size, System.Drawing">
<value>1003, 338</value>
<value>1003, 334</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lvServers.TabIndex" type="System.Int32, mscorlib">
@@ -396,7 +396,7 @@
<value>0, 0</value>
</data>
<data name="tabGroup.Size" type="System.Drawing.Size, System.Drawing">
<value>1003, 20</value>
<value>1003, 24</value>
</data>
<data name="tabGroup.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -593,12 +593,12 @@
<data name="&gt;&gt;scBig.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="notifyMain.TrayLocation" type="System.Drawing.Point, System.Drawing">
<metadata name="notifyMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</data>
<data name="cmsMain.TrayLocation" type="System.Drawing.Point, System.Drawing">
</metadata>
<metadata name="cmsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>137, 17</value>
</data>
</metadata>
<data name="cmsMain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -713,9 +713,9 @@
<data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing">
<metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>315, 17</value>
</data>
</metadata>
<data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 59</value>
</data>
@@ -1001,12 +1001,12 @@
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="$this.Localizable" type="System.Boolean, mscorlib">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</data>
<data name="$this.TrayHeight" type="System.Int32, mscorlib">
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>64</value>
</data>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>8, 15</value>
</data>

View File

@@ -20,6 +20,7 @@ namespace v2rayN
public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases";
public const string naiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
public const string tuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
public const string singboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";
public const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";

View File

@@ -181,6 +181,14 @@ namespace v2rayN.Handler
arguments = "-c config.json",
coreUrl = Global.tuicCoreUrl
});
coreInfos.Add(new CoreInfo
{
coreType = ECoreType.sing_box,
coreExes = new List<string> { "sing-box-client", "sing-box" },
arguments = "run",
coreUrl = Global.singboxCoreUrl
});
}
}

View File

@@ -127,7 +127,8 @@ namespace v2rayN.Handler
}
}
}
Thread.Sleep(1000 * config_.statisticsFreshRate);
var sleep = config_.statisticsFreshRate < 1 ? 1 : config_.statisticsFreshRate;
Thread.Sleep(1000 * sleep);
channel_.ConnectAsync();
}
catch (Exception ex)

View File

@@ -12,6 +12,7 @@ namespace v2rayN.Mode
hysteria = 21,
naiveproxy = 22,
tuic = 23,
sing_box = 24,
v2rayN = 99
}
}

View File

@@ -5,7 +5,7 @@
<OutputType>WinExe</OutputType>
<UseWindowsForms>true</UseWindowsForms>
<Copyright>Copyright © 2019-2022 (GPLv3)</Copyright>
<FileVersion>5.35</FileVersion>
<FileVersion>5.36</FileVersion>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>v2rayN.ico</ApplicationIcon>