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.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Main/System/HeroUI/HeroUIManager.cs b/Main/System/HeroUI/HeroUIManager.cs
index fae06d9..aa03f11 100644
--- a/Main/System/HeroUI/HeroUIManager.cs
+++ b/Main/System/HeroUI/HeroUIManager.cs
@@ -304,8 +304,8 @@
}
// 鎺掑簭瑙勫垯锛氫笂闃�>姝﹀皢绛夌骇锛炵獊鐮寸瓑绾э紴姝﹀皢瑙夐啋闃剁骇锛炴灏嗗搧璐紴姝﹀皢鍚炲櫖鏄熺骇锛炴灏咺D
- bool isInTeamA = heroA.IsInTeamByTeamType(TeamType.Story);
- bool isInTeamB = heroB.IsInTeamByTeamType(TeamType.Story);
+ bool isInTeamA = heroA.IsInTeamByTeamType(BattlePreSetType.Story);
+ bool isInTeamB = heroB.IsInTeamByTeamType(BattlePreSetType.Story);
if (isInTeamA != isInTeamB)
{
return isInTeamA ? -1 : 1;
@@ -499,7 +499,7 @@
return 0;
var heroCnt = PackManager.Instance.GetItemCountByID(PackType.Hero, hero.heroId);
- if (!hero.IsInTeamByTeamType(TeamType.Story))
+ if (!hero.IsInTeamByTeamType(BattlePreSetType.Story))
{
if (hero.heroStar < hero.GetCurMaxStar() && heroCnt > 1)
{
@@ -579,7 +579,7 @@
if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Hero))
return;
- var team = TeamManager.Instance.GetTeam(TeamType.Story);
+ var team = TeamManager.Instance.GetTeam(BattlePreSetType.Story);
for (int i = 0; i < heroOnTeamRedpointList.Count; i++)
{
var redpoint = heroOnTeamRedpointList[i];
@@ -712,9 +712,9 @@
}
}
- void OnTeamChangeEvent(TeamType teamType)
+ void OnTeamChangeEvent(int teamType)
{
- if (teamType == TeamType.Story)
+ if (teamType == TeamManager.Instance.GetMainTeamID())
{
refreshRedPoint = true;
}
--
Gitblit v1.8.0