From 69fdc58cb97714f856df268f08451f2ba7e5ecf2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 21 一月 2026 10:40:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/HeroUI/HeroUIManager.OnTeam.cs | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/Main/System/HeroUI/HeroUIManager.OnTeam.cs b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
index 6fb8cb2..397450c 100644
--- a/Main/System/HeroUI/HeroUIManager.OnTeam.cs
+++ b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
@@ -11,8 +11,8 @@
#region 甯冮樀鐣岄潰
public List<string> heroOnTeamSortList { get; private set; } = new List<string>(); //涓嶅悓涓婇樀鐨勫垪琛ㄦ帓搴�
- private TeamType m_SelectTeamType = TeamType.Story; //褰撳墠閫変腑鐨勬槸鍝釜闃靛, 甯冮樀鐩稿叧閫昏緫浣跨敤
- public TeamType selectTeamType
+ private int m_SelectTeamType = 1; //褰撳墠閫変腑鐨勬槸鍝釜鍏ㄥ眬鏂规ID, 甯冮樀鐩稿叧閫昏緫浣跨敤
+ public int selectTeamType
{
get { return m_SelectTeamType; }
set
@@ -20,7 +20,7 @@
if (m_SelectTeamType == value)
return;
//涓婁竴涓樀瀹归渶瑕佹仮澶嶅埌鍘熺姸鎬�
- if (m_SelectTeamType != TeamType.None)
+ if (m_SelectTeamType != 0)
{
TeamManager.Instance.GetTeam(m_SelectTeamType).RestoreTeam();
}
@@ -28,6 +28,8 @@
m_SelectTeamType = value;
}
}
+
+ public int setlectTabIndex = 0; //鎴樻枟鎬绘爣绛� 瀵瑰簲 BattlePreSetType
public List<int> selectListTeamPos = new List<int>(); //甯冮樀鐣岄潰 绛涢�夋潯浠�
@@ -88,10 +90,9 @@
/// <summary>
/// 鎸夐槦浼嶈幏寰楅樀鍨嬶紙鍥藉鍏夌幆锛夊睘鎬�
/// </summary>
- /// <param name="teamType"></param>
/// <param name="isPreview">true 瀹㈡埛绔瑙堥樀瀹癸紝榛樿false 鏈嶅姟鍣ㄩ樀瀹�</param>
/// <returns></returns>
- public Dictionary<int, int> GetCountryAttrs(TeamType teamType, bool isPreview = false)
+ public Dictionary<int, int> GetCountryAttrs(int teamType, bool isPreview = false)
{
Dictionary<int, int> countryAttrs = new Dictionary<int, int>();
Int2 result = GetMaxCountHeroCountry(teamType, isPreview);
@@ -164,7 +165,7 @@
/// <param name="teamType"></param>
/// <param name="isPreview">true 瀹㈡埛绔瑙堥樀瀹癸紝榛樿false 鏈嶅姟鍣ㄩ樀瀹�</param>
/// <returns></returns>
- public Dictionary<HeroCountry, int> GetCountryHeroCountByTeamType(TeamType teamType, bool isPreview = false)
+ public Dictionary<HeroCountry, int> GetCountryHeroCountByTeamType(int teamType, bool isPreview = false)
{
Dictionary<HeroCountry, int> heroCountryCount = new Dictionary<HeroCountry, int>();
@@ -233,7 +234,7 @@
/// <param name="teamType"></param>
/// <param name="isPreview">true 瀹㈡埛绔瑙堥樀瀹癸紝榛樿false 鏈嶅姟鍣ㄩ樀瀹�</param>
/// <returns></returns>
- public Int2 GetMaxCountHeroCountry(TeamType teamType, bool isPreview = false)
+ public Int2 GetMaxCountHeroCountry(int teamType, bool isPreview = false)
{
var countryCountDict = GetCountryHeroCountByTeamType(teamType, isPreview);
//鎵惧埌鏈�澶х殑鍥藉鍜屾暟閲�
@@ -268,18 +269,6 @@
}
}
return new Int2((int)country, maxValue);
- }
-
- //鍦ㄤ笉鍚岄〉绛句笅閫堿ttackType 0 鏀诲嚮闃靛 1 闃插畧闃靛
- public int GetSelectTeamTypeByAttackType(int AttackType)
- {
- if (selectTeamType == TeamType.Arena || selectTeamType == TeamType.ArenaDefense)
- {
- return AttackType == 0 ? (int)TeamType.Arena : (int)TeamType.ArenaDefense;
- }
-
-
- return (int)TeamType.Story;
}
@@ -534,7 +523,7 @@
{
int minLV = int.MaxValue;
int minID = -1;
- var team = TeamManager.Instance.GetTeam(TeamType.Story);
+ var team = TeamManager.Instance.GetTeam(TeamManager.Instance.GetMainTeamID());
for (int i = 0; i < team.serverHeroes.Length; i++)
{
if (team.serverHeroes[i] != null)
--
Gitblit v1.8.0