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
@@ -2,40 +2,11 @@ public class VideoHostingManager : SingletonMonoBehaviour<VideoHostingManager>
|
||||
{
|
||||
private VideoHostingImplBase _impl;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_impl = base.gameObject.AddComponent<VideoHostingImplNull>();
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
}
|
||||
|
||||
public bool IsVideoHostingSupported()
|
||||
{
|
||||
return _impl.IsVideoHostingSupported();
|
||||
}
|
||||
|
||||
public void StartRecording()
|
||||
{
|
||||
_impl.StartRecording();
|
||||
}
|
||||
|
||||
public void StopRecording()
|
||||
{
|
||||
_impl.StopRecording();
|
||||
}
|
||||
|
||||
public void PauseRecording()
|
||||
{
|
||||
_impl.PauseRecording();
|
||||
}
|
||||
|
||||
public void ResumeRecording()
|
||||
{
|
||||
_impl.ResumeRecording();
|
||||
}
|
||||
|
||||
public bool IsRecording()
|
||||
{
|
||||
return _impl.IsRecording();
|
||||
@@ -46,46 +17,11 @@ public class VideoHostingManager : SingletonMonoBehaviour<VideoHostingManager>
|
||||
return _impl.IsRecordingPause();
|
||||
}
|
||||
|
||||
public bool HasRecordedData()
|
||||
{
|
||||
return _impl.HasRecordedData();
|
||||
}
|
||||
|
||||
public void UploadRecording()
|
||||
{
|
||||
_impl.UploadRecording();
|
||||
}
|
||||
|
||||
public bool IsUploading()
|
||||
{
|
||||
return _impl.IsUploading();
|
||||
}
|
||||
|
||||
public void WatchRecording()
|
||||
{
|
||||
_impl.WatchRecording();
|
||||
}
|
||||
|
||||
public void StartPublishing()
|
||||
{
|
||||
_impl.StartPublishing();
|
||||
}
|
||||
|
||||
public void StopPublishing()
|
||||
{
|
||||
_impl.StopPublishing();
|
||||
}
|
||||
|
||||
public void PausePublishing()
|
||||
{
|
||||
_impl.PausePublishing();
|
||||
}
|
||||
|
||||
public void ResumePublishing()
|
||||
{
|
||||
_impl.ResumePublishing();
|
||||
}
|
||||
|
||||
public bool IsPublising()
|
||||
{
|
||||
return _impl.IsPublising();
|
||||
@@ -96,108 +32,13 @@ public class VideoHostingManager : SingletonMonoBehaviour<VideoHostingManager>
|
||||
return _impl.IsPublishingPause();
|
||||
}
|
||||
|
||||
public void SetPublishingReceiveCommentEnable(bool isEnable)
|
||||
{
|
||||
_impl.SetPublishingReceiveCommentEnable(isEnable);
|
||||
}
|
||||
|
||||
public void ShowPublishingMenu()
|
||||
{
|
||||
_impl.ShowPublishingMenu();
|
||||
}
|
||||
|
||||
public void SetRecordingFaceCameraMicrophoneStatus(bool isEnableCamera, bool isEnableMicrophone)
|
||||
{
|
||||
_impl.SetRecordingFaceCameraMicrophoneStatus(isEnableCamera, isEnableMicrophone);
|
||||
}
|
||||
|
||||
public bool GetRecordingFaceCameraEnable()
|
||||
{
|
||||
return _impl.GetRecordingFaceCameraEnable();
|
||||
}
|
||||
|
||||
public bool GetRecordingMicrophoneEnable()
|
||||
{
|
||||
return _impl.GetRecordingMicrophoneEnable();
|
||||
}
|
||||
|
||||
public void SetRecordingMicrophoneGain(float gain)
|
||||
{
|
||||
_impl.SetRecordingMicrophoneGain(gain);
|
||||
}
|
||||
|
||||
public float GetRecordingMicrophoneGain()
|
||||
{
|
||||
return _impl.GetRecordingMicrophoneGain();
|
||||
}
|
||||
|
||||
public void SetPublishingFaceCameraMicrophoneStatus(bool isEnableCamera, bool isEnableMicrophone)
|
||||
{
|
||||
_impl.SetPublishingFaceCameraMicrophoneStatus(isEnableCamera, isEnableMicrophone);
|
||||
}
|
||||
|
||||
public bool GetPublishingFaceCameraEnable()
|
||||
{
|
||||
return _impl.GetPublishingFaceCameraEnable();
|
||||
}
|
||||
|
||||
public bool GetPublishingMicrophoneEnable()
|
||||
{
|
||||
return _impl.GetPublishingMicrophoneEnable();
|
||||
}
|
||||
|
||||
public void SetPublishingMicrophoneGain(float gain)
|
||||
{
|
||||
_impl.SetPublishingMicrophoneGain(gain);
|
||||
}
|
||||
|
||||
public float GetPublishingMicrophoneGain()
|
||||
{
|
||||
return _impl.GetPublishingMicrophoneGain();
|
||||
}
|
||||
|
||||
public void SetFaceCameraWindowVisible(bool isVisible)
|
||||
{
|
||||
_impl.SetFaceCameraWindowVisible(isVisible);
|
||||
}
|
||||
|
||||
public int GetFaceCameraWindowX()
|
||||
{
|
||||
return _impl.GetFaceCameraWindowX();
|
||||
}
|
||||
|
||||
public void SetFaceCameraWindowX(int screenX)
|
||||
{
|
||||
_impl.SetFaceCameraWindowX(screenX);
|
||||
}
|
||||
|
||||
public int GetFaceCameraWindowY()
|
||||
{
|
||||
return _impl.GetFaceCameraWindowY();
|
||||
}
|
||||
|
||||
public void SetFaceCameraWindowY(int screenY)
|
||||
{
|
||||
_impl.SetFaceCameraWindowY(screenY);
|
||||
}
|
||||
|
||||
public int GetFaceCameraWindowWidth()
|
||||
{
|
||||
return _impl.GetFaceCameraWindowWidth();
|
||||
}
|
||||
|
||||
public void SetFaceCameraWindowWidth(int w)
|
||||
{
|
||||
_impl.SetFaceCameraWindowWidth(w);
|
||||
}
|
||||
|
||||
public int GetFaceCameraWindowHeight()
|
||||
{
|
||||
return _impl.GetFaceCameraWindowHeight();
|
||||
}
|
||||
|
||||
public void SetFaceCameraWindowHeight(int h)
|
||||
{
|
||||
_impl.SetFaceCameraWindowHeight(h);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user