Skip to content

Commit

Permalink
V2.4.1 修复检查更新错误！
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheMRLL
TheMRLL authored Jan 15, 2021
1 parent b25e67d commit e6d8055
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion default.aproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<project ver="10" name="winXray" libEmbed="true" icon="\app.ico" ui="win" output="winXray.exe" CompanyName="winXray" FileDescription="xray,xray,trojan,shadowsocks 通用客户端" LegalCopyright="Copyright (C) winXray 2020" ProductName="winXray" InternalName="winXray" FileVersion="2.3.0.07" ProductVersion="2.3.0.07" publishDir="\winXray" dstrip="false" local="false">
<project ver="10" name="winXray" libEmbed="true" icon="\app.ico" ui="win" output="winXray.exe" CompanyName="winXray" FileDescription="xray,xray,trojan,shadowsocks 通用客户端" LegalCopyright="Copyright (C) winXray 2020" ProductName="winXray" InternalName="winXray" FileVersion="2.3.0.09" ProductVersion="2.3.0.09" publishDir="\winXray" dstrip="false" local="false">
<file name="main" path="main.aardio"/>
<folder name="窗体" path="forms" comment="" embed="true" local="false">
<folder name="main" path="forms\main" comment="forms\main" local="false" embed="false">
Expand Down
36 changes: 18 additions & 18 deletions main.aardio
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ elseif(_ARGV.updateTime){
time.ntp.updateSystemTime();
return;
}
else {
/*else {
import process;
import fsys.update.simpleMain;

Expand All @@ -150,27 +150,27 @@ else {
function(version,description,status){})){
return 0;
}
}
} */

/*}}*/

import fonts.fontAwesome;
import win.ui;
/*DSG{{*/
mainForm = win.form(text="winXray";right=1019;bottom=679;bgcolor=15793151;border="none")
mainForm.add(
button={cls="button";text="winxray";left=15;top=307;right=70;bottom=362;z=9};
caption={cls="bkplus";text="winXray 2.4";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};
navJsonConfig={cls="plus";text="配置";left=0;top=132;right=85;bottom=212;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='\uF0F6';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=5};
navStart={cls="plus";text="首页";left=0;top=48;right=85;bottom=128;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='\uF015';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=3};
navTools={cls="plus";text="工具";left=0;top=216;right=85;bottom=296;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='\uF0AD';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=8};
titleBar={cls="bkplus";left=0;top=0;right=1022;bottom=38;bgcolor=8036607;dl=1;dr=1;dt=1;forecolor=16777215;linearGradient=180;z=2}
)
/*}}*/

import win.ui;
/*DSG{{*/
mainForm = win.form(text="winXray";right=1019;bottom=679;bgcolor=15793151;border="none")
mainForm.add(
button={cls="button";text="winxray";left=15;top=307;right=70;bottom=362;z=9};
caption={cls="bkplus";text="winXray 2.4";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};
navJsonConfig={cls="plus";text="配置";left=0;top=132;right=85;bottom=212;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='\uF0F6';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=5};
navStart={cls="plus";text="首页";left=0;top=48;right=85;bottom=128;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='\uF015';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=3};
navTools={cls="plus";text="工具";left=0;top=216;right=85;bottom=296;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='\uF0AD';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=8};
titleBar={cls="bkplus";left=0;top=0;right=1022;bottom=38;bgcolor=8036607;dl=1;dr=1;dt=1;forecolor=16777215;linearGradient=180;z=2}
)
/*}}*/
import win.ui.atom;
var atom,hwnd = mainForm.atom("DFA5667E-1D8C-49C0-8918-C6FEC2DECCF8");
if(!atom){
Expand Down
Binary file modified winXray/winXray.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion winXray/xray-core/config.json
View file
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":"172.104.81.92","port":29000,"users":[{"alterId":2,"email":"[email protected]","id":"55b949b2-4240-4985-8d54-d1f083ff5fc7","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"headers":{"Host":""},"path":"/dwn"}},"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","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":"t2.b2cloud.xyz","port":11104,"users":[{"alterId":2,"email":"[email protected]","id":"5c871677-cc07-3ff9-959c-c53be60be019","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"headers":{"Host":"hkt5.b2cloud.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"}]}}
2 changes: 1 addition & 1 deletion xray-core/config.json
View file
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":"t1.b2cloud.xyz","port":3106,"users":[{"alterId":2,"email":"[email protected]","id":"5c871677-cc07-3ff9-959c-c53be60be019","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"headers":{"Host":"hk07.b2cloud.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","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":"aga011.b2cloud.xyz","port":11091,"users":[{"alterId":2,"email":"[email protected]","id":"5c871677-cc07-3ff9-959c-c53be60be019","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"headers":{"Host":""},"path":"/aga/091"}},"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"}]}}

0 comments on commit e6d8055

Please sign in to comment.