V3.2 默认Xray核心更新到1.4.2版本! 更快更安全!

TheMRLL · Apr 7, 2021 · 8734047 · 8734047
1 parent b76c75b
commit 8734047
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 6 deletions.
diff --git a/default.aproj b/default.aproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="WinXray" libEmbed="true" icon="\forms\ico\app.ico" ui="win" output="WinXray.exe" CompanyName="WinXray" FileDescription="网络代理通用客户端" LegalCopyright="Copyright (C) WinXray" ProductName="WinXray" InternalName="WinXray" FileVersion="3.1" ProductVersion="3.1" publishDir="\WinXray" dstrip="false" local="false" ignored="false">
+<project ver="10" name="WinXray" libEmbed="true" icon="\forms\ico\app.ico" ui="win" output="WinXray.exe" CompanyName="WinXray" FileDescription="网络代理通用客户端" LegalCopyright="Copyright (C) WinXray" ProductName="WinXray" InternalName="WinXray" FileVersion="3.2" ProductVersion="3.2" publishDir="\WinXray" dstrip="false" local="false" ignored="false">
 	<file name="main" path="main.aardio"/>
 	<folder name="窗体" path="forms" comment="" embed="true" local="false" ignored="false">
 		<folder name="ico" path="forms\ico" comment="forms\ico" local="false" embed="false" ignored="false">

diff --git a/forms/main/outbound.aardio b/forms/main/outbound.aardio
@@ -302,9 +302,9 @@ var insertFieldMenu = {
 			winform.addOutboundField("headers",{method="GET"});
 		} 
 	};
-	{ "SSR混淆插件:obfs";
+	{ "SS混淆插件:obfs";
 		function(id){
-			winform.addOutboundField("obfs","");
+			winform.addOutboundField("obfs","plain","");
 		} 
 	};
 	{ "SSR混淆参数:obfsParam";

diff --git a/lib/xray/core/configJson.aardio b/lib/xray/core/configJson.aardio
@@ -379,6 +379,7 @@ write  = function(jsonPath,outbound,sockPort,httpPort){
 			};
 			streamSettings={
 				network = outbound.network : "tcp";
+				obfs = outbound.obfs : "";
 			};
 			tag="proxy"
 		};

diff --git a/main.aardio b/main.aardio
@@ -162,7 +162,7 @@ import win.ui;
 mainForm = win.form(text="WinXray";right=1019;bottom=679;bgcolor=15793151;border="none")
 mainForm.add(
 Promote={cls="plus";text="推荐";left=0;top=300;right=85;bottom=380;bkBottom=3;bkLeft=7;bkRight=8;bkTop=2;border={color=-65536};color=16777215;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={font=LOGFONT(h=-37;name='FontAwesome');padding={bottom=20}};iconText='\uF233';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=9};
-caption={cls="bkplus";text="WinXray 3.1";left=67;top=9;right=727;bottom=27;align="left";color=6052956;dl=1;dt=1;font=LOGFONT(h=-14);z=7};
+caption={cls="bkplus";text="WinXray 3.2";left=67;top=9;right=727;bottom=27;align="left";color=6052956;dl=1;dt=1;font=LOGFONT(h=-14);z=7};
 custom={cls="custom";left=83;top=40;right=1022;bottom=679;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;z=4};
 logo={cls="bkplus";text='\uF1D9';left=35;top=7;right=64;bottom=32;color=3054125;dl=1;dt=1;font=LOGFONT(h=-18;name='FontAwesome');z=6};
 navBar={cls="bkplus";left=0;top=37;right=83;bottom=681;bgcolor=3442175;db=1;dl=1;dt=1;z=1};

diff --git a/release/WinXray.7z b/release/WinXray.7z
diff --git a/release/WinXray32.7z b/release/WinXray32.7z
diff --git a/release/update/checksum.lzma b/release/update/checksum.lzma
diff --git a/release/update/files/WinXray.exe.lzma b/release/update/files/WinXray.exe.lzma
diff --git a/release/update/files/xray-core/xray.exe.lzma b/release/update/files/xray-core/xray.exe.lzma
diff --git a/release/update/version.txt b/release/update/version.txt
@@ -1,8 +1,8 @@
 {
-    "description":"修复右键新增/编辑代理服务器切换协议报错的问题以及优化代码！",
+    "description":"默认Xray核心更新到1.4.2版本! 更快更安全！",
     "format":".lzma",
     "main":"\\WinXray.exe",
     "updater":"\\WinXray.exe",
     "url":"https://raw.githubusercontent.com/TheMRLL/winxray/main/release/update/",
-    "version":"3.1"
+    "version":"3.2"
 }
diff --git a/winXray/WinXray.exe b/winXray/WinXray.exe
diff --git a/winXray/xray-core/xray.exe b/winXray/xray-core/xray.exe
diff --git a/xray-core/xray.exe b/xray-core/xray.exe