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/Hero/HeroInfo.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Main/System/Hero/HeroInfo.cs b/Main/System/Hero/HeroInfo.cs
index 0646590..842b847 100644
--- a/Main/System/Hero/HeroInfo.cs
+++ b/Main/System/Hero/HeroInfo.cs
@@ -112,17 +112,17 @@
//鏄惁涓妜闃� 鏈嶅姟绔槦浼�
- public bool IsInTeamByTeamType(TeamType teamType)
+ public bool IsInTeamByTeamType(BattlePreSetType battleType)
{
- return TeamManager.Instance.GetTeam(teamType).HasHeroInServer(itemHero.guid);
+ return TeamManager.Instance.GetTeam(battleType).HasHeroInServer(itemHero.guid);
}
//鏄惁涓婁换浣曢樀瀹�
public bool IsInAnyTeam()
{
- for (int i = 1; i < (int)TeamType.Max; i++)
+ for (int i = 1; i < FuncPresetManager.Instance.teamPresetMaxID; i++)
{
- if (TeamManager.Instance.GetTeam((TeamType)i).HasHeroInServer(itemHero.guid))
+ if (TeamManager.Instance.GetTeam(i).HasHeroInServer(itemHero.guid))
{
return true;
}
@@ -133,9 +133,9 @@
//鏄惁涓婁换浣曢樀瀹癸紝涓斿彧鏈変竴鍙�
public bool IsInAnyTeamJustOne()
{
- for (int i = 1; i < (int)TeamType.Max; i++)
+ for (int i = 1; i < FuncPresetManager.Instance.teamPresetMaxID; i++)
{
- var team = TeamManager.Instance.GetTeam((TeamType)i);
+ var team = TeamManager.Instance.GetTeam(i);
if (team.HasHeroInServer(itemHero.guid))
{
if (team.GetTeamHeroCount() == 1)
@@ -148,11 +148,11 @@
//涓嬮樀鎵�鏈夐樀瀹�
public void LeaveAllTeam()
{
- for (int i = 1; i < (int)TeamType.Max; i++)
+ for (int i = 1; i < FuncPresetManager.Instance.teamPresetMaxID; i++)
{
int pos;
- var team = TeamManager.Instance.GetTeam((TeamType)i);
- if (TeamManager.Instance.GetTeam((TeamType)i).RemoveHero(this, out pos))
+ var team = TeamManager.Instance.GetTeam(i);
+ if (TeamManager.Instance.GetTeam(i).RemoveHero(this, out pos))
{
//濡傛灉鏄渶鍚庝竴涓灏嗭紝鍒欓粯璁や笂闃典竴涓�
team.SaveTeam();
--
Gitblit v1.8.0