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/Battle/BattleField/StoryBattleField.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Main/System/Battle/BattleField/StoryBattleField.cs b/Main/System/Battle/BattleField/StoryBattleField.cs
index cf12d91..ea24d09 100644
--- a/Main/System/Battle/BattleField/StoryBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBattleField.cs
@@ -138,9 +138,9 @@
base.OnTurnFightState(turnNum, State, FuncLineID, extendData);
}
- protected void OnTeamChange(TeamType teamType)
+ protected void OnTeamChange(int teamType)
{
- if (teamType == TeamType.Story)
+ if (teamType == TeamManager.Instance.GetMainTeamID())
{
if (battleState == StoryBattleState.Break)
{
@@ -171,8 +171,8 @@
protected void ReloadTeam()
{
- PreloadResources(new List<TeamBase>() { TeamManager.Instance.GetTeam(TeamType.Story) }, null);
- battleObjMgr.ReloadTeam(TeamManager.Instance.GetTeam(TeamType.Story), BattleCamp.Red);
+ PreloadResources(new List<TeamBase>() { TeamManager.Instance.GetTeam(BattlePreSetType.Story) }, null);
+ battleObjMgr.ReloadTeam(TeamManager.Instance.GetTeam(BattlePreSetType.Story), BattleCamp.Red);
}
// public override void OnBattleEnd(JsonData turnFightStateData)
--
Gitblit v1.8.0