engine cleanup passes 4-7 + multi-instancing ambient rip
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>
This commit is contained in:
gamer147
@@ -20,126 +20,8 @@ public abstract class InPlayViewBase
|
||||
battleCardViewList = new List<IBattleCardView>();
|
||||
}
|
||||
|
||||
protected abstract void RearrangeInplay(float rearrangeTime);
|
||||
|
||||
public VfxBase OneTimeRearrangeInplay(float rearrangeTime)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
{
|
||||
rearrangeTime = 0f;
|
||||
}
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
RearrangeInplay(rearrangeTime);
|
||||
});
|
||||
}
|
||||
|
||||
public void AddCardToView(IBattleCardView cardViewToAdd, float deckRearrangeTime)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
{
|
||||
deckRearrangeTime = 0f;
|
||||
}
|
||||
if (!battleCardViewList.Contains(cardViewToAdd))
|
||||
{
|
||||
battleCardViewList.Add(cardViewToAdd);
|
||||
RearrangeInplay(deckRearrangeTime);
|
||||
}
|
||||
}
|
||||
|
||||
public void AddCardsToView(List<IBattleCardView> cardViewsToAdd, float deckRearrangeTime)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
{
|
||||
deckRearrangeTime = 0f;
|
||||
}
|
||||
List<IBattleCardView> source = cardViewsToAdd.FindAll((IBattleCardView cardView) => !battleCardViewList.Contains(cardView));
|
||||
if (source.Any())
|
||||
{
|
||||
battleCardViewList.AddRange(source.ToList());
|
||||
RearrangeInplay(deckRearrangeTime);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void RemoveCardFromView(IBattleCardView cardViewToRemove, float deckRearrangeTime)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
{
|
||||
deckRearrangeTime = 0f;
|
||||
}
|
||||
if (battleCardViewList.Remove(cardViewToRemove))
|
||||
{
|
||||
RearrangeInplay(deckRearrangeTime);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void RemoveCardFromView(IBattleCardView cardViewToRemove)
|
||||
{
|
||||
battleCardViewList.Remove(cardViewToRemove);
|
||||
}
|
||||
|
||||
public virtual void RemoveCardsFromView(List<IBattleCardView> cardViewsToRemove, float deckRearrangeTime)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
{
|
||||
deckRearrangeTime = 0f;
|
||||
}
|
||||
if (cardViewsToRemove.FindAll((IBattleCardView cardView) => battleCardViewList.Remove(cardView)).Any())
|
||||
{
|
||||
RearrangeInplay(deckRearrangeTime);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual VfxBase CreateRemoveCardsFromViewVfx(List<IBattleCardView> cardViewsToRemove, float deckRearrangeTime)
|
||||
{
|
||||
return InstantVfx.Create(delegate
|
||||
{
|
||||
RemoveCardsFromView(cardViewsToRemove, deckRearrangeTime);
|
||||
});
|
||||
}
|
||||
|
||||
public void Replacement(IBattleCardView originalView, IBattleCardView newView)
|
||||
{
|
||||
battleCardViewList.Insert(battleCardViewList.IndexOf(originalView), newView);
|
||||
battleCardViewList.RemoveAt(battleCardViewList.IndexOf(originalView));
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
{
|
||||
RearrangeInplay(0f);
|
||||
}
|
||||
else
|
||||
{
|
||||
RearrangeInplay(0.1f);
|
||||
}
|
||||
}
|
||||
|
||||
public void AttachCardView(IBattleCardView cardView)
|
||||
{
|
||||
cardView.Transform.parent = inPlayCardControl.transform;
|
||||
}
|
||||
|
||||
public int GetViewIndex(IBattleCardView viewCard)
|
||||
{
|
||||
return battleCardViewList.IndexOf(viewCard);
|
||||
}
|
||||
|
||||
public Vector3 GetPositionInView(IBattleCardView battleCardView, bool isGlobal)
|
||||
{
|
||||
int viewIndex = GetViewIndex(battleCardView);
|
||||
return GetPositionInView(viewIndex, isGlobal);
|
||||
}
|
||||
|
||||
public Vector3 GetPositionInView(int viewIndex, bool isGlobal)
|
||||
{
|
||||
Vector3 vector = inPlayCardControl.GetPosition(viewIndex);
|
||||
if (isGlobal)
|
||||
{
|
||||
vector = inPlayCardControl.transform.TransformPoint(vector);
|
||||
}
|
||||
return vector;
|
||||
}
|
||||
|
||||
public Vector3 GetPositionInOverflowList(int indexInOverflowList, bool isPlayer)
|
||||
{
|
||||
return inPlayCardControl.GetOverflowPosition(indexInOverflowList, isPlayer);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user