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:
@@ -19,8 +19,6 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
{
|
||||
public const float TimeOut = 30f;
|
||||
|
||||
public const float TimeOutShort = 2f;
|
||||
|
||||
protected NetworkTask lastRequestTask;
|
||||
|
||||
public bool isConnect;
|
||||
@@ -37,24 +35,6 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
|
||||
private IEnumerator connectCoroutine;
|
||||
|
||||
[SerializeField]
|
||||
public Certification _certification;
|
||||
|
||||
public INetworkUI NetworkUI { get; set; }
|
||||
|
||||
private void Start()
|
||||
{
|
||||
Toolbox.NetworkManager = this;
|
||||
}
|
||||
|
||||
public bool IsReachability()
|
||||
{
|
||||
if (Application.internetReachability != NetworkReachability.NotReachable)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public IEnumerator Connect(NetworkTask task, Action<NetworkTask.ResultCode> callbackOnSuccess = null, Action<NetworkTask.ResultCode> callbackOnFailure = null, Action<int> callbackOnResultCodeError = null, bool encrypt = true, bool useJson = false, bool showLoadingIcon = true, bool showErrorDialog = true)
|
||||
{
|
||||
@@ -92,10 +72,6 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
isConnect = true;
|
||||
isTimeOut = false;
|
||||
isError = false;
|
||||
if (NetworkUI != null && _showLoadingIcon)
|
||||
{
|
||||
NetworkUI.StartLoading();
|
||||
}
|
||||
bool isLogTraceCheckUri = false;
|
||||
if (lastRequestTask is DoMatchingBase || lastRequestTask is FinishTaskBase)
|
||||
{
|
||||
@@ -126,10 +102,6 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
{
|
||||
LogTraceCheck("3");
|
||||
}
|
||||
if (NetworkUI != null)
|
||||
{
|
||||
NetworkUI.StopLoading();
|
||||
}
|
||||
if (!unityWebRequest.isDone)
|
||||
{
|
||||
isTimeOut = true;
|
||||
@@ -139,23 +111,16 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
{
|
||||
if (lastRequestTask.GetType().Equals(typeof(PackOpenTask)) || lastRequestTask.GetType().Equals(typeof(BuildDeckBuyTask)) || lastRequestTask.GetType().Equals(typeof(SleeveBuyTask)) || lastRequestTask.GetType().Equals(typeof(SkinBuyMultiRewardTask)) || lastRequestTask.GetType().Equals(typeof(SkinBuyMultiTask)) || lastRequestTask.GetType().Equals(typeof(SkinBuySingleTask)) || lastRequestTask.GetType().Equals(typeof(ItemPurchaseBuyTask)) || lastRequestTask.GetType().Equals(typeof(SpotCardExchangeTask)) || lastRequestTask.GetType().Equals(typeof(CardCreateTask)) || lastRequestTask.GetType().Equals(typeof(CardDestructTask)) || lastRequestTask.GetType().Equals(typeof(StoryFinishTask)) || lastRequestTask.GetType().Equals(typeof(PracticeFinishTask)) || lastRequestTask.GetType().Equals(typeof(BingoDrawTask)) || lastRequestTask.GetType().Equals(typeof(MypageTreasureBoxCpOpenTask)) || lastRequestTask.GetType().Equals(typeof(MypageReceiveSpecialTreasureTask)) || lastRequestTask.GetType().Equals(typeof(FreeCardPackCampaignFinishTask)))
|
||||
{
|
||||
NetworkUI.OpenGoToTitleErrorPopUp(Data.SystemText.Get("ErrorHeader_0012"), Data.SystemText.Get("Error_0012"), "");
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
NetworkUI.OpenTimeOutErrorPopUp();
|
||||
|
||||
}
|
||||
}
|
||||
if (lastRequestTask.CallbackOnFailure != null)
|
||||
{
|
||||
if (lastRequestTask.GetType().Equals(typeof(PaymentPCFinishTask)))
|
||||
{
|
||||
NetworkUI.OpenGoToTitleErrorPopUp(Data.SystemText.Get("ErrorHeader_0012"), Data.SystemText.Get("Error_0012"), "");
|
||||
}
|
||||
else
|
||||
{
|
||||
lastRequestTask.CallbackOnFailure(NetworkTask.ResultCode.TimeOut);
|
||||
}
|
||||
lastRequestTask.CallbackOnFailure(NetworkTask.ResultCode.TimeOut);
|
||||
}
|
||||
Toolbox.DeviceManager.ClearIpAddress();
|
||||
}
|
||||
@@ -165,13 +130,13 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
isError = true;
|
||||
if (showErrorDialog && !lastRequestTask.isSkipCommonHttpStatusErrorPopUp())
|
||||
{
|
||||
if (lastRequestTask.GetType().Equals(typeof(PackOpenTask)) || lastRequestTask.GetType().Equals(typeof(PaymentPCFinishTask)))
|
||||
if (lastRequestTask.GetType().Equals(typeof(PackOpenTask)))
|
||||
{
|
||||
NetworkUI.OpenGoToTitleErrorPopUp(Data.SystemText.Get("ErrorHeader_0012"), Data.SystemText.Get("Error_0012"), "");
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
NetworkUI.OpenHttpStatusErrorPopUp();
|
||||
|
||||
}
|
||||
}
|
||||
disposeUnityWebRequest(unityWebRequest);
|
||||
@@ -274,7 +239,7 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
|
||||
private bool IsBattle()
|
||||
{
|
||||
if (ToolboxGame.RealTimeNetworkAgent != null && BattleManagerBase.GetIns() != null && BattleManagerBase.GetIns().GetCurrentPhase() is MainPhase)
|
||||
if (false /* Pre-Phase-5b: RTA + MainPhase gate headless-false */)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -314,7 +279,7 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
|
||||
public void ClearLastRequestTask()
|
||||
{
|
||||
if ((NetworkUI != null && !NetworkUI.IsKeepLastRequest()) || lastRequestTask.isServerResultCodeOK())
|
||||
if (lastRequestTask.isServerResultCodeOK())
|
||||
{
|
||||
if (IsBattle())
|
||||
{
|
||||
@@ -328,7 +293,7 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
{
|
||||
if (lastRequestTask == null)
|
||||
{
|
||||
NetworkUI.OpenRetryFailErrorPopup();
|
||||
|
||||
yield break;
|
||||
}
|
||||
if (connectCoroutine != null)
|
||||
@@ -339,43 +304,12 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
yield return StartCoroutine(connectCoroutine);
|
||||
}
|
||||
|
||||
public void Certification()
|
||||
{
|
||||
_certification.GenerateUdid();
|
||||
}
|
||||
|
||||
public void ReturnToTitle()
|
||||
{
|
||||
NetworkUI.SetKeepLastRequest(flag: false);
|
||||
ClearLastRequestTask();
|
||||
NetworkUI.SoftwareRest();
|
||||
}
|
||||
|
||||
public void GoToMypage()
|
||||
{
|
||||
NetworkUI.SetKeepLastRequest(flag: false);
|
||||
ClearLastRequestTask();
|
||||
NetworkUI.GoToMypage();
|
||||
}
|
||||
|
||||
public void GoToStore()
|
||||
{
|
||||
lastRequestTask.GotoStore();
|
||||
NetworkUI.SetKeepLastRequest(flag: false);
|
||||
ClearLastRequestTask();
|
||||
NetworkUI.SoftwareRest();
|
||||
}
|
||||
|
||||
public void QuitApplication()
|
||||
{
|
||||
NetworkUI.SetKeepLastRequest(flag: false);
|
||||
ClearLastRequestTask();
|
||||
if (Toolbox.mute != null)
|
||||
{
|
||||
Toolbox.mute.Close();
|
||||
Toolbox.mute = null;
|
||||
}
|
||||
Application.Quit();
|
||||
|
||||
}
|
||||
|
||||
private void disposeUnityWebRequest(UnityWebRequest unityWebRequest)
|
||||
@@ -395,12 +329,4 @@ public class NetworkManager : MonoBehaviour, IManager
|
||||
isConnect = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (RealTimeNetworkAgent.IsNormalNetworkBattle())
|
||||
{
|
||||
LocalLog.AccumulateLastTraceLog("NetworkManager_Destroy");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user