SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine cleanup passes 4-7 + multi-instancing ambient rip

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

124
SVSim.BattleEngine/Shim/Generated/RoomConnectController.g.cs
View File

@@ -22,141 +22,21 @@ public partial class RoomConnectController
}
public enum BattleRule
{
None,
Bo1,
Bo3,
Bo5,
Bo3Ban,
Bo5Ban
}
None }
public enum FirstTurn
{
INVALID,
RANDOM,
OWNER_FIRST_TURN,
OWNER_SECOND_TURN,
MAX
}
RANDOM }
public enum ConnectRoomResult
{
IDLE = -1,
TIMEOUT = -2,
ERROR = -3,
CONNECT_ERROR = -4,
SUCCESS = 0
}
private enum RoomSetupErrorAction
{
CALL_ACTION,
GO_HOME,
GO_TITLE
}
private const float TIMEOUT_SEC = 10f;
public const int SERVER_ROOM_TYPE_NORMAL = 1;
public const int SERVER_ROOM_TYPE_TWOPICK = 2;
public const int SERVER_ROOM_TYPE_TWOPICK_BACK_DRAFT = 3;
public const int SERVER_ROOM_TYPE_BO3 = 4;
public const int SERVER_ROOM_TYPE_BO5 = 5;
public const int SERVER_ROOM_TYPE_TWOPICK_QUBE = 6;
public const int SERVER_ROOM_TYPE_HOF = 7;
public const int SERVER_ROOM_TYPE_TWOPICK_BO3 = 8;
public const int SERVER_ROOM_TYPE_TWOPICK_BO5 = 9;
public const int SERVER_ROOM_TYPE_WINDFALL = 10;
public const int SERVER_ROOM_TYPE_AVATAR = 11;
public const int ID_NUMBER_OF_DIGIT = 5;
public const int CONVENTION_ID_NUMBER_OF_DIGIT = 5;
private string _roomId;
private DialogBase _nodeErrorDialog;
public int TotalBattleNum;
public int TotalWatchBattleNum;
public bool IsRelease;
private Coroutine _timeOutCoroutine;
private RoomWatchEventDispatch _watchEventDispatch;
public bool IsWatchBattleLoadStart;
public ConnectRoomResult ConnectRoomResultType { get; set; }
public bool IsEnterErrorDeckCount { get; set; }
public bool IsTournament { get; set; }
public bool IsTournamentSettled { get; set; }
public bool IsTournamentTimeOutCheack { get; set; }
public string RoomID { get; set; }
public bool IsEnableGuildInviteButton { get; set; }
public bool IsJoinGuild { get; set; }
public string DisplayRoomID { get; set; }
public bool CanUseNonPossessionCard { get; set; }
public RoomBase RoomUIClass { get; set; }
public Matching MatchingClass { get; set; }
public static RoomDialog RoomDialog { get; set; }
public bool IsDisconnectSelf { get; set; }
public RealTimeNetworkAgent NetworkAgent { get; set; }
public RoomFormatEventHandler FormatEventHandler { get; set; }
public PlayerController OwnCtrl { get; set; }
public PlayerController OppoCtrl { get; set; }
public OpenRoomBattleGetRecoveryParamTask RecoveryTask { get; set; }
public PositionMode PositionModeValue { get; set; }
public BattleParameter BattleParameterInstance { get; set; }
public static bool IsAlreadyStartBattle { get; set; }
public FirstTurn FirstTurnType { get; set; }
public bool IsRoomRecovery { get; set; }
public bool IsConvention { get; set; }
public bool IsGuildChatPost { get; set; }
public ConventionInfo ConventionInfo { get; set; }
public long SelfSleeveIdForTwoPick { get; set; }
public bool IsGathering { get; set; }
public GatheringAutoJoinTaskInfo GatheringAutoJoinTaskInfo { get; set; }
private bool _isAutoJoinEntry { get; set; }
public bool IsReceivedInitWatch { get; set; }
public bool IsConnect { get; set; }
public bool IsAvatar { get; set; }
public bool IsMultiDeckHistoryClearSoon { get; set; }
public bool IsMultiDeckRule { get; set; }
public int SelectDeckCount { get; set; }
public int BattleUseDeckCount { get; set; }
public bool IsShowHighRankFormat { get; set; }
public bool IsTwoPick { get; set; }
public bool IsChaosFormat { get; set; }
public bool IsTwoPickDraftAPI { get; set; }
public bool IsWatch { get; set; }
public bool IsPlayer { get; set; }
public bool IsPermitFriendWatch { get; set; }
public bool IsPermitGuildWatch { get; set; }
public bool IsConventionRematchEnable { get; set; }
public bool IsEnableTurnSelect { get; set; }
public static bool IsDeckBanRule(BattleRule rule) => default!;
public static bool IsMultiDeck(BattleRule rule) => default!;
public static bool IsTwoPickFormat(NetworkDefine.ServerBattleType type) => default!;
public static bool IsShowHighRankRoomRuleFormat(BattleParameter battleFormatBase) => default!;
public static int RuleBattleDeckCount(BattleRule rule) => default!;
public static int RuleSelectDeckCount(BattleRule rule) => default!;
public static bool IsTwoPickDraftMatchingAPI(TwoPickFormat rule) => default!;
public static bool IsNormalMatchingAPI(BattleParameter rule) => default!;
public static DataMgr.BattleType RoomRuleToBattleType(BattleParameter battleParameter) => default!;
public void SetConventionInfo(ConventionRoomBattleWatchTask watchTask) { }
public RoomConnectController(InitializeParameter param) { }
public void InitializeWatchEventDispatch() { }
public void RemoveWatchEventDispath(bool isOwn) { }
public Matching_Room CreateMatchingRoom(bool isConvention, bool isGathering, BattleParameter battleParameter) => default!;
public void InitPlayerController() { }
public void InitializeOwnPlayer() { }
public void InitializeOpponentPlayer() { }
public IEnumerator StartConnect(string battleId = "") => default!;
private void InitTimeout() { }
private void StartTimeout() { }
public IEnumerator ConnectRecoveryRoom(OpenRoomBattleGetRecoveryParamTask task) => default!;
public IEnumerator ReSetConnectCoroutine(Matching matching) => default!;
private IEnumerator TimeMeasurement(float timeout) => default!;
public void DestroyRealTimeNetwork() { }
private void ExitRoomTask() { }
private IEnumerator ConnectRealTimeNetworkAgent(bool isFirstConnect) => default!;
private void TimeoutInitNetwork() { }
private void ConnectError() { }
private bool IsCheckConnectResultType() => default!;
private bool _ResultCheck(ConnectRoomResult result, RoomSetupErrorAction errorActionType, Action inDialogCloseAction = null) => default!;
public bool IsExistNodeErrorDialog() => default!;
private void _GoHome() { }
private void _MoveView(NetworkTask.ResultCode in_ResultCode) { }
public void ClearRoomRecoveryInfo() { }
public void CommonResultCodeError(int code) { }
private bool ResultCodeError(int code) => default!;
private bool ResultCodeErrorForWatcher(int code) => default!;
}
}