Files
SVSimServer/SVSim.BattleEngine/Engine/DoMatchingBase.cs
gamer147 2d9a6eea4b 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>
2026-07-03 19:18:54 -04:00

85 lines
2.3 KiB
C#

using System.Collections.Generic;
using LitJson;
using Wizard;
public class DoMatchingBase : BaseTask
{
public class DoMatchingTaskParam : BaseParam
{
public int deck_no;
public int need_init;
public int log;
public List<int> excluded_field_id_list;
public int use_stage_select;
public int is_default_skin;
public DoMatchingTaskParam(int deckNo, int needInit, int logdType)
{
deck_no = deckNo;
need_init = needInit;
log = logdType;
excluded_field_id_list = PlayerPrefsWrapper.CreateServerSendStageOffList();
use_stage_select = PlayerPrefsWrapper.GetValue(PlayerPrefsWrapper.USE_OFF_STAGE);
is_default_skin = (PlayerPrefsWrapper.GetBool(PlayerPrefsWrapper.SHOW_OPPONENT_DEFAULT_SKIN) ? 1 : 0);
}
}
public class DoMatchingTaskIncludeCardMasterHashParam : DoMatchingTaskParam
{
public string card_master_hash;
public DoMatchingTaskIncludeCardMasterHashParam(int deckNo, int needInit, int logdType)
: base(deckNo, needInit, logdType)
{
card_master_hash = CardMasterLocalFileUtility.GetCardMasterHash();
}
}
public DoMatchingBase()
{
SkipCuteTimeOutPopup();
SkipCuteHttpStatusErrorPopup();
SkipAllCuteResultCodeCheckErrorPopup();
}
protected override int Parse()
{
int num = base.Parse();
if (num != 1)
{
return num;
}
if (base.ResponseData["data"].Keys.Contains("feature_maintenance_list"))
{
List<NetworkDefine.MAINTENANCE_TYPE> list = new List<NetworkDefine.MAINTENANCE_TYPE>();
for (int i = 0; i < base.ResponseData["data"]["feature_maintenance_list"].Count; i++)
{
list.Add((NetworkDefine.MAINTENANCE_TYPE)base.ResponseData["data"]["feature_maintenance_list"][i].ToInt());
}
Data.UpdateMaintenance(new List<NetworkDefine.MAINTENANCE_TYPE>
{
NetworkDefine.MAINTENANCE_TYPE.REPLAY_ALL,
NetworkDefine.MAINTENANCE_TYPE.NEWREPLAY_ALL,
NetworkDefine.MAINTENANCE_TYPE.NEWREPLAY_EXCLUDE_ROTATION,
NetworkDefine.MAINTENANCE_TYPE.NEWREPLAY_RECORD
}, list);
}
SettingCardMasterId(base.ResponseData["data"]);
return num;
}
private void SettingCardMasterId(JsonData jsonData)
{
int num = jsonData["matching_state"].ToInt();
if (num == 3004 || num == 3007 || num == 3011)
{
CardMaster.SetBattleCardMasterId(jsonData["card_master_id"].ToInt());
}
}
}