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
@@ -9,9 +9,6 @@ public class MyRotationAllInfo
|
||||
{
|
||||
public class PeriodData
|
||||
{
|
||||
public DateTime BeginTime = DateTime.MaxValue;
|
||||
|
||||
public DateTime EndTime = DateTime.MinValue;
|
||||
|
||||
public double StartUnixTime { get; set; }
|
||||
|
||||
@@ -20,8 +17,6 @@ public class MyRotationAllInfo
|
||||
|
||||
private Dictionary<string, MyRotationInfo> _myRotationDictionary = new Dictionary<string, MyRotationInfo>();
|
||||
|
||||
public PeriodData GatheringPeriod = new PeriodData();
|
||||
|
||||
public PeriodData FreeMatchPeriod = new PeriodData();
|
||||
|
||||
private bool _myRotationScheduleExist;
|
||||
@@ -32,63 +27,14 @@ public class MyRotationAllInfo
|
||||
|
||||
public List<MyRotationInfo> MyRotationInfoList { get; } = new List<MyRotationInfo>();
|
||||
|
||||
public MyRotationInfo FirstPackInfo { get; private set; }
|
||||
|
||||
public MyRotationInfo FirstPackInfoNemesis { get; private set; }
|
||||
|
||||
public List<MyRotationAbilityGroup> AbilityGroup { get; private set; } = new List<MyRotationAbilityGroup>();
|
||||
|
||||
public List<string> DisableCardPackIdList { get; private set; } = new List<string>();
|
||||
|
||||
public bool IsFinishInitializeText { get; private set; }
|
||||
|
||||
public bool IsMyRotationEnable => IsWithinPeriod(FreeMatchPeriod);
|
||||
|
||||
public bool IsWithinGatheringPeriod => IsWithinPeriod(GatheringPeriod);
|
||||
|
||||
public bool IsWithinFreeMatchPeriod => IsWithinPeriod(FreeMatchPeriod);
|
||||
|
||||
public bool IsWithinCopyDeckIntroductionPeriod => IsWithinFreeMatchPeriod;
|
||||
|
||||
public void InitializeText()
|
||||
{
|
||||
IsFinishInitializeText = true;
|
||||
int num = int.MaxValue;
|
||||
int num2 = int.MaxValue;
|
||||
foreach (MyRotationInfo myRotationInfo in MyRotationInfoList)
|
||||
{
|
||||
myRotationInfo.InitializeText();
|
||||
int num3 = int.Parse(myRotationInfo.LastPackId);
|
||||
if (num3 < num)
|
||||
{
|
||||
num = num3;
|
||||
FirstPackInfo = myRotationInfo;
|
||||
}
|
||||
if (myRotationInfo.IsEnableNemesis && num3 < num2)
|
||||
{
|
||||
num2 = num3;
|
||||
FirstPackInfoNemesis = myRotationInfo;
|
||||
}
|
||||
}
|
||||
InitializeAbilityGroup();
|
||||
InitializeRePrintCard();
|
||||
}
|
||||
|
||||
private void InitializeRePrintCard()
|
||||
{
|
||||
CardMaster instance = CardMaster.GetInstance(FormatBehaviorManager.GetDefaultBehaviour(Format.MyRotation).CardMasterId);
|
||||
List<int> allCardIds = instance.GetAllCardIds();
|
||||
List<CardParameter> list = new List<CardParameter>(allCardIds.Count);
|
||||
foreach (int item in allCardIds)
|
||||
{
|
||||
list.Add(instance.GetCardParameterFromId(item));
|
||||
}
|
||||
foreach (MyRotationInfo myRotationInfo in MyRotationInfoList)
|
||||
{
|
||||
myRotationInfo.InitializeRePrintCard(list);
|
||||
}
|
||||
}
|
||||
|
||||
public MyRotationInfo Get(string id)
|
||||
{
|
||||
if (string.IsNullOrEmpty(id))
|
||||
@@ -102,111 +48,6 @@ public class MyRotationAllInfo
|
||||
return null;
|
||||
}
|
||||
|
||||
private void InitializeAbilityGroup()
|
||||
{
|
||||
if (MyRotationInfoList.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
MyRotationInfo myRotationInfo = MyRotationInfoList[0];
|
||||
MyRotationInfo lastPack = MyRotationInfoList[0];
|
||||
bool isFirst = true;
|
||||
for (int i = 0; i < MyRotationInfoList.Count; i++)
|
||||
{
|
||||
MyRotationInfo myRotationInfo2 = MyRotationInfoList[i];
|
||||
if (!MyRotationInfo.IsEqualAbility(myRotationInfo, myRotationInfo2))
|
||||
{
|
||||
AbilityGroup.Add(CreateGroup(myRotationInfo, lastPack, isFirst));
|
||||
isFirst = false;
|
||||
myRotationInfo = (lastPack = myRotationInfo2);
|
||||
}
|
||||
else
|
||||
{
|
||||
lastPack = myRotationInfo2;
|
||||
}
|
||||
}
|
||||
AbilityGroup.Add(CreateGroup(myRotationInfo, lastPack, isFirst));
|
||||
}
|
||||
|
||||
private static MyRotationAbilityGroup CreateGroup(MyRotationInfo startPack, MyRotationInfo lastPack, bool isFirst)
|
||||
{
|
||||
int startNumber = int.Parse(startPack.LastPackId) - 10000;
|
||||
int lastNumber = int.Parse(lastPack.LastPackId) - 10000;
|
||||
string shortName = Data.Master.CardSetNameMgr.Get(startPack.LastPackId).ShortName;
|
||||
string shortName2 = Data.Master.CardSetNameMgr.Get(lastPack.LastPackId).ShortName;
|
||||
if (isFirst)
|
||||
{
|
||||
startNumber = int.Parse(startPack.FirstPackId) - 10000;
|
||||
shortName = Data.Master.CardSetNameMgr.Get(startPack.FirstPackId).ShortName;
|
||||
}
|
||||
return new MyRotationAbilityGroup(startNumber, lastNumber, shortName, shortName2, startPack.Abilities);
|
||||
}
|
||||
|
||||
public void Parse(JsonData json, JsonData headerData)
|
||||
{
|
||||
JsonData jsonData = json["setting"];
|
||||
JsonData jsonData2 = json["restricted_base_card_id_list"];
|
||||
JsonData jsonData3 = json["abilities"];
|
||||
foreach (string key in jsonData.Keys)
|
||||
{
|
||||
MyRotationInfo myRotationInfo = new MyRotationInfo(jsonData[key]);
|
||||
_myRotationDictionary[myRotationInfo.Id] = myRotationInfo;
|
||||
MyRotationInfoList.Add(myRotationInfo);
|
||||
}
|
||||
if (jsonData2.IsObject)
|
||||
{
|
||||
foreach (string key2 in jsonData2.Keys)
|
||||
{
|
||||
_myRotationDictionary[key2].ParseRestrictJson(jsonData2[key2]);
|
||||
}
|
||||
}
|
||||
JsonData jsonData4 = json["reprinted_base_card_ids"];
|
||||
if (jsonData4.IsObject)
|
||||
{
|
||||
foreach (string key3 in jsonData4.Keys)
|
||||
{
|
||||
_myRotationDictionary[key3].ParseRePrintJson(jsonData4[key3]);
|
||||
}
|
||||
}
|
||||
if (jsonData3.IsObject)
|
||||
{
|
||||
foreach (MyRotationInfo myRotationInfo2 in MyRotationInfoList)
|
||||
{
|
||||
myRotationInfo2.ParseAbilitiesJson(jsonData3);
|
||||
}
|
||||
}
|
||||
JsonData jsonData5 = json["schedules"];
|
||||
if (jsonData5.IsObject)
|
||||
{
|
||||
if (jsonData5.TryGetValue("gathering", out var value))
|
||||
{
|
||||
SetPeriodData(GatheringPeriod, value);
|
||||
}
|
||||
if (jsonData5.TryGetValue("free_battle", out var value2))
|
||||
{
|
||||
SetPeriodData(FreeMatchPeriod, value2);
|
||||
_myRotationScheduleExist = true;
|
||||
_receiveSinceTime = Time.realtimeSinceStartup;
|
||||
_receiveServerUnixTime = headerData["servertime"].ToDouble();
|
||||
}
|
||||
}
|
||||
if (json.TryGetValue("disable_card_set_ids", out var value3))
|
||||
{
|
||||
for (int i = 0; i < value3.Count; i++)
|
||||
{
|
||||
DisableCardPackIdList.Add(value3[i].ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void SetPeriodData(PeriodData period, JsonData jsonData)
|
||||
{
|
||||
period.BeginTime = DateTime.Parse(jsonData["begin_time"].ToString());
|
||||
period.EndTime = DateTime.Parse(jsonData["end_time"].ToString());
|
||||
period.StartUnixTime = ConvertTime.DateTimeToUnixTime(DateTime.Parse(jsonData["begin_time"].ToString()));
|
||||
period.EndUnixTime = ConvertTime.DateTimeToUnixTime(DateTime.Parse(jsonData["end_time"].ToString()));
|
||||
}
|
||||
|
||||
private bool IsWithinPeriod(PeriodData period)
|
||||
{
|
||||
if (!_myRotationScheduleExist)
|
||||
|
||||
Reference in New Issue
Block a user