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
@@ -1,96 +1,32 @@
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Wizard;
|
||||
|
||||
public static class ToolboxGame
|
||||
{
|
||||
private enum SYSTEM_INIT
|
||||
{
|
||||
SYSTEM_NOT_READY,
|
||||
SYSTEM_READY
|
||||
}
|
||||
|
||||
public static SetUp SetUp = null;
|
||||
|
||||
public static UIManager UIManager = null;
|
||||
|
||||
public static GameMgr GameManager = null;
|
||||
|
||||
public static bool isLoadFromLocal = false;
|
||||
|
||||
public static bool isLoadLocalSound = false;
|
||||
|
||||
public static bool bDebugLogMode = true;
|
||||
|
||||
private static Transform _gameTransform = null;
|
||||
|
||||
public static RealTimeNetworkAgent RealTimeNetworkAgent
|
||||
{
|
||||
// Soft read: returns null when no scope is active, mirroring GetIns. Engine code reads this
|
||||
// via `ToolboxGame.RealTimeNetworkAgent?.Foo`-style patterns (network-send paths gated on a
|
||||
// non-null agent), so a null on the unwrapped path is the correct degrade — not a throw.
|
||||
get => SVSim.BattleEngine.Ambient.BattleAmbient.Current?.NetworkAgent;
|
||||
}
|
||||
|
||||
public static Transform GameTransform
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!_gameTransform)
|
||||
{
|
||||
GameObject gameObject = GameObject.Find("_Game");
|
||||
if ((bool)gameObject)
|
||||
{
|
||||
_gameTransform = gameObject.transform;
|
||||
}
|
||||
}
|
||||
return _gameTransform;
|
||||
}
|
||||
}
|
||||
|
||||
public static void Clear()
|
||||
{
|
||||
UIManager = null;
|
||||
GameManager = null;
|
||||
}
|
||||
|
||||
public static void ClearUIManager()
|
||||
{
|
||||
UIManager = null;
|
||||
}
|
||||
|
||||
public static void SetRealTimeNetworkBattle(RealTimeNetworkAgent agent)
|
||||
{
|
||||
// Strict: must be inside a scope to set the per-session agent. Forcing-function — any
|
||||
// historical unwrapped caller (no production callsite remains) now fails fast.
|
||||
SVSim.BattleEngine.Ambient.BattleAmbient.Require().NetworkAgent = agent;
|
||||
}
|
||||
|
||||
public static void DestroyNetworkAgent()
|
||||
{
|
||||
var c = SVSim.BattleEngine.Ambient.BattleAmbient.Current;
|
||||
var current = c?.NetworkAgent;
|
||||
if (current != null)
|
||||
{
|
||||
Object.DestroyImmediate(current.gameObject);
|
||||
c.NetworkAgent = null;
|
||||
}
|
||||
}
|
||||
|
||||
public static IEnumerator CreateRealTimeNetworkBattleAgent(Matching matching = null)
|
||||
{
|
||||
string loadObjectPath = "TurnBase/_TurnBaseManager";
|
||||
if (GameMgr.GetIns().IsAINetwork)
|
||||
{
|
||||
loadObjectPath = "TurnBase/_AINetworkBaseManager";
|
||||
}
|
||||
yield return BattleCoroutine.GetInstance().StartCoroutine(GameMgr.GetIns().GetPrefabMgr().LoadAync(loadObjectPath));
|
||||
NGUITools.AddChild(GameObject.Find("_Game"), GameMgr.GetIns().GetPrefabMgr().Get(loadObjectPath));
|
||||
yield return null;
|
||||
if (matching != null)
|
||||
{
|
||||
RealTimeNetworkAgent.SettingMatchingClass(matching);
|
||||
}
|
||||
}
|
||||
}
|
||||
using UnityEngine;
|
||||
|
||||
namespace Wizard;
|
||||
|
||||
public static class ToolboxGame
|
||||
{
|
||||
public static UIManager UIManager = null;
|
||||
|
||||
public static RealTimeNetworkAgent RealTimeNetworkAgent
|
||||
{
|
||||
// Instance-backed via BattleManagerBase.InstanceNetworkAgent (Phase 5, chunk 40 — ambient
|
||||
// fallback dropped after chunk 38 converted all 60 consumers to per-mgr reads).
|
||||
get => BattleManagerBase.GetIns()?.InstanceNetworkAgent;
|
||||
}
|
||||
|
||||
public static void SetRealTimeNetworkBattle(RealTimeNetworkAgent agent)
|
||||
{
|
||||
var mgr = BattleManagerBase.GetIns()
|
||||
?? throw new System.InvalidOperationException("SetRealTimeNetworkBattle called with no attached mgr.");
|
||||
mgr.InstanceNetworkAgent = agent;
|
||||
}
|
||||
|
||||
public static void DestroyNetworkAgent()
|
||||
{
|
||||
var mgr = BattleManagerBase.GetIns();
|
||||
if (mgr?.InstanceNetworkAgent is { } m)
|
||||
{
|
||||
Object.DestroyImmediate(m.gameObject);
|
||||
mgr.InstanceNetworkAgent = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user