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
@@ -1,4 +1,8 @@
|
||||
using Wizard;
|
||||
// TODO(engine-cleanup-pass2): 37 of 39 methods unrun in baseline
|
||||
// Type: Cute.CustomPreference
|
||||
// See data_dumps/reports/engine-cleanup/live-methods.baseline.txt
|
||||
|
||||
|
||||
namespace Cute;
|
||||
|
||||
@@ -15,48 +19,24 @@ public class CustomPreference
|
||||
|
||||
public enum PlatformType
|
||||
{
|
||||
NONE,
|
||||
APPLE,
|
||||
GOOGLE,
|
||||
DMM,
|
||||
STEAM
|
||||
}
|
||||
NONE }
|
||||
|
||||
public enum SmallResourceStatus
|
||||
{
|
||||
NO_SELECT,
|
||||
USE_NORMAL,
|
||||
USE_SMALL
|
||||
}
|
||||
|
||||
private const string fileScheme = "file:///";
|
||||
|
||||
private const string httpScheme = "http://";
|
||||
|
||||
private const string httpsScheme = "https://";
|
||||
|
||||
private const string jarFileScheme = "jar:file://";
|
||||
|
||||
private static string nodeServerScheme = "ws://";
|
||||
|
||||
private const string directoryLowLevelResources = "Low/";
|
||||
|
||||
private const string directoryHighLevelResources = "High/";
|
||||
|
||||
private static string directoryRoot = "dl/";
|
||||
|
||||
private static string _applicationServerUrl = "";
|
||||
|
||||
private static string _resourceServerUrl = "";
|
||||
|
||||
private static string _nodeServerUrl = "";
|
||||
|
||||
private static string _deckBuilderServerUrl = "";
|
||||
|
||||
public static string _localePref = "Eng";
|
||||
|
||||
private static string _signaturePref = "";
|
||||
|
||||
private static string _languagePref = "Eng";
|
||||
|
||||
private static string _languageSoundPref = "Eng";
|
||||
@@ -75,34 +55,8 @@ public class CustomPreference
|
||||
|
||||
private static eSchemeType _schemeCDNType = eSchemeType.Http;
|
||||
|
||||
private static bool _isPreferenceComplete = false;
|
||||
|
||||
private static bool _isLocalAssetBundles = false;
|
||||
|
||||
public static bool isPreferenceComplete
|
||||
{
|
||||
get
|
||||
{
|
||||
return _isPreferenceComplete;
|
||||
}
|
||||
set
|
||||
{
|
||||
_isPreferenceComplete = value;
|
||||
}
|
||||
}
|
||||
|
||||
public static bool isLocalAssetBundles
|
||||
{
|
||||
get
|
||||
{
|
||||
return _isLocalAssetBundles;
|
||||
}
|
||||
set
|
||||
{
|
||||
_isLocalAssetBundles = value;
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsNormalResource => !IsSmallResource;
|
||||
|
||||
public static bool IsSmallResource => PlayerPrefsCache.Instance.GetValue(PlayerPrefsWrapper.SMALL_RESOURCE_STATUS) == 2;
|
||||
@@ -112,44 +66,16 @@ public class CustomPreference
|
||||
return GetScheme() + _applicationServerUrl;
|
||||
}
|
||||
|
||||
public static void SetApplicationServerURL(string strApplicationServer)
|
||||
{
|
||||
_applicationServerUrl = strApplicationServer;
|
||||
}
|
||||
|
||||
public static string GetResourceServerURL()
|
||||
{
|
||||
return GetCDNScheme() + _resourceServerUrl;
|
||||
}
|
||||
|
||||
public static void SetResourceServerURL(string strResourceServer)
|
||||
{
|
||||
_resourceServerUrl = strResourceServer;
|
||||
}
|
||||
|
||||
public static string GetNodeServerURL()
|
||||
{
|
||||
return nodeServerScheme + _nodeServerUrl;
|
||||
}
|
||||
|
||||
public static void SetNodeServerURL(string strNodeServer)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(strNodeServer))
|
||||
{
|
||||
_nodeServerUrl = strNodeServer;
|
||||
}
|
||||
}
|
||||
|
||||
public static string GetDeckBuilderServerURL()
|
||||
{
|
||||
return GetScheme() + _deckBuilderServerUrl;
|
||||
}
|
||||
|
||||
public static void SetDeckBuilderServerURL(string strDeckBuilderServer)
|
||||
{
|
||||
_deckBuilderServerUrl = strDeckBuilderServer;
|
||||
}
|
||||
|
||||
public static int GetPlatform()
|
||||
{
|
||||
return 4;
|
||||
@@ -216,53 +142,6 @@ public class CustomPreference
|
||||
return Toolbox.SavedataManager.GetResourceVersion() + "/";
|
||||
}
|
||||
|
||||
public static void SetScemeMode(eSchemeType schemeType)
|
||||
{
|
||||
_schemeType = schemeType;
|
||||
}
|
||||
|
||||
public static void SetScemeModeCDN(eSchemeType schemeCDNType)
|
||||
{
|
||||
_schemeCDNType = schemeCDNType;
|
||||
}
|
||||
|
||||
public static void SetOptionalNodeSceme()
|
||||
{
|
||||
if (PlayerPrefsWrapper.GetBool(PlayerPrefsWrapper.IS_SELECT_WSS))
|
||||
{
|
||||
SetNodeSceme("wss://");
|
||||
}
|
||||
else
|
||||
{
|
||||
SetNodeSceme("ws://");
|
||||
}
|
||||
}
|
||||
|
||||
private static void SetNodeSceme(string scheme)
|
||||
{
|
||||
nodeServerScheme = scheme;
|
||||
}
|
||||
|
||||
public static void SetRootFolderName(string strDir)
|
||||
{
|
||||
directoryRoot = strDir;
|
||||
}
|
||||
|
||||
public static void SetTextLanguage(string strLanguage)
|
||||
{
|
||||
_languagePref = strLanguage;
|
||||
}
|
||||
|
||||
public static void SetLocale(string strLocale)
|
||||
{
|
||||
_localePref = strLocale;
|
||||
}
|
||||
|
||||
public static string GetLanguageFolderName()
|
||||
{
|
||||
return _languagePref + "/";
|
||||
}
|
||||
|
||||
public static string GetTextLanguage()
|
||||
{
|
||||
return GetResourceLanguage();
|
||||
@@ -273,11 +152,6 @@ public class CustomPreference
|
||||
return _languagePref;
|
||||
}
|
||||
|
||||
public static void SetSoundLanguage(string strLanguage)
|
||||
{
|
||||
_languageSoundPref = strLanguage;
|
||||
}
|
||||
|
||||
public static string GetSoundMovieLanguageFolderName()
|
||||
{
|
||||
return _languageSoundPref + "/";
|
||||
@@ -287,32 +161,4 @@ public class CustomPreference
|
||||
{
|
||||
return _languageSoundPref;
|
||||
}
|
||||
|
||||
public static void SetSignature(string strSignature)
|
||||
{
|
||||
_signaturePref = strSignature;
|
||||
}
|
||||
|
||||
public static string GetSignaturePath()
|
||||
{
|
||||
return "/../" + _signaturePref;
|
||||
}
|
||||
|
||||
public static void createResourcePath()
|
||||
{
|
||||
if (_isLocalAssetBundles)
|
||||
{
|
||||
_assetbundleurl = GetResourceServerURL() + Utility.GetRuntimePlatform() + "/";
|
||||
_manifestsuburl = GetResourceServerURL() + Utility.GetRuntimePlatform() + "/";
|
||||
}
|
||||
else
|
||||
{
|
||||
_assetbundleurl = GetResourceServerURL() + directoryRoot + "Resource/" + GetLanguageFolderName() + Utility.GetRuntimePlatform() + "/";
|
||||
string text = "Manifest/";
|
||||
_manifestsuburl = GetResourceServerURL() + directoryRoot + text + GetVersionFolderName() + GetSoundMovieLanguageFolderName() + Utility.GetRuntimePlatform() + "/";
|
||||
_manifestUrl = GetResourceServerURL() + directoryRoot + text + GetVersionFolderName() + GetLanguageFolderName() + Utility.GetRuntimePlatform() + "/";
|
||||
}
|
||||
_soundurl = GetResourceServerURL() + directoryRoot + "Sound/" + GetSoundMovieLanguageFolderName();
|
||||
_movieurl = GetResourceServerURL() + directoryRoot + "Resource/" + GetSoundMovieLanguageFolderName() + Utility.GetRuntimePlatform() + "/";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user