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
@@ -23,26 +23,6 @@ public class WebViewManager : MonoBehaviour
|
||||
|
||||
private bool screenDpiChangedWhileInvisible;
|
||||
|
||||
private static readonly Dictionary<string, string> FontFamilyDict = new Dictionary<string, string>
|
||||
{
|
||||
{
|
||||
Global.LANG_TYPE.Jpn.ToString(),
|
||||
"font_jpn"
|
||||
},
|
||||
{
|
||||
Global.LANG_TYPE.Kor.ToString(),
|
||||
"font_kor"
|
||||
},
|
||||
{
|
||||
Global.LANG_TYPE.Cht.ToString(),
|
||||
"font_cht"
|
||||
},
|
||||
{
|
||||
Global.LANG_TYPE.Chs.ToString(),
|
||||
"font_chs"
|
||||
}
|
||||
};
|
||||
|
||||
public Action<string> Callback { get; set; }
|
||||
|
||||
public static bool HasInstance => instance != null;
|
||||
@@ -77,11 +57,6 @@ public class WebViewManager : MonoBehaviour
|
||||
screenDpi = Screen.dpi;
|
||||
}
|
||||
|
||||
private bool IsScreenDpiChanged()
|
||||
{
|
||||
return Math.Abs(screenDpi - Screen.dpi) > 0.1f;
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
instance = this;
|
||||
@@ -89,47 +64,6 @@ public class WebViewManager : MonoBehaviour
|
||||
UpdateScreenDpi();
|
||||
}
|
||||
|
||||
private void OnLoadedCallback(string msg)
|
||||
{
|
||||
if (onLoaded != null)
|
||||
{
|
||||
onLoaded(msg);
|
||||
}
|
||||
}
|
||||
|
||||
private string GetFontFamilyName()
|
||||
{
|
||||
if (!FontFamilyDict.TryGetValue(CustomPreference.GetTextLanguage(), out var value))
|
||||
{
|
||||
return "font_alphabet";
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
private void OnErrorCallback(string error)
|
||||
{
|
||||
if (onError != null)
|
||||
{
|
||||
onError(error);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnApplicationFocus(bool focus)
|
||||
{
|
||||
if (focus && IsScreenDpiChanged())
|
||||
{
|
||||
UpdateScreenDpi();
|
||||
if (Visible)
|
||||
{
|
||||
OnDpiChange();
|
||||
}
|
||||
else
|
||||
{
|
||||
screenDpiChangedWhileInvisible = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDpiChange()
|
||||
{
|
||||
if (OnDpiChangedAction != null)
|
||||
@@ -147,70 +81,15 @@ public class WebViewManager : MonoBehaviour
|
||||
SetMargins((int)oldMargin.x, (int)oldMargin.y, (int)oldMargin.z, (int)oldMargin.w);
|
||||
}
|
||||
|
||||
public void ClearFontFilePaths()
|
||||
{
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
instance = null;
|
||||
ClearFontFilePaths();
|
||||
}
|
||||
|
||||
public void InitCustomFontFileInfo(Dictionary<string, string> fileNamePathDict, int currentCustomFontFileIndex)
|
||||
{
|
||||
}
|
||||
|
||||
private void InitIOSCustomFont()
|
||||
{
|
||||
}
|
||||
|
||||
private void DisableIOSCustomFont()
|
||||
{
|
||||
}
|
||||
|
||||
public void OpenWeb(string url)
|
||||
{
|
||||
m_WebViewScreen.CurBoxCollider.enabled = true;
|
||||
SetMargins(UIManager.GetInstance().UIManagerRoot, m_WebViewScreen);
|
||||
LoadWeb(url);
|
||||
SetVisible(visible: true);
|
||||
}
|
||||
|
||||
public void LoadWeb(string url)
|
||||
{
|
||||
}
|
||||
|
||||
public void ClearHistory()
|
||||
{
|
||||
}
|
||||
|
||||
public void SetMargins(int leftMargin, int topMargin, int rightMargin, int bottomMargin)
|
||||
{
|
||||
marginNow = new Vector4(leftMargin, topMargin, rightMargin, bottomMargin);
|
||||
}
|
||||
|
||||
public void SetMargins(UIRoot trgUIRoot, WebViewScreen trgScreen)
|
||||
{
|
||||
float arg = trgUIRoot.activeHeight;
|
||||
Func<float, float, float, float, int> func = delegate(float deviceSize, float activeScreenSize, float screenSize, float pos)
|
||||
{
|
||||
screenSize += pos * 2f;
|
||||
screenSize /= activeScreenSize;
|
||||
screenSize = 1f - screenSize;
|
||||
return (int)(screenSize * deviceSize * 0.5f);
|
||||
};
|
||||
Vector2 deviceResolution = Toolbox.QualityManager.deviceResolution;
|
||||
float num = Mathf.Max(deviceResolution.x, deviceResolution.y);
|
||||
BoxCollider curBoxCollider = trgScreen.CurBoxCollider;
|
||||
int num2 = (int)(num - num * AspectCamera.SafeAreaRate);
|
||||
int num3 = (int)(num * AspectCamera.SafeAreaRate) / 30 + num2 / 2;
|
||||
int rightMargin = num3;
|
||||
int topMargin = func(deviceResolution.y, arg, curBoxCollider.size.y, curBoxCollider.center.y);
|
||||
int bottomMargin = func(deviceResolution.y, arg, curBoxCollider.size.y, 0f - curBoxCollider.center.y);
|
||||
getInstance().SetMargins(num3, topMargin, rightMargin, bottomMargin);
|
||||
}
|
||||
|
||||
public void UnloadWebView()
|
||||
{
|
||||
m_WebViewScreen.CurBoxCollider.enabled = false;
|
||||
@@ -221,14 +100,6 @@ public class WebViewManager : MonoBehaviour
|
||||
OnError = null;
|
||||
}
|
||||
|
||||
public void DestroyWebViewObject()
|
||||
{
|
||||
}
|
||||
|
||||
public void EvaluateJS(string js)
|
||||
{
|
||||
}
|
||||
|
||||
public void SetVisible(bool visible)
|
||||
{
|
||||
Visible = visible;
|
||||
@@ -239,14 +110,6 @@ public class WebViewManager : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public void ClearCaches()
|
||||
{
|
||||
}
|
||||
|
||||
public void Reload()
|
||||
{
|
||||
}
|
||||
|
||||
public bool CanGoBack()
|
||||
{
|
||||
return false;
|
||||
@@ -256,21 +119,8 @@ public class WebViewManager : MonoBehaviour
|
||||
{
|
||||
}
|
||||
|
||||
public void Screenshot()
|
||||
{
|
||||
}
|
||||
|
||||
public void SetScreenshotData(int width, int height)
|
||||
{
|
||||
}
|
||||
|
||||
public void SetCallback(Action<string> cb)
|
||||
{
|
||||
Callback = cb;
|
||||
}
|
||||
|
||||
public void CacheClear()
|
||||
{
|
||||
LoadWeb(CustomPreference.GetApplicationServerURL() + "information/blank");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user