From 1aadfa4182c6be9ffd92fba777b6ad895ce15389 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:27:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8Dxr?=
 =?UTF-8?q?ay-core=E5=85=A8=E5=B1=80=E5=88=86=E6=B5=81=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=E3=80=81=E4=BF=AE=E5=A4=8Dsing-box?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=A4=A7=E9=99=86=E5=9F=9F=E5=90=8D=E5=90=8E?=
 =?UTF-8?q?GooglePlay=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 3c2d42a..da6816a 100644
--- a/install.sh
+++ b/install.sh
@@ -3248,6 +3248,7 @@ addSingBoxRouteRule() {
   }
 }
 EOF
+        jq 'if .route.rule_set == [] then del(.route.rule_set) else . end' "${singBoxConfigPath}${routingName}.json" >"${singBoxConfigPath}${routingName}_tmp.json" && mv "${singBoxConfigPath}${routingName}_tmp.json" "${singBoxConfigPath}${routingName}.json"
     fi
 
 }
@@ -5886,7 +5887,7 @@ ipv6Routing() {
             if [[ "${coreInstallType}" == "1" ]]; then
                 addXrayOutbound IPv6_out
                 removeXrayOutbound IPv4_out
-                removeXrayOutbound direct
+                removeXrayOutbound z_direct_outbound
                 removeXrayOutbound blackhole_out
                 removeXrayOutbound wireguard_out_IPv4
                 removeXrayOutbound wireguard_out_IPv6
@@ -6062,7 +6063,11 @@ blacklist() {
         fi
 
         if [[ -n "${singBoxConfigPath}" ]]; then
+
             addSingBoxRouteRule "cn_block_outbound" "cn" "cn_block_route"
+
+            addSingBoxRouteRule "01_direct_outbound" "googleapis.com,googleapis.cn,xn--ngstr-lra8j.com,gstatic.com" "cn_01_google_play_route"
+
             addSingBoxOutbound "cn_block_outbound"
             addSingBoxOutbound "01_direct_outbound"
         fi
@@ -6078,6 +6083,8 @@ blacklist() {
             removeSingBoxConfig "cn_block_route"
             removeSingBoxConfig "cn_block_outbound"
 
+            removeSingBoxConfig "cn_01_google_play_route"
+
             removeSingBoxConfig "block_domain_route"
             removeSingBoxConfig "block_domain_outbound"
         fi
@@ -6367,7 +6374,7 @@ warpRoutingReg() {
 
                 removeXrayOutbound IPv4_out
                 removeXrayOutbound IPv6_out
-                removeXrayOutbound direct
+                removeXrayOutbound z_direct_outbound
                 removeXrayOutbound blackhole_out
 
                 rm ${configPath}09_routing.json >/dev/null 2>&1
@@ -6608,7 +6615,7 @@ setSocks5OutboundRoutingAll() {
         if [[ "${coreInstallType}" == "1" ]]; then
             removeXrayOutbound IPv4_out
             removeXrayOutbound IPv6_out
-            removeXrayOutbound direct
+            removeXrayOutbound z_direct_outbound
             removeXrayOutbound blackhole_out
 
             rm ${configPath}09_routing.json >/dev/null 2>&1
@@ -8728,7 +8735,7 @@ menu() {
     cd "$HOME" || exit
     echoContent red "\n=============================================================="
     echoContent green "作者：mack-a"
-    echoContent green "当前版本：v3.2.10"
+    echoContent green "当前版本：v3.2.11"
     echoContent green "Github：https://github.com/mack-a/v2ray-agent"
     echoContent green "描述：八合一共存脚本\c"
     showInstallStatus