Merge branch 'master' of another.github.com:mack-a/v2ray-agent

pull/534/merge
mack-a 2020-12-21 11:42:19 +08:00
commit afb41aa950
2 changed files with 10 additions and 9 deletions

View File

@ -64,6 +64,7 @@
- 不支持非root账户 - 不支持非root账户
- 现在脚本进入相对稳定的时期如果有功能不完善的地方请提issues。 - 现在脚本进入相对稳定的时期如果有功能不完善的地方请提issues。
- **脚本默认屏蔽BT**。 - **脚本默认屏蔽BT**。
- **中间的版本号升级意味可能不兼容之前安装的内容,如果不是追新用户或者必须升级的版本请谨慎升级。** 例如 2.2.\*不兼容2.1.\*
## 脚本目录 ## 脚本目录
- v2ray-core 【**/etc/v2ray-agent/v2ray**】 - v2ray-core 【**/etc/v2ray-agent/v2ray**】

View File

@ -1538,8 +1538,8 @@ EOF
"outbounds": [ "outbounds": [
{ {
"protocol": "blackhole", "protocol": "blackhole",
"settings": {} "settings": {},
"tag": "blocked", "tag": "blocked"
} }
] ]
} }
@ -1562,12 +1562,12 @@ EOF
EOF EOF
# VLESS_TCP_TLS/XTLS # VLESS_TCP_TLS/XTLS
# 回落nginx # 回落nginx
local fallbacksList='{"dest":31296,"xver":0}' local fallbacksList='{"dest":31300,"xver":0}'
if [[ -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]] if [[ ! -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]]
then then
# 回落trojan-go # 回落trojan-go
fallbacksList='{"dest":31300,"xver":0}' fallbacksList='{"dest":31296,"xver":0}'
fi fi
# VLESS_WS_TLS # VLESS_WS_TLS
@ -1865,12 +1865,12 @@ EOF
EOF EOF
# VLESS_TCP_TLS/XTLS # VLESS_TCP_TLS/XTLS
# 回落nginx # 回落nginx
local fallbacksList='{"dest":31296,"xver":0}' local fallbacksList='{"dest":31300,"xver":0}'
if [[ -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]] if [[ ! -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]]
then then
# 回落trojan-go # 回落trojan-go
fallbacksList='{"dest":31300,"xver":0}' fallbacksList='{"dest":31296,"xver":0}'
fi fi
# VLESS_WS_TLS # VLESS_WS_TLS
@ -3009,7 +3009,7 @@ menu(){
cd cd
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者mack-a" echoContent green "作者mack-a"
echoContent green "当前版本v2.2.1" echoContent green "当前版本v2.2.2"
echoContent green "Githubhttps://github.com/mack-a/v2ray-agent" echoContent green "Githubhttps://github.com/mack-a/v2ray-agent"
echoContent green "描述:七合一共存脚本" echoContent green "描述:七合一共存脚本"
echoContent red "==============================================================" echoContent red "=============================================================="