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
142
SVSim.BattleEngine/Shim/External/LooseEnds.cs
vendored
142
SVSim.BattleEngine/Shim/External/LooseEnds.cs
vendored
@@ -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 } }
|
||||
|
||||
Reference in New Issue
Block a user