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
@@ -1,77 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using LitJson;
|
||||
|
||||
namespace Wizard.Scripts.Network.Data.TaskData.SpotCardExchange;
|
||||
|
||||
public class SpotCardExchangeInfoTask : BaseTask
|
||||
{
|
||||
public class PrereleaseExchangeInfo
|
||||
{
|
||||
private int _exchangeablePrereleaseCardLimit;
|
||||
|
||||
private int _exchangedPrereleaseCardCount;
|
||||
|
||||
public bool IsPrerelease { get; private set; }
|
||||
|
||||
public int RemainingExchangeableCount
|
||||
{
|
||||
get
|
||||
{
|
||||
if (IsPrerelease)
|
||||
{
|
||||
return _exchangeablePrereleaseCardLimit - _exchangedPrereleaseCardCount;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public PrereleaseExchangeInfo(JsonData jsonData)
|
||||
{
|
||||
IsPrerelease = jsonData["is_pre_release"].ToBoolean();
|
||||
_exchangeablePrereleaseCardLimit = jsonData["pre_release_spot_card_exchange_limit"].ToInt();
|
||||
_exchangedPrereleaseCardCount = jsonData["pre_release_spot_card_exchange_count"].ToInt();
|
||||
}
|
||||
}
|
||||
|
||||
public Dictionary<CardBasePrm.ClanType, List<SpotCardExchangeInfo>> ExchangeableSpotCardListInClassDict { get; private set; }
|
||||
|
||||
public int NextCycleOutPackId { get; private set; }
|
||||
|
||||
public PrereleaseExchangeInfo PrereleaseInfo { get; private set; }
|
||||
|
||||
public SpotCardExchangeInfoTask()
|
||||
{
|
||||
base.type = ApiType.Type.SpotCardInfo;
|
||||
}
|
||||
|
||||
protected override int Parse()
|
||||
{
|
||||
int num = base.Parse();
|
||||
if (num != 1)
|
||||
{
|
||||
return num;
|
||||
}
|
||||
JsonData jsonData = base.ResponseData["data"];
|
||||
PlayerStaticData.UserSpotCardPointCount = jsonData["spot_point"].ToInt();
|
||||
ExchangeableSpotCardListInClassDict = new Dictionary<CardBasePrm.ClanType, List<SpotCardExchangeInfo>>();
|
||||
for (CardBasePrm.ClanType clanType = CardBasePrm.ClanType.ALL; clanType < CardBasePrm.ClanType.MAX; clanType++)
|
||||
{
|
||||
ExchangeableSpotCardListInClassDict[clanType] = new List<SpotCardExchangeInfo>();
|
||||
JsonData jsonData2 = jsonData["exchangeable_card_list"][(int)clanType];
|
||||
List<string> list = new List<string>(jsonData2.Keys);
|
||||
for (int i = 0; i < list.Count; i++)
|
||||
{
|
||||
JsonData jsonData3 = jsonData2[list[i]];
|
||||
for (int j = 0; j < jsonData3.Count; j++)
|
||||
{
|
||||
SpotCardExchangeInfo item = new SpotCardExchangeInfo(jsonData3[j], int.Parse(list[i]));
|
||||
ExchangeableSpotCardListInClassDict[clanType].Add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
int.TryParse(jsonData["soon_cycle_out_card_set_id"].ToString(), out var result);
|
||||
NextCycleOutPackId = result;
|
||||
PrereleaseInfo = new PrereleaseExchangeInfo(jsonData["pre_relase_info"]);
|
||||
return num;
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,6 @@ public class SpotCardExchangeTask : BaseTask
|
||||
public class SpotCardExchangeTaskParam : BaseParam
|
||||
{
|
||||
public int card_id;
|
||||
|
||||
public int exchange_point;
|
||||
}
|
||||
|
||||
public SpotCardExchangeTask()
|
||||
@@ -14,14 +12,6 @@ public class SpotCardExchangeTask : BaseTask
|
||||
base.type = ApiType.Type.SpotCardExchange;
|
||||
}
|
||||
|
||||
public void SetParameter(int cardId, int exchangePoint)
|
||||
{
|
||||
SpotCardExchangeTaskParam spotCardExchangeTaskParam = new SpotCardExchangeTaskParam();
|
||||
spotCardExchangeTaskParam.card_id = cardId;
|
||||
spotCardExchangeTaskParam.exchange_point = exchangePoint;
|
||||
base.Params = spotCardExchangeTaskParam;
|
||||
}
|
||||
|
||||
protected override int Parse()
|
||||
{
|
||||
int num = base.Parse();
|
||||
|
||||
Reference in New Issue
Block a user