From 11bfe7fee4a20ee29d59bfe46fcff1a473a2ffd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?=
 <renweikg@gmail.com>
Date: Thu, 2 Mar 2023 06:30:11 +0000
Subject: [PATCH] Update 661.sh

---
 661.sh | 85 +++++++++++++++++++---------------------------------------
 1 file changed, 28 insertions(+), 57 deletions(-)

diff --git a/661.sh b/661.sh
index 8e2e5a9..b95fb84 100644
--- a/661.sh
+++ b/661.sh
@@ -260,6 +260,33 @@ sleep 2 && ShowSOCKS5
 S5menu 
 }
 
+WGCFmenu(){
+white "------------------------------------------------------------------------------------"
+white " 当前 IPV4 接管出站流量情况如下 "
+white " ${WARPIPv4Status}"
+white "------------------------------------------------------------------------------------"
+white " 当前 IPV6 接管出站流量情况如下"
+white " ${WARPIPv6Status}"
+white "------------------------------------------------------------------------------------"
+}
+S5menu(){
+white "------------------------------------------------------------------------------------------------"
+white " 当前Socks5-WARP客户端本地代理情况如下(不支持 纯IPV6)"
+blue " ${S5Status}"
+white "------------------------------------------------------------------------------------------------"
+}
+
+back(){
+white "------------------------------------------------------------------------------------"
+white " 回主菜单，请按任意键"
+white " 退出脚本，请按Ctrl+C"
+get_char && bash CFwarp.sh
+}
+
+IP_Status_menu(){
+WGCFmenu;S5menu 
+}
+
 ONEWARPGO(){
 STOPwgcf(){
 if [[ -n $(type -P warp-cli) ]]; then
@@ -638,34 +665,7 @@ else
 red "输入错误，请重新选择" && warpinscha
 fi
 echo
-}  
-
-WGCFmenu(){
-white "------------------------------------------------------------------------------------"
-white " 当前 IPV4 接管出站流量情况如下 "
-white " ${WARPIPv4Status}"
-white "------------------------------------------------------------------------------------"
-white " 当前 IPV6 接管出站流量情况如下"
-white " ${WARPIPv6Status}"
-white "------------------------------------------------------------------------------------"
-}
-S5menu(){
-white "------------------------------------------------------------------------------------------------"
-white " 当前Socks5-WARP客户端本地代理127.0.0.1情况如下"
-blue " ${S5Status}"
-white "------------------------------------------------------------------------------------------------"
-}
-
-back(){
-white "------------------------------------------------------------------------------------"
-white " 回主菜单，请按任意键"
-white " 退出脚本，请按Ctrl+C"
-get_char && bash CFwarp.sh
-}
-
-IP_Status_menu(){
-WGCFmenu;S5menu 
-}
+} 
 
 warprefresh(){
 wget -N https://gitlab.com/rwkgyg/CFwarp/raw/main/wp-plus.py 
@@ -828,8 +828,6 @@ case "$cd" in
 esac
 }
 
-
-
 UPwpyg(){
 if [[ ! $(type -P warp-go) && ! $(type -P warp-cli) ]] && [[ ! -f '/root/CFwarp.sh' ]]; then
 red "未正常安装CFwarp脚本!" && exit
@@ -1205,33 +1203,6 @@ CheckWARP && first4 && ShowWGCF && WGCFmenu
 fi
 }
 
-WGCFmenu(){
-white "------------------------------------------------------------------------------------"
-white " 当前 IPV4 接管出站流量情况如下 "
-white " ${WARPIPv4Status}"
-white "------------------------------------------------------------------------------------"
-white " 当前 IPV6 接管出站流量情况如下"
-white " ${WARPIPv6Status}"
-white "------------------------------------------------------------------------------------"
-}
-S5menu(){
-white "------------------------------------------------------------------------------------------------"
-white " 当前Socks5-WARP客户端本地代理127.0.0.1情况如下"
-blue " ${S5Status}"
-white "------------------------------------------------------------------------------------------------"
-}
-
-back(){
-white "------------------------------------------------------------------------------------"
-white " 回主菜单，请按任意键"
-white " 退出脚本，请按Ctrl+C"
-get_char && bash CFwarp.sh
-}
-
-IP_Status_menu(){
-WGCFmenu;S5menu 
-}
-
 CheckWARP(){
 i=0
 wg-quick down wgcf >/dev/null 2>&1