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/Main/FightPowerManager.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Main/System/Main/FightPowerManager.cs b/Main/System/Main/FightPowerManager.cs
index a7b6065..a408d50 100644
--- a/Main/System/Main/FightPowerManager.cs
+++ b/Main/System/Main/FightPowerManager.cs
@@ -120,7 +120,7 @@
}
#region 鍒濆鍖栨垬鍔涜绠楃殑淇℃伅
- TeamType teamTypeCalc = TeamType.Story; //涓嶅悓闃靛鎴樺姏涓嶅悓
+ int teamTypeCalc = 1; //涓嶅悓闃靛鎴樺姏涓嶅悓
bool isPreviewTeamPower; //棰勮闃靛锛堥槦浼嶏級鎴樺姏
int dropIndexCalc = -1; //鎺夎惤瑁呭鍦ㄩ樀瀹圭殑绱㈠紩锛岀敤浜庨瑙堟垬鍔涘姣�
@@ -131,7 +131,7 @@
/// <param name="teamType">闃靛绫诲瀷</param>
/// <param name="dropindex">鎺夎惤瑁呭鐨勭储寮曪紝-1浠ｈ〃涓嶆浛鎹㈣绠�</param>
/// <param name="ispreview">棰勮闃靛鎴樺姏</param>
- public void InitFightPowerParam(TeamType teamType = TeamType.Story, int dropindex = -1, bool ispreview = false)
+ public void InitFightPowerParam(int teamType = 1, int dropindex = -1, bool ispreview = false)
{
#if !UNITY_EDITOR
openLog = false;
@@ -608,7 +608,7 @@
public long GetHeroFightPower(HeroInfo heroInfo)
{
bool ispreview = false;
- var team = TeamManager.Instance.GetTeam(TeamType.Story);
+ var team = TeamManager.Instance.GetTeam(TeamManager.Instance.GetMainTeamID());
if (!team.HasHero(heroInfo.itemHero.guid))
{
//鏇挎崲涓婇樀浣嶇疆
@@ -640,7 +640,7 @@
//鏌ョ湅闃靛鎴樺姏
- public long GetTeamFightPower(TeamType team, bool isPreview)
+ public long GetTeamFightPower(int team, bool isPreview)
{
InitFightPowerParam(team, -1, isPreview);
return CalculatePower();
@@ -652,7 +652,7 @@
{
Dictionary<int, long> tmpAttrs = new Dictionary<int, long>();
- hero.RefreshFetterAttrsWhenCalcPower(TeamType.Story); //缇佺粖灞炴�ц瀹炴椂绠�
+ hero.RefreshFetterAttrsWhenCalcPower(TeamManager.Instance.GetMainTeamID()); //缇佺粖灞炴�ц瀹炴椂绠�
#if UNITY_EDITOR
propertyStrForDebug = "";
--
Gitblit v1.8.0