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
@@ -16,22 +16,6 @@ public class NtDataTranslateManager
|
||||
|
||||
public const string FIRST_LOOK = "FIRST_LOOK";
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_SAME_EMAIL = 99401;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_RESPONE_ERROR = 99402;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_MAIL_ERROR = 99403;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_FREQUENTCY = 99404;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_DAILY_MAX = 99405;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_SYS_ERROR = 99406;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_CURL_ERROR = 99407;
|
||||
|
||||
public const int RC_NETEASE_DATA_TRANSACTION_UNKNOWN_ERROR = 99408;
|
||||
|
||||
private NtDataTranslateManager()
|
||||
{
|
||||
TranslateInfo = NtDataTranslateInfo.Init();
|
||||
@@ -56,26 +40,6 @@ public class NtDataTranslateManager
|
||||
return string.Format("{0}{1}", TranslateInfo.serverUrl, "netease_data_transaction/set_email_address");
|
||||
}
|
||||
|
||||
public bool CheckViewCanShow()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public void GetTranslateInfo(Action callBack = null)
|
||||
{
|
||||
TranslateInfo = NtDataTranslateInfo.Init();
|
||||
NtDataTranslate.Instance.TxtTranslate.text = TranslateInfo.buttonTitle;
|
||||
if (GetInstance().CheckViewCanShow())
|
||||
{
|
||||
NtDataTranslate.Instance.BtnTranslate.SetActive(value: true);
|
||||
}
|
||||
else
|
||||
{
|
||||
NtDataTranslate.Instance.BtnTranslate.SetActive(value: false);
|
||||
}
|
||||
callBack.Call();
|
||||
}
|
||||
|
||||
public void ShowStatement()
|
||||
{
|
||||
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
||||
@@ -199,50 +163,4 @@ public class NtDataTranslateManager
|
||||
callback.Call();
|
||||
};
|
||||
}
|
||||
|
||||
public void ShowCygamesStatement(Action callback, bool fromTitle = false)
|
||||
{
|
||||
if (CheckViewCanShow())
|
||||
{
|
||||
NtDataTranslate.Instance.BtnTranslate.SetActive(value: true);
|
||||
if (string.IsNullOrEmpty(Toolbox.SavedataManager.GetString("FIRST_LOOK")))
|
||||
{
|
||||
ShowMainNotice(callback, fromTitle);
|
||||
}
|
||||
else
|
||||
{
|
||||
callback.Call();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
NtDataTranslate.Instance.BtnTranslate.SetActive(value: false);
|
||||
callback.Call();
|
||||
}
|
||||
}
|
||||
|
||||
public void ShowMainNotice(Action callback, bool fromTitle = false)
|
||||
{
|
||||
if (fromTitle)
|
||||
{
|
||||
string text = Toolbox.SavedataManager.GetString("LANG_SETTING");
|
||||
if (!GameStartCheckTask.IsTutorialClear || (text != "Eng" && text != "Cht"))
|
||||
{
|
||||
callback.Call();
|
||||
return;
|
||||
}
|
||||
}
|
||||
SystemText systemText = Wizard.Data.SystemText;
|
||||
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose();
|
||||
dialogBase.SetTitleLabel(systemText.Get("Account_0111"));
|
||||
dialogBase.SetText(systemText.Get("Account_0112"));
|
||||
dialogBase.SetButtonLayout(DialogBase.ButtonLayout.OkBtn);
|
||||
dialogBase.SetSize(DialogBase.Size.XL);
|
||||
dialogBase.onPushButton1 = delegate
|
||||
{
|
||||
callback.Call();
|
||||
};
|
||||
dialogBase.SetOnClickUrl();
|
||||
Toolbox.SavedataManager.SetString("FIRST_LOOK", "1");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user