SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine cleanup passes 4-7 + multi-instancing ambient rip

Browse Source 
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
2026-07-03 19:18:54 -04:00
parent 5c1db83967
commit 2d9a6eea4b
2045 changed files with 11704 additions and 158495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SVSim.BattleEngine/Engine/Wizard.Battle.Mulligan/MulliganMgrBase.cs
View File

@@ -7,6 +7,10 @@ using UnityEngine;
using Wizard.Battle.UI;
using Wizard.Battle.View;
using Wizard.Battle.View.Vfx;
// TODO(engine-cleanup-pass2): 13 of 18 methods unrun in baseline
// Type: Wizard.Battle.Mulligan.MulliganMgrBase
// See data_dumps/reports/engine-cleanup/live-methods.baseline.txt
namespace Wizard.Battle.Mulligan;
@@ -14,16 +18,12 @@ public abstract class MulliganMgrBase : IMulliganMgr
{
protected OpponentMulliganCtrl _opponentMulliganControl;
private const float MULLIGAN_LIMIT_TIME = 5f;
private Coroutine mulliganTimeoutCoroutine;
public PlayerMulliganCtrl PlayerMlgCtrl { get; protected set; }
public OpponentMulliganCtrl OpponentMlgCtrl => _opponentMulliganControl;
public IList<BattleCardBase> AbandonList => PlayerMlgCtrl.AbandonList;
public Action OnSubmit { get; set; }
public VfxBase StartDeal(List<int> playerDealIdxList, List<int> oppoDealIdxList, SkillProcessor skillProcessor)
@@ -40,7 +40,7 @@ public abstract class MulliganMgrBase : IMulliganMgr
instance2 = _opponentMulliganControl.StartMulliganVfx(skillProcessor);
parallelVfxPlayer.Register(instance);
parallelVfxPlayer.Register(instance2);
if (BattleManagerBase.GetIns().IsRecovery && Data.BattleRecoveryInfo.IsMulliganEnd)
if (false /* Pre-Phase-5b: recovery+mulligan-end guard headless-safe as false */)
{
return NullVfx.GetInstance();
}
@@ -60,7 +60,7 @@ public abstract class MulliganMgrBase : IMulliganMgr
BattleCoroutine.GetInstance().StopCoroutine(mulliganTimeoutCoroutine);
mulliganTimeoutCoroutine = null;
}
BattleManagerBase.GetIns().BattlePlayer.BattleView.HideAlertDialogue();
/* Pre-Phase-5b: HideAlertDialogue dropped; no BattleView headless */
}
private IEnumerator MulliganNetworkTimeout()
@@ -69,20 +69,19 @@ public abstract class MulliganMgrBase : IMulliganMgr
do
{
yield return null;
if (BattleManagerBase.GetIns().IsBattleEnd)
if (false /* Pre-Phase-5b: IsBattleEnd guard on coroutine timeout; unreachable headless */)
{
StopTimeout();
yield break;
}
}
while (!((float)NetworkUtility.GetTimeSpanSecond(matchedTimer) >= 5f));
BattleManagerBase.GetIns().BattlePlayer.BattleView.ShowAlert(PanelMgr.BattleAlertType.DisconnectInfomationMulligan, isClass: false);
/* Pre-Phase-5b: ShowAlert dropped; no BattleView headless */
}
public virtual VfxBase Submit(BattleManagerBase m_BtlMgrIns)
{
OnSubmit.Call();
ImmediateVfxMgr.GetInstance().Register(PlayerMlgCtrl.MoveMulliganUIOutWhenSubmitMulligan());
return NullVfx.GetInstance();
}
@@ -106,17 +105,17 @@ public abstract class MulliganMgrBase : IMulliganMgr
public virtual VfxBase CompleteMulligan(BattleManagerBase battleMgr)
{
if (!battleMgr.IsVirtualBattle && !GameMgr.GetIns().IsNewReplayBattle)
if (!battleMgr.IsVirtualBattle && !battleMgr.GameMgr.IsNewReplayBattle)
{
AddBattleLogMulliganResult(battleMgr);
}
return NullVfx.GetInstance();
}
public virtual VfxBase InitMulligan(MulliganInfoControl mulliganInfo, IPlayerView view)
public virtual VfxBase InitMulligan(BattleManagerBase mgr, MulliganInfoControl mulliganInfo, IPlayerView view)
{
PlayerMlgCtrl = new PlayerMulliganCtrl(BattleManagerBase.GetIns().BattlePlayer, mulliganInfo, view);
_opponentMulliganControl = new OpponentMulliganCtrl(BattleManagerBase.GetIns().BattleEnemy, mulliganInfo, isUseExchangeMark: false);
PlayerMlgCtrl = new PlayerMulliganCtrl(mgr.BattlePlayer, mulliganInfo, view);
_opponentMulliganControl = new OpponentMulliganCtrl(mgr.BattleEnemy, mulliganInfo, isUseExchangeMark: false);
return NullVfx.GetInstance();
}