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
@@ -15,24 +15,6 @@ public static class ShopCommonUtility
|
||||
ticket
|
||||
}
|
||||
|
||||
public const float SUPPLY_LIST_LASTLINE_MARGIN = 30f;
|
||||
|
||||
private const string SPRITE_FORMAT_CLASS_COLOR = "icon_class_color_{0}";
|
||||
|
||||
private const int MAX_LENGTH_VIEW_PRODUCT_NAME = 18;
|
||||
|
||||
private const int MAX_LENGTH_VIEW_PRODUCT_NAME_ALPHABET = 35;
|
||||
|
||||
private const string OVER_MAX_TEXT_REPLACE_CHAR = "...";
|
||||
|
||||
public const string CMN_SHOP_ICON_1 = "cmn_shop_icon_1";
|
||||
|
||||
public const string TEXTURE_NAME_PRE_PACK_ICON = "card_pack_{0}_icon";
|
||||
|
||||
private const int ERROR_CODE_NOTFOUND_DECKCODE = 10001;
|
||||
|
||||
private const int ERROR_CODE_2PICK_DECKCODE = 10005;
|
||||
|
||||
private static readonly Vector3 POS_COST_LABLE_RIGHT = new Vector3(40f, -86f, 0f);
|
||||
|
||||
private static readonly Vector3 POS_COST_LABLE_LEFT = new Vector3(-141f, -86f, 0f);
|
||||
@@ -224,8 +206,7 @@ public static class ShopCommonUtility
|
||||
}
|
||||
case UserGoods.Type.Skin:
|
||||
typeName = Data.SystemText.Get("Common_0143");
|
||||
detailName = GameMgr.GetIns().GetDataMgr().GetCharaPrmBySkinId((int)userGoodsId)
|
||||
.chara_name;
|
||||
detailName = ""; // Pre-Phase-5b: no chara master headless
|
||||
break;
|
||||
case UserGoods.Type.SpotCardPoint:
|
||||
typeName = Data.SystemText.Get("Common_0161");
|
||||
@@ -237,37 +218,6 @@ public static class ShopCommonUtility
|
||||
}
|
||||
}
|
||||
|
||||
public static string GetRewardDetailName(ShopCommonRewardInfo rewardInfo)
|
||||
{
|
||||
int type = rewardInfo.Type;
|
||||
long userGoodsId = rewardInfo.UserGoodsId;
|
||||
int num = rewardInfo.Num;
|
||||
string typeName = null;
|
||||
string detailName = null;
|
||||
GetRewardNames(type, userGoodsId, num, out typeName, out detailName);
|
||||
return detailName;
|
||||
}
|
||||
|
||||
public static string GetRewardImagePath(ShopCommonRewardInfo rewardInfo, bool isFetch = false)
|
||||
{
|
||||
int type = rewardInfo.Type;
|
||||
long userGoodsId = rewardInfo.UserGoodsId;
|
||||
string result = "";
|
||||
switch ((UserGoods.Type)type)
|
||||
{
|
||||
case UserGoods.Type.Sleeve:
|
||||
{
|
||||
long existingSleeveId = Toolbox.ResourcesManager.GetExistingSleeveId(userGoodsId);
|
||||
result = Toolbox.ResourcesManager.GetAssetTypePath(existingSleeveId.ToString(), ResourcesManager.AssetLoadPathType.SleeveTexture, isFetch);
|
||||
break;
|
||||
}
|
||||
case UserGoods.Type.Emblem:
|
||||
result = Toolbox.ResourcesManager.GetAssetTypePath(userGoodsId.ToString(), ResourcesManager.AssetLoadPathType.Emblem_M, isFetch);
|
||||
break;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static string TrimProductName(string text)
|
||||
{
|
||||
int maxLength = (Global.IsAlphabetLanguage() ? 35 : 18);
|
||||
@@ -340,30 +290,6 @@ public static class ShopCommonUtility
|
||||
}
|
||||
}
|
||||
|
||||
public static void OnResultCodeErrorDeckCodeInfo(int code)
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 10001:
|
||||
{
|
||||
DialogBase dialogBase2 = UIManager.GetInstance().CreateDialogClose(isSystem: true);
|
||||
dialogBase2.SetTitleLabel(Data.SystemText.Get("Dia_BuyBuildDeck_006_Title"));
|
||||
dialogBase2.SetText(Data.SystemText.Get("Dia_BuyBuildDeck_006_Body"));
|
||||
break;
|
||||
}
|
||||
case 10005:
|
||||
{
|
||||
DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose(isSystem: true);
|
||||
dialogBase.SetTitleLabel(Data.SystemText.Get("Dia_BuyBuildDeck_007_Title"));
|
||||
dialogBase.SetText(Data.SystemText.Get("Dia_BuyBuildDeck_007_Body"));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
Wizard.ErrorDialog.Dialog.Create(code);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public static string GetTicketIconPath(string itemId, bool isFetch)
|
||||
{
|
||||
return Toolbox.ResourcesManager.GetAssetTypePath("ticket_" + itemId + "_icon", ResourcesManager.AssetLoadPathType.ShopItem, isFetch);
|
||||
|
||||
Reference in New Issue
Block a user