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:
@@ -8,8 +8,6 @@ public class UIInput : MonoBehaviour
|
||||
{
|
||||
public enum InputType
|
||||
{
|
||||
Standard,
|
||||
AutoCorrect,
|
||||
Password
|
||||
}
|
||||
|
||||
@@ -26,20 +24,11 @@ public class UIInput : MonoBehaviour
|
||||
|
||||
public enum KeyboardType
|
||||
{
|
||||
Default,
|
||||
ASCIICapable,
|
||||
NumbersAndPunctuation,
|
||||
URL,
|
||||
NumberPad,
|
||||
PhonePad,
|
||||
NamePhonePad,
|
||||
EmailAddress
|
||||
}
|
||||
Default }
|
||||
|
||||
public enum OnReturnKey
|
||||
{
|
||||
Default,
|
||||
Submit,
|
||||
NewLine
|
||||
}
|
||||
|
||||
@@ -59,8 +48,6 @@ public class UIInput : MonoBehaviour
|
||||
|
||||
public KeyboardType keyboardType;
|
||||
|
||||
public bool hideInput;
|
||||
|
||||
[NonSerialized]
|
||||
public bool selectAllTextOnFocus = true;
|
||||
|
||||
@@ -70,10 +57,6 @@ public class UIInput : MonoBehaviour
|
||||
|
||||
public string savedAs;
|
||||
|
||||
[HideInInspector]
|
||||
[SerializeField]
|
||||
private GameObject selectOnTab;
|
||||
|
||||
public Color activeTextColor = Color.white;
|
||||
|
||||
public Color caretColor = new Color(1f, 1f, 1f, 0.8f);
|
||||
@@ -137,9 +120,6 @@ public class UIInput : MonoBehaviour
|
||||
[NonSerialized]
|
||||
protected float mLastAlpha;
|
||||
|
||||
[NonSerialized]
|
||||
protected string mCached = "";
|
||||
|
||||
[NonSerialized]
|
||||
protected int mSelectMe = -1;
|
||||
|
||||
@@ -157,52 +137,6 @@ public class UIInput : MonoBehaviour
|
||||
|
||||
private static int mIgnoreKey = 0;
|
||||
|
||||
public string defaultText
|
||||
{
|
||||
get
|
||||
{
|
||||
if (mDoInit)
|
||||
{
|
||||
Init();
|
||||
}
|
||||
return mDefaultText;
|
||||
}
|
||||
set
|
||||
{
|
||||
if (mDoInit)
|
||||
{
|
||||
Init();
|
||||
}
|
||||
mDefaultText = value;
|
||||
UpdateLabel();
|
||||
}
|
||||
}
|
||||
|
||||
public bool inputShouldBeHidden
|
||||
{
|
||||
get
|
||||
{
|
||||
if (hideInput && label != null && !label.multiLine)
|
||||
{
|
||||
return inputType != InputType.Password;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
[Obsolete("Use UIInput.value instead")]
|
||||
public string text
|
||||
{
|
||||
get
|
||||
{
|
||||
return value;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
}
|
||||
|
||||
public string value
|
||||
{
|
||||
get
|
||||
@@ -253,19 +187,6 @@ public class UIInput : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
[Obsolete("Use UIInput.isSelected instead")]
|
||||
public bool selected
|
||||
{
|
||||
get
|
||||
{
|
||||
return isSelected;
|
||||
}
|
||||
set
|
||||
{
|
||||
isSelected = value;
|
||||
}
|
||||
}
|
||||
|
||||
public bool isSelected
|
||||
{
|
||||
get
|
||||
@@ -348,8 +269,6 @@ public class UIInput : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public UITexture caret => mCaret;
|
||||
|
||||
public string Validate(string val)
|
||||
{
|
||||
if (string.IsNullOrEmpty(val))
|
||||
@@ -380,27 +299,6 @@ public class UIInput : MonoBehaviour
|
||||
return stringBuilder.ToString();
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
if (selectOnTab != null)
|
||||
{
|
||||
if (GetComponent<UIKeyNavigation>() == null)
|
||||
{
|
||||
base.gameObject.AddComponent<UIKeyNavigation>().onDown = selectOnTab;
|
||||
}
|
||||
selectOnTab = null;
|
||||
NGUITools.SetDirty(this);
|
||||
}
|
||||
if (mLoadSavedValue && !string.IsNullOrEmpty(savedAs))
|
||||
{
|
||||
LoadValue();
|
||||
}
|
||||
else
|
||||
{
|
||||
value = mValue.Replace("\\n", "\n");
|
||||
}
|
||||
}
|
||||
|
||||
protected void Init()
|
||||
{
|
||||
if (mDoInit && label != null)
|
||||
@@ -648,199 +546,6 @@ public class UIInput : MonoBehaviour
|
||||
Insert("");
|
||||
}
|
||||
|
||||
public virtual bool ProcessEvent(Event ev)
|
||||
{
|
||||
if (label == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
RuntimePlatform platform = Application.platform;
|
||||
bool flag = ((platform == RuntimePlatform.OSXEditor || platform == RuntimePlatform.OSXPlayer) ? ((ev.modifiers & EventModifiers.Command) != 0) : ((ev.modifiers & EventModifiers.Control) != 0));
|
||||
if ((ev.modifiers & EventModifiers.Alt) != EventModifiers.None)
|
||||
{
|
||||
flag = false;
|
||||
}
|
||||
bool flag2 = (ev.modifiers & EventModifiers.Shift) != 0;
|
||||
switch (ev.keyCode)
|
||||
{
|
||||
case KeyCode.Backspace:
|
||||
ev.Use();
|
||||
DoBackspace();
|
||||
return true;
|
||||
case KeyCode.Delete:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
if (mSelectionStart == mSelectionEnd)
|
||||
{
|
||||
if (mSelectionStart >= mValue.Length)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
mSelectionEnd++;
|
||||
}
|
||||
Insert("");
|
||||
}
|
||||
return true;
|
||||
case KeyCode.LeftArrow:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
mSelectionEnd = Mathf.Max(mSelectionEnd - 1, 0);
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.RightArrow:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
mSelectionEnd = Mathf.Min(mSelectionEnd + 1, mValue.Length);
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.PageUp:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
mSelectionEnd = 0;
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.PageDown:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
mSelectionEnd = mValue.Length;
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.Home:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
if (label.multiLine)
|
||||
{
|
||||
mSelectionEnd = label.GetCharacterIndex(mSelectionEnd, KeyCode.Home);
|
||||
}
|
||||
else
|
||||
{
|
||||
mSelectionEnd = 0;
|
||||
}
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.End:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
if (label.multiLine)
|
||||
{
|
||||
mSelectionEnd = label.GetCharacterIndex(mSelectionEnd, KeyCode.End);
|
||||
}
|
||||
else
|
||||
{
|
||||
mSelectionEnd = mValue.Length;
|
||||
}
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.UpArrow:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
mSelectionEnd = label.GetCharacterIndex(mSelectionEnd, KeyCode.UpArrow);
|
||||
if (mSelectionEnd != 0)
|
||||
{
|
||||
mSelectionEnd += mDrawStart;
|
||||
}
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.DownArrow:
|
||||
ev.Use();
|
||||
if (!string.IsNullOrEmpty(mValue))
|
||||
{
|
||||
mSelectionEnd = label.GetCharacterIndex(mSelectionEnd, KeyCode.DownArrow);
|
||||
if (mSelectionEnd != label.processedText.Length)
|
||||
{
|
||||
mSelectionEnd += mDrawStart;
|
||||
}
|
||||
else
|
||||
{
|
||||
mSelectionEnd = mValue.Length;
|
||||
}
|
||||
if (!flag2)
|
||||
{
|
||||
mSelectionStart = mSelectionEnd;
|
||||
}
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.A:
|
||||
if (flag)
|
||||
{
|
||||
ev.Use();
|
||||
mSelectionStart = 0;
|
||||
mSelectionEnd = mValue.Length;
|
||||
UpdateLabel();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.C:
|
||||
if (flag)
|
||||
{
|
||||
ev.Use();
|
||||
NGUITools.clipboard = GetSelection();
|
||||
}
|
||||
return true;
|
||||
case KeyCode.V:
|
||||
if (flag)
|
||||
{
|
||||
ev.Use();
|
||||
Insert(NGUITools.clipboard);
|
||||
isAfterPaste = true;
|
||||
}
|
||||
return true;
|
||||
case KeyCode.X:
|
||||
if (flag)
|
||||
{
|
||||
ev.Use();
|
||||
NGUITools.clipboard = GetSelection();
|
||||
Insert("");
|
||||
}
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void Insert(string text, bool dontAddCompositionString = false)
|
||||
{
|
||||
string leftText = GetLeftText();
|
||||
@@ -918,17 +623,6 @@ public class UIInput : MonoBehaviour
|
||||
return "";
|
||||
}
|
||||
|
||||
protected string GetSelection()
|
||||
{
|
||||
if (string.IsNullOrEmpty(mValue) || mSelectionStart == mSelectionEnd)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
int num = Mathf.Min(mSelectionStart, mSelectionEnd);
|
||||
int num2 = Mathf.Max(mSelectionStart, mSelectionEnd);
|
||||
return mValue.Substring(num, num2 - num);
|
||||
}
|
||||
|
||||
protected int GetCharUnderMouse()
|
||||
{
|
||||
if (string.IsNullOrEmpty(label.text))
|
||||
@@ -956,19 +650,6 @@ public class UIInput : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void OnDrag(Vector2 delta)
|
||||
{
|
||||
if (label != null && (UICamera.currentScheme == UICamera.ControlScheme.Mouse || UICamera.currentScheme == UICamera.ControlScheme.Touch))
|
||||
{
|
||||
selectionEnd = GetCharUnderMouse();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
Cleanup();
|
||||
}
|
||||
|
||||
protected virtual void Cleanup()
|
||||
{
|
||||
if ((bool)mHighlight)
|
||||
@@ -1312,21 +993,6 @@ public class UIInput : MonoBehaviour
|
||||
{
|
||||
}
|
||||
|
||||
public void SaveValue()
|
||||
{
|
||||
SaveToPlayerPrefs(mValue);
|
||||
}
|
||||
|
||||
public void LoadValue()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(savedAs))
|
||||
{
|
||||
string text = mValue.Replace("\\n", "\n");
|
||||
mValue = "";
|
||||
value = (PlayerPrefs.HasKey(savedAs) ? PlayerPrefs.GetString(savedAs) : text);
|
||||
}
|
||||
}
|
||||
|
||||
private bool UpdateFromInput(string inputString, string compositionString, bool forceInsert = false)
|
||||
{
|
||||
bool result = false;
|
||||
|
||||
Reference in New Issue
Block a user