From d165af063d7365e143d92c3a950a0b52e683a66e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 23 一月 2026 15:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Team/TeamManager.cs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Main/System/Team/TeamManager.cs b/Main/System/Team/TeamManager.cs
index 4fc2b47..1fd3e90 100644
--- a/Main/System/Team/TeamManager.cs
+++ b/Main/System/Team/TeamManager.cs
@@ -72,16 +72,16 @@
 		return teamDict.ContainsKey(teamType);
 	}
 
-	//閫氳繃闃靛鏂规ID鑾峰彇闃靛
-	public TeamBase GetTeam(int teamType)
+	//閫氳繃闃靛鏂规ID鑾峰彇闃靛 浠�1寮�濮�
+	public TeamBase GetTeam(int presetID)
 	{
 		TeamBase team = null;
 
-		if (!teamDict.TryGetValue(teamType, out team))
+		if (!teamDict.TryGetValue(presetID, out team))
 		{
-			team = new TeamBase(teamType);
+			team = new TeamBase(presetID);
 			// team.CreateDefault(HeroManager.Instance.GetPowerfulHeroList());
-			teamDict.Add(teamType, team);
+			teamDict.Add(presetID, team);
 		}
 
 		return team;
@@ -109,6 +109,7 @@
 		return FuncPresetManager.Instance.GetFuncPresetID((int)BattlePreSetType.Story, (int)FuncPresetType.Team);
 	}
 
+	// 鑾峰彇鎸囧畾鐨勬柟妗圛D
 	public int GetTeamID(int battleType)
 	{
 		return FuncPresetManager.Instance.GetFuncPresetID(battleType, (int)FuncPresetType.Team);

--
Gitblit v1.8.0