Squashes 146 commits from battle-engine-extraction. Net: 2,045 files changed, +11,896 / -158,687 lines. Ships engine passes 4-7 (dead-code cull, view-layer stub, receive-path shrink) plus the Phase-5 AsyncLocal ambient deletion that turns concurrent battles into a type-system property rather than a scope contract. ## What landed **Passes 4-7 (chunks 1-34):** Extended the Phase-4 const-false collapse into a cascading cull across the skill graph, view layer, and receive-path periphery. Six mode flags (IsWatchBattle/IsReplayBattle/IsAdmin/IsAdminWatch/IsPuzzleQuest/ IsAINetwork) became `const false`, every guarded block deleted. Field*.cs subclass ctors + BackGroundBase + ObjectChecker culled to no-ops. Mulligan family reworked to take a mgr param through IMulliganMgr.InitMulligan. Emotion/Recovery/Resource clusters null-stubbed. Prediction/OperationSimulator/ skill filters converted from static ambient reads to per-mgr reads via SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr / ins.BattleMgr / this.BattleMgr. **Phase-5 ambient rip (chunks 35-47):** Deleted BattleAmbient / BattleAmbient- Context / TestBattleScope in full. Every per-battle mutable slot now lives on the mgr instance itself: mgr.InstanceIsForecast / InstanceIsRandomDraw / InstanceRecoveryInfo / InstanceViewerId / InstanceNetworkAgent / GameMgr BattleManagerBase.GetIns() returns null unconditionally; the residual static flags + 3 façades (Certification.ViewerId, Data.BattleRecoveryInfo, ToolboxGame.RealTimeNetworkAgent) are null-tolerant defaults kept for the handful of engine-internal readers that still reference their types. Zero BattleAmbient references anywhere in engine + node + tests. Added pre-seeded GameMgr ctor overload threaded through the mgr chain (BattleManagerBase → SingleBattleMgr / NetworkBattleManagerBase → NetworkStandard- BattleMgr → HeadlessBattleMgr / HeadlessNetworkBattleMgr). Fixtures build a GameMgr, seed it via HeadlessEngineEnv.SeedCharaIds/SeedNetUser, and pass it to the mgr's ctor — no ambient reach. Node side (SVSim.BattleNode/SessionBattleEngine): _ctx replaced with a plain GameMgr field; 34 `using var _ambient = BattleAmbient.Enter(_ctx)` scope wraps ripped from every accessor and mutator; EngineGlobalInit.WirePerSessionGameMgr takes GameMgr as a param and runs from SessionBattleEngine.SetupInternal BEFORE mgr construction. Test side: TestBattleScope deleted; 18 fixture [SetUp]s migrated to `HeadlessEngineEnv.EnsureProcessGlobals()`; MultiInstanceEngineTests rewritten around per-mgr construction (GetIns() → null is the pinned invariant). ## Regression fixes - **chunk-48** (MulliganCtrl): chunk-35's `= null` stubs on card lookups broke the live receive-driven Deal path (BattlePlayerBase.DrawCard NRE'd downstream of NetworkPlayerMulliganCtrl.StartMulliganVfx). Restored the three lookups via `_battlePlayer.BattleMgr.GetBattleCardIdx`. Engine tests were satisfied by the WireMulliganPhase seam; unit tests exposed the live-path gap. ## Ship state - SVSim.BattleEngine.Tests: 56/56 pass, 2 skip - SVSim.UnitTests: 1554/1554 pass (was 1523/31-fail before chunk 48) - Solution build: 0 source warnings (40 pre-existing NU1902 MessagePack CVEs in SVSim.EmulatedEntrypoint, unrelated) - Sequential PVP smoke: verified live (two back-to-back battles, no regression on cleanup/spinup) - Concurrent PVP smoke: verified live Adds tools/engine-port/ClosureAnalyzer/ — the Roslyn transitive-type-closure analyzer needed to make future cascade cleanup safe (per feedback memory "Engine cleanup needs closure tool" from the 2026-06-28 pass-3 failure). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
102 lines
2.7 KiB
C#
102 lines
2.7 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Wizard;
|
|
|
|
public class NetworkBattleData
|
|
{
|
|
protected NetworkBattleManagerBase _battleMgr;
|
|
|
|
public bool isEnemyFirstTurn;
|
|
|
|
protected NetworkBattleReceiver.ReceiveData receiveData;
|
|
|
|
public bool isReceiveTurnEndAction;
|
|
|
|
public bool isOppoMulliganEnd;
|
|
|
|
public bool isPlayerMulliganEnd;
|
|
|
|
public bool isEchoWait;
|
|
|
|
public NetworkBattleDefine.NetworkBattleURI nowReceiveUri;
|
|
|
|
public NetworkBattleData(NetworkBattleManagerBase battleMgr)
|
|
{
|
|
_battleMgr = battleMgr;
|
|
}
|
|
|
|
public void SetReceiveData(NetworkBattleReceiver.ReceiveData data)
|
|
{
|
|
receiveData = data;
|
|
}
|
|
|
|
public NetworkBattleReceiver.ReceiveData GetReceiveData()
|
|
{
|
|
return receiveData;
|
|
}
|
|
|
|
public virtual void BeforeSettingReceiveData()
|
|
{
|
|
ReplaceReceivedCards(receiveData.knownCardList);
|
|
List<CardDataModel> cardList = receiveData.unapprovedList.Where((CardDataModel uCard) => uCard.fromState != NetworkBattleDefine.NetworkCardPlaceState.Deck || !uCard.ToStateList.Any((NetworkBattleDefine.NetworkCardPlaceState s) => s == NetworkBattleDefine.NetworkCardPlaceState.Banish) || !receiveData.knownCardList.Any((CardDataModel kCard) => kCard.Index == uCard.Index && kCard.IsOpen)).ToList();
|
|
ReplaceReceivedCards(cardList);
|
|
SetEnemyFirstTurn();
|
|
}
|
|
|
|
protected void SetEnemyFirstTurn()
|
|
{
|
|
if (receiveData.dataUri == NetworkBattleDefine.NetworkBattleURI.Ready && _battleMgr.InstanceNetworkAgent.GetIsFirstPlayer() == 1)
|
|
{
|
|
isEnemyFirstTurn = true;
|
|
}
|
|
}
|
|
|
|
private void ReplaceReceivedCards(List<CardDataModel> cardList)
|
|
{
|
|
List<BattleCardBase> list = new List<BattleCardBase>();
|
|
foreach (CardDataModel card in cardList)
|
|
{
|
|
ReplaceReceivedCard replaceReceivedCard = CreateReplaceReceivedCard(card);
|
|
if (card.CardId == 0)
|
|
{
|
|
if (card.isOpponent)
|
|
{
|
|
replaceReceivedCard.SetPrivateCardSpellboost(_battleMgr.BattleEnemy);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
list.Add(replaceReceivedCard.ReplaceCard(_battleMgr.BattleEnemy));
|
|
}
|
|
}
|
|
if (!_battleMgr.IsRecovery && list.Count > 0)
|
|
{
|
|
_battleMgr.VfxMgr.RegisterSequentialVfx(_battleMgr.LoadCardResources(list));
|
|
}
|
|
}
|
|
|
|
protected virtual ReplaceReceivedCard CreateReplaceReceivedCard(CardDataModel cardData)
|
|
{
|
|
return new ReplaceReceivedCard(_battleMgr, cardData);
|
|
}
|
|
|
|
public void AfterSettingReceiveData()
|
|
{
|
|
nowReceiveUri = receiveData.dataUri;
|
|
if (receiveData.dataUri == NetworkBattleDefine.NetworkBattleURI.TurnStart)
|
|
{
|
|
isEnemyFirstTurn = false;
|
|
}
|
|
}
|
|
|
|
public CardDataModel GetPlayCard()
|
|
{
|
|
return receiveData.knownCardList.FirstOrDefault((CardDataModel c) => c.Index == receiveData.playCardIndex);
|
|
}
|
|
|
|
public int GetPlayCardIndex()
|
|
{
|
|
return receiveData.playCardIndex;
|
|
}
|
|
}
|