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
@@ -13,10 +13,6 @@ public class Mission : UIBase
|
||||
BattlePassMission
|
||||
}
|
||||
|
||||
public const int ONE_DAY_HOURS = 24;
|
||||
|
||||
public const double CAN_CHANGE_MISSION_CHECK_MARGIN_SECONDS = 10.0;
|
||||
|
||||
private static readonly Vector3 POS_SOLO_PLAY_MISSION_LABEL_CHANGE_ENABLE = new Vector3(990f, -31f, 0f);
|
||||
|
||||
private static readonly Vector3 POS_SOLO_PLAY_MISSION_LABEL_CHANGE_DISABLE = new Vector3(990f, -21f, 0f);
|
||||
@@ -129,7 +125,7 @@ public class Mission : UIBase
|
||||
_btnTransitionBattlePass.onClick.Add(new EventDelegate(delegate
|
||||
{
|
||||
UIManager.GetInstance().ChangeViewScene(UIManager.ViewScene.BattlePass);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_BTN_DECIDE);
|
||||
|
||||
}));
|
||||
UIEventListener uIEventListener = UIEventListener.Get(_soloPlayMissionEventListener.gameObject);
|
||||
uIEventListener.onClick = (UIEventListener.VoidDelegate)Delegate.Combine(uIEventListener.onClick, (UIEventListener.VoidDelegate)delegate
|
||||
@@ -144,7 +140,7 @@ public class Mission : UIBase
|
||||
if (_currentViewTab != viewTab)
|
||||
{
|
||||
UpdateMissionView(viewTab);
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_TOGGLE_ON);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,13 +150,13 @@ public class Mission : UIBase
|
||||
string text;
|
||||
if (Data.MissionInfo.data._missionReceiveType == MissionInfoDetail.eMissionReceiveType.normal)
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_TOGGLE_ON);
|
||||
|
||||
receiveType = MissionInfoDetail.eMissionReceiveType.solo;
|
||||
text = Data.SystemText.Get("Mission_0083");
|
||||
}
|
||||
else
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_TOGGLE_OFF);
|
||||
|
||||
receiveType = MissionInfoDetail.eMissionReceiveType.normal;
|
||||
text = Data.SystemText.Get("Mission_0084");
|
||||
}
|
||||
@@ -187,7 +183,7 @@ public class Mission : UIBase
|
||||
TimeSpan timeSpan = default(TimeSpan);
|
||||
if (!flag)
|
||||
{
|
||||
timeSpan = TimeSpan.FromSeconds(Data.MissionInfo.data.WaitTimeCanChangeReceiveType - GameMgr.GetIns().GetMissionInfoTask().NowUnixTime());
|
||||
timeSpan = TimeSpan.FromSeconds(Data.MissionInfo.data.WaitTimeCanChangeReceiveType - 0L /* headless UI stub: no mission time */);
|
||||
flag = timeSpan.TotalSeconds < -10.0;
|
||||
}
|
||||
_soloPlayMssionChangeWaitTime.gameObject.SetActive(!flag);
|
||||
@@ -267,7 +263,7 @@ public class Mission : UIBase
|
||||
_soloPlayMissionToggleUI.gameObject.SetActive(value: true);
|
||||
SetMissionTypeToggleBtn(Data.MissionInfo.data._missionReceiveType);
|
||||
bool flag = Data.MissionInfo.data._isChangeMission;
|
||||
long num = GameMgr.GetIns().GetMissionInfoTask().NowUnixTime();
|
||||
long num = 0L /* headless UI stub: no mission time */;
|
||||
TimeSpan timeSpan = TimeSpan.FromSeconds(Data.MissionInfo.data._canChangeMissionTime - num);
|
||||
if (!flag)
|
||||
{
|
||||
@@ -357,7 +353,7 @@ public class Mission : UIBase
|
||||
ReceiveButton.onClick.Clear();
|
||||
ReceiveButton.onClick.Add(new EventDelegate(delegate
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_COMMON_BUTTON);
|
||||
|
||||
ReceiveAllAchievementRewards();
|
||||
}));
|
||||
goAchievementWindowBase.SetActive(value: false);
|
||||
@@ -383,7 +379,7 @@ public class Mission : UIBase
|
||||
DateTime? dateTime = ConvertTime.GetDateTime(monthlyMission.EndDate);
|
||||
if (dateTime.HasValue)
|
||||
{
|
||||
string remainingTime = ConvertTime.GetRemainingTime(ConvertTime.GetTimeSpan(GameMgr.GetIns().GetMissionInfoTask().NowUnixTime(), dateTime.Value));
|
||||
string remainingTime = ConvertTime.GetRemainingTime(ConvertTime.GetTimeSpan(0L /* headless UI stub: no mission time */, dateTime.Value));
|
||||
_battlePassMontlyMissionPeriodLabel.text = remainingTime;
|
||||
_battlePassMontlyMissionPeriodLabel.fontSize = PERIOD_TEXT_SIZE_BIG;
|
||||
_battlePassMontlyMissionPeriodLabel.color = LabelDefine.TEXT_COLOR_ORANGE;
|
||||
|
||||
Reference in New Issue
Block a user