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,9 +4,6 @@ public class ItemPurchaseBuyTask : BaseTask
|
||||
{
|
||||
public class ItemPurchaseBuyTaskParam : BaseParam
|
||||
{
|
||||
public int purchase_id;
|
||||
|
||||
public int rest;
|
||||
}
|
||||
|
||||
public ItemPurchaseBuyTask()
|
||||
@@ -14,14 +11,6 @@ public class ItemPurchaseBuyTask : BaseTask
|
||||
base.type = ApiType.Type.ItemPurchaseBuy;
|
||||
}
|
||||
|
||||
public void SetParameter(int purchaseId, int rest)
|
||||
{
|
||||
ItemPurchaseBuyTaskParam itemPurchaseBuyTaskParam = new ItemPurchaseBuyTaskParam();
|
||||
itemPurchaseBuyTaskParam.purchase_id = purchaseId;
|
||||
itemPurchaseBuyTaskParam.rest = rest;
|
||||
base.Params = itemPurchaseBuyTaskParam;
|
||||
}
|
||||
|
||||
protected override int Parse()
|
||||
{
|
||||
int num = base.Parse();
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
namespace Wizard.Scripts.Network.Data.TaskData.ItemPurchase;
|
||||
|
||||
public class ItemPurchaseData
|
||||
{
|
||||
public int purchase_id { get; set; }
|
||||
|
||||
public UserGoods.Type purchase_item_type { get; set; }
|
||||
|
||||
public long PurchaseUserGoodsId { get; set; }
|
||||
|
||||
public int purchase_item_num { get; set; }
|
||||
|
||||
public string purchase_name { get; set; }
|
||||
|
||||
public UserGoods.Type require_item_type { get; set; }
|
||||
|
||||
public long RequireUserGoodsId { get; set; }
|
||||
|
||||
public int require_item_num { get; set; }
|
||||
|
||||
public bool isMonthryReset { get; set; }
|
||||
|
||||
public string purchase_begin_time { get; set; }
|
||||
|
||||
public string purchase_end_time { get; set; }
|
||||
|
||||
public int rest { get; set; }
|
||||
|
||||
public string textureName { get; set; }
|
||||
}
|
||||
@@ -4,7 +4,4 @@ namespace Wizard.Scripts.Network.Data.TaskData.ItemPurchase;
|
||||
|
||||
public class ItemPurchaseInfo
|
||||
{
|
||||
private List<ItemPurchaseData> _itemPurchaseList = new List<ItemPurchaseData>();
|
||||
|
||||
public List<ItemPurchaseData> itemPurchaseList => _itemPurchaseList;
|
||||
}
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
using LitJson;
|
||||
|
||||
namespace Wizard.Scripts.Network.Data.TaskData.ItemPurchase;
|
||||
|
||||
public class ItemPurchaseInfoTask : BaseTask
|
||||
{
|
||||
public ItemPurchaseInfoTask()
|
||||
{
|
||||
base.type = ApiType.Type.ItemPurchaseInfo;
|
||||
}
|
||||
|
||||
protected override int Parse()
|
||||
{
|
||||
int num = base.Parse();
|
||||
if (num != 1)
|
||||
{
|
||||
return num;
|
||||
}
|
||||
Wizard.Data.ItemPurchaseInfo.itemPurchaseList.Clear();
|
||||
JsonData jsonData = base.ResponseData["data"]["item_purchase_info"];
|
||||
for (int i = 0; i < jsonData.Count; i++)
|
||||
{
|
||||
ItemPurchaseData itemData = new ItemPurchaseData();
|
||||
itemData.purchase_id = jsonData[i]["purchase_id"].ToInt();
|
||||
itemData.purchase_item_type = (UserGoods.Type)jsonData[i]["purchase_item_type"].ToInt();
|
||||
itemData.PurchaseUserGoodsId = jsonData[i]["purchase_item_id"].ToLong();
|
||||
itemData.purchase_item_num = jsonData[i]["purchase_item_num"].ToInt();
|
||||
itemData.purchase_name = jsonData[i]["purchase_name"].ToString();
|
||||
if (string.IsNullOrEmpty(itemData.purchase_name))
|
||||
{
|
||||
string userGoodsName = UserGoods.getUserGoodsName(itemData.purchase_item_type, itemData.PurchaseUserGoodsId);
|
||||
itemData.purchase_name = Wizard.Data.SystemText.Get("Shop_0132", userGoodsName.ToString(), itemData.purchase_item_num.ToString());
|
||||
}
|
||||
itemData.require_item_type = (UserGoods.Type)jsonData[i]["require_item_type"].ToInt();
|
||||
itemData.RequireUserGoodsId = jsonData[i]["require_item_id"].ToLong();
|
||||
itemData.require_item_num = jsonData[i]["require_item_num"].ToInt();
|
||||
itemData.isMonthryReset = ((jsonData[i]["is_monthly_reset"].ToInt() != 0) ? true : false);
|
||||
itemData.rest = jsonData[i]["rest"].ToInt();
|
||||
if (itemData.purchase_item_type == UserGoods.Type.Item)
|
||||
{
|
||||
itemData.textureName = Wizard.Data.Master.ItemList.Find((Item data) => data.UserGoodsId == itemData.PurchaseUserGoodsId).thumbnail;
|
||||
}
|
||||
else
|
||||
{
|
||||
itemData.textureName = UserGoods.GetUserGoodsImageName(itemData.purchase_item_type, itemData.PurchaseUserGoodsId);
|
||||
}
|
||||
Wizard.Data.ItemPurchaseInfo.itemPurchaseList.Add(itemData);
|
||||
}
|
||||
JsonData jsonData2 = base.ResponseData["data"]["user_card_pack_ticket_list"];
|
||||
for (int num2 = 0; num2 < jsonData2.Count; num2++)
|
||||
{
|
||||
PlayerStaticData.UpdateItemNum(jsonData2[num2]["item_id"].ToInt(), jsonData2[num2]["number"].ToInt());
|
||||
}
|
||||
return num;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user