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
2026-07-03 19:18:54 -04:00
parent 5c1db83967
commit 2d9a6eea4b
2045 changed files with 11704 additions and 158495 deletions

View File

@@ -1,108 +0,0 @@
// AUTHORED SHIM (not copied). CRI ADX2 (Atom) audio + CRI Mana (movie) middleware.
// A precompiled SDK with no decompiled source, referenced by the copied audio/movie
// engine files (Cute/AudioManager.cs, Voice.cs, Se.cs, Effect.cs, MoviePlayer.cs).
// Pure cosmetic surface — never on the battle-resolution path; every member is a no-op
// returning a safe default. Signatures mirror the real CRI API as exercised by the
// decomp (arg counts/types taken from the call sites) so the copied code compiles.
using System;
namespace CriWare
{
// ---- CRI Atom (audio) ----
public class CriAtomExPlayer
{
public void SetFadeOutTime(int ms) { }
public void SetFadeInTime(int ms) { }
public void SetFadeInStartOffset(int ms) { }
public void SetStartTime(long ms) { }
public void ResetFaderParameters() { }
public void Update(CriAtomExPlayback playback) { }
public void AttachFader() { }
}
public static class CriAtomExCategory
{
public static void Mute(string categoryName, bool mute) { }
public static void Pause(string categoryName, bool sw) { }
public static void SetVolume(string categoryName, float volume) { }
}
public struct CriAtomExPlayback
{
public bool GetNumPlayedSamples(out long numSamples, out int samplingRate)
{ numSamples = 0L; samplingRate = 0; return false; }
}
public class CriAtomExAcb : IDisposable
{
public void Dispose() { }
public bool GetCueInfo(int index, out CriAtomEx.CueInfo cueInfo)
{ cueInfo = default; return false; }
}
public static class CriAtomEx
{
public struct CueInfo { public long length; }
}
public class CriAtomCueSheet { public CriAtomExAcb acb => null; }
public class CriAtomSource : UnityEngine.MonoBehaviour
{
public enum Status { Stop, Prep, Playing, PlayEnd, Removed, Removing, Error }
public Status status => Status.Stop;
public CriAtomExPlayer player { get; } = new CriAtomExPlayer();
public bool loop;
public bool playOnStart;
public float volume;
public bool use3dPositioning;
public string cueSheet;
public string cueName;
public CriAtomExPlayback Play() => default;
public CriAtomExPlayback Play(int cueId) => default;
public CriAtomExPlayback Play(string cue) => default;
public CriAtomExPlayback Play(string sheet, string cue) => default;
public void Stop() { }
public void Pause(bool sw) { }
public void Pause() { }
public void SetAisacControl(string name, float value) { }
public void SetAisacControl(uint id, float value) { }
}
public static class CriAtom
{
public static CriAtomCueSheet AddCueSheet(string name, string acbPath, string awbPath) => null;
public static CriAtomCueSheet GetCueSheet(string name) => null;
public static void RemoveCueSheet(string name) { }
public static CriAtomExAcb GetAcb(string acbName) => null;
public static void AttachDspBusSetting(string name) { }
}
// ---- CRI Mana (movie) ---- (CriManaMovieMaterial lives in External/SdkStubs.cs)
public class CriFsBinder { }
}
namespace CriWare.CriMana
{
public struct MovieInfo
{
public uint framerateN;
public uint totalFrames;
}
public class Player
{
public enum Status { Stop, Decheader, WaitPrep, Prep, Ready, Playing, PlayEnd, Error, StopProcessing }
public Status status => Status.Stop;
public MovieInfo movieInfo => default;
public long GetTime() => 0L;
public bool IsPaused() => false;
public void Pause(bool sw) { }
public void Prepare() { }
public void Start() { }
public void Stop() { }
public void SetFile(CriFsBinder binder, string moviePath) { }
public void SetSeekPosition(int frameNumber) { }
public void SetVolume(float volume) { }
}
}

View File

@@ -4,19 +4,19 @@
// (2) a few concrete tangential types referenced directly. (3) minimal third-party
// serialization/SDK surface. None is on the battle-resolution path.
namespace Wizard.AutoTest { internal class _ShimAnchor { } }
namespace Wizard.Title { internal class _ShimAnchor { } }
namespace Wizard.ErrorDialog { internal class _ShimAnchor { } }
namespace Wizard.Bingo { internal class _ShimAnchor { } }
namespace Wizard.Scripts.Network.Data.TaskData.BuildDeckPurchase { internal class _ShimAnchor { } }
namespace Wizard.Scripts.Network.Data.TaskData.ItemPurchase { internal class _ShimAnchor { } }
namespace Wizard.Scripts.Network.Data.TaskData.SkinPurchase { internal class _ShimAnchor { } }
namespace Wizard.Scripts.Network.Data.TaskData.SpotCardExchange { internal class _ShimAnchor { } }
namespace Wizard.AutoTest { }
namespace Wizard.Title { }
namespace Wizard.ErrorDialog { }
namespace Wizard.Bingo { }
namespace Wizard.Scripts.Network.Data.TaskData.BuildDeckPurchase { }
namespace Wizard.Scripts.Network.Data.TaskData.ItemPurchase { }
namespace Wizard.Scripts.Network.Data.TaskData.SkinPurchase { }
namespace Wizard.Scripts.Network.Data.TaskData.SpotCardExchange { }
// These are NAMESPACES (used as `using` targets in copied files), not types.
namespace Wizard.DeckSelect.FirstDisplayPageIndexGetter { internal class _ShimAnchor { } }
namespace Wizary.StorySelectionWorld { internal class _ShimAnchor { } }
namespace Wizard.Scripts.Network.Data.TableData.Arena.TwoPick { internal class _ShimAnchor { } }
namespace Wizard.DeckSelect.FirstDisplayPageIndexGetter { }
namespace Wizary.StorySelectionWorld { }
namespace Wizard.Scripts.Network.Data.TableData.Arena.TwoPick { }
// IManager: a Cute manager interface implemented by NetworkManager/ResourcesManager.
namespace Cute { public interface IManager { } }
@@ -26,8 +26,6 @@ namespace MessagePack
{
public static class MessagePackSerializer
{
public static byte[] Serialize<T>(T obj) => new byte[0];
public static T Deserialize<T>(byte[] bytes) => default;
public static string ToJson(byte[] bytes) => "";
public static byte[] FromJson(string json) => new byte[0];
}
@@ -38,138 +36,22 @@ namespace MiniJSON
public static class Json
{
public static object Deserialize(string json) => null;
public static string Serialize(object obj) => "";
}
}
namespace Steamworks
{
// Steam callback wrapper. Engine constructs via Callback<T>.Create(handler).
public sealed class Callback<T>
{
public delegate void DispatchDelegate(T param);
public static Callback<T> Create(DispatchDelegate func) => new Callback<T>();
}
public enum EResult { k_EResultOK = 1 }
public struct AppId_t
{
public uint m_AppId;
public AppId_t(uint v) { m_AppId = v; }
public static explicit operator AppId_t(uint v) => new AppId_t(v);
public override string ToString() => m_AppId.ToString();
}
public struct CSteamID { public ulong m_SteamID; }
public struct HAuthTicket { }
public struct SteamNetworkingIdentity { }
// Microtransaction auth response struct (callback payload).
public struct MicroTxnAuthorizationResponse_t
{
public AppId_t m_unAppID;
public ulong m_ulOrderID;
public byte m_bAuthorized;
}
public struct GetAuthSessionTicketResponse_t
{
public HAuthTicket m_hAuthTicket;
public EResult m_eResult;
}
// Steam warning-message hook delegate.
public delegate void SteamAPIWarningMessageHook_t(int severity, System.Text.StringBuilder debugText);
public static class SteamAPI
{
public static bool Init() => false;
public static bool RestartAppIfNecessary(AppId_t appId) => false;
public static void RunCallbacks() { }
public static void Shutdown() { }
}
public static class SteamUser
{
public static HAuthTicket GetAuthSessionTicket(byte[] pTicket, int cbMaxTicket, out uint pcbTicket, ref SteamNetworkingIdentity identity) { pcbTicket = 0; return default; }
public static CSteamID GetSteamID() => default;
}
public static class SteamUtils { public static AppId_t GetAppID() => default; }
public static class SteamClient { public static void SetWarningMessageHook(SteamAPIWarningMessageHook_t hook) { } }
}
// AOT P/Invoke callback attribute (IL2CPP) + StandaloneFileBrowser anchor.
namespace AOT
{
public sealed class MonoPInvokeCallbackAttribute : System.Attribute
{
public MonoPInvokeCallbackAttribute(System.Type type) { }
}
}
namespace SFB
{
public struct ExtensionFilter
{
public string Name;
public string[] Extensions;
public ExtensionFilter(string name, params string[] extensions) { Name = name; Extensions = extensions; }
}
public static class StandaloneFileBrowser
{
public static string[] OpenFilePanel(string title, string directory, ExtensionFilter[] extensions, bool multiselect) => System.Array.Empty<string>();
public static string[] OpenFilePanel(string title, string directory, string extension, bool multiselect) => System.Array.Empty<string>();
}
}
// ---- third-party SDK namespace anchors (referenced via `using`) ----
namespace Facebook { internal class _ShimAnchor { } }
namespace Facebook { }
namespace Facebook.Unity
{
public interface ILoginResult
{
string Error { get; }
bool Cancelled { get; }
string RawResult { get; }
}
public delegate void FacebookDelegate<T>(T result);
public class AccessToken { public string TokenString => ""; public string UserId => ""; public static AccessToken CurrentAccessToken => null; }
public static class FB
{
public static bool IsLoggedIn => false;
public static void LogInWithReadPermissions(System.Collections.Generic.List<string> permissions, FacebookDelegate<ILoginResult> callback) { }
public static void LogOut() { }
}
}
namespace RedShellSDK
{
public static class RedShellSDK
{
public static void SetApiKey(string apiKey) { }
public static void SetUserId(string userId) { }
public static void SetVerboseLogs(bool verbose) { }
public static System.Collections.IEnumerator MarkConversion() { yield break; }
public static System.Collections.IEnumerator LogEvent(string type) { yield break; }
}
}
namespace ZXing
{
public enum BarcodeFormat { QR_CODE, AZTEC, CODE_128, EAN_13 }
public sealed class Result { public string Text => ""; }
public class BarcodeWriter
{
public BarcodeFormat Format { get; set; }
public ZXing.QrCode.QrCodeEncodingOptions Options { get; set; }
public UnityEngine.Color32[] Write(string contents) => System.Array.Empty<UnityEngine.Color32>();
}
public class BarcodeReader
{
public bool AutoRotate { get; set; }
public bool TryHarder { get; set; }
public Result Decode(UnityEngine.Color32[] rawColor, int width, int height) => null;
}
}
namespace ZXing.QrCode
{
public class QrCodeEncodingOptions
{
public ZXing.QrCode.Internal.ErrorCorrectionLevel ErrorCorrection { get; set; }
public int Width { get; set; }
public int Height { get; set; }
public int Margin { get; set; }
}
}
namespace ZXing.QrCode.Internal { public enum ErrorCorrectionLevel { L, M, Q, H } }

View File

@@ -3,36 +3,14 @@
// resolution path. Namespaces must merely exist (anchors); the few types referenced
// by member get a minimal no-op surface. Members grow only as the compile loop demands.
// ---- CriWare audio + movie (CRI types with members live in External/CriShim.cs) ----
namespace CriWare
{
internal class _ShimAnchor { }
}
namespace CriWare.CriMana
{
public class CriManaMovieMaterial : UnityEngine.MonoBehaviour
{
public enum MaxFrameDrop { Disable, One, Two, Three, Four, Five, Six, Seven, Eight, Nine, Ten }
public MaxFrameDrop maxFrameDrop;
public Player player { get; } = new Player();
}
internal class _ShimAnchor { }
}
// ---- CodeStage anti-cheat obscured prefs (static k/v facade; no persistence headless) ----
namespace CodeStage.AntiCheat.ObscuredTypes
{
public static class ObscuredPrefs
{
public static bool HasKey(string key) => false;
public static void DeleteKey(string key) { }
public static void DeleteAll() { }
public static void Save() { }
public static int GetInt(string key, int defaultValue = 0) => defaultValue;
public static float GetFloat(string key, float defaultValue = 0f) => defaultValue;
public static string GetString(string key, string defaultValue = "") => defaultValue;
public static void SetInt(string key, int value) { }
public static void SetFloat(string key, float value) { }
public static void SetString(string key, string value) { }
}
}
@@ -40,65 +18,29 @@ namespace CodeStage.AntiCheat.ObscuredTypes
// ---- Spine animation ----
namespace Spine
{
// Spine runtime — minimal hand shim (cosmetic skeletal animation, off battle path).
public class SkeletonData { public System.Collections.Generic.List<Skin> Skins { get; } = new System.Collections.Generic.List<Skin>(); }
public class Skin { public string Name { get; set; } }
public class Bone
{
public float WorldX, WorldY, WorldRotationX;
public Skeleton Skeleton => null;
}
public class Skeleton
{
public SkeletonData Data => null;
public Skin Skin => null;
public float ScaleX, ScaleY;
public Bone FindBone(string boneName) => null;
public void SetSkin(string skinName) { }
public void SetSkin(Skin newSkin) { }
public void SetSlotsToSetupPose() { }
public void Update(float delta) { }
}
internal class _ShimAnchor { }
}
namespace Spine.Unity
{
public class SkeletonMecanim : UnityEngine.MonoBehaviour
{
public Spine.Skeleton skeleton => null;
public Spine.Skeleton Skeleton => null;
}
internal class _ShimAnchor { }
}
// ---- misc third-party namespaces (anchors) ----
namespace RedShellUnity { internal class _ShimAnchor { } }
namespace RedShellUnity { }
namespace PlatformSupport.Collections.ObjectModel
{
public class ObservableDictionary<TKey, TValue> : System.Collections.Generic.Dictionary<TKey, TValue> { }
internal class _ShimAnchor { }
}
namespace Convention { internal class _ShimAnchor { } }
namespace Convention { }
namespace com.adjust.sdk
{
public static class Adjust
{
public static bool IsEditor() => true;
public static void addSessionCallbackParameter(string key, string value) { }
}
}
namespace BestHTTP.Decompression { internal class _ShimAnchor { } }
namespace BestHTTP.SocketIO.Transports { internal class _ShimAnchor { } }
namespace BestHTTP.Decompression { }
namespace BestHTTP.SocketIO.Transports { }
namespace BestHTTP.Decompression.Zlib
{
public static class GZipStream { public static byte[] UncompressBuffer(byte[] data) => data; }
}
// Native plugins (no decomp source) referenced unqualified from global scope.
public static class TimeNativePlugin { public static float GetDeviceOperatingTime() => 0f; }
public static class Packsize { public static bool Test() => true; }
public static class DllCheck { public static bool Test() => true; }
// The BCL's CollectionExtensions.GetValueOrDefault only binds to IReadOnlyDictionary;
// copied code calls it on an IDictionary<,> static type (where the only by-name match is

View File

@@ -8,25 +8,7 @@ using System;
namespace UnityEngine
{
public partial class Font : Object { }
public enum Space { World, Self }
// NGUI's UIInputOnGUI / UIInput read the legacy IMGUI Event.
public enum EventType
{
MouseDown, MouseUp, MouseMove, MouseDrag, KeyDown, KeyUp,
ScrollWheel, Repaint, Layout, DragUpdated, DragPerform, DragExited,
Ignore, Used, ValidateCommand, ExecuteCommand, ContextClick,
MouseEnterWindow, MouseLeaveWindow, TouchDown, TouchUp, TouchMove,
TouchEnter, TouchLeave, TouchStationary
}
public class Event
{
public static Event current => null;
public EventType type;
public EventType rawType => type;
public KeyCode keyCode;
public EventModifiers modifiers;
public void Use() { }
}
public enum Space { Self }
}
namespace UnityEngine.Networking
@@ -39,11 +21,9 @@ namespace UnityEngine.Networking
// ---- BestHTTP Socket.IO ----
namespace BestHTTP.SocketIO
{
public interface IManager { }
}
// ---- Google Play Games ----
namespace GooglePlayGames.BasicApi.Events
{
public class Event { }
}