From 7e499aa26c996f40aa08d75ca8c626b6ce55d7d4 Mon Sep 17 00:00:00 2001
From: huyufei <yufei.hu@castbox.fm>
Date: Tue, 30 Jul 2024 15:54:22 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=20=E9=92=88=E5=AF=B9=202021.3.4?=
 =?UTF-8?q?1=20=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85=E7=AE=A1=E7=BA=BF?=
 =?UTF-8?q?=E5=92=8C=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: huyufei <yufei.hu@castbox.fm>
---
 Editor/BuildTool/AppBuilder.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Editor/BuildTool/AppBuilder.cs b/Editor/BuildTool/AppBuilder.cs
index b787594..786b35b 100644
--- a/Editor/BuildTool/AppBuilder.cs
+++ b/Editor/BuildTool/AppBuilder.cs
@@ -1,3 +1,5 @@
+
+
 namespace Guru.Editor
 {
 	using System.Linq;
@@ -21,6 +23,10 @@ namespace Guru.Editor
 	    private const string GuruKeystorePass = "guru0622";
 	    private const string GuruAliasName = "guru";
 	    private const string GuruAliasPass = "guru0622";
+
+	    private const string UnityGradlePath_2021_3_41 =
+		    "/Applications/Unity/Hub/Editor/2021.3.41f1/PlaybackEngines/AndroidPlayer/Tools/gradle";
+	    
 	    private static string GuruKeystorePath => Application.dataPath + $"/Plugins/Android/{GuruKeystoreName}";
 	    private static string ProguardName => "proguard-user.txt";
 	    private static string ProguardPath => Application.dataPath + $"/Plugins/Android/{ProguardName}";
@@ -70,6 +76,8 @@ namespace Guru.Editor
 		    SwitchBuildPlatform(BuildTarget.Android);
 		    // 打包通用设置
 		    ChangeBuildPlayerCommonSetting(buildParam, BuildTargetGroup.Android);
+		    // Set GradlePath
+		    SetGradlePath();
 		    
 		    var isDebug = !buildParam.IsBuildRelease;
 		    var useMinify = buildParam.AndroidUseMinify;
@@ -141,7 +149,18 @@ namespace Guru.Editor
 	        return apkPath;
 	    }
 
-		/// <summary>
+	    private static void SetGradlePath()
+	    {
+#if UNITY_ANDROID && UNITY_2021_3_41
+		    if (Directory.Exists(UnityGradlePath_2021_3_41))
+		    {
+			    UnityEditor.Android.AndroidExternalToolsSettings.gradlePath = UnityGradlePath_2021_3_41;
+		    }
+#endif
+	    }
+
+
+	    /// <summary>
 		/// 部署 Guru 专用的 Keystore
 		/// </summary> 
         private static bool DeployAndroidKeystore()