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>
217 lines
6.5 KiB
C#
217 lines
6.5 KiB
C#
using System.Collections.Generic;
|
|
using UnityEngine;
|
|
using Wizard.Bingo;
|
|
|
|
namespace Wizard;
|
|
|
|
public class AllLabelColorChanger
|
|
{
|
|
public struct ColorSet
|
|
{
|
|
public Color32 FontColor { get; private set; }
|
|
|
|
public Color32 FrameColor { get; private set; }
|
|
|
|
public UILabel.Effect Effect { get; private set; }
|
|
|
|
public Vector2 EffectDistance { get; private set; }
|
|
|
|
public Color32? ButtonFontColor { get; private set; }
|
|
|
|
public bool DontChangeEffect { get; private set; }
|
|
|
|
public ColorSet(Color32 fontColor, Color32 frameColor, UILabel.Effect effect, Vector2 effectDistance, Color32? buttonFontColor = null)
|
|
{
|
|
FontColor = fontColor;
|
|
FrameColor = frameColor;
|
|
Effect = effect;
|
|
EffectDistance = effectDistance;
|
|
DontChangeEffect = false;
|
|
ButtonFontColor = buttonFontColor;
|
|
}
|
|
|
|
public ColorSet(Color32 fontColor)
|
|
{
|
|
FontColor = fontColor;
|
|
DontChangeEffect = true;
|
|
FrameColor = fontColor;
|
|
Effect = UILabel.Effect.None;
|
|
EffectDistance = Vector2.zero;
|
|
ButtonFontColor = null;
|
|
}
|
|
}
|
|
|
|
private static bool deactivateTextColorChange = false;
|
|
|
|
private static Dictionary<Color32, ColorSet> COLOR_TABLE = new Dictionary<Color32, ColorSet>
|
|
{
|
|
{
|
|
LabelDefine.TEXT_COLOR_NORMAL,
|
|
new ColorSet(FromHexRGB(14182531), FromHexRGB(16777215), UILabel.Effect.None, new Vector2(2f, 2f))
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_CREAM,
|
|
new ColorSet(FromHexRGB(14182531), new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, 0), UILabel.Effect.None, Vector2.zero)
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_BUTTON_DISABLE,
|
|
new ColorSet(FromHexRGB(11838375), FromHexRGB(7171180), UILabel.Effect.None, new Vector2(2f, 2f), FromHexRGB(6106424))
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_KEYWORD,
|
|
new ColorSet(FromHexRGB(13803266), FromHexRGB(16777215), UILabel.Effect.None, Vector2.zero)
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_ORANGE,
|
|
new ColorSet(FromHexRGB(16777215), FromHexRGB(16777215), UILabel.Effect.None, Vector2.zero)
|
|
}
|
|
};
|
|
|
|
public static Dictionary<Color32, ColorSet> COLOR_TABLE_DETAIL = new Dictionary<Color32, ColorSet>
|
|
{
|
|
{
|
|
LabelDefine.TEXT_COLOR_NORMAL,
|
|
new ColorSet(FromHexRGB(14182531), FromHexRGB(16777215), UILabel.Effect.None, new Vector2(2f, 2f))
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_CREAM,
|
|
new ColorSet(FromHexRGB(11892614), new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, 0), UILabel.Effect.None, Vector2.zero)
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_BUTTON_DISABLE,
|
|
new ColorSet(FromHexRGB(6106424), FromHexRGB(7171180), UILabel.Effect.Outline8, new Vector2(2f, 2f))
|
|
}
|
|
};
|
|
|
|
public static Dictionary<Color32, ColorSet> COLOR_TABLE_DECK_SELECTION_ROTATION_UNLIMITED = new Dictionary<Color32, ColorSet> {
|
|
{
|
|
LabelDefine.TEXT_COLOR_NORMAL,
|
|
new ColorSet(FromHexRGB(16777215), FromHexRGB(16777215), UILabel.Effect.None, new Vector2(2f, 2f))
|
|
} };
|
|
|
|
public static Dictionary<Color32, ColorSet> COLOR_TABLE_DECK_SELECTION = new Dictionary<Color32, ColorSet>
|
|
{
|
|
{
|
|
LabelDefine.TEXT_COLOR_NORMAL,
|
|
new ColorSet(FromHexRGB(16777215), FromHexRGB(14182531), UILabel.Effect.None, new Vector2(2f, 2f))
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_ORANGE,
|
|
new ColorSet(FromHexRGB(16777215), FromHexRGB(16777215), UILabel.Effect.None, Vector2.zero)
|
|
}
|
|
};
|
|
|
|
public static Dictionary<Color32, ColorSet> COLOR_TABLE_QUEST_BUTTON = new Dictionary<Color32, ColorSet>
|
|
{
|
|
{
|
|
LabelDefine.TEXT_COLOR_NORMAL,
|
|
new ColorSet(FromHexRGB(16777201))
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_ORANGE,
|
|
new ColorSet(FromHexRGB(16777215), FromHexRGB(16777215), UILabel.Effect.None, Vector2.zero)
|
|
}
|
|
};
|
|
|
|
private static Dictionary<Color32, ColorSet> COLOR_TABLE_BINGO_BUTTON = new Dictionary<Color32, ColorSet>
|
|
{
|
|
{
|
|
LabelDefine.TEXT_COLOR_NORMAL,
|
|
new ColorSet(FromHexRGB(4599345), FromHexRGB(16777215), UILabel.Effect.None, new Vector2(2f, 2f))
|
|
},
|
|
{
|
|
LabelDefine.TEXT_COLOR_BUTTON_DISABLE,
|
|
new ColorSet(FromHexRGB(4599345), FromHexRGB(16777215), UILabel.Effect.None, new Vector2(2f, 2f))
|
|
}
|
|
};
|
|
|
|
private static Color32 FromHexRGB(int hex)
|
|
{
|
|
byte r = (byte)((hex & 0xFF0000) >> 16);
|
|
byte g = (byte)((hex & 0xFF00) >> 8);
|
|
byte b = (byte)(hex & 0xFF);
|
|
return new Color32(r, g, b, byte.MaxValue);
|
|
}
|
|
|
|
public static void ChangeAllLabel(GameObject root, Dictionary<Color32, ColorSet> colorDict = null)
|
|
{
|
|
if (deactivateTextColorChange)
|
|
{
|
|
return;
|
|
}
|
|
if (colorDict == null)
|
|
{
|
|
colorDict = COLOR_TABLE;
|
|
}
|
|
if (root.GetComponentInChildren<DeckSelectUI>(includeInactive: true) != null)
|
|
{
|
|
colorDict = COLOR_TABLE_DECK_SELECTION;
|
|
}
|
|
if (root.GetComponent<QuestSelectionButtonBase>() != null)
|
|
{
|
|
colorDict = COLOR_TABLE_QUEST_BUTTON;
|
|
}
|
|
if (root.GetComponent<CardDetailUI>() != null)
|
|
{
|
|
colorDict = COLOR_TABLE_DETAIL;
|
|
}
|
|
// BingoPage removed (DEAD-COLD engine cleanup Task 12)
|
|
if (colorDict == COLOR_TABLE_DETAIL && (root.name == "CardTexture" || root.name == "CardText"))
|
|
{
|
|
return;
|
|
}
|
|
UILabel[] components = root.GetComponents<UILabel>();
|
|
foreach (UILabel uILabel in components)
|
|
{
|
|
bool flag = false;
|
|
bool flag2 = false;
|
|
ColorOverwrite component = uILabel.GetComponent<ColorOverwrite>();
|
|
if (component != null)
|
|
{
|
|
if (component.ColorChange == ColorOverwrite.Change.No)
|
|
{
|
|
continue;
|
|
}
|
|
if (component.ColorChange == ColorOverwrite.Change.UseDeckColorSet)
|
|
{
|
|
colorDict = COLOR_TABLE_DECK_SELECTION;
|
|
}
|
|
else if (component.ColorChange == ColorOverwrite.Change.UseBingoButtonSet)
|
|
{
|
|
colorDict = COLOR_TABLE_BINGO_BUTTON;
|
|
}
|
|
flag2 = component.DontChangeEffectDistance;
|
|
flag = component.DontChangeEffectStyle;
|
|
}
|
|
if (uILabel.GetComponent<ParameterOverwriterBase>() != null || !colorDict.TryGetValue(uILabel.color, out var value))
|
|
{
|
|
continue;
|
|
}
|
|
if ((bool)uILabel.gameObject.GetComponentInParent<UIButton>(includeInactive: true) && (uILabel.color == LabelDefine.TEXT_COLOR_NORMAL || uILabel.color == LabelDefine.TEXT_COLOR_BUTTON_DISABLE) && value.ButtonFontColor.HasValue)
|
|
{
|
|
uILabel.color = value.ButtonFontColor.Value;
|
|
}
|
|
else
|
|
{
|
|
uILabel.color = value.FontColor;
|
|
}
|
|
if (!value.DontChangeEffect)
|
|
{
|
|
uILabel.effectColor = value.FrameColor;
|
|
if (!flag)
|
|
{
|
|
uILabel.effectStyle = value.Effect;
|
|
}
|
|
if (!flag2)
|
|
{
|
|
uILabel.effectDistance = value.EffectDistance;
|
|
}
|
|
}
|
|
}
|
|
for (int j = 0; j < root.transform.childCount; j++)
|
|
{
|
|
ChangeAllLabel(root.transform.GetChild(j).gameObject, colorDict);
|
|
}
|
|
}
|
|
}
|