From ac93e899d5c6331e89ccae552ecbb502a9652d01 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 27 一月 2026 18:49:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Hero/HeroInfo.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Main/System/Hero/HeroInfo.cs b/Main/System/Hero/HeroInfo.cs
index 1a83b6c..36df488 100644
--- a/Main/System/Hero/HeroInfo.cs
+++ b/Main/System/Hero/HeroInfo.cs
@@ -49,14 +49,24 @@
get
{
var _list = itemHero.GetUseData(83);
- // 榛樿娌℃湁棰勮鐨勮瘽灏辨槸鐢熸晥鐨�
if (_list == null || _list.Count == 0)
- return true;
+ return false;
var id = FuncPresetManager.Instance.GetFuncPresetID((int)FuncPresetType.Team);
return _list.Contains(id);
}
}
+ //鍙鍦ㄩ璁句腑鍒欎唬琛ㄦ湁婵�娲伙紝浣嗕笉涓�瀹氭縺娲诲睘鎬�
+ public bool isActive
+ {
+ get
+ {
+ var _list = itemHero.GetUseData(83);
+ if (_list == null || _list.Count == 0)
+ return false;
+ return true;
+ }
+ }
public bool isLock
{
@@ -125,7 +135,7 @@
//鏄惁涓婁换浣曢樀瀹�
public bool IsInAnyTeam()
{
- var maxCnt = FuncPresetManager.Instance.GetUnlockCnt((int)FuncPresetType.Mingge);
+ var maxCnt = FuncPresetManager.Instance.GetUnlockCnt((int)FuncPresetType.Team);
for (int i = 1; i < maxCnt + 1; i++)
{
if (TeamManager.Instance.GetTeam(i).HasHeroInServer(itemHero.guid))
@@ -139,7 +149,7 @@
//鏄惁涓婁换浣曢樀瀹癸紝涓斿彧鏈変竴鍙�
public bool IsInAnyTeamJustOne()
{
- var maxCnt = FuncPresetManager.Instance.GetUnlockCnt((int)FuncPresetType.Mingge);
+ var maxCnt = FuncPresetManager.Instance.GetUnlockCnt((int)FuncPresetType.Team);
for (int i = 1; i < maxCnt + 1; i++)
{
var team = TeamManager.Instance.GetTeam(i);
@@ -155,7 +165,7 @@
//涓嬮樀鎵�鏈夐樀瀹�
public void LeaveAllTeam()
{
- var maxCnt = FuncPresetManager.Instance.GetUnlockCnt((int)FuncPresetType.Mingge);
+ var maxCnt = FuncPresetManager.Instance.GetUnlockCnt((int)FuncPresetType.Team);
for (int i = 1; i < maxCnt + 1; i++)
{
int pos;
--
Gitblit v1.8.0