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
@@ -6,19 +6,6 @@ namespace Wizard;
|
||||
|
||||
public class PurchaseConfirm : MonoBehaviour
|
||||
{
|
||||
private const string SPRITE_NAME_CRYSTAL = "icon_crystal_s";
|
||||
|
||||
private const string SPRITE_NAME_RUPY = "icon_rupy_s";
|
||||
|
||||
private const string SPRITE_NAME_2PICK_TICKET = "icon_2pick_s";
|
||||
|
||||
private const string SPRITE_NAME_ORB = "icon_orb_s";
|
||||
|
||||
private const string SPRITE_NAME_ORB_PIECE = "icon_orb_piece_s";
|
||||
|
||||
private const string SPRITE_NAME_RED_ETHER = "icon_liquid_s";
|
||||
|
||||
private const string SPRITE_NAME_SPOT_CARD_POINT = "icon_spotpoint_s";
|
||||
|
||||
[SerializeField]
|
||||
private UISprite _spriteConfirmItemIcon;
|
||||
@@ -59,8 +46,6 @@ public class PurchaseConfirm : MonoBehaviour
|
||||
[SerializeField]
|
||||
private GameObject _haveObj;
|
||||
|
||||
private const float WARNING_TEXT_OBJ_Y = -40f;
|
||||
|
||||
[SerializeField]
|
||||
private UITable _tablePackPoint;
|
||||
|
||||
@@ -103,15 +88,9 @@ public class PurchaseConfirm : MonoBehaviour
|
||||
[SerializeField]
|
||||
private UILabel _campaignNameLabel;
|
||||
|
||||
[SerializeField]
|
||||
private UIScrollView _scrollView;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject _rootObj;
|
||||
|
||||
[SerializeField]
|
||||
private UIScrollBar _scrollBar;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject _jpnLawRoot;
|
||||
|
||||
@@ -121,76 +100,9 @@ public class PurchaseConfirm : MonoBehaviour
|
||||
[SerializeField]
|
||||
private GameObject _saleTimeNoneLayout;
|
||||
|
||||
[SerializeField]
|
||||
private UIButton[] _showJpnLawButton;
|
||||
|
||||
[SerializeField]
|
||||
private UILabel _expiryTimeLabel;
|
||||
|
||||
private const float CONFIRM_OBJ_Y_WITH_PACKPOINT = -32f;
|
||||
|
||||
private const float HAVE_OBJ_Y_WITH_PACKPOINT = 0f;
|
||||
|
||||
private const float PACK_POINT_Y_WITH_PRE_RELEASE_POINT = -60f;
|
||||
|
||||
private const float NON_ITEM_Y_WITH_PACKPOINT = -12f;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
UIButton[] showJpnLawButton = _showJpnLawButton;
|
||||
for (int i = 0; i < showJpnLawButton.Length; i++)
|
||||
{
|
||||
showJpnLawButton[i].onClick.Add(new EventDelegate(delegate
|
||||
{
|
||||
GameMgr.GetIns().GetSoundMgr().PlaySe(Se.TYPE.SYS_COMMON_BUTTON);
|
||||
UIManager.GetInstance().WebViewHelper.OpenWebView(WebViewHelper.WebViewType.LEGALTEXT);
|
||||
}));
|
||||
}
|
||||
showJpnLawButton = _showJpnLawButton;
|
||||
for (int i = 0; i < showJpnLawButton.Length; i++)
|
||||
{
|
||||
showJpnLawButton[i].gameObject.SetActive(value: false);
|
||||
}
|
||||
_expiryTimeLabel.gameObject.SetActive(value: false);
|
||||
}
|
||||
|
||||
public void SetConfirmDialog(int useNum, string purchaseText, int haveNum, UserGoods.Type type, long userGoodsId, ShopExpirtyInfo expirtyInfo, Texture texture = null)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case UserGoods.Type.Crystal:
|
||||
SetClystalConfirmDialog(useNum, purchaseText, haveNum, expirtyInfo);
|
||||
break;
|
||||
case UserGoods.Type.Rupy:
|
||||
SetRupyConfirmDialog(useNum, purchaseText, haveNum);
|
||||
break;
|
||||
case UserGoods.Type.Item:
|
||||
switch (Item.GetItemType(type, (int)userGoodsId))
|
||||
{
|
||||
case Item.Type.TwoPickTicket:
|
||||
Set2PickTicketConfirmDialog(useNum, purchaseText, haveNum);
|
||||
break;
|
||||
case Item.Type.CardPackTicket:
|
||||
SetTicketConfirmDialog(useNum, purchaseText, haveNum, texture);
|
||||
break;
|
||||
case Item.Type.Orb:
|
||||
SetOrbConfirmDialog(useNum, purchaseText, haveNum);
|
||||
break;
|
||||
case Item.Type.OrbPiece:
|
||||
SetOrbPieceConfirmDialog(useNum, purchaseText, haveNum);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case UserGoods.Type.RedEther:
|
||||
SetRedEtherConfirmDialog(useNum, purchaseText, haveNum);
|
||||
break;
|
||||
case UserGoods.Type.SpotCardPoint:
|
||||
SetSpotCardPointConfirmDialog(useNum, purchaseText, haveNum);
|
||||
break;
|
||||
}
|
||||
UpdateJpnLawObj();
|
||||
}
|
||||
|
||||
private void UpdateJpnLawObj()
|
||||
{
|
||||
_ = _rootObj == null;
|
||||
@@ -246,56 +158,6 @@ public class PurchaseConfirm : MonoBehaviour
|
||||
HideJpnLawObj();
|
||||
}
|
||||
|
||||
public void Set2PickTicketConfirmDialog(int useItemNum, string purchaseText, int haveItemCnt)
|
||||
{
|
||||
SetIconImage(UserGoods.Type.Item, Item.Type.TwoPickTicket);
|
||||
int afterItemNum = haveItemCnt - useItemNum;
|
||||
string unit = Data.SystemText.Get("Common_0117");
|
||||
string useItemNumText = Data.SystemText.Get("Shop_0042", useItemNum.ToString());
|
||||
SetLabelText(Data.SystemText.Get("Mail_0037"), useItemNumText, afterItemNum, unit, purchaseText, haveItemCnt);
|
||||
HideJpnLawObj();
|
||||
}
|
||||
|
||||
public void SetOrbConfirmDialog(int useItemNum, string purchaseText, int haveItemCnt)
|
||||
{
|
||||
SetIconImage(UserGoods.Type.Item, Item.Type.Orb);
|
||||
int afterItemNum = haveItemCnt - useItemNum;
|
||||
string unit = Data.SystemText.Get("Common_0116");
|
||||
string useItemNumText = Data.SystemText.Get("Shop_0133", useItemNum.ToString());
|
||||
SetLabelText(Data.SystemText.Get("Common_0158"), useItemNumText, afterItemNum, unit, purchaseText, haveItemCnt);
|
||||
HideJpnLawObj();
|
||||
}
|
||||
|
||||
public void SetOrbPieceConfirmDialog(int useItemNum, string purchaseText, int haveItemCnt)
|
||||
{
|
||||
SetIconImage(UserGoods.Type.Item, Item.Type.OrbPiece);
|
||||
int afterItemNum = haveItemCnt - useItemNum;
|
||||
string unit = Data.SystemText.Get("Common_0116");
|
||||
string useItemNumText = Data.SystemText.Get("Shop_0140", useItemNum.ToString());
|
||||
SetLabelText(Data.SystemText.Get("Common_0159"), useItemNumText, afterItemNum, unit, purchaseText, haveItemCnt);
|
||||
HideJpnLawObj();
|
||||
}
|
||||
|
||||
public void SetRedEtherConfirmDialog(int useItemNum, string purchaseText, int haveItemCnt)
|
||||
{
|
||||
SetIconImage(UserGoods.Type.RedEther);
|
||||
int afterItemNum = haveItemCnt - useItemNum;
|
||||
string unit = Data.SystemText.Get("Common_0116");
|
||||
string useItemNumText = Data.SystemText.Get("Shop_0134", useItemNum.ToString());
|
||||
SetLabelText(Data.SystemText.Get("Common_0205"), useItemNumText, afterItemNum, unit, purchaseText, haveItemCnt);
|
||||
HideJpnLawObj();
|
||||
}
|
||||
|
||||
public void SetSpotCardPointConfirmDialog(int useItemNum, string purchaseText, int haveItemCnt)
|
||||
{
|
||||
SetIconImage(UserGoods.Type.SpotCardPoint);
|
||||
int afterItemNum = haveItemCnt - useItemNum;
|
||||
string unit = Data.SystemText.Get("Common_0116");
|
||||
string useItemNumText = Data.SystemText.Get("Shop_0151", useItemNum.ToString());
|
||||
SetLabelText(Data.SystemText.Get("Common_0161"), useItemNumText, afterItemNum, unit, purchaseText, haveItemCnt);
|
||||
HideJpnLawObj();
|
||||
}
|
||||
|
||||
public void SetLeaderSkinTicketConfirmDialog(int cost, string purchaseText, int haveItem, long itemId)
|
||||
{
|
||||
int afterItemNum = haveItem - cost;
|
||||
|
||||
Reference in New Issue
Block a user