diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs index 7b537bb..74d2ecd 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs @@ -73,6 +73,9 @@ namespace Gallop.Live.Cutt public event Action OnUpdateWashLight; public event Action OnUpdateLaser; public event Action OnUpdateBlinkLight; + public event Action OnUpdateChromaticAberration; + public event Action OnUpdateHdrBloom; + public event Action OnUpdateColorCorrection; private static Func fnGetCameraPosValue = GetCameraPosValue; @@ -364,6 +367,9 @@ namespace Gallop.Live.Cutt AlterUpdate_SimpleListControl(workSheet.WashLightList, d => d.keys, OnUpdateWashLight, _currentFrame); 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); + AlterUpdate_SimpleListControl(workSheet.hdrBloomKeys, d => d.keys, OnUpdateHdrBloom, _currentFrame); + AlterUpdate_SimpleListControl(workSheet.colorCorrectionDataLists, d => d.keys, OnUpdateColorCorrection, _currentFrame); _isNowAlterUpdate = false; diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineChromaticAberrationData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineChromaticAberrationData.cs new file mode 100644 index 0000000..94aeaea --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineChromaticAberrationData.cs @@ -0,0 +1,29 @@ +using System; +using UnityEngine; + +namespace Gallop.Live.Cutt +{ + [Serializable] + public class LiveTimelineKeyChromaticAberrationData : LiveTimelineKeyWithInterpolate + { + public int isEnable; + public Vector2 redOffset; + public Vector2 greenOffset; + public Vector2 blueOffset; + public float power; + public float clip; + public int effectType; + } + + [Serializable] + public class LiveTimelineKeyChromaticAberrationDataList : LiveTimelineKeyDataListTemplate + { + } + + [Serializable] + public class LiveTimelineChromaticAberrationData : ILiveTimelineGroupDataWithName + { + private const string default_name = "ChromaticAberration"; + public LiveTimelineKeyChromaticAberrationDataList keys; + } +} diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineChromaticAberrationData.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineChromaticAberrationData.cs.meta new file mode 100644 index 0000000..b2f77dd --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineChromaticAberrationData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 577536d7b04577e4f97cd0c33c4c54d9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineColorCorrectionData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineColorCorrectionData.cs new file mode 100644 index 0000000..676b535 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineColorCorrectionData.cs @@ -0,0 +1,35 @@ +using System; +using UnityEngine; + +namespace Gallop.Live.Cutt +{ + [Serializable] + public class LiveTimelineKeyColorCorrectionData : LiveTimelineKeyWithInterpolate + { + public int enable; + public float saturation; // 1.0 = neutral + public int mode; + public AnimationCurve redCurve; + public AnimationCurve greenCurve; + public AnimationCurve blueCurve; + public AnimationCurve depthRedCurve; + public AnimationCurve depthGreenCurve; + public AnimationCurve depthBlueCurve; + public AnimationCurve blendCurve; + public int selective; + public Color keyColor; + public Color targetColor; + } + + [Serializable] + public class LiveTimelineKeyColorCorrectionDataList : LiveTimelineKeyDataListTemplate + { + } + + [Serializable] + public class LiveTimelineColorCorrectionData : ILiveTimelineGroupDataWithName + { + private const string default_name = "ColorCorrection"; + public LiveTimelineKeyColorCorrectionDataList keys; + } +} diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineColorCorrectionData.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineColorCorrectionData.cs.meta new file mode 100644 index 0000000..09a4069 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineColorCorrectionData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3bbc9d423334b7e4fbce26081357344f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineHdrBloomData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineHdrBloomData.cs new file mode 100644 index 0000000..6a7965d --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineHdrBloomData.cs @@ -0,0 +1,26 @@ +using System; +using UnityEngine; + +namespace Gallop.Live.Cutt +{ + [Serializable] + public class LiveTimelineKeyHdrBloomData : LiveTimelineKeyWithInterpolate + { + // TODO: fields unconfirmed — no bundle data found in 30-song scan. + // Likely candidates based on URP Bloom: intensity, threshold. + public float bloomIntensity; + public float threshold; + } + + [Serializable] + public class LiveTimelineKeyHdrBloomDataList : LiveTimelineKeyDataListTemplate + { + } + + [Serializable] + public class LiveTimelineHdrBloomData : ILiveTimelineGroupDataWithName + { + private const string default_name = "HdrBloom"; + public LiveTimelineKeyHdrBloomDataList keys; + } +} diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineHdrBloomData.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineHdrBloomData.cs.meta new file mode 100644 index 0000000..0d46ff1 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineHdrBloomData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6de4d415603668a47807908ceac5e327 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs index 3cff786..d6b380c 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs @@ -947,6 +947,9 @@ namespace Gallop.Live.Cutt [SerializeField] public List WashLightList; [SerializeField] public List laserList; [SerializeField] public List blinkLightList; + [SerializeField] public List chromaticAberrationList; + [SerializeField] public List hdrBloomKeys; + [SerializeField] public List colorCorrectionDataLists; /* //���ڿ��Ե���AB���ˣ���Ȼ���淢��ûʲô��...˵����ʲôʱ�����õ� diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 1fc58e6..f7ee5eb 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; namespace Gallop.Live { @@ -49,6 +51,8 @@ namespace Gallop.Live private Dictionary _activeEffects = new Dictionary(); + private Volume _postProcessVolume; + public UmaViewerAudio.CuteAudioSource liveMusic = new UmaViewerAudio.CuteAudioSource(); public PartEntry partInfo; @@ -307,6 +311,26 @@ namespace Gallop.Live _liveTimelineControl.OnUpdateWashLight += OnWashLightUpdate; _liveTimelineControl.OnUpdateLaser += OnLaserUpdate; _liveTimelineControl.OnUpdateBlinkLight += OnBlinkLightUpdate; + _liveTimelineControl.OnUpdateChromaticAberration += OnChromaticAberrationUpdate; + _liveTimelineControl.OnUpdateHdrBloom += OnHdrBloomUpdate; + _liveTimelineControl.OnUpdateColorCorrection += OnColorCorrectionUpdate; + + // 获取或创建摄像机上的 Volume 组件,供后处理 handler 使用 + var mainCam = Camera.main; + if (mainCam != null) + { + _postProcessVolume = mainCam.GetComponent(); + if (_postProcessVolume == null) + _postProcessVolume = mainCam.gameObject.AddComponent(); + if (_postProcessVolume.profile == null) + _postProcessVolume.profile = ScriptableObject.CreateInstance(); + + 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); + } } private void OnEffectUpdate(LiveTimelineEffectData effectData, LiveTimelineKeyEffectData keyData) @@ -430,6 +454,55 @@ namespace Gallop.Live } } + private void OnChromaticAberrationUpdate(LiveTimelineChromaticAberrationData data, LiveTimelineKeyChromaticAberrationData keyData) + { + if (keyData == null || _postProcessVolume == null) return; + if (!_postProcessVolume.profile.TryGet(out var fx)) return; + bool on = keyData.isEnable != 0; + fx.active = on; + if (on) + fx.intensity.Override(keyData.power); + // TODO: keyData.redOffset/greenOffset/blueOffset — per-channel displacement, + // 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. + } + + private void OnColorCorrectionUpdate(LiveTimelineColorCorrectionData data, LiveTimelineKeyColorCorrectionData keyData) + { + if (keyData == null || _postProcessVolume == null) return; + + bool on = keyData.enable != 0; + + if (_postProcessVolume.profile.TryGet(out var ca)) + { + ca.active = on; + if (on) + // game: 1.0 = neutral; URP: 0 = neutral, range -100..100 + ca.saturation.Override((keyData.saturation - 1f) * 100f); + } + + if (_postProcessVolume.profile.TryGet(out var cc)) + { + cc.active = on; + if (on && keyData.redCurve != null) + { + cc.red.Override(new TextureCurve(keyData.redCurve.keys, 0f, false, new Vector2(0f, 1f))); + cc.green.Override(new TextureCurve(keyData.greenCurve.keys, 0f, false, new Vector2(0f, 1f))); + cc.blue.Override(new TextureCurve(keyData.blueCurve.keys, 0f, false, new Vector2(0f, 1f))); + } + } + // TODO: depthRedCurve/depthGreenCurve/depthBlueCurve — depth-based curves, no URP equivalent. + // blendCurve, mode, selective, keyColor, targetColor unused. + } + private void OnBlinkLightUpdate(LiveTimelineBlinkLightData data, LiveTimelineKeyBlinkLightData keyData) { if (keyData == null || _stageController == null) return; diff --git a/CLAUDE.md b/CLAUDE.md index 05c2a13..e079e9c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -76,6 +76,9 @@ StageController.cs ← manages stage GameObjects, StageObjectMap | LightShafts (50) | `LiveTimelineLightShaftsData` | data deserialized, no visual (component absent) | | Particle (41) | `LiveTimelineParticleData` | sets ParticleSystem.emission.rateOverTime | | ParticleGroup (42) | `LiveTimelineParticleGroupData` | sets FlickerLightRate | +| ChromaticAberration (73) | `LiveTimelineChromaticAberrationData` | URP `ChromaticAberration.intensity` ← `power`;per-channel offset 无法映射 | +| HdrBloom (38) | `LiveTimelineHdrBloomData` | URP `Bloom.intensity/threshold`;字段未经 bundle 确认 | +| ColorCorrection (61) | `LiveTimelineColorCorrectionData` | URP `ColorAdjustments.saturation` + `ColorCurves` RGB;depth/blend curve 无 URP 对应 | | BlinkLight | `LiveTimelineBlinkLightData` | SetActive + child Light color/intensity from timeline data (56/58 songs) | | WashLight | `LiveTimelineWashLightData` | SetActive only — RaycastDistance/CameraProjection fields unused (5/58 songs) | | Laser | `LiveTimelineLaserData` | SetActive + position/rotation/scale — blink/raycast not implemented (6/58 songs) |