From 30ef1b19294b1b724827ed2790e12e53b751a492 Mon Sep 17 00:00:00 2001 From: ritenseki Date: Fri, 7 Aug 2026 13:09:39 +0800 Subject: [PATCH] cleanup: one shared property block, explicit resolve report, drop dead diagnostics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No behavioural change intended; this is the tidy-up pass after five rounds of track fixes. Director.cs * Six MaterialPropertyBlock fields (chara / bgColor1 / bgColor2 / spotlight / uvScroll / blinkLight) become one shared `PropBlock`. Every use is the same self-contained Get -> modify -> Set, and the block carries no state across frames or handlers, so the separate fields were pure duplication. The reason the Get is mandatory (SetPropertyBlock replaces rather than merges — this is what made GlobalLight dead for 59/59 songs) now lives on the one shared field instead of being restated per handler. * ResolveStageTargets wrote four instance fields as de facto out-parameters that LogBgColor1Resolution read back. Replaced with a returned StageResolveReport, which also lets the logger become static. `props` is now a required parameter — the `= null` default silently meant "BgColor1's channel", which is the wrong default for a BgColor2 caller. * Three duplicated blocks removed: shader-description building (BgColor1 and BlinkLight logs -> DescribeRendererShaders), vocal entry resolution (InitializeMusic and GetLiveAllVoiceEntry -> ResolveVocalEntry), and the FOV frame marking copied verbatim into SaveCameraVMD and SaveMultiCameraVMD (-> MarkFovFrames, which additionally no longer throws on an empty frame list). * OnEffectUpdate's three identical "record the frame, bail out" branches collapse into LoadEffectPrefab returning null. * HdrBloom's handler and the Bloom volume override are gone. hdrBloomKeys is empty in all 59 songs, and the field-to-URP mapping was never confirmed — so this was code that could only ever be wrong, plus an effect nobody wrote to. The data layer and the dispatch stay, so re-adding it is one subscription. * The BlinkLight TODO no longer lists palette slot mapping: that was reverse-engineered (slot = the lightNNN_/alphaNNN_ prefix of the renderer or its nearest ancestor). StageEnvMapDiag.cs deleted (with StageEnvRateToggle and its F9 hotkey). It existed to test one hypothesis — that the floor blow-out came from DefaultEnvMapNoAmbient's env reflection — and the verdict experiment ran: _EnvRate = 0 changed nothing. The real cause turned out to be mirror_a and is fixed. Keeping it meant a full-hierarchy sweep on every stage load and a hotkey, for a question already answered. StageController no longer calls it; StageMissingScriptCensus's doc comment stops restating the signature list that CLAUDE.md already carries. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01UzXXkLzVC8pNA3JjyUGMbq --- .../Gallop/Live/Cutt/LiveTimelineControl.cs | 2 + .../Scripts/umamusume/Gallop/Live/Director.cs | 438 ++++++++---------- .../Gallop/Live/StageAnimationPlayer.cs | 31 +- .../umamusume/Gallop/Live/StageController.cs | 5 +- .../umamusume/Gallop/Live/StageEnvMapDiag.cs | 162 ------- .../Gallop/Live/StageEnvMapDiag.cs.meta | 11 - 6 files changed, 209 insertions(+), 440 deletions(-) delete mode 100644 Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs delete mode 100644 Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs.meta diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs index 1bbbd70..faa5a47 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs @@ -378,6 +378,8 @@ namespace Gallop.Live.Cutt AlterUpdate_SimpleListControl(workSheet.laserList, d => d.keys, OnUpdateLaser, _currentFrame); AlterUpdate_SimpleListControl(workSheet.blinkLightList, d => d.keys, OnUpdateBlinkLight, _currentFrame); AlterUpdate_SimpleListControl(workSheet.chromaticAberrationList, d => d.keys, OnUpdateChromaticAberration, _currentFrame); + // HdrBloom:Director 侧刻意没有 handler(全语料 59 首 0 keys,映射也无从核对)。 + // 分发保留,接上只需订阅 OnUpdateHdrBloom。 AlterUpdate_SimpleListControl(workSheet.hdrBloomKeys, d => d.keys, OnUpdateHdrBloom, _currentFrame); AlterUpdate_SimpleListControl(workSheet.colorCorrectionDataLists, d => d.keys, OnUpdateColorCorrection, _currentFrame); AlterUpdate_PostFilm(workSheet.postFilmKeys, 0, _currentFrame); diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 5b54493..bb8a2f5 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -173,7 +173,9 @@ namespace Gallop.Live _uvScrollAccum.Clear(); totalTime = _liveTimelineControl.data.timeLength; - // 临时诊断:确认是否有 worksheet[1..] 携带轨道数据。结论出来后连同 LiveTimelineWorksheetDiag.cs 一起删。 + // 每首歌开场时列一遍本曲实际带了哪些轨道、各多少关键帧。 + // 「worksheet[1..] 是否也带数据」这个问题已经有结论(1177 实测 Count==1 / MainLive, + // 读 worksheetList[0] 不丢东西),但这份清单本身仍是接新轨道时最快的对照表,故保留。 LiveTimelineWorksheetDiag.Dump(_liveTimelineControl.data); liveMode = mode; @@ -227,7 +229,6 @@ namespace Gallop.Live _liveTimelineControl.OnUpdateLaser += OnLaserUpdate; _liveTimelineControl.OnUpdateBlinkLight += OnBlinkLightUpdate; _liveTimelineControl.OnUpdateChromaticAberration += OnChromaticAberrationUpdate; - _liveTimelineControl.OnUpdateHdrBloom += OnHdrBloomUpdate; _liveTimelineControl.OnUpdateColorCorrection += OnColorCorrectionUpdate; _liveTimelineControl.OnUpdatePostFilm += OnPostFilmUpdate; PostFilmRendererFeature.ResetLayers(); @@ -242,9 +243,10 @@ namespace Gallop.Live if (_postProcessVolume.profile == null) _postProcessVolume.profile = ScriptableObject.CreateInstance(); + // 只加真的有 handler 驱动的 override。Bloom 曾在这里被加上,但驱动它的 + // HdrBloom 轨道全语料 0 keys,等于挂一个没人写、参数恒为默认值的效果。 var profile = _postProcessVolume.profile; if (!profile.Has()) profile.Add(true); - if (!profile.Has()) profile.Add(true); if (!profile.Has()) profile.Add(true); if (!profile.Has()) profile.Add(true); } @@ -267,33 +269,26 @@ namespace Gallop.Live if (_activeEffects.TryGetValue(effectData, out var old) && old.instance != null) Destroy(old.instance); - // Load prefab - string path = string.Format(EFFECT_PATH, effectData.name); - if (!UmaViewerMain.Instance.AbList.ContainsKey(path)) + GameObject prefab = LoadEffectPrefab(effectData.name); + GameObject instance = null; + if (prefab != null) { - _activeEffects[effectData] = (keyData.frame, null); - return; + instance = Instantiate(prefab, transform); + ApplyEffectTransform(instance.transform, keyData); } - - AssetBundle bundle = UmaAssetManager.LoadAssetBundle(UmaViewerMain.Instance.AbList[path]); - if (bundle == null) - { - _activeEffects[effectData] = (keyData.frame, null); - return; - } - - GameObject prefab = bundle.LoadAsset(System.IO.Path.GetFileName(path)); - if (prefab == null) - { - _activeEffects[effectData] = (keyData.frame, null); - return; - } - - GameObject instance = Instantiate(prefab, transform); - ApplyEffectTransform(instance.transform, keyData); + // 载不到时也要记下帧号,否则每帧都会重试一遍 bundle 载入。 _activeEffects[effectData] = (keyData.frame, instance); } + private static GameObject LoadEffectPrefab(string effectName) + { + string path = string.Format(EFFECT_PATH, effectName); + if (!UmaViewerMain.Instance.AbList.TryGetValue(path, out var entry)) return null; + + AssetBundle bundle = UmaAssetManager.LoadAssetBundle(entry); + return bundle != null ? bundle.LoadAsset(Path.GetFileName(path)) : null; + } + private void ApplyEffectTransform(Transform t, LiveTimelineKeyEffectData keyData) { Vector3 basePos = Vector3.zero; @@ -337,26 +332,27 @@ namespace Gallop.Live } /// - /// 角色渲染器共用的 MaterialPropertyBlock。 + /// 所有写 shader 属性的 handler 共用的 MaterialPropertyBlock。 /// - /// GlobalLight 和 BgColor1 的角色分支写的是同一批 container.Renderers,而 - /// Renderer.SetPropertyBlock() 是「整块替换」而不是合并。两者在同一帧里按 - /// AlterLateUpdate 的顺序先后跑(GlobalLight → BgColor1),所以各自 new 一个空 block - /// 再 Set 的话,后跑的 BgColor1 每帧都会把 GlobalLight 刚写进去的 13 个 rim 属性 - /// 抹回材质默认值 —— 全语料 59/59 首都同时带这两条轨道的数据(歌曲 1177 是 - /// GlobalLight×2 组 + CharaColor×2 组),于是 GlobalLight 实际上从来没生效过。 + /// 用法固定为 **Get → 改 → Set**,不能省掉 Get: + /// Renderer.SetPropertyBlock() 是「整块替换」而不是合并,而多条轨道在同一帧里 + /// 按 AlterLateUpdate 的顺序先后写同一批渲染器。GlobalLight → BgColor1(角色分支)就是 + /// 这样的一对:各自 new 一个空 block 再 Set 的话,后跑的 BgColor1 每帧都会把 GlobalLight + /// 刚写进去的 13 个 rim 属性抹回材质默认值 —— 全语料 59/59 首都同时带这两条轨道的数据 + /// (歌曲 1177 是 GlobalLight×2 组 + CharaColor×2 组),于是 GlobalLight 从来没生效过。 /// - /// 正确做法是先 GetPropertyBlock 把渲染器上已有的块取回来,改完再写回去 —— - /// 舞台侧的 和 - /// 本来就是这么写的,这两个角色侧的 handler 是仅有的两处例外。 - /// 顺带干掉每个 locator 每帧一次的 new。 + /// 既然每次使用都是「取回渲染器当前的块 → 改 → 写回」这一个自洽动作,块本身不携带 + /// 跨帧或跨 handler 的状态,一个实例足够;此前每个 handler 各存一个字段(chara / + /// bgColor1 / bgColor2 / spotlight / uvScroll / blinkLight 六个)只是重复。 /// - private MaterialPropertyBlock _charaBlock; + private MaterialPropertyBlock _propBlock; + + private MaterialPropertyBlock PropBlock => _propBlock ??= new MaterialPropertyBlock(); private void OnGlobalLightUpdate(ref GlobalLightUpdateInfo updateInfo) { var tmpPos = -(updateInfo.lightRotation * Vector3.forward).normalized; - _charaBlock ??= new MaterialPropertyBlock(); + var block = PropBlock; foreach (var locator in _liveTimelineControl.liveCharactorLocators) { if (locator == null || !updateInfo.flags.hasFlag(locator.liveCharaStandingPosition) || locator is not LiveTimelineCharaLocator charaLocator) continue; @@ -365,28 +361,28 @@ namespace Gallop.Live foreach (var renderer in container.Renderers) { if (renderer == null) continue; - renderer.GetPropertyBlock(_charaBlock); - _charaBlock.SetFloat("_RimShadowRate", updateInfo.globalRimShadowRate); - _charaBlock.SetColor("_RimColor", updateInfo.rimColor); - _charaBlock.SetFloat("_RimStep", updateInfo.rimStep); - _charaBlock.SetFloat("_RimFeather", updateInfo.rimFeather); - _charaBlock.SetFloat("_RimSpecRate", updateInfo.rimSpecRate); - _charaBlock.SetFloat("_RimHorizonOffset", updateInfo.RimHorizonOffset); - _charaBlock.SetFloat("_RimVerticalOffset", updateInfo.RimVerticalOffset); - _charaBlock.SetFloat("_RimHorizonOffset2", updateInfo.RimHorizonOffset2); - _charaBlock.SetFloat("_RimVerticalOffset2", updateInfo.RimVerticalOffset2); - _charaBlock.SetColor("_RimColor2", updateInfo.rimColor2); - _charaBlock.SetFloat("_RimStep2", updateInfo.rimStep2); - _charaBlock.SetFloat("_RimFeather2", updateInfo.rimFeather2); - _charaBlock.SetFloat("_RimSpecRate2", updateInfo.rimSpecRate2); - _charaBlock.SetFloat("_RimShadowRate2", updateInfo.globalRimShadowRate2); + renderer.GetPropertyBlock(block); + block.SetFloat("_RimShadowRate", updateInfo.globalRimShadowRate); + block.SetColor("_RimColor", updateInfo.rimColor); + block.SetFloat("_RimStep", updateInfo.rimStep); + block.SetFloat("_RimFeather", updateInfo.rimFeather); + block.SetFloat("_RimSpecRate", updateInfo.rimSpecRate); + block.SetFloat("_RimHorizonOffset", updateInfo.RimHorizonOffset); + block.SetFloat("_RimVerticalOffset", updateInfo.RimVerticalOffset); + block.SetFloat("_RimHorizonOffset2", updateInfo.RimHorizonOffset2); + block.SetFloat("_RimVerticalOffset2", updateInfo.RimVerticalOffset2); + block.SetColor("_RimColor2", updateInfo.rimColor2); + block.SetFloat("_RimStep2", updateInfo.rimStep2); + block.SetFloat("_RimFeather2", updateInfo.rimFeather2); + block.SetFloat("_RimSpecRate2", updateInfo.rimSpecRate2); + block.SetFloat("_RimShadowRate2", updateInfo.globalRimShadowRate2); // 这两个原先走 renderer.materials,那个 getter 每次调用都会实例化材质副本 // 并新分配数组(每帧、每渲染器)。两者在 bundle 的 Gallop/3D/Chara/* 上 // 分别是 Float 和 Vector,MPB 能直接写;ToonEye/T 上的 [MaterialToggle] // 只是编辑器 drawer,运行时 SetFloat 一样不会开关键字,所以行为不变。 - _charaBlock.SetFloat("_UseOriginalDirectionalLight", 1); - _charaBlock.SetVector("_OriginalDirectionalLightDir", tmpPos); - renderer.SetPropertyBlock(_charaBlock); + block.SetFloat("_UseOriginalDirectionalLight", 1); + block.SetVector("_OriginalDirectionalLightDir", tmpPos); + renderer.SetPropertyBlock(block); } } } @@ -413,8 +409,6 @@ namespace Gallop.Live private readonly Dictionary> _bgColor1StageCache = new Dictionary>(); - private MaterialPropertyBlock _bgColor1Block; - private void OnBgColor1Update(ref BgColor1UpdateInfo updateInfo) { if (!string.IsNullOrEmpty(updateInfo.TimelineName) && @@ -431,18 +425,18 @@ namespace Gallop.Live var container = charaLocator.UmaContainer; if (!container) continue; // 必须 Get→改→Set,否则会把 GlobalLight 同一帧写进去的 rim 属性整块抹掉。 - // 详见 _charaBlock 的注释。 - _charaBlock ??= new MaterialPropertyBlock(); + // 详见 _propBlock 的注释。 + var block = PropBlock; foreach (var renderer in container.Renderers) { if (renderer == null) continue; - renderer.GetPropertyBlock(_charaBlock); - _charaBlock.SetColor("_CharaColor", updateInfo.color); - _charaBlock.SetColor("_ToonDarkColor", updateInfo.toonDarkColor); - _charaBlock.SetColor("_ToonBrightColor", updateInfo.toonBrightColor); - _charaBlock.SetColor("_OutlineColor", updateInfo.outlineColor); - _charaBlock.SetFloat("_Saturation", updateInfo.Saturation); - renderer.SetPropertyBlock(_charaBlock); + renderer.GetPropertyBlock(block); + block.SetColor("_CharaColor", updateInfo.color); + block.SetColor("_ToonDarkColor", updateInfo.toonDarkColor); + block.SetColor("_ToonBrightColor", updateInfo.toonBrightColor); + block.SetColor("_OutlineColor", updateInfo.outlineColor); + block.SetFloat("_Saturation", updateInfo.Saturation); + renderer.SetPropertyBlock(block); } } } @@ -458,19 +452,19 @@ namespace Gallop.Live string key = updateInfo.TimelineName; if (!_bgColor1StageCache.TryGetValue(key, out var targets)) { - targets = ResolveStageTargets(key); + targets = ResolveStageTargets(key, kStageBgColor1Props, out var report); _bgColor1StageCache[key] = targets; - LogBgColor1Resolution(key, targets); + LogBgColor1Resolution(key, targets, report); } if (targets.Count == 0) return; - _bgColor1Block ??= new MaterialPropertyBlock(); + var block = PropBlock; foreach (var t in targets) { if (t.renderer == null) continue; - t.renderer.GetPropertyBlock(_bgColor1Block); - _bgColor1Block.SetColor(t.prop, updateInfo.color); + t.renderer.GetPropertyBlock(block); + block.SetColor(t.prop, updateInfo.color); // ⚠ 不要在这里写 _ColorPower —— 缺 ground truth。 // 已核实的只有「这些 shader 上 _ColorPower 这个 Float 属性存在」; @@ -484,7 +478,7 @@ namespace Gallop.Live // _ReflectionTex 从没赋值,Unity 代入白贴图 = 满强度白反射。 // 实现 Gallop.MirrorReflection 后已解决。与 _ColorPower 无关。) - t.renderer.SetPropertyBlock(_bgColor1Block); + t.renderer.SetPropertyBlock(block); } } @@ -507,15 +501,42 @@ namespace Gallop.Live return $"{sh.name} 颜色属性: {(colors.Count > 0 ? string.Join(",", colors) : "<无>")}"; } + /// 把一批渲染器用到的 shader 去重列出,供各 handler 的首次日志核对写对了通道。 + private static string DescribeRendererShaders(IEnumerable renderers) + { + var shaders = new List(); + foreach (var r in renderers) + { + if (r == null) continue; + foreach (var mat in r.sharedMaterials) + { + if (mat == null) continue; + string info = DescribeShaderColors(mat.shader); + if (!shaders.Contains(info)) shaders.Add(info); + } + } + return string.Join(" | ", shaders); + } + + /// + /// 的诊断副产物:找到几个同名对象、它们下面有几个 + /// Renderer、这些 Renderer 用的材质和 shader。解析失败时靠它把原因拆开说清楚。 + /// 原先是四个实例字段被 resolve 当输出参数改写,日志再读回来 —— 隐式耦合,改成显式返回。 + /// + private struct StageResolveReport + { + public bool foundObject; + public int objectCount; + public int rendererCount; + public List materials; + } + /// 用 sharedMaterials 探测(不会实例化材质),只保留确实有候选属性的 Renderer。 - private List ResolveStageTargets(string timelineName, string[] props = null) + private List ResolveStageTargets(string timelineName, string[] props, + out StageResolveReport report) { var result = new List(); - - _bgColor1FoundObject = false; - _bgColor1ObjCount = 0; - _bgColor1RendererCount = 0; - _bgColor1MatInfo.Clear(); + report = new StageResolveReport { materials = new List() }; // 按 Transform 名遍历整个舞台层级。 // 不能只查 StageObjectMap:它按名字去重,而观众群里同名对象有几十上百个 @@ -527,8 +548,8 @@ namespace Gallop.Live { if (!string.Equals(tr.name.Replace("(Clone)", ""), timelineName, StringComparison.OrdinalIgnoreCase)) continue; - _bgColor1FoundObject = true; - _bgColor1ObjCount++; + report.foundObject = true; + report.objectCount++; foreach (var r in tr.GetComponentsInChildren(true)) if (r != null && seen.Add(r)) byName.Add(r); } @@ -536,20 +557,20 @@ namespace Gallop.Live // StageObjectMap 兜底:万一有对象不在 _stageController 层级下。 if (_stageController.StageObjectMap.TryGetValue(timelineName, out var go) && go != null) { - _bgColor1FoundObject = true; + report.foundObject = true; foreach (var r in go.GetComponentsInChildren(true)) if (r != null && seen.Add(r)) byName.Add(r); } - _bgColor1RendererCount = byName.Count; + report.rendererCount = byName.Count; foreach (var r in byName) { if (r == null) continue; foreach (var mat in r.sharedMaterials) { - if (mat == null) { _bgColor1MatInfo.Add(""); continue; } + if (mat == null) { report.materials.Add(""); continue; } string info = $"{mat.name}[{DescribeShaderColors(mat.shader)}]"; - if (!_bgColor1MatInfo.Contains(info)) _bgColor1MatInfo.Add(info); + if (!report.materials.Contains(info)) report.materials.Add(info); } } if (byName.Count > 0) @@ -567,7 +588,7 @@ namespace Gallop.Live if (mat == null) continue; if (mat.name.IndexOf(timelineName, StringComparison.OrdinalIgnoreCase) >= 0) { - _bgColor1FoundObject = true; + report.foundObject = true; matched.Add(r); break; } @@ -577,17 +598,9 @@ namespace Gallop.Live return result; } - // ResolveStageTargets 的副产物,用于把失败原因拆干净: - // 找到几个同名对象 / 它们下面有几个 Renderer / 这些 Renderer 用的材质和 shader。 - private bool _bgColor1FoundObject; - private int _bgColor1ObjCount; - private int _bgColor1RendererCount; - private readonly List _bgColor1MatInfo = new List(); - private static void CollectTargets(IEnumerable renderers, List result, - string[] props = null) + string[] props) { - props ??= kStageBgColor1Props; foreach (var r in renderers) { if (r == null) continue; @@ -613,17 +626,18 @@ namespace Gallop.Live } } - private void LogBgColor1Resolution(string timelineName, List targets) + private static void LogBgColor1Resolution(string timelineName, List targets, + StageResolveReport report) { if (targets.Count == 0) { - if (!_bgColor1FoundObject) + if (!report.foundObject) Debug.LogWarning($"[BgColor1] '{timelineName}':整个舞台层级里找不到同名对象,材质名也匹配不上"); - else if (_bgColor1RendererCount == 0) - Debug.LogWarning($"[BgColor1] '{timelineName}':找到 {_bgColor1ObjCount} 个同名对象,但它们下面没有任何 Renderer"); + else if (report.rendererCount == 0) + Debug.LogWarning($"[BgColor1] '{timelineName}':找到 {report.objectCount} 个同名对象,但它们下面没有任何 Renderer"); else - Debug.LogWarning($"[BgColor1] '{timelineName}':找到 {_bgColor1ObjCount} 个对象 / {_bgColor1RendererCount} 个 Renderer," + - $"但材质无候选属性。材质[shader]: {string.Join(" | ", _bgColor1MatInfo)}"); + Debug.LogWarning($"[BgColor1] '{timelineName}':找到 {report.objectCount} 个对象 / {report.rendererCount} 个 Renderer," + + $"但材质无候选属性。材质[shader]: {string.Join(" | ", report.materials)}"); return; } @@ -631,17 +645,8 @@ namespace Gallop.Live foreach (var t in targets) props.Add(t.prop); // 成功分支也打印 shader 真实声明的颜色属性,便于核对写对了通道。 - var shaders = new List(); - foreach (var t in targets) - foreach (var mat in t.renderer.sharedMaterials) - { - if (mat == null) continue; - string info = DescribeShaderColors(mat.shader); - if (!shaders.Contains(info)) shaders.Add(info); - } - Debug.Log($"[BgColor1] '{timelineName}' -> {targets.Count} 个 Renderer,写入 {string.Join(",", props)};" + - $"{string.Join(" | ", shaders)}"); + $"{DescribeRendererShaders(targets.Select(t => t.renderer))}"); } /// @@ -698,7 +703,6 @@ namespace Gallop.Live private readonly Dictionary> _bgColor2StageCache = new Dictionary>(); private List _bgColor2AllTargets; - private MaterialPropertyBlock _bgColor2Block; /// /// BgColor2。原实现有三个问题,这里修掉两个半: @@ -730,7 +734,7 @@ namespace Gallop.Live { targets = string.IsNullOrEmpty(key) ? new List() - : ResolveStageTargets(key, kStageBgColor2Props); + : ResolveStageTargets(key, kStageBgColor2Props, out _); _bgColor2StageCache[key] = targets; if (targets.Count == 0) Debug.LogWarning($"[BgColor2] 组名 '{key}' 解析不到任何渲染器,退回全舞台写入。" + @@ -739,8 +743,6 @@ namespace Gallop.Live Debug.Log($"[BgColor2] 组名 '{key}' → {targets.Count} 个渲染器"); } - _bgColor2Block ??= new MaterialPropertyBlock(); - // 名字解析成功:只写这一组。 if (targets.Count > 0) { @@ -760,12 +762,13 @@ namespace Gallop.Live private void WriteAmbient(List targets, Color c) { + var block = PropBlock; foreach (var t in targets) { if (t.renderer == null) continue; - t.renderer.GetPropertyBlock(_bgColor2Block); - _bgColor2Block.SetColor(t.prop, c); - t.renderer.SetPropertyBlock(_bgColor2Block); + t.renderer.GetPropertyBlock(block); + block.SetColor(t.prop, c); + t.renderer.SetPropertyBlock(block); } } @@ -810,30 +813,29 @@ namespace Gallop.Live _spotlightRenderers[go] = renderers; } - _spotlightBlock ??= new MaterialPropertyBlock(); + var block = PropBlock; foreach (var r in renderers) { if (r == null) continue; BlinkTarget t = ResolveBlinkTarget(r); if (t.colorProp == null) continue; - r.GetPropertyBlock(_spotlightBlock); + r.GetPropertyBlock(block); if (t.hasColorPower) { // 亮度是独立通道,不要折进颜色里,合成交给 shader。 - _spotlightBlock.SetColor(t.colorProp, keyData.color); - _spotlightBlock.SetFloat(kColorPowerProp, keyData.colorPower); + block.SetColor(t.colorProp, keyData.color); + block.SetFloat(kColorPowerProp, keyData.colorPower); } else { - _spotlightBlock.SetColor(t.colorProp, keyData.color * keyData.colorPower); + block.SetColor(t.colorProp, keyData.color * keyData.colorPower); } - r.SetPropertyBlock(_spotlightBlock); + r.SetPropertyBlock(block); } // TODO: localHeight / targetCameraType / targetCameraIndex 未实现。 } - private MaterialPropertyBlock _spotlightBlock; private readonly Dictionary _spotlightRenderers = new Dictionary(); @@ -847,7 +849,6 @@ namespace Gallop.Live private readonly Dictionary> _uvScrollTargets = new Dictionary>(); private readonly HashSet _uvScrollLoggedShaders = new HashSet(); - private MaterialPropertyBlock _uvScrollBlock; private void OnUVScrollLightUpdate(LiveTimelineUVScrollLightData data, LiveTimelineKeyUVScrollLightData keyData) { @@ -891,15 +892,15 @@ namespace Gallop.Live } if (targets.Count == 0) return; - _uvScrollBlock ??= new MaterialPropertyBlock(); + var block = PropBlock; foreach (var t in targets) { if (t.renderer == null) continue; - t.renderer.GetPropertyBlock(_uvScrollBlock); + t.renderer.GetPropertyBlock(block); // MPB 没有 SetTextureOffset,等价写法是 _MainTex_ST = (scaleX, scaleY, offsetX, offsetY)。 - _uvScrollBlock.SetVector("_MainTex_ST", + block.SetVector("_MainTex_ST", new Vector4(t.baseScale.x, t.baseScale.y, totalOffset.x, totalOffset.y)); // 之前写的是 _Color。实测这些材质用的是 @@ -915,11 +916,11 @@ namespace Gallop.Live // (LightAdd1_UV / StageLightAdd1_UVAlphaMask_TransmittedLightMask)都有该属性, // 兜底分支永远跑不到,却会在真跑到时悄悄产生另一种画面。 // MPB 往 shader 没有的属性写入本身是无害空操作,不需要守卫。 - _uvScrollBlock.SetColor("_MulColor0", keyData.mulColor0); - _uvScrollBlock.SetColor("_MulColor1", keyData.mulColor1); - _uvScrollBlock.SetFloat(kColorPowerProp, keyData.colorPower); + block.SetColor("_MulColor0", keyData.mulColor0); + block.SetColor("_MulColor1", keyData.mulColor1); + block.SetFloat(kColorPowerProp, keyData.colorPower); - t.renderer.SetPropertyBlock(_uvScrollBlock); + t.renderer.SetPropertyBlock(block); } // TODO: ColorType0/1、CharacterIndex0/1、IsColorBlend0/1、ColorBlendRate0/1、 // AltCharaColor0/1、loopType/loopCount 未实现。 @@ -937,14 +938,10 @@ namespace Gallop.Live // not expressible in URP built-in ChromaticAberration. clip, effectType unused. } - private void OnHdrBloomUpdate(LiveTimelineHdrBloomData data, LiveTimelineKeyHdrBloomData keyData) - { - if (keyData == null || _postProcessVolume == null) return; - if (!_postProcessVolume.profile.TryGet(out var fx)) return; - fx.intensity.Override(keyData.bloomIntensity); - fx.threshold.Override(keyData.threshold); - // TODO: field mapping unconfirmed — no bundle data found. Verify when data becomes available. - } + // HdrBloom (38) 没有 handler,这是有意的:全语料 59 首的 hdrBloomKeys 全部为空 + // (`tools/` 全量扫描 + song 1177 的 dump 都是 0),而字段到 URP Bloom 的映射也无从核对。 + // 数据层(LiveTimelineHdrBloomData / hdrBloomKeys / OnUpdateHdrBloom)保留着, + // 哪天真有歌带数据,接一个 handler 即可。 private void OnColorCorrectionUpdate(LiveTimelineColorCorrectionData data, LiveTimelineKeyColorCorrectionData keyData) { @@ -983,7 +980,7 @@ namespace Gallop.Live var renderers = go.GetComponentsInChildren(true); if (renderers.Length == 0) return; - _blinkLightBlock ??= new MaterialPropertyBlock(); + var block = PropBlock; int noProp = 0; // color0Array/powerArray 恒为 10 项,是「调色板」而不是每盏灯一项。 @@ -1039,26 +1036,24 @@ namespace Gallop.Live // 于是 _BlinkLightColor 一直是默认值,灯全渲染成黑块。 if (t.colorProp == null) { noProp++; continue; } - r.GetPropertyBlock(_blinkLightBlock); + r.GetPropertyBlock(block); if (t.hasColorPower) { // shader 自带独立的亮度通道,颜色和强度分开写,合成交给 shader。 - _blinkLightBlock.SetColor(t.colorProp, col); - _blinkLightBlock.SetFloat(kColorPowerProp, power); + block.SetColor(t.colorProp, col); + block.SetFloat(kColorPowerProp, power); } else { // BgMirrorBall 这类只有 _MulColor0、没有 _ColorPower,只能把强度乘进颜色。 - _blinkLightBlock.SetColor(t.colorProp, col * power); + block.SetColor(t.colorProp, col * power); } - r.SetPropertyBlock(_blinkLightBlock); + r.SetPropertyBlock(block); } LogBlinkLightOnce(data.name, keyData, renderers, noProp); - // TODO: 调色板槽位映射、color1Array、LightBlendMode、isReverseHueArray 尚未实现。 + // TODO: color1Array、LightBlendMode、isReverseHueArray 尚未实现。 } - private MaterialPropertyBlock _blinkLightBlock; - // 舞台灯光 shader 的通道(枚举 shader 属性表实测,见 CLAUDE.md): // LightBlinkBlend _BlinkLightColor + _ColorPower // DefaultNoAmbient _MulColor0 + _ColorPower @@ -1180,22 +1175,13 @@ namespace Gallop.Live { if (!_blinkLoggedGroups.Add(groupName)) return; - var shaders = new List(); - foreach (var r in renderers) - foreach (var mat in r.sharedMaterials) - { - if (mat == null) continue; - string info = DescribeShaderColors(mat.shader); - if (!shaders.Contains(info)) shaders.Add(info); - } - Debug.Log($"[BlinkLight] '{groupName}' renderers={renderers.Length} 无可写颜色属性={noProp} " + $"pattern={k.pattern} colorType={k.colorType} blendMode={k.LightBlendMode} " + $"color0Array={k.color0Array?.Length ?? -1} color1Array={k.color1Array?.Length ?? -1} " + $"powerArray={k.powerArray?.Length ?? -1} reverseHue={k.isReverseHueArray?.Length ?? -1} " + $"power={k.powerMin}~{k.powerMax} loop={k.loopCount} " + $"wait={k.waitTime} on={k.turnOnTime} keep={k.keepTime} off={k.turnOffTime} interval={k.intervalTime}; " + - $"{string.Join(" | ", shaders)}"); + $"{DescribeRendererShaders(renderers)}"); } private static float ComputeBlinkIntensity(LiveTimelineKeyBlinkLightData keyData, float elapsed) @@ -1352,38 +1338,33 @@ namespace Gallop.Live } } + /// + /// 某位角色在某首歌里的 vocal 音源。角色专属音轨不存在时(未实装的组合), + /// 从该曲的全部 chara 音轨里随机挑一条顶上。 + /// + private static UmaDatabaseEntry ResolveVocalEntry(int songid, int charaid) + { + var sounds = UmaViewerMain.Instance.AbSounds; + var entry = sounds.FirstOrDefault(a => a.Name.Contains(string.Format(VOCAL_PATH, songid, charaid)) && a.Name.EndsWith("awb")); + if (entry != null) return entry; + + var fallbacks = sounds.Where(a => a.Name.Contains(string.Format(RANDOM_VOCAL_PATH, songid)) && a.Name.EndsWith("awb")).ToList(); + return fallbacks.Count > 0 ? fallbacks[UnityEngine.Random.Range(0, fallbacks.Count - 1)] : null; + } + public void InitializeMusic(int songid, List characters) { - for (int i = 0; i < characters.Count; i++) { - if (characters[i].CharaEntry.Name != "" && i < partInfo.SingerCount) - { - var charaid = characters[i].CharaEntry.Id; + if (characters[i].CharaEntry.Name == "" || i >= partInfo.SingerCount) continue; - var entry = UmaViewerMain.Instance.AbSounds.FirstOrDefault(a => a.Name.Contains(string.Format(VOCAL_PATH, songid, charaid)) && a.Name.EndsWith("awb")); - if (entry == null) - { - List entries = new List(); - foreach (var random in UmaViewerMain.Instance.AbSounds.Where(a => (a.Name.Contains(string.Format(RANDOM_VOCAL_PATH, songid)) && a.Name.EndsWith("awb")))) - { - entries.Add(random); - } - if (entries.Count > 0) - { - entry = entries[UnityEngine.Random.Range(0, entries.Count - 1)]; - } - } + var entry = ResolveVocalEntry(songid, characters[i].CharaEntry.Id); + if (entry == null) continue; - if (entry != null) - { - Debug.Log(entry.Name); - liveVocal.Add(UmaViewerAudio.ApplySound(entry.Name.Split('.')[0], i)); - } - } + Debug.Log(entry.Name); + liveVocal.Add(UmaViewerAudio.ApplySound(entry.Name.Split('.')[0], i)); } - liveMusic = UmaViewerAudio.ApplySound(string.Format(SONG_PATH, songid), -1); } @@ -1565,27 +1546,38 @@ namespace Gallop.Live } } + /// + /// 标记 VMD 录制里需要保留 FOV 的帧:首帧,以及每个 fov 关键帧命中的那一帧和它周围 + /// 的 -3..+1 帧。单机位与多机位两条保存路径原先各写了一份完全相同的循环。 + /// + private static void MarkFovFrames(List frames, IEnumerable fovKeys) + { + if (frames == null || frames.Count == 0) return; + frames[0].FovVaild = true; + if (fovKeys == null) return; + + foreach (var key in fovKeys) + { + int frame = key.frame; + var keyframe = frames.Find(f => f.frameIndex == frame); + if (keyframe == null) continue; + + int index = frames.IndexOf(keyframe); + keyframe.FovVaild = true; + if (index + 1 < frames.Count) frames[index + 1].FovVaild = true; + if (index - 1 > 0) frames[index - 1].FovVaild = true; + if (index - 2 > 0) frames[index - 2].FovVaild = true; + if (index - 3 > 0) frames[index - 3].FovVaild = true; + } + } + private void SaveMultiCameraVMD() { - for (int i = 0; i < _liveTimelineControl.data.worksheetList[0].multiCameraPosKeys.Count; i++) + var sheet = _liveTimelineControl.data.worksheetList[0]; + for (int i = 0; i < sheet.multiCameraPosKeys.Count; i++) { var frames = _liveTimelineControl.MultiRecordFrames[i]; - frames[0].FovVaild = true; - var fov = _liveTimelineControl.data.worksheetList[0].multiCameraPosKeys[i].keys.thisList; - fov.ForEach(k => - { - var keyframe = frames.Find(f => f.frameIndex == k.frame); - if (keyframe != null) - { - var index = frames.IndexOf(keyframe); - keyframe.FovVaild = true; - if (index + 1 < frames.Count) frames[index + 1].FovVaild = true; - if (index - 1 > 0) frames[index - 1].FovVaild = true; - if (index - 2 > 0) frames[index - 2].FovVaild = true; - if (index - 3 > 0) frames[index - 3].FovVaild = true; - } - }); - + MarkFovFrames(frames, sheet.multiCameraPosKeys[i].keys.thisList); UnityCameraVMDRecorder.SaveLiveCameraVMD(live, ExitTime, frames, i); } } @@ -1593,23 +1585,7 @@ namespace Gallop.Live private void SaveCameraVMD() { var frames = _liveTimelineControl.RecordFrames; - frames[0].FovVaild = true; - var fov = _liveTimelineControl.data.worksheetList[0].cameraFovKeys.thisList; - fov.ForEach(k => - { - - var keyframe = frames.Find(f => f.frameIndex == k.frame); - if (keyframe != null) - { - var index = frames.IndexOf(keyframe); - keyframe.FovVaild = true; - if (index + 1 < frames.Count) frames[index + 1].FovVaild = true; - if (index - 1 > 0) frames[index - 1].FovVaild = true; - if (index - 2 > 0) frames[index - 2].FovVaild = true; - if (index - 3 > 0) frames[index - 3].FovVaild = true; - } - }); - + MarkFovFrames(frames, _liveTimelineControl.data.worksheetList[0].cameraFovKeys.thisList); UnityCameraVMDRecorder.SaveLiveCameraVMD(live, ExitTime, frames); } @@ -1618,28 +1594,12 @@ namespace Gallop.Live List entryList = new List (); for (int i = 0; i < characters.Count; i++) { - if (characters[i].CharaEntry.Name != "") + if (characters[i].CharaEntry.Name == "") continue; + + var entry = ResolveVocalEntry(songid, characters[i].CharaEntry.Id); + if (entry != null) { - var charaid = characters[i].CharaEntry.Id; - - var entry = UmaViewerMain.Instance.AbSounds.FirstOrDefault(a => a.Name.Contains(string.Format(VOCAL_PATH, songid, charaid)) && a.Name.EndsWith("awb")); - if (entry == null) - { - List entries = new List(); - foreach (var random in UmaViewerMain.Instance.AbSounds.Where(a => (a.Name.Contains(string.Format(RANDOM_VOCAL_PATH, songid)) && a.Name.EndsWith("awb")))) - { - entries.Add(random); - } - if (entries.Count > 0) - { - entry = entries[UnityEngine.Random.Range(0, entries.Count - 1)]; - } - } - - if (entry != null) - { - entryList.Add(entry); - } + entryList.Add(entry); } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/StageAnimationPlayer.cs b/Assets/Scripts/umamusume/Gallop/Live/StageAnimationPlayer.cs index 4417e05..c41442a 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/StageAnimationPlayer.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/StageAnimationPlayer.cs @@ -85,31 +85,14 @@ namespace Gallop.Live } /// - /// 缺失脚本的运行时普查。 + /// 缺失脚本的运行时普查,当进度表用:每按原签名实现一个原版脚本, + /// 「脚本丢失」就该下降对应的实例数(已验证 BillboardController 令 892→728,正好 −164)。 /// - /// **2026-08-05 更正**:这段最初写着「新建同名 class 绑不上,字段运行时读不到」, - /// 那是错的。这次普查的结果自己推翻了它 —— 存活的 7 个里有 `AssetHolder` - /// (bundle ns=`Gallop`)和 `StageController`(ns=`Gallop.Live`),它们**正是靠 - /// 类名 + namespace + 程序集名对上才绑定成功的**。 - /// - /// `Assets/Scripts/umamusume.asmdef` 的 name 就是 `umamusume`,和 bundle 里 - /// 每个 MonoScript 的 `m_AssemblyName` 完全一致 —— 这个项目本来就是为此组织的 - /// (`LiveTimelineWorkSheet` 读 cutt 数据靠的也是同一个机制)。 - /// - /// 所以那 892 个只是**没人写**,不是读不到。按下面的签名建类,Unity 会把 - /// `_rotationType`、`MirrorBallLoopRotationSpeed` 这些序列化字段真正填进来: - /// - /// Gallop.Live AnimationObjectController / BillboardController / - /// LightProjection / UnityLensFlareController / WashLightController - /// Gallop.RenderPipeline MirrorBallProjector / CustomProjector / CustomLensFlare - /// Gallop MirrorReflection - /// Gallop.Live.ShaderParam ShaderParamController - /// - /// 这段普查保留下来当进度表:每实现一个类,「脚本丢失」就该下降对应的实例数。 - /// live10149 的离线统计:AnimationObjectController 282、UnityLensFlareController 205、 - /// CustomLensFlare 200、BillboardController 164、WashLightController 27、 - /// MirrorBallProjector/CustomProjector/LightProjection 各 4、 - /// MirrorReflection/ShaderParamController 各 1,合计 892,另有 1 个 StageController。 + /// 签名清单、各类实例数、以及「为什么建同名类就能收到字段」见 CLAUDE.md + /// 「用原签名重建脚本」。一句话:Unity 按**类名 + namespace + 程序集名**解析 MonoScript, + /// 而 `umamusume.asmdef` 的程序集名与 bundle 里写的完全一致 —— 那 892 个空槽位 + /// 只是没人写,不是读不到。(这条最初记反了,是本普查的结果自己推翻的: + /// 存活的 `AssetHolder` 和 `StageController` 正是靠这个机制绑上的。) /// public static class StageMissingScriptCensus { diff --git a/Assets/Scripts/umamusume/Gallop/Live/StageController.cs b/Assets/Scripts/umamusume/Gallop/Live/StageController.cs index 49cf041..12df663 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/StageController.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/StageController.cs @@ -109,11 +109,8 @@ namespace Gallop.Live // 舞台自带 Animation 的播放(原版由缺失的 AnimationObjectController 负责)。 StageAnimationPlayer.Setup(this); - // 缺失脚本普查:决定这些脚本能不能直接重新实现。 + // 缺失脚本普查:每按签名实现一个原版脚本,「脚本丢失」计数就该下降对应实例数。 StageMissingScriptCensus.Dump(this); - - // 地板发白的诊断,只打日志不改任何东西。见 StageEnvMapDiag 的说明。 - StageEnvMapDiag.Dump(this); } public void UpdateObject(ref ObjectUpdateInfo updateInfo) { diff --git a/Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs b/Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs deleted file mode 100644 index abb9505..0000000 --- a/Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace Gallop.Live -{ - /// - /// 舞台地板/高光面「过亮发白」的诊断。 - /// - /// 已从 bundle 查明的部分(ground truth,见 LIVE_AUDIT_2026-08-05.md): - /// - /// * live10149 上发白的 plane_000 / stage_object_001 / specular_002 三个物件, - /// 用的是**同一个** shader:Gallop/3D/Live/Stage/DefaultEnvMapNoAmbient。 - /// 它是舞台 shader 里唯一带环境反射通道的一族。 - /// * 该 shader 真实声明的属性只有 8 个: - /// _MainTex _MulColor0 _ColorPower _AddColor - /// _TripleMaskMap _EnvMap _EnvRate(Range 0..1, 默认 0.5) _EnvBias(Range 0..8, 默认 1) - /// * 三个材质的 _EnvRate 分别是 0.75 / 1.0 / 1.0,_EnvBias 是 2 / 2 / 5。 - /// * 材质里 _EnvMap 是**绑定了**的(指向别的 bundle,不是 null)。 - /// - /// 剩下的唯一未知项是运行时:那些跨 bundle 的贴图引用 UmaViewer 到底解析出来没有。 - /// 如果 _EnvMap 运行时是 null,Unity 会代入默认贴图(白),再乘上 _EnvRate=1.0 - /// 就是满强度的白色反射 —— 正好是「地板发白」的样子。 - /// - /// 这个类只负责把那个未知项打出来,不做任何修改。 - /// - /// 可证伪的预测:plane_000 的 _EnvRate 是 0.75,另外两个是 1.0, - /// 所以**如果**这个假设成立,plane_000 应该比另外两个略轻一些。 - /// 若三者一样白,说明白化另有来源,这条假设就该丢掉。 - /// - public static class StageEnvMapDiag - { - private const string kEnvShader = "Gallop/3D/Live/Stage/DefaultEnvMapNoAmbient"; - - public static void Dump(StageController stage) - { - if (stage == null) return; - - var lines = new List(); - int total = 0, nullEnv = 0; - - foreach (var r in stage.GetComponentsInChildren(true)) - { - foreach (var mat in r.sharedMaterials) - { - if (mat == null || mat.shader == null) continue; - if (mat.shader.name != kEnvShader) continue; - - total++; - // 必须问当前 shader;材质的 m_SavedProperties 里还留着一堆 URP Lit 的 - // 历史属性(_WorkflowMode/_Smoothness/_ClearCoatMask…),那个表不可信。 - Texture env = mat.HasProperty("_EnvMap") ? mat.GetTexture("_EnvMap") : null; - if (env == null) nullEnv++; - - lines.Add(string.Format( - " {0,-22} mat={1,-34} _EnvMap={2,-26} _EnvRate={3:F2} _EnvBias={4:F2}", - r.gameObject.name, - mat.name.Replace(" (Instance)", ""), - env == null ? "*** null(会代入白贴图)***" : env.name, - mat.HasProperty("_EnvRate") ? mat.GetFloat("_EnvRate") : -1f, - mat.HasProperty("_EnvBias") ? mat.GetFloat("_EnvBias") : -1f)); - break; - } - } - - if (total == 0) - { - Debug.Log($"[EnvMapDiag] 本舞台没有使用 {kEnvShader} 的渲染器"); - return; - } - - Debug.Log($"[EnvMapDiag] {kEnvShader}:{total} 个渲染器,其中 _EnvMap 为 null 的有 {nullEnv} 个\n" - + string.Join("\n", lines)); - - if (nullEnv > 0) - Debug.LogWarning($"[EnvMapDiag] {nullEnv}/{total} 个材质的 _EnvMap 运行时没解析出来 —— " + - "Unity 会代入白贴图,_EnvRate 越接近 1 就越白。地板发白的成因基本可以坐实。"); - else - Debug.Log("[EnvMapDiag] _EnvMap 全部解析成功 —— 发白不是贴图缺失造成的。" + - "按 F9 可在「原始 _EnvRate ↔ 0」之间来回切换,判断反射项是不是发白的来源。"); - - if (stage.GetComponent() == null) - stage.gameObject.AddComponent(); - } - } - - /// - /// 判决实验:按 F9 把 DefaultEnvMapNoAmbient 的 `_EnvRate` 在「原始值 ↔ 0」之间切换。 - /// - /// 为什么需要它:`_EnvRate` 0.75 与 1.00 只差 25%,如果反射项本来就超过 1.0 被钳到白, - /// 两者会一样白 —— 所以「plane_000 看起来没比别的轻」**不能**否定反射项假设, - /// 那个对比检验设计得太弱。把 `_EnvRate` 直接归零才是二元的: - /// - /// 发白消失 → 就是 env 反射项,问题转化为「反射强度该由谁压下来」 - /// 发白照旧 → env 路径无关,改查 Built-in shader 在 URP 下的翻译 - /// - /// 走 MaterialPropertyBlock,不动材质本身;再按一次即可还原。纯诊断,默认不改变任何东西。 - /// - public class StageEnvRateToggle : MonoBehaviour - { - public KeyCode key = KeyCode.F9; - - private const string kEnvShader = "Gallop/3D/Live/Stage/DefaultEnvMapNoAmbient"; - private bool _zeroed; - private MaterialPropertyBlock _block; - private readonly List _targets = new List(); - private bool _collected; - - private void Collect() - { - _collected = true; - foreach (var r in GetComponentsInChildren(true)) - { - foreach (var mat in r.sharedMaterials) - { - if (mat != null && mat.shader != null && mat.shader.name == kEnvShader) - { - _targets.Add(r); - break; - } - } - } - } - - private void Update() - { - if (!Input.GetKeyDown(key)) return; - if (!_collected) Collect(); - if (_targets.Count == 0) - { - Debug.Log("[EnvMapDiag] 本舞台没有带 env 反射的渲染器,F9 无事可做"); - return; - } - - _zeroed = !_zeroed; - _block ??= new MaterialPropertyBlock(); - - foreach (var r in _targets) - { - if (r == null) continue; - r.GetPropertyBlock(_block); - if (_zeroed) - { - _block.SetFloat("_EnvRate", 0f); - } - else - { - // 还原成材质自己的授权值(plane_000=0.75,另两个=1.0) - float authored = 0.5f; - foreach (var mat in r.sharedMaterials) - { - if (mat != null && mat.HasProperty("_EnvRate")) { authored = mat.GetFloat("_EnvRate"); break; } - } - _block.SetFloat("_EnvRate", authored); - } - r.SetPropertyBlock(_block); - } - - Debug.Log($"[EnvMapDiag] _EnvRate → {(_zeroed ? "0(反射关闭)" : "原始值(反射恢复)")}," + - $"作用于 {_targets.Count} 个渲染器。地板此刻变了吗?"); - } - } -} diff --git a/Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs.meta deleted file mode 100644 index 8d83dcf..0000000 --- a/Assets/Scripts/umamusume/Gallop/Live/StageEnvMapDiag.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2f47145aad184ad3a6ae81cb1b711182 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: