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
@@ -111,18 +111,12 @@ public class NetworkTask
|
||||
resultCode = getDataHeader()["result_code"].ToInt();
|
||||
}
|
||||
|
||||
public int GetResultCode()
|
||||
{
|
||||
return resultCode;
|
||||
}
|
||||
|
||||
public ERROR_CODE_STATUS CheckResultCodeToPopupCreate_ReturnStatus(int rc = 0)
|
||||
{
|
||||
INetworkUI networkUI = Toolbox.NetworkManager.NetworkUI;
|
||||
if (isAppVersionUP())
|
||||
{
|
||||
RecoveryRecordManagerBase.DeleteRecoveryFile();
|
||||
networkUI.OpenGotoStoreErrorPopup();
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR;
|
||||
}
|
||||
if (isResourceVersionUp())
|
||||
@@ -132,25 +126,25 @@ public class NetworkTask
|
||||
if (!Url.Contains(CuteNetworkDefine.ApiUrlList[CuteNetworkDefine.ApiType.GameStartCheck]))
|
||||
{
|
||||
RecoveryRecordManagerBase.DeleteRecoveryFile();
|
||||
networkUI.OpenResourceVersionUpPopUp();
|
||||
|
||||
Parse();
|
||||
return ERROR_CODE_STATUS.ERROR;
|
||||
}
|
||||
}
|
||||
if (isSessionError())
|
||||
{
|
||||
networkUI.OpenSessionErrorPopUp();
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR;
|
||||
}
|
||||
setSession();
|
||||
if (isUnknownServerError() || isServerProcessedError() || isServerDataBaseError())
|
||||
{
|
||||
networkUI.OpenStrictServerErrorPopUp(resultCode);
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR;
|
||||
}
|
||||
if (isAccountBlockError())
|
||||
{
|
||||
networkUI.OpenAccountBlockErrorPopUp(resultCode);
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR;
|
||||
}
|
||||
if (isNeteaseAccountBlockError())
|
||||
@@ -161,18 +155,18 @@ public class NetworkTask
|
||||
if (isAccountLimitedBlockError())
|
||||
{
|
||||
string accountLimitedBlockEndTime = getAccountLimitedBlockEndTime();
|
||||
networkUI.OpenAccountLimitedBlockErrorPopUp(resultCode, accountLimitedBlockEndTime);
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR;
|
||||
}
|
||||
if (IsAllMaintenanceError())
|
||||
{
|
||||
string maintenanceEndTime = getMaintenanceEndTime();
|
||||
networkUI.OpenAllMaintenancePopUp(resultCode, maintenanceEndTime);
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR_TO_MAINTENANCE_POPUP;
|
||||
}
|
||||
if (IsEachFunctionMaintenanceError())
|
||||
{
|
||||
networkUI.OpenEachFunctionMaintenancePopUp(resultCode);
|
||||
|
||||
return ERROR_CODE_STATUS.ERROR_TO_MAINTENANCE_POPUP;
|
||||
}
|
||||
if (IsCardMaintenanceError())
|
||||
@@ -206,15 +200,6 @@ public class NetworkTask
|
||||
|
||||
private void cuteCheckResultCode()
|
||||
{
|
||||
INetworkUI networkUI = Toolbox.NetworkManager.NetworkUI;
|
||||
if (networkUI.isCloseDialogGroupError(resultCode))
|
||||
{
|
||||
networkUI.OpenCloseOnlyErrorPopUp(resultCode);
|
||||
}
|
||||
else if (!isServerResultCodeOK())
|
||||
{
|
||||
networkUI.OpenOtherServerErrorPopUp(resultCode);
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual string getAccountLimitedBlockEndTime()
|
||||
@@ -297,16 +282,16 @@ public class NetworkTask
|
||||
private void AddHeaderParam()
|
||||
{
|
||||
string udid = getUdid();
|
||||
string viewer_id = CryptAES.encrypt(Certification.ViewerId.ToString());
|
||||
string viewer_id = CryptAES.encrypt(0 /* Pre-Phase-5 chunk 39: Cute NetworkTask is client-only; dead headless */.ToString());
|
||||
Params.viewer_id = viewer_id;
|
||||
Params.steam_id = Certification.SteamID;
|
||||
Params.steam_session_ticket = Certification.SteamSessionTicket;
|
||||
string text = Convert.ToBase64String(MessagePackSerializer.FromJson(JsonMapper.ToJson(Params)));
|
||||
Uri uri = new Uri(Url.Trim());
|
||||
string text2 = udid + uri.AbsolutePath + text;
|
||||
if (Certification.ViewerId != 0)
|
||||
if (0 /* Pre-Phase-5 chunk 39: Cute NetworkTask is client-only; dead headless */ != 0)
|
||||
{
|
||||
text2 += Certification.ViewerId;
|
||||
text2 += 0 /* Pre-Phase-5 chunk 39: Cute NetworkTask is client-only; dead headless */;
|
||||
}
|
||||
string value = Cryptographer.ComputeHash(text2);
|
||||
header["PARAM"] = value;
|
||||
@@ -380,11 +365,6 @@ public class NetworkTask
|
||||
{
|
||||
}
|
||||
|
||||
private void AddHeaderCarrier()
|
||||
{
|
||||
header["CARRIER"] = Toolbox.DeviceManager.GetCarrier();
|
||||
}
|
||||
|
||||
private void AddHeaderKeyChain()
|
||||
{
|
||||
header["KEYCHAIN"] = Certification.GetKeyChainViewerId();
|
||||
@@ -521,16 +501,6 @@ public class NetworkTask
|
||||
Toolbox.SavedataManager.SetResourceVersion(resourceVersion);
|
||||
}
|
||||
|
||||
public void AddSkipCuteCheckResultCode(int resultCode)
|
||||
{
|
||||
skipCuteCheckResultCodes.Add(resultCode);
|
||||
}
|
||||
|
||||
public void AddSkipCuteCheckResultCode(List<int> resultCodes)
|
||||
{
|
||||
skipCuteCheckResultCodes.Add(resultCodes);
|
||||
}
|
||||
|
||||
public void SkipAllCuteResultCodeCheckErrorPopup()
|
||||
{
|
||||
skipCuteCheckResultCodes.setSkipAll(pSkipAll: true);
|
||||
@@ -555,16 +525,4 @@ public class NetworkTask
|
||||
{
|
||||
return skipCommonHttpStatusErrorPopUp;
|
||||
}
|
||||
|
||||
public void ClearSkipCuteCheckResultCode()
|
||||
{
|
||||
skipCuteCheckResultCodes.Clear();
|
||||
}
|
||||
|
||||
public void SkipAllNetworkChecks()
|
||||
{
|
||||
SkipAllCuteResultCodeCheckErrorPopup();
|
||||
SkipCuteTimeOutPopup();
|
||||
SkipCuteHttpStatusErrorPopup();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user