Files
SVSimServer/SVSim.BattleEngine/Engine/Wizard.DeckCardEdit/CachingCardBundle.cs
gamer147 2d9a6eea4b 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>
2026-07-03 19:18:54 -04:00

150 lines
4.9 KiB
C#

using System;
using System.Collections.Generic;
using System.Linq;
using Cute;
using UnityEngine;
namespace Wizard.DeckCardEdit;
public class CachingCardBundle : CardBundle
{
private List<UIBase_CardManager.CardObjData> _cachedList;
public CachingCardBundle(CardCreator cardCreator, Transform parent, UITexture sleeveOriginal, float scale, IFormatBehavior formatBehavior, bool isDisplaySpotCardNum)
: base(cardCreator, parent, sleeveOriginal, scale, formatBehavior, isDisplaySpotCardNum)
{
_cachedList = new List<UIBase_CardManager.CardObjData>(32);
}
private UIBase_CardManager.CardObjData GetCachedCardFromId(int id)
{
return _cachedList.Find((UIBase_CardManager.CardObjData card) => card.ids == id);
}
private void AddCache(UIBase_CardManager.CardObjData item)
{
_cachedList.Remove(item);
_cachedList.Insert(0, item);
}
private void RemoveCache(UIBase_CardManager.CardObjData item)
{
CardParameter cardParameterFromId = CardMaster.GetInstance(base.FormatBehavior.CardMasterId).GetCardParameterFromId(item.ids);
Toolbox.ResourcesManager.RemoveAsset(Toolbox.ResourcesManager.GetAssetTypePath(cardParameterFromId.ResourceCardId.ToString(), ResourcesManager.AssetLoadPathType.UnitCardMaterial));
if (cardParameterFromId.IsFoil)
{
int resourceCardId = CardMaster.GetInstance(base.FormatBehavior.CardMasterId).GetCardParameterFromId(cardParameterFromId.NormalCardId).ResourceCardId;
Toolbox.ResourcesManager.RemoveAsset(Toolbox.ResourcesManager.GetAssetTypePath(resourceCardId.ToString(), ResourcesManager.AssetLoadPathType.UnitCardMaterial));
}
UnityEngine.Object.Destroy(item.CardObj);
_cachedList.Remove(item);
}
public override bool CreateCards(List<int> idList, bool isDestroyImmediate, bool isRotate, Action onCreateSleeves = null, Action onFinish = null, Action onFirstAnimationFinish = null, float cardRotateDelayTimeMax = float.MaxValue, bool isSkipSameDeckCheck = false)
{
int count = idList.Count;
for (int i = 0; i < count; i++)
{
UIBase_CardManager.CardObjData cachedCardFromId = GetCachedCardFromId(idList[i]);
if (cachedCardFromId != null)
{
AddCache(cachedCardFromId);
}
}
return base.CreateCards(idList, isDestroyImmediate, isRotate, onCreateSleeves, onFinish, onFirstAnimationFinish, cardRotateDelayTimeMax, isSkipSameDeckCheck);
}
protected override CardObject CreateSleeve(int id, int mainNum, int subNum, bool isNonPossessionCard = false)
{
UIBase_CardManager.CardObjData cachedCardFromId = GetCachedCardFromId(id);
if (cachedCardFromId != null)
{
CardObject cardObject = new CardObject(cachedCardFromId, _parent, _cardScale, base.FormatBehavior, _isDisplaySpotCardNum, _isHideZeroSpotCardNum);
cardObject.CardObj.SetActive(value: true);
cardObject.CardId = id;
cardObject.MainCardNum = mainNum;
cardObject.SubCardNum = subNum;
OnCreateSleeveCall(cardObject);
OnCreateCardCall(cardObject);
return cardObject;
}
return base.CreateSleeve(id, mainNum, subNum);
}
public override void Load(List<int> order, bool isPreferentially, Action<List<UIBase_CardManager.CardObjData>> onFinish)
{
int orderLen = order.Count;
Func<List<int>> order2 = () => order.Where((int id) => GetCachedCardFromId(id) == null).ToList();
_cardCreator.Request(order2, isPreferentially, delegate(List<UIBase_CardManager.CardObjData> returnList)
{
int i;
for (i = 0; i < orderLen; i++)
{
UIBase_CardManager.CardObjData cardObjData = returnList.Find((UIBase_CardManager.CardObjData entry) => entry.ids == order[i]);
UIBase_CardManager.CardObjData cachedCardFromId = GetCachedCardFromId(order[i]);
if (cachedCardFromId != null)
{
if (cardObjData != null)
{
UnityEngine.Object.Destroy(cardObjData.CardObj);
returnList.Remove(cardObjData);
}
cachedCardFromId.CardObj.SetActive(value: true);
cachedCardFromId.CardObj.GetComponent<UIWidget>().alpha = 1f;
returnList.Insert(i, cachedCardFromId);
}
AddCache(returnList[i]);
}
DestroyOverStock();
onFinish.Call(returnList);
}, base.FormatBehavior.CardMasterId);
}
private void DestroyOverStock()
{
int num = _cachedList.Count();
if (num <= 32)
{
return;
}
int num2 = num - 32;
for (int i = 0; i < num; i++)
{
if (_cachedList.Count() <= 0)
{
break;
}
if (num2 <= 0)
{
break;
}
RemoveCache(_cachedList[_cachedList.Count() - 1]);
num2--;
}
}
public override void DestroyAll()
{
_cardList.ForEach(delegate(CardObject card)
{
card.Destroy(isRemoveAsset: false);
});
_cardList.Clear();
while (_cachedList.Count > 0)
{
RemoveCache(_cachedList[0]);
}
}
protected override void DestroyEach(CardObject card)
{
card.DestroySleeve();
card.DestroyUseInfo();
card.DestroyCursorEffect();
card.DestroyTween();
card.ActiveCullObjs(isActive: true);
card.CardObj.SetActive(value: false);
}
}