2d9a6eea4b
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>
104 lines
2.8 KiB
C#
104 lines
2.8 KiB
C#
using System.Collections;
|
|
using Cute;
|
|
using LitJson;
|
|
using Wizard;
|
|
|
|
public class NtDataTranslateInfo
|
|
{
|
|
|
|
public string titleStatement = "";
|
|
|
|
public string containStatement = "";
|
|
|
|
public string titleEmail = "";
|
|
|
|
public string emailAddress1 = "";
|
|
|
|
public string emailAddress2 = "";
|
|
|
|
public string emailAddressTip1 = "";
|
|
|
|
public string emailAddressTip2 = "";
|
|
|
|
public string titleSuccess = "";
|
|
|
|
public string containSuccess = "";
|
|
|
|
public string titleTip = "";
|
|
|
|
public string containTip = "";
|
|
|
|
public string titleRebind = "";
|
|
|
|
public string containRebind = "";
|
|
|
|
public string ERROR_TITLE = "";
|
|
|
|
public string ERROR_CONTAIN1 = "";
|
|
|
|
public string ERROR_CONTAIN2 = "";
|
|
|
|
public string ERROR_CONTAIN4 = "";
|
|
|
|
public string ERROR_CONTAIN5 = "";
|
|
|
|
public string ERROR_CONTAIN6 = "";
|
|
|
|
public string ERROR_CONTAIN7 = "";
|
|
|
|
public string serverUrl = "";
|
|
|
|
public string buttonTitle = "";
|
|
|
|
public string button_id1 = "";
|
|
|
|
public string button_id2 = "";
|
|
|
|
public string button_id3 = "";
|
|
|
|
public string button_id4 = "";
|
|
|
|
public string button_id5 = "";
|
|
|
|
public string button_id6 = "";
|
|
|
|
public string button_id7 = "";
|
|
|
|
public static NtDataTranslateInfo Init()
|
|
{
|
|
SystemText systemText = Data.SystemText;
|
|
return new NtDataTranslateInfo
|
|
{
|
|
titleStatement = systemText.Get("Account_0113"),
|
|
containStatement = systemText.Get("Account_0114"),
|
|
titleEmail = systemText.Get("Account_0115"),
|
|
emailAddress1 = systemText.Get("Account_0116"),
|
|
emailAddress2 = systemText.Get("Account_0117"),
|
|
emailAddressTip1 = systemText.Get("Account_0118"),
|
|
emailAddressTip2 = systemText.Get("Account_0119"),
|
|
titleSuccess = systemText.Get("Account_0120"),
|
|
containSuccess = systemText.Get("Account_0121"),
|
|
titleTip = systemText.Get("Account_0122"),
|
|
containTip = systemText.Get("Account_0123"),
|
|
titleRebind = systemText.Get("Account_0124"),
|
|
containRebind = systemText.Get("Account_0125"),
|
|
ERROR_TITLE = systemText.Get("Account_0126"),
|
|
ERROR_CONTAIN1 = systemText.Get("Account_0127"),
|
|
ERROR_CONTAIN2 = systemText.Get("Account_0128"),
|
|
ERROR_CONTAIN4 = systemText.Get("Account_0130"),
|
|
ERROR_CONTAIN5 = systemText.Get("Account_0131"),
|
|
ERROR_CONTAIN6 = systemText.Get("Account_0132"),
|
|
ERROR_CONTAIN7 = systemText.Get("Account_0133"),
|
|
serverUrl = CustomPreference.GetApplicationServerURL(),
|
|
buttonTitle = systemText.Get("Account_0137"),
|
|
button_id1 = systemText.Get("Account_0134"),
|
|
button_id2 = systemText.Get("Account_0135"),
|
|
button_id3 = systemText.Get("Account_0136"),
|
|
button_id4 = systemText.Get("Account_0136"),
|
|
button_id5 = systemText.Get("Account_0134"),
|
|
button_id6 = systemText.Get("Account_0135"),
|
|
button_id7 = systemText.Get("Account_0136")
|
|
};
|
|
}
|
|
}
|