Skip to content

Commit

Permalink
V3.6 更新默认Xray 核心到V1.45版本!
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMRLL authored Oct 1, 2021
1 parent 855f40e commit b574096
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 10 deletions.
8 changes: 4 additions & 4 deletions default.aproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?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.6" ProductVersion="3.6" 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.7" ProductVersion="3.7" 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">
<folder name="ico" path="forms\ico" comment="forms\ico">
<file name="app-direct.ico" path="forms\ico\app-direct.ico" comment="forms\ico\app-direct.ico"/>
<file name="app-pac.ico" path="forms\ico\app-pac.ico" comment="forms\ico\app-pac.ico"/>
<file name="app.ico" path="forms\ico\app.ico" comment="forms\ico\app.ico"/>
Expand All @@ -11,11 +11,11 @@
<file name="outbound.aardio" path="forms\main\outbound.aardio" comment="forms\main\outbound.aardio"/>
<file name="pac.aardio" path="forms\main\pac.aardio" comment="forms\main\pac.aardio"/>
<file name="xray.aardio" path="forms\main\xray.aardio" comment="forms\main\xray.aardio"/>
<folder name="config" path="forms\main\config" comment="forms\main\config" local="false" embed="false" ignored="false">
<folder name="config" path="forms\main\config" comment="forms\main\config">
<file name="advancedConfig.aardio" path="forms\main\config\advancedConfig.aardio" comment="forms\main\config\advancedConfig.aardio"/>
<file name="jsonConfig.aardio" path="forms\main\config\jsonConfig.aardio" comment="forms\main\config\jsonConfig.aardio"/>
<file name="subscription.aardio" path="forms\main\config\subscription.aardio" comment="forms\main\config\subscription.aardio"/>
<folder name="coreConfigs" path="forms\main\config\coreConfigs" comment="forms\main\config\coreConfigs" local="false" embed="false">
<folder name="coreConfigs" path="forms\main\config\coreConfigs" comment="forms\main\config\coreConfigs">
<file name="default.json" path="forms\main\config\coreConfigs\default.json" comment="forms\main\config\coreConfigs\default.json"/>
<file name="xray.rules.json" path="forms\main\config\coreConfigs\xray.rules.json" comment="forms\main\config\coreConfigs\xray.rules.json"/>
</folder>
Expand Down
2 changes: 1 addition & 1 deletion forms/main/config/jsonConfig.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ btnUpdateNaiveCore={cls="plus";text="下载 / 更新 NaÏveProxy Core";left=448;
btnUpdateRules={cls="plus";text="下载 / 更新 路由规则";left=227;top=39;right=425;bottom=67;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF041';notify=1;textPadding={left=50};z=15};
btnUpdateSsrCore={cls="plus";text="下载 / 更新 SSR Core";left=16;top=39;right=214;bottom=67;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-17;name='FontAwesome');padding={left=18}};iconText='\uF1D8';notify=1;textPadding={left=50};z=16};
btnUpdatev2rayCore={cls="plus";text="下载 / 更新 V2ray Core";left=227;top=5;right=425;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF27D';notify=1;textPadding={left=50};z=14};
btnUpdatexrayCore={cls="plus";text="下载 / 更新 Xray Core";left=16;top=5;right=223;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF0E7';notify=1;textPadding={left=50};z=13};
btnUpdatexrayCore={cls="plus";text="下载 / 更新 Xray Core";left=16;top=5;right=223;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF2D3';notify=1;textPadding={left=50};z=13};
editCoreConfig={cls="edit";left=9;top=72;right=930;bottom=594;db=1;dl=1;dr=1;dt=1;edge=1;hide=1;hscroll=1;multiline=1;vscroll=1;z=7};
editOutbounds={cls="edit";left=9;top=29;right=930;bottom=594;db=1;dl=1;dr=1;dt=1;edge=1;hscroll=1;multiline=1;vscroll=1;z=8};
lbTip={cls="static";text="可在下面输入多行服务器分享链接,或JSON数组( 点击字段名会显示用法说明 ):";left=11;top=9;right=899;bottom=29;color=3947580;dl=1;dr=1;dt=1;font=LOGFONT(h=-13);transparent=1;z=9};
Expand Down
1 change: 0 additions & 1 deletion lib/xray/core/configJson.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ write = function(jsonPath,outbound,sockPort,httpPort){
};
streamSettings={
network = outbound.network : "tcp";
obfs = outbound.obfs : "";
};
tag="proxy"
};
Expand Down
2 changes: 1 addition & 1 deletion main.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -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.6";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.7";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=3};
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};
Expand Down
Binary file modified release/WinXray.7z
Binary file not shown.
Binary file modified release/WinXray32.7z
Binary file not shown.
Binary file modified release/update/checksum.lzma
Binary file not shown.
Binary file modified release/update/files/WinXray.exe.lzma
Binary file not shown.
Binary file modified release/update/files/xray-core/xray.exe.lzma
Binary file not shown.
4 changes: 2 additions & 2 deletions release/update/version.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"description":"修复win10下全局模式UWP的错误问题!",
"description":"更新默认Xray 核心到V1.45版本!",
"format":".lzma",
"main":"\\WinXray.exe",
"updater":"\\WinXray.exe",
"url":"https://raw.githubusercontent.com/TheMRLL/winxray/main/release/update/",
"version":"3.6"
"version":"3.7"
}
Binary file modified winXray/WinXray.exe
Binary file not shown.
Binary file modified winXray/xray-core/xray.exe
Binary file not shown.
Binary file modified xray-core-32/xray.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion xray-core/config.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"inbounds":[{"listen":"127.0.0.1","port":1081,"protocol":"socks","settings":{"auth":"noauth","udp":true},"sniffing":{"destOverride":["http","tls"],"enabled":true},"tag":"proxy"},{"listen":"127.0.0.1","port":1082,"protocol":"http","settings":{},"sniffing":{"destOverride":["http","tls"],"enabled":true},"tag":"http_proxy"}],"log":{"access":"","error":"","loglevel":"warning"},"outbounds":[{"mux":{"concurrency":8,"enabled":true},"protocol":"vmess","settings":{"vnext":[{"address":"sh2.v0.b2cloud.xyz","port":10003,"users":[{"alterId":2,"email":"[email protected]","id":"5c871677-cc07-3ff9-959c-c53be60be019","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"headers":{"Host":"03.v0.cloudgo.xyz"},"path":"/v2ray"}},"tag":"proxy"},{"protocol":"freedom","settings":{},"tag":"direct"},{"protocol":"blackhole","settings":{"response":{"type":"http"}},"tag":"block"}],"routing":{"domainStrategy":"IPIfNonMatch","rules":[{"inboundTag":["api"],"outboundTag":"api","type":"field"}]}}
{"inbounds":[{"listen":"127.0.0.1","port":1081,"protocol":"socks","tag":"proxy","settings":{"auth":"noauth","udp":true},"sniffing":{"destOverride":["http","tls"],"enabled":true}},{"listen":"127.0.0.1","port":1082,"protocol":"http","tag":"http_proxy","settings":{},"sniffing":{"destOverride":["http","tls"],"enabled":true}}],"outbounds":[{"protocol":"vmess","tag":"proxy","mux":{"concurrency":8,"enabled":true},"settings":{"vnext":[{"address":"k3.2y7.top","port":41321,"users":[{"alterId":0,"email":"[email protected]","id":"fc065ec9-8382-c908-1748-1b4a3df5e67a","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"path":"/62797a7468776331696c7775","headers":{"Host":""}}}},{"protocol":"freedom","tag":"direct","settings":{}},{"protocol":"blackhole","tag":"block","settings":{"response":{"type":"http"}}}],"log":{"access":"","error":"","loglevel":"warning"},"routing":{"domainStrategy":"IPIfNonMatch","rules":[{"inboundTag":["api"],"outboundTag":"api","type":"field"}]}}
Binary file modified xray-core/xray.exe
Binary file not shown.

0 comments on commit b574096

Please sign in to comment.