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
@@ -5,17 +5,6 @@ using UnityEngine;
|
||||
|
||||
public class MyPageItem : MonoBehaviour
|
||||
{
|
||||
protected const float APPEAR_ANIMATION_DISTANCE_X = 1000f;
|
||||
|
||||
protected const float APPEAR_ANIMATION_TIME = 0.3f;
|
||||
|
||||
protected const float APPEAR_ANIMATION_DELAY = 0.1f;
|
||||
|
||||
protected const float TWEEN_MOVE_TIME = 0.3f;
|
||||
|
||||
protected const float TWEEN_DELAY_TIME = 0.1f;
|
||||
|
||||
private const float CARD_PANEL_LEFT_X = -328f;
|
||||
|
||||
[SerializeField]
|
||||
private MyPageCardPanelAnimation _cardMove;
|
||||
@@ -27,12 +16,8 @@ public class MyPageItem : MonoBehaviour
|
||||
|
||||
private Dictionary<int, Vector3> _defaultPosition = new Dictionary<int, Vector3>();
|
||||
|
||||
private bool _isAttachAtlasEnd;
|
||||
|
||||
private bool cardAnimationInitialized;
|
||||
|
||||
public MyPageCardPanel[] CardPanelList => _cardPanelList;
|
||||
|
||||
protected bool IsCardMoving
|
||||
{
|
||||
get
|
||||
@@ -53,11 +38,6 @@ public class MyPageItem : MonoBehaviour
|
||||
|
||||
public bool IsEnableFooterCurrentMenu { get; set; }
|
||||
|
||||
public void SetCardPanelList(MyPageCardPanel[] myPageCardPanels)
|
||||
{
|
||||
_cardPanelList = myPageCardPanels;
|
||||
}
|
||||
|
||||
public virtual void Initialize(MyPageMenu parent)
|
||||
{
|
||||
_parent = parent;
|
||||
@@ -93,15 +73,6 @@ public class MyPageItem : MonoBehaviour
|
||||
{
|
||||
}
|
||||
|
||||
public void AttachAtlas()
|
||||
{
|
||||
if (!_isAttachAtlasEnd)
|
||||
{
|
||||
_isAttachAtlasEnd = true;
|
||||
UIManager.GetInstance().AttachAtlas(base.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
protected void StartCardPanelAppearAnimation()
|
||||
{
|
||||
if (_cardMove != null)
|
||||
@@ -178,12 +149,6 @@ public class MyPageItem : MonoBehaviour
|
||||
iTween.MoveTo(obj, iTween.Hash("x", x, "time", 0.3f, "delay", 0.1f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo));
|
||||
}
|
||||
|
||||
protected void TweenMoveTo(GameObject obj, float x, float y)
|
||||
{
|
||||
RemoveITween(obj);
|
||||
iTween.MoveTo(obj, iTween.Hash("x", x, "y", y, "time", 0.3f, "delay", 0.1f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo));
|
||||
}
|
||||
|
||||
protected void MoveCardPanelLeftPosition(GameObject moveObj)
|
||||
{
|
||||
CardAnimation.StopMove();
|
||||
@@ -220,12 +185,6 @@ public class MyPageItem : MonoBehaviour
|
||||
FadeUtility.FadeOutObject(tweenAlpha, onFinish);
|
||||
}
|
||||
|
||||
protected static void FadeInObject(UITweenAlpha tweenAlpha, Action onFinish = null)
|
||||
{
|
||||
tweenAlpha.End();
|
||||
FadeUtility.FadeInObject(tweenAlpha, onFinish);
|
||||
}
|
||||
|
||||
protected void ResetAlphaAndRemoveTween(UISprite spriteObj)
|
||||
{
|
||||
UITweenAlpha component = spriteObj.GetComponent<UITweenAlpha>();
|
||||
@@ -242,7 +201,7 @@ public class MyPageItem : MonoBehaviour
|
||||
{
|
||||
if (currentPlate == null)
|
||||
{
|
||||
GameObject prefab = GameMgr.GetIns().GetPrefabMgr().Get("Prefab/UI/Menu/CardPanelMaintenancePlate");
|
||||
GameObject prefab = null; // Pre-Phase-5b: no PrefabMgr headless
|
||||
currentPlate = NGUITools.AddChild(button.gameObject, prefab).GetComponent<CardPanelMaintenancePlate>();
|
||||
currentPlate.SetDepth(buttonLabelDepth + 1);
|
||||
}
|
||||
@@ -278,37 +237,4 @@ public class MyPageItem : MonoBehaviour
|
||||
obj.transform.localPosition = _defaultPosition[obj.GetInstanceID()];
|
||||
}
|
||||
}
|
||||
|
||||
protected void ShowMenu(MyPageCardPanel selectedPanel, GameObject menuRoot, bool isAnimate)
|
||||
{
|
||||
int index = selectedPanel.Index;
|
||||
selectedPanel.RestoreSavedPosition();
|
||||
MoveCardPanelLeftPosition(selectedPanel.gameObject);
|
||||
if (isAnimate)
|
||||
{
|
||||
CardAnimation.OnClicked(index);
|
||||
}
|
||||
for (int i = 0; i < CardPanelList.Length; i++)
|
||||
{
|
||||
if (i == index)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
MyPageCardPanel myPageCardPanel = CardPanelList[i];
|
||||
if (myPageCardPanel.gameObject.activeSelf)
|
||||
{
|
||||
if (isAnimate)
|
||||
{
|
||||
FadeOutCardPanelAndNonActive(myPageCardPanel);
|
||||
}
|
||||
else
|
||||
{
|
||||
myPageCardPanel.gameObject.SetActive(value: false);
|
||||
}
|
||||
}
|
||||
}
|
||||
menuRoot.SetActive(value: true);
|
||||
RestoreDefaultPosition(menuRoot);
|
||||
AppearAnimationFromRight(menuRoot);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user