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:
@@ -4,14 +4,9 @@ using Wizard;
|
||||
|
||||
public class UserCrystalCount : HeaderData
|
||||
{
|
||||
private const string ORB_KEY = "orb";
|
||||
|
||||
public int total_crystal;
|
||||
|
||||
public int free_crystal;
|
||||
|
||||
public int charge_crystal;
|
||||
|
||||
public int red_ether;
|
||||
|
||||
public int rupy;
|
||||
@@ -19,74 +14,4 @@ public class UserCrystalCount : HeaderData
|
||||
public int _spotcardPoint;
|
||||
|
||||
public string create_time;
|
||||
|
||||
public string update_time;
|
||||
|
||||
public string delete_time;
|
||||
|
||||
public string affected_rows;
|
||||
|
||||
public int last_payment_date;
|
||||
|
||||
public string _lastPaymentId;
|
||||
|
||||
public int _lastPaymentItemBuyNumber;
|
||||
|
||||
public List<SpecialCrystalInfo> SpecialCrystalInfo { get; private set; }
|
||||
|
||||
public bool EnableSpecialCrystal => SpecialCrystalInfo.Count > 0;
|
||||
|
||||
public bool NeedNewIcon
|
||||
{
|
||||
get
|
||||
{
|
||||
foreach (SpecialCrystalInfo item in SpecialCrystalInfo)
|
||||
{
|
||||
if (item.AvailablePurchaseCount > 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public RemainTime GetCloseTimeLimit()
|
||||
{
|
||||
int num = int.MaxValue;
|
||||
RemainTime result = null;
|
||||
foreach (SpecialCrystalInfo item in SpecialCrystalInfo)
|
||||
{
|
||||
if (item.RemainTime.Second < num)
|
||||
{
|
||||
num = item.RemainTime.Second;
|
||||
result = item.RemainTime;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public void SetUserCrystalCount(JsonData data)
|
||||
{
|
||||
total_crystal = data["total_crystal"].ToInt();
|
||||
free_crystal = data["free_crystal"].ToInt();
|
||||
charge_crystal = data["crystal"].ToInt();
|
||||
red_ether = data["red_ether"].ToInt();
|
||||
rupy = data["rupy"].ToInt();
|
||||
}
|
||||
|
||||
public void ParseSpecialCrystal(JsonData responseData)
|
||||
{
|
||||
SpecialCrystalInfo = new List<SpecialCrystalInfo>();
|
||||
JsonData jsonData = responseData["data"];
|
||||
if (jsonData.Keys.Contains("special_crystal_info"))
|
||||
{
|
||||
JsonData jsonData2 = jsonData["special_crystal_info"];
|
||||
for (int i = 0; i < jsonData2.Count; i++)
|
||||
{
|
||||
SpecialCrystalInfo item = new SpecialCrystalInfo(jsonData2[i], responseData);
|
||||
SpecialCrystalInfo.Add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user