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
@@ -10,23 +10,12 @@ namespace UnityEngine
|
||||
public static Vector3 mousePosition => Vector3.zero;
|
||||
public static Vector2 mouseScrollDelta => Vector2.zero;
|
||||
public static int touchCount => 0;
|
||||
public static Touch[] touches => new Touch[0];
|
||||
public static Touch GetTouch(int i) => default;
|
||||
public static bool anyKey => false;
|
||||
public static bool anyKeyDown => false;
|
||||
public static bool mousePresent => false;
|
||||
public static bool GetMouseButton(int b) => false;
|
||||
public static bool GetMouseButtonDown(int b) => false;
|
||||
public static bool GetMouseButtonUp(int b) => false;
|
||||
public static bool GetKey(KeyCode k) => false;
|
||||
public static bool GetKey(string n) => false;
|
||||
public static bool GetKeyDown(KeyCode k) => false;
|
||||
public static bool GetKeyDown(string n) => false;
|
||||
public static bool GetKeyUp(KeyCode k) => false;
|
||||
public static bool GetButton(string n) => false;
|
||||
public static bool GetButtonDown(string n) => false;
|
||||
public static float GetAxis(string n) => 0f;
|
||||
public static float GetAxisRaw(string n) => 0f;
|
||||
public static string inputString => "";
|
||||
public static bool multiTouchEnabled { get; set; }
|
||||
}
|
||||
@@ -36,14 +25,8 @@ namespace UnityEngine
|
||||
public static float value => 0f;
|
||||
public static int Range(int minInclusive, int maxExclusive) => minInclusive;
|
||||
public static float Range(float min, float max) => min;
|
||||
public static Vector2 insideUnitCircle => Vector2.zero;
|
||||
public static Vector3 insideUnitSphere => Vector3.zero;
|
||||
public static Vector3 onUnitSphere => Vector3.up;
|
||||
public static Quaternion rotation => Quaternion.identity;
|
||||
public static Quaternion rotationUniform => Quaternion.identity;
|
||||
public static int seed { get; set; }
|
||||
public static void InitState(int s) { }
|
||||
public static Color ColorHSV() => Color.white;
|
||||
}
|
||||
|
||||
public static partial class Resources
|
||||
@@ -63,11 +46,7 @@ namespace UnityEngine
|
||||
return _loaded.GetOrAdd(path, static p => new GameObject(p));
|
||||
}
|
||||
public static Object Load(string path, Type t) => Load(path);
|
||||
public static T[] LoadAll<T>(string path) where T : Object => new T[0];
|
||||
public static Object[] LoadAll(string path) => new Object[0];
|
||||
public static ResourceRequest LoadAsync<T>(string path) where T : Object => null;
|
||||
public static ResourceRequest LoadAsync(string path) => null;
|
||||
public static void UnloadAsset(Object o) { }
|
||||
public static AsyncOperation UnloadUnusedAssets() => null;
|
||||
}
|
||||
|
||||
@@ -75,32 +54,5 @@ namespace UnityEngine
|
||||
|
||||
public enum KeyCode
|
||||
{
|
||||
None = 0,
|
||||
Backspace = 8, Tab = 9, Clear = 12, Return = 13, Pause = 19, Escape = 27, Space = 32,
|
||||
Exclaim = 33, DoubleQuote = 34, Hash = 35, Dollar = 36, Ampersand = 38, Quote = 39,
|
||||
LeftParen = 40, RightParen = 41, Asterisk = 42, Plus = 43, Comma = 44, Minus = 45,
|
||||
Period = 46, Slash = 47,
|
||||
Alpha0 = 48, Alpha1, Alpha2, Alpha3, Alpha4, Alpha5, Alpha6, Alpha7, Alpha8, Alpha9,
|
||||
Colon = 58, Semicolon = 59, Less = 60, Equals = 61, Greater = 62, Question = 63, At = 64,
|
||||
LeftBracket = 91, Backslash = 92, RightBracket = 93, Caret = 94, Underscore = 95, BackQuote = 96,
|
||||
A = 97, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,
|
||||
LeftCurlyBracket = 123, Pipe = 124, RightCurlyBracket = 125, Tilde = 126, Delete = 127,
|
||||
Keypad0 = 256, Keypad1, Keypad2, Keypad3, Keypad4, Keypad5, Keypad6, Keypad7, Keypad8, Keypad9,
|
||||
KeypadPeriod = 266, KeypadDivide = 267, KeypadMultiply = 268, KeypadMinus = 269,
|
||||
KeypadPlus = 270, KeypadEnter = 271, KeypadEquals = 272,
|
||||
UpArrow = 273, DownArrow = 274, RightArrow = 275, LeftArrow = 276,
|
||||
Insert = 277, Home = 278, End = 279, PageUp = 280, PageDown = 281,
|
||||
F1 = 282, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15,
|
||||
Numlock = 300, CapsLock = 301, ScrollLock = 302,
|
||||
RightShift = 303, LeftShift = 304, RightControl = 305, LeftControl = 306,
|
||||
RightAlt = 307, LeftAlt = 308, RightCommand = 309, LeftCommand = 310,
|
||||
LeftWindows = 311, RightWindows = 312, AltGr = 313,
|
||||
Help = 315, Print = 316, SysReq = 317, Break = 318, Menu = 319,
|
||||
Mouse0 = 323, Mouse1, Mouse2, Mouse3, Mouse4, Mouse5, Mouse6,
|
||||
JoystickButton0 = 330, JoystickButton1, JoystickButton2, JoystickButton3,
|
||||
JoystickButton4, JoystickButton5, JoystickButton6, JoystickButton7,
|
||||
JoystickButton8, JoystickButton9, JoystickButton10, JoystickButton11,
|
||||
JoystickButton12, JoystickButton13, JoystickButton14, JoystickButton15,
|
||||
JoystickButton16, JoystickButton17, JoystickButton18, JoystickButton19
|
||||
}
|
||||
None = 0, Tab = 9, Return = 13, Escape = 27, Alpha0 = 48, A = 97, B, D, E, F, N, P, S, X, RightArrow = 275, LeftArrow = 276, RightShift = 303, LeftShift = 304, RightControl = 305, LeftControl = 306, Mouse0 = 323, JoystickButton0 = 330, JoystickButton1 }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user