diff --git a/.gitignore b/.gitignore index 53e9339..469d957 100644 --- a/.gitignore +++ b/.gitignore @@ -105,5 +105,11 @@ global-metadata*.dat *.pfx *.p12 +# Local agent instructions and internal handoff plans +/AGENTS.md +/CLAUDE.md +/implementation_plan.md +/docs/CLAUDE_LIVE_HANDOFF.md + # Handwritten tool project; Unity-generated root IDE projects stay ignored !/tools/TargetMethodLookup/TargetMethodLookup.csproj diff --git a/AGENTS.md b/AGENTS.md deleted file mode 100644 index fa2761d..0000000 --- a/AGENTS.md +++ /dev/null @@ -1,408 +0,0 @@ -# CLAUDE.md - -This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. - -## Project Overview - -UmaViewer is a Unity application (2022.3.62f1) that loads and displays assets from Uma Musume: Pretty Derby. It reads encrypted asset bundles directly from the game installation without modifying game files. - -## Development - -**Open the project:** Unity Hub → Add → `C:\Users\riten\Desktop\UmaBuild` -**Run:** Open `Assets/Scenes/Version2` scene → Play in Unity Editor -**Build:** File → Build Settings → PC Standalone → Build - -No CLI build commands — Unity Editor is required. - -## Game Data & Asset Pipeline - -Game assets are encrypted. Key files: -- `meta` (SQLite-MC ChaCha20 encrypted) — maps bundle names → hash filenames in `dat/` -- `dat/{2-char-prefix}/{hash}` — encrypted asset bundles, each with a per-bundle XOR key from meta - -**Bundle decryption** (`UmaAssetBundleStream.cs`): header (first 256 bytes) is plain; bytes ≥256 are XOR'd with `FKey = ABKey[i] XOR bundleKey_bytes[j]`. - -**meta DB decryption**: `UmaDatabaseController.ReadMetaFromEncryptedDb()` uses `sqlite3mc_x64.dll` with cipher=3 (ChaCha20). Final key = `DBKey[i] XOR DBBaseKey[i % 13]`. - -**Asset bundle paths** (key formats): -- Live cutt timelines: `cutt/cutt_son{music_id}/cutt_son{music_id}` -- Live effect prefabs: `3d/effect/live/pfb_{effectName}` -- Stage prefabs: `3d/env/live/live{bgId}/pfb_env_live{bgId}_controller000` - -**Python tools** (`tools/`) — rebuilt 2026-08-04 after the old `UmaCrack\` toolchain was deleted. Run with `~/.venvs/umatools/bin/python3` (needs `UnityPy` + `apsw-sqlite3mc`, **not** plain `apsw`; see `tools/requirements.txt`). - -| Script | Use | -|---|---| -| `uma_common.py` | Library: key constants, `decrypt_bundle_bytes()`, `MetaDb` (path→hash, UnityPy load) | -| `dump_meta.py` | `plain` → `out/meta_plain.db` · `find ` · `info ` (hash, dat path, deps, `[NOT DOWNLOADED]`) · `songs` | -| `dump_bundle.py` | `list` / `tree` / `json` / `save` / `gameobjects`, `--deps` | -| `dump_cutt_typetree.py` | **Authoritative track schema.** `--fields ` · `--tree ` · `--sample ` · `--groups` | -| `scan_live_tracks.py` | All 59 songs → `out/scan_keys.csv`, `scan_groups.csv`, `scan_summary.txt`, `scan.json` (~21 s) | - -Notes: `meta` decrypts via sqlite3mc `PRAGMA cipher='chacha20'` + `PRAGMA hexkey='<64 hex>'` (the `key=x'...'` and `raw:` forms both fail); `VACUUM INTO` re-encrypts the target, so `dump_meta.py plain` copies schema+rows explicitly. - -**Cutt bundles ship full TypeTrees, so field names and keyframe counts from these tools are ground truth.** All 70 worksheets across all 59 songs share one 128-field schema — no version drift. Only `son_camera` and `type_01..type_10` carry the trees; the `cutt_son` prefab and `data` bundles are stripped. - -**Getting a track's real field name without the dump tools** — Unity matches bundle TypeTree fields by name, case-sensitively. A field whose name doesn't match is never populated (it does *not* become null — Unity initialises every serialised `List` to an empty list, so null-vs-empty tells you nothing). To test a candidate name, declare it on `LiveTimelineWorkSheet` and check whether it receives keys: - -```csharp -LiveTimelineWorksheetDiag.Probe(sheet, "candidateFieldName"); -``` - -Unsure about casing? Declare both spellings side by side — only the correct one fills. This is how `WashLightList` (capital W) was confirmed; note upstream katboi01 uses `washLightList`, which never populates. - -## Live Timeline Architecture - -The Live playback system is in `Assets/Scripts/umamusume/Gallop/Live/`: - -``` -Director.cs ← singleton, wires everything together -Cutt/ - LiveTimelineControl.cs ← dispatches timeline events each frame (~1900 lines) - LiveTimelineWorkSheet.cs ← all track data fields (ScriptableObject) - LiveTimelineDataList/ ← one .cs per track type - UpdateInfo/ ← structs passed to event handlers -StageController.cs ← manages stage GameObjects, StageObjectMap -``` - -**Track implementation pattern** (repeat for each new track): -1. Add data class in `LiveTimelineDataList/` (extend `LiveTimelineKeyWithInterpolate` for key, add group wrapper implementing `ILiveTimelineGroupDataWithName`) -2. Add `[SerializeField] public List<...> trackList;` to `LiveTimelineWorkSheet` -3. Add `public event Action OnUpdateXxx;` in `LiveTimelineControl` -4. Call `AlterUpdate_SimpleListControl(workSheet.trackList, d => d.keys, OnUpdateXxx, _currentFrame)` in `AlterLateUpdate()` -5. Subscribe `_liveTimelineControl.OnUpdateXxx += handler` in `Director.InitializeTimeline()` - -**Important:** `LiveTimelineKeyWithInterpolate` already declares `frame`, `attribute`, `interpolateType`, `curve`, `easingType` — do NOT redeclare these in subclasses. - -**Stage shader colour channels** (enumerated at runtime via `Shader.GetPropertyType`, confirmed on stage live10149 / song 1177): - -| shader | colour | brightness | other | -|---|---|---|---| -| `Gallop/3D/Live/Stage/DefaultNoAmbient` | `_MulColor0` | `_ColorPower` | | -| `Gallop/3D/Live/Stage/DefaultEnvMapNoAmbient` | `_MulColor0` | `_ColorPower` | `_AddColor`, `_EnvMap` | -| `Gallop/3D/Live/Stage/DefaultTransparentNoAmbient` | `_MulColor0` | `_ColorPower` | `_AmbientColor` | -| `Gallop/3D/Live/Stage/LightBlinkBlend` | `_BlinkLightColor` | `_ColorPower` | `_SrcBlend`/`_DstBlend` | -| `Gallop/3D/Live/Stage/LightBlend` / `LightAdd1` | `_MulColor0`, `_MulColor1` | `_ColorPower`, `_ColorPowerMultiply` | | -| `Gallop/3D/Live/Stage/Laser` | `_MulColor0`, `_MulColor1` | `_ColorPower` | `_RandomValue` | -| `Gallop/3D/Bg/BgMirrorBall` | `_MulColor0` | **(none)** | | -| `Gallop/3D/Live/Stage/StageMirrorBallShine` | (none) | | | -| `Gallop/3D/Live/Stage/StageTransmittedLightMask` | (none) | | `_TransmittedLightMaskScale` | - -**Brightness is a separate channel — do not fold it into the colour.** Write the key's colour to the colour property and its `power` to `_ColorPower`; let the shader combine them. Only fall back to `colour * power` where `_ColorPower` is absent (`BgMirrorBall`). - -**Writing shader properties: one shared block, always Get → modify → Set.** All of `Director`'s -handlers write through the single `PropBlock` (`Director._propBlock`) and must call -`renderer.GetPropertyBlock(block)` first — `SetPropertyBlock()` **replaces** the block rather than -merging, so a handler that starts from an empty block wipes whatever another track wrote to the -same renderer earlier in the same frame. That is exactly how GlobalLight was silently dead for -59/59 songs (BgColor1's character branch runs right after it and cleared all 13 rim properties). -Never `new MaterialPropertyBlock()` per frame, and never write `_Color` without first checking the -target shader's real property table — three separate tracks shipped no-op colour writes that way. - -Dump any shader's real property table with: - -```python -# tools/, via ~/.venvs/umatools/bin/python3 -env = MetaDb().load("shader") # 499 shaders -pf = obj.read_typetree()["m_ParsedForm"] # m_Name, m_PropInfo.m_Props -``` - -**`_MulColor0` is on every stage shader and is BgColor1's channel; `_AmbientColor` belongs to BgColor2.** They are separate properties on the same shader, so the two tracks must not write the same one. Same naming family as WashLight's `MulColor0` and UVScrollLight's `mulColor1`. - -⚠️ A material's `m_SavedProperties` in the bundle lists properties it no longer has — it retains entries from whatever shader it was authored against. `Material.HasProperty()` asks the *current shader*. Always enumerate the shader, never trust the bundle's saved-property table. - -**渲染状态也从这张过期表里读,后果最严重。** Gallop 的发光类 shader 把混合写成 -`Blend [_SrcBlend] [_DstBlend]`,也就是**从材质属性取渲染状态**。live10149 的 -**26/26 个材质**存的都是 `_SrcBlend=One, _DstBlend=Zero`(不透明覆盖),且每一个的 float 表里 -都带着 `_WorkflowMode`/`_Surface`/`_ClearCoatMask`/`_Smoothness`/`_Blend` —— 那是 **URP Lit -的属性表**,整批盖上去的,One/Zero 正是 URP Lit 的不透明预设。 - -作者意图可查:全库 16 个声明这两个属性的 shader 里,**14 个默认 `One/One`(加法混合)** —— -`LightBlinkBlend`、`LightBlend`、`StageBeamLight{,Cutoff,Fadeout}`、 -`StageLightBlink{Cutoff,Fadeout}`、`StageProjectorBlend{,VertexAlpha,AnimVertexAlpha}`、 -`StageMonitorBlend*`、`MirrorBallProjector`、`BgUnlitStencilAlpha`,全是发光/投影那一批。 - -被压成不透明后,加法光柱「颜色为黑 = 什么都不加 = 不可见」变成了**一堵实心黑墙**。 - -⚠️ **实际受害面比存档表窄得多,别照着 26 这个数推。** 只有**当前 shader 真的声明了**这两个 -属性的材质才会被读到;其余材质虽然也存着 `One/Zero`,但那只是过期条目,无人问津。 -live10149 实测(`[StageBlend]` 日志):31 个材质里**只有 1 个**被修正 —— -`mtl_env_live10149_blinklight000` / `LightBlinkBlend`,`_DstBlend` 0 → 1。 - -**但「1 个材质」严重低估了影响面 —— 材质在舞台上是高度共享的。** 那一个材质铺满 -27 个 BlinkLight 组、约 **1450 个渲染器**(观众席 95、mob000 570、glow_object 67、 -glow_ramp 58、镜面球闪片 83、全部 wash 组、各种 LED 板),实机确认修好的不只是地面 wash 灯的 -黑楔子,长期挂着的「小灯泡渲染成黑块」也一并正常了。 -**教训(第三次同一天):报数要报对单位。** 舞台上约 1500 个渲染器只有 31 个材质, -按材质计数会把影响面说小两个数量级 —— `[StageBlend]` 日志现在同时报渲染器数。 -`StageController.RestoreAuthoredBlendState()` 在舞台初始化时把这两个属性写回 **shader 声明的 -默认值**(`Shader.GetPropertyDefaultFloatValue`),对本来就该不透明的 shader 是空操作,自限。 -改了哪些材质会逐条打进 `[StageBlend]` 日志。 - -> 教训比这个 bug 本身通用:**过期存档表不只影响颜色,还能改渲染状态**。 -> 看到「本该发光的东西是黑的/挡住后面的东西」,先查 `_SrcBlend`/`_DstBlend`, -> 再查颜色写对没有。 - -Worked example — `mtl_env_live10149_projector001` (shader `Gallop/3D/MirrorAndShadow/MirrorBallProjector`, 22 real properties) saves 40+, including Standard-shader leftovers (`_Glossiness`, `_Metallic`, `_Parallax`, `_Mode`, `_UVSec`) **and** four plausible-looking ghosts the current shader never declares: `_IsLoopYRotation`, `_LoopYRotationSpeed`, `_MirrorBallProjectionIntensity`, `_MirrorBallRotateWS`. Two of those are older spellings of properties that *do* exist (`_MirrorBallIsLoopRotation`, `_MirrorBallLoopRotationSpeed`) — exactly the kind of near-miss that reads as a discovery. Note also that where a component field and a saved property disagree (`MirrorBallFallOffPower` = 1.0 on the component vs `_MirrorBallFalloffPower` = 2.0 in the material), the component wins at runtime: these controllers push their own fields into the material. - -**Track group names are not always GameObject names.** Four separate silent failures were traced to this in one session, so check the mapping before assuming a track is unimplemented: -- a whitelist filter in the dispatcher dropped 92% of BgColor1's keys (`validBgColorNames`) -- `StageObjectMap` dedupes by name, so a crowd of 66 same-named objects only ever got its first member -- the Object track's `neonsign` is a `_stageObjectUnits` **unit name**, not a GameObject — no object of that name exists -- `ObjectUpdateInfo.OffsetType` was populated by the dispatcher but never read by `StageController`, so `Add`-relative positions were written as absolute - -All four failed silently, with no error. Treat a track that "works" but looks wrong as a routing problem first. - -**StageObjectMap:** Stage child GameObjects are indexed by name. Objects whose names match `IsTimelineControlledLight()` (`blinklight`, `spotlight3d`, `_wash_`, `laser`) start `SetActive(false)` — their handlers call `SetActive(true)` when the track fires. All other objects (neonsigns, glow meshes, UV scroll objects, etc.) keep their prefab default state. - -## Ground-truth sources: what is recoverable and what is not - -Mapped 2026-08-05. **Check this list before declaring something "unknown"** — several things -previously written off as un-reversible are in fact dumpable, and one whole class of problem -was solved by realising the game's own scripts can be re-bound. - -### Available - -| 来源 | 给出什么 | 怎么取 | -|---|---|---| -| cutt bundle TypeTree | 128 个轨道字段名 + 全部关键帧值,59 首全带 | `tools/dump_cutt_typetree.py` | -| 舞台 prefab TypeTree | GameObject 层级、组件构成,**以及缺失脚本 MonoBehaviour 的字段名和值**(离线可读) | `MetaDb().load('3d/env/live/liveNNNNN/pfb_..._controller000')` | -| shader bundle | 499 个 shader 的真实属性表(名/类型/默认值/range) | 枚举 `m_ParsedForm.m_PropInfo.m_Props` | -| material bundle | 材质的 shader 绑定与存档属性(⚠ 存档表含过期条目,见下) | `sourceresources/3d/env/live/liveNNNNN/materials/mtl_*` | -| AnimationClip | 曲线的 path / 目标属性 / 关键帧时间与值 | `m_RotationCurves` 等 | -| MonoScript | **类名 + namespace + 程序集名** | 见下,这是最重要的一条 | - -### ⭐ 用原签名重建脚本,可直接拿到真实序列化字段 - -舞台 prefab 引用了 11 个脚本类,UmaViewer 起初只实现了 `StageController`,其余 892 个 -MonoBehaviour 实例脚本为空。**但这些脚本是可以「接管」的** —— Unity 按 -**类名 + namespace + 程序集名** 解析 MonoScript,而 `Assets/Scripts/umamusume.asmdef` -的程序集名正是 bundle 里写的 `umamusume`。所以只要按签名建类,字段就会被真正反序列化进来。 - -已验证:新建 `Gallop.Live.BillboardController` 后,`[StageScripts]` 的「脚本丢失」 -从 **892 降到 728**(正好 −164 个实例),`_rotationType` 等字段直接可读。 - -签名清单(`Assets/Scripts/` 下任意位置均可,只要在 umamusume 程序集内): - -| namespace | 类 | live10149 实例数 | 状态 / 已 dump 到的字段 | -|---|---|---|---| -| `Gallop.Live` | `AnimationObjectController` | 282 | ❌ **别建,建了也没用**:实测序列化字段 **一个都没有**(282 个实例全空)。重建只会让「脚本丢失」892→446,拿到 0 bit 新信息 —— 它是纯行为类,播哪个 clip / 何时播 / 多快全在拿不到的方法体里。顶替版已于 2026-08-07 撤除,舞台 Animation 现在**有意不播**,见下 | -| `Gallop.Live` | `UnityLensFlareController` | 205 | ❌ 只有 1 个字段 `_enableAngleDegree`(0),本体不在这里 | -| `Gallop.Live` | `BillboardController` | 164 | ✅ 已建(字段已读到,朝向行为待定)| -| `Gallop.Live` | `WashLightController` | 27 | ❌ 24 个字段全是具体数值 + 两张投影贴图(`_projectionTexture`/`_cameraProjectionTexture`),缺的是 URP 下的投影实现 | -| `Gallop.Live` | `LightProjection` | 4 | ❌ 只有 `_projectionType`(1) | -| `Gallop.RenderPipeline` | `CustomLensFlare` | 200 | ❌ **数据最完整、最值得做的一个**,见下 | -| `Gallop.RenderPipeline` | `MirrorBallProjector` | 4 | ❌ 字段已 dump 但**运行时绑定不可见**,见 Blocked | -| `Gallop.RenderPipeline` | `CustomProjector` | 4 | ❌ 就是一套 legacy `Projector` 参数(near .1 / far 60 / fov 30 / aspect 1 + `Material`)| -| `Gallop` | `MirrorReflection` | 1 | ✅ 已建并实现(平面镜反射,见下)| -| `Gallop.Live.ShaderParam` | `ShaderParamController` | 1 | ⚠ **不值得做**:实测只有 `_AmbientColor`/`_CharaColor` 两个向量,值都是 (1,1,1,1),实现出来是空操作 | - -**LensFlare 这条线数据是齐的**(这也是目前性价比最高的一块): - -- `CustomLensFlare` 字段:`Flare`(PPtr) / `Brightness` / `FadeSpeed` / `Color` / `IgnoreLayers` / `IsDirectional`。 -- `Flare` 指向的**不是** Unity 内置 `Flare` 资产,而是 `Gallop.RenderPipeline.LensFlareData` - 这个 ScriptableObject(同样在 umamusume 程序集里,照样可以按签名重建)。 - 路径形如 `sourceresources/3d/env/live/common/lensflare/flare013/flares/flare013_00`。 -- 它的字段是 Unity legacy Flare 的逐字翻版: - `TextureLayout` / `Texture` / `ElementArray[{ImageIndex, Position, Size, Color, UseLightColor, - Rotate, Zoom, Fade}]` / `UseFog`。**所以语义不受 IL2CPP 阻塞** —— 这些是 Unity 自己的概念。 -- live10149 上 199 个物件同时挂 `CustomLensFlare` + `UnityLensFlareController` + MeshRenderer, - 另有 5 个只挂 `UnityLensFlareController`。舞台上**没有任何 legacy `LensFlare` 组件**, - 原版是自己画的。URP 侧对应物是 `LensFlareComponentSRP` + `LensFlareDataSRP`。 - -字段名必须和 TypeTree 逐字一致(大小写敏感),dump 一下即可。 -这条同样适用于任何其它 bundle 里的 MonoBehaviour。 - -**重建签名只拿得到数据,拿不到方法体。** 两个已建的类正好是两种情形: - -- `MirrorReflection`(`Assets/Scripts/umamusume/Gallop/MirrorReflection.cs`)—— 接收端能 - 自己查出来,所以能补完行为:宿主 `mirror_a` 的材质用 `Cygames/MirrorAndShadow/ReceiveMirror`, - 该 shader 只有 `_MainTex`/`_ReflectionTex`/`_Color`/`_ReflectionRate`,而组件字段 - `_mirrorReflectionColor`/`_mirrorReflectionRate` 与后两者逐字对应。实现方式是第二摄像机 - + 反射矩阵 + 斜投影渲进 RT 再写回 `_ReflectionTex`(URP 下不能用 `Camera.Render()`, - 必须挂 `beginCameraRendering` 拿 `ScriptableRenderContext` 后 `RenderSingleCamera`)。 - 这同时解决了长期的「地板发白」——`_ReflectionTex` 未绑定时 Unity 代入白贴图, - 而 `_ReflectionRate` 默认 1.0,等于满强度白反射。 -- `BillboardController` —— 字段读到了,**但行为写了一版又关掉了**,这是「重建签名」的能力边界。 - `_rotationType == 0` 是不是「整轴朝向摄像机」、朝向该用摄像机 up(跟镜头 roll)还是世界 up - (只绕 Y),都没有 ground truth;实机看是「一直转来转去,而那东西不该转」, - 于是 `BillboardController.EnableRotation` 默认 false,面片保持 prefab 作者摆好的朝向。 - 同一次排查里揪出一个**确定的** bug(已修):目标摄像机只解析了一次就缓存, - 而生效摄像机随 CameraSwitcher 每帧变 —— 切换后面片朝的是观众看不见的那台, - 那台还在自己动,看上去就是无缘无故乱转。**凡是引用「当前摄像机」的舞台脚本都要注意这条。** - -**舞台自带 Animation 有意不播**(283 个组件,2026-08-07 撤除了替代实现): -它们全部 `playAutomatically = true` 但默认 clip 为空,原版靠 `AnimationObjectController` -显式 `Play()`,而那个类**零序列化字段**,纯行为,方法体拿不到 —— 「播哪个 / 何时播 / 多快」 -没有任何数据能还原。写过一版 `StageAnimationPlayer` 顶替,策略是「只有一个 clip 就播」, -错在把「这物件只有一个**状态**」当成「这个状态**一直在播**」(后者正是那个缺失的类每帧做的 -决定):wash 灯 2 秒一个来回疯狂摆头(原版不扫只闪),镜面球转速无从校验。已整体撤除。 -**完整理由与复活条件见 `LIVE_TRACKS.md` →「舞台自带 Animation 为什么不播」专条。** - -⚠ 撤除时唯一保留下来的结论:**驱动舞台动画不要用 `Animation.Play()`**, -那跑 Unity 自己的时钟,暂停/拖动进度条都会脱节;应每帧把 `AnimationState.time` 设成 -`LiveTimelineControl.currentLiveTime`(秒)再 `Sample()`。将来重做直接用这条。 - -### 🔎 舞台上「行为不对」的第一嫌疑:缺组件,不是解析错 - -**这是分诊规则,不是某一次的结论。** 舞台 prefab 引用 11 个脚本类,至今仍有 **728 个 -MonoBehaviour 实例是空的**(基线 892,已补 `BillboardController` −164)。其中 -`AnimationObjectController` 一家就占 282 个实例 —— 舞台上所有「什么时候动、动多快、 -动哪一个」的决定原本都在它手里,而它整个不存在。 - -所以当某个舞台元素表现不对(该动的不动、不该动的在动、动的节奏不对), -**默认假设应该是「原版那个组件缺失,现在由我们猜的行为顶着」,而不是「数据解析错了」**。 -理由是可检验的:字段值、clip 曲线、shader 属性表这些**数据**层面的东西全都能 dump 出来核对, -而且一路核对下来**基本都是对的**;反复出错的是**行为**层面 —— 那正好是拿不到方法体的部分。 - -已经有两个同形状的例子,都是「物件选对了、行为猜错了」: - -| 现象 | 数据对不对 | 真实原因 | -|---|---|---| -| wash 灯疯狂摆头 | clip 曲线完全正确(实测 90°→0°→90°) | 缺 `AnimationObjectController`,我们替它决定了「一直播」 | -| 面片一直乱转 | 字段全部正确读到 | 缺原方法体,`_rotationType==0` 的语义是我们猜的 | - -推论一:动手前先查一眼**这个物件挂过什么脚本、那个脚本我们有没有** -(`[StageScripts]` 日志 + `CLAUDE.md` 的签名清单),比直接怀疑解析快得多。 - -推论零:**先 dump 一眼那个缺失组件有没有字段,再决定值不值得重建。** -`AnimationObjectController` 实测**零字段**(282 个实例全空),所以重建它拿不到任何信息, -舞台动画的那些时机问题不可能靠「把原类建出来」解决 —— 这个方向是死的, -别再试。反过来 `CustomLensFlare` 字段齐全(还牵出 `LensFlareData`),就非常值得建。 -判断只要一条命令,不要凭实例数多就以为收益大。 - -推论二:**顶替缺失组件时,要把「我在替谁做决定」写清楚**,并且区分 -「从 bundle 数据推出来的」和「看参考视频观察到的」—— 后者是有效证据,但不是 ground truth, -换个舞台可能就不成立。(反面教材:舞台动画的 `_wash_` 排除规则就是这么来的, -后来连同整个替代实现一起撤掉了 —— 观察能证伪一个实现,但支撑不起一个实现。) - -反例也要记住:**并非所有舞台画面问题都是缺组件。** 光柱渲染成黑墙那次, -根因是材质被盖了 URP Lit 的属性表、`_DstBlend` 从 One 变成 Zero, -把加法混合压成了不透明 —— 那是**数据**问题,而且是 dump 得出来的(见下)。 -分诊规则的意思是「先查缺不缺组件」,不是「一律归咎于缺组件」。 - -### Blocked - -**IL2CPP 元数据拿不到。** 游戏是 IL2CPP 构建,但 `global-metadata.dat` 既不在 -`umamusume_Data/il2cpp_data/`(那里只有 `Resources/`),也没嵌在 `GameAssembly.dll` 里 -—— 魔数 `0xFAB11BAF` 零命中,`BillboardController` / `_rotationType` 等标识符字符串 -也全部搜不到。这是该游戏已知的反篡改,元数据运行时才还原。 - -因此以下**永远拿不到标准答案**,只能靠交叉验证或承认未知: - -- **游戏自己定义的枚举语义** —— `_rotationType`(0/2)、`LightBlendMode`、`CmnColorType0/1`、 - BlinkLight 的 `pattern`、`ColorType` 等。字段值读得到,含义读不到。 - ⚠ 但**先分清是谁的枚举**:`LensFlareData.TextureLayout` 长得像这一类,其实是 Unity - legacy `Flare` 资产的 `FlareTextureLayout`,语义在 Unity 侧公开,不受此限。 -- **对象之间的运行时绑定** —— 重建签名只能拿到**数据**,拿不到原方法体,所以「这个组件 - 跑起来去找谁」是不可见的。实例:`MirrorBallProjector` 的 shader 需要 - `_MirrorBallPosWS`/`_MirrorBallScale`/`_MirrorBallRotateValue`,而组件里**没有任何指向 - 灯球的引用字段**,4 个 projector 全在原点、共用同一个材质,灯球却散布在 6 个位置。 - 绑定关系只存在于方法体里。 -- **速度/系数一类的常量** —— 如果原版在代码里对动画做了调速,那个倍率无从得知。 - (注意这条不要滥用:镜面球转速一度被记成此类,实测其实完全确定,见下。) -- 未随包发布的 shader(PostFilm 的定义性 shader 就在 app 二进制里)。 - -**「灯球转速」到底确定到什么程度(2026-08-07,当天两次修正)** - -⚠️ **先说结论的边界**:clip 里的转速是硬数据,**但「原版按 1.0 倍速播这条 clip」不是**。 -实机跑下来观察是「所有迪斯科灯球还是太快」,也就是说原版多半有个播放倍率或者压根不用 -这条 clip 驱动球体 —— 那正是本节上面「速度/系数一类的常量」说的那类不可知量。 -下面的数字只证明「**我们忠实地播了这条 clip**」,不证明「和原版一致」。 - -已确定的部分: - -- live10149 的 4 个 `MirrorBallProjector` 实例**全部** `MirrorBallIsLoopRotation = 0`、 - `MirrorBallLoopRotationSpeed = 0`、`MirrorBallLoopRotationValue = 0` —— - shader 自带的 loop-rotation 通路在这个舞台上是**关掉的**,不是转速来源。 -- 真正在转的是 clip `anm_env_live10149_blinklight_mirrorball_flarelight_loop_000`: - 6 条 quaternion 曲线(`mirrorball_a_000` + `b_000..004`),7 个关键帧, - **恒定 −179.50°/s 绕 Y**(每个关键帧算出来都是这个数),2.0 s 一圈,wrapMode = Loop。 - 末帧 −359° 而不是 −360°,是为了循环接缝不重复一帧。 -- 曾接管过这条 clip,采样用的 `currentLiveTime` 单位是秒(帧号 = ×60),**没有单位换算错误**, - 放出来就是 clip 写的 2.0 s 一圈 —— 但实机仍然偏快,这正是下面第 2 条教训的由来。 - 该实现已于 2026-08-07 撤除,球现在不转。 - -两条教训,方向相反,都要记: - -1. 把「值是 0」当成「值未知」是两回事 —— dump 之前先看一眼开关字段 - (`MirrorBallIsLoopRotation` 就是那个开关)。 -2. **但「clip 的转速是确定的」推不出「转速问题解决了」**。我上一版文档写成了 - 「我们的构建里转速本来就是对的」,实机观察当天就否掉了它。 - 数据确定的是**素材**,不是**原版怎么用这个素材**;中间那个倍率仍然是不可知量。 - -### ⚠ 现象描述不是 ground truth - -字段值、shader 属性表是硬数据;**「哪个物件看起来不对」不是** —— 文档里的现象描述往往 -没经过验证。地板发白排查栽在这上面:文档记着 `plane_000` / `stage_object_001` / -`specular_002` 发白,整轮排查都围着这三个转,最后查明白的其实是**叠在同一位置的 -`mirror_a`**(同在 `pfb_env_live10149_main000` 下、局部变换全为单位,肉眼分不出)。 -它用 `Cygames/MirrorAndShadow/ReceiveMirror`,`_ReflectionRate` 默认 1.0 而 -`_ReflectionTex` 从没赋值 —— Unity 对未绑定采样器代入白贴图,满强度白反射。 - -期间那个「把 `_EnvRate` 归零无变化」的实验因此也是误导:切的是另一批物件。 - -**排查视觉问题的第一步应该是确认现象归属于哪个物件**(让代码把可疑物件隔离/高亮), -而不是从文档里的名字出发。 - -### 间接手段(已被证明有效) - -拿不到直接答案时,**相关性交叉验证**多次奏效,比猜测可靠得多: - -- BlinkLight 调色板槽位规则:靠「物件名 `lightNNN_`/`alphaNNN_` 前缀的种数」与 - 「调色板里去重颜色数」在**每一组都精确相等**推出,7 组无一例外。 -- BgColor1 的通道 `_MulColor0`:靠枚举 shader 属性表 + 排除法确认。 -- 「某属性存在」≠「目标 shader 上有该属性」—— `_Color` 空写连续栽了三次 - (BlinkLight / Spotlight3d / UVScrollLight),扫一遍 shader 属性表即可批量排查。 - -## Working rule: no ground truth, no implementation - -Field names, keyframe values and shader property tables are all recoverable from the bundles -(`tools/`), so **verify before you write code** — and when something genuinely cannot be -recovered, leave it unimplemented with a TODO rather than guessing a value. - -Guessing has cost real time in this project: the PostFilm vignette geometry was guessed twice -(full-screen wash, then a huge border) before it turned out the defining shader isn't shipped in -any bundle. `PostFilmRendererFeature._enableRendering` is now `false` for exactly this reason. - -Note the distinction that has caught me out: *"the property exists"* is not *"this field maps to -that property"*. `_ColorPower` is present on the stage shaders, but there is no evidence that -BgColor1's `power` field drives it — so that write was reverted while BlinkLight's was kept -(there the shader `LightBlinkBlend` is named for the track and pairs `_BlinkLightColor` with -`_ColorPower`, which is a much tighter fit). - -Open items and why each is blocked are tracked in `LIVE_TRACKS.md` → 「已知未解问题」. - -## Currently Implemented Tracks - -| Track | Data class | Notes | -|-------|-----------|-------| -| Camera (pos/lookat/fov/roll/switcher) | existing | fully working | -| CharaMotionSequence | existing | | -| Facial / LipSync / FormationOffset | existing | | -| GlobalLight (48) | existing | sets rim light shader props on characters | -| BgColor1 | existing | **two branches.** Groups named `CharaCenter/CharaLeft/CharaRight/CharaColor` (`LiveTimelineControl.CharaBgColorNames`) → character toon props (`_CharaColor`, `_ToonDarkColor`, …). Every other group name → stage renderers, resolved by walking the whole stage hierarchy for same-named Transforms (`Director.ResolveStageTargets`), writing **`_MulColor0`** via `MaterialPropertyBlock`. | -| BgColor2 | existing | sets `_AmbientColor` on stage renderers via `Lerp(color1, color2, value)` | -| Transform / Object | existing | handled by `StageController.cs` | -| Effect (60) | `LiveTimelineEffectData` | loads prefab from `3d/effect/live/pfb_{name}` | -| GlobalFog (49) | `LiveTimelineGlobalFogData` | sets `RenderSettings.fog*` | -| Spotlight3d (68) | `LiveTimelineSpotlight3dData` | looks up `keyData.assetName` in StageObjectMap | -| UVScrollLight (46) | `LiveTimelineUVScrollLightData` | sets texture UV on stage materials | -| VolumeLight (37) | `LiveTimelineVolumeLightData` | data deserialized, no visual (component absent) | -| 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` | **no handler, deliberately** — 0/58 songs carry data (`hdrBloomKeys` empty in every scan and in the song-1177 dump), and the field→URP-`Bloom` mapping was never verifiable. Data layer (data class, worksheet field, event) is kept; the Director handler and the `Bloom` volume override were removed 2026-08-07. | -| ColorCorrection (61) | `LiveTimelineColorCorrectionData` | URP `ColorAdjustments.saturation` + `ColorCurves` RGB;depth/blend curve 无 URP 对应 | -| BlinkLight | `LiveTimelineBlinkLightData` | SetActive + writes `_BlinkLightColor`/`_ColorPower` on the group's renderers (56/58 songs). **Biggest lighting payload by far** — 全语料 19420 keys / 57 songs, and over half are named `*_wash_*` (`wash_truss_a` 147, `wash_truss_b` 147, `wash_ground_a` 51, …). Palette slot = the `lightNNN_`/`alphaNNN_` prefix of the renderer or its nearest ancestor; renderers with no prefix are left to their real owner (BgColor1) when the group has slotted ones. `color1Array` / `LightBlendMode` / `isReverseHueArray` still unused. | -| WashLight | `LiveTimelineWashLightData` | SetActive only (5/58 songs). Low value: real "wash light" output comes from the BlinkLight `*_wash_*` groups above, not this track — song 1177 has just 1 group / 11 keys here. | -| Laser | `LiveTimelineLaserData` | SetActive + position/rotation/scale — blink/raycast not implemented (6/58 songs) | - -## Track Coverage (from 58-song scan) - -**The pre-2026-08-04 scan data in `LIVE_TRACKS.md` was wrong** and has been re-measured with `tools/`. Two systematic errors: a batch of tracks marked "WorkSheet 无 X 字段" do have the field (`MobControlKeys`, `CyalumeControlKeys`, `nodeScaleList`, `sweatLocatorList`, `monitorCameraPos/LookAtKeys`, `facialNoiseKeys`, `charaMotionNoiseKeys`, …), and a batch marked "全 0 keyframe 空占位" carry thousands of keys (`postFilmKeys`/`postFilm2Keys`/`postFilm3Keys` ≈20 200 keys over 59/59 songs, `radialBlurKeys`, `tiltShiftKeys`, `charaFootLightKeys`, …). Rows tagged ✅实测 are trustworthy; untagged rows are still old data. **Re-verify with `tools/` before acting on any untagged row.** - -Coverage numbers measure **what exists in the bundles**, not what the C# consumes — the two diverge. When a track looks under-powered, check the dispatcher in `AlterUpdate_*` for filters before assuming it's unimplemented (BgColor1 was dropping ~92% of its keys that way). - -**Measuring what a song actually carries**: `LiveTimelineWorksheetDiag.Dump()` is called from `Director.InitializeTimeline()` and logs, per worksheet, every track field with its group names and key counts. Confirmed on song 1177: `worksheetList.Count == 1`, `SheetType == MainLive`, so reading `worksheetList[0]` loses nothing. diff --git a/Assets/Editor/LiveDofFocusRegression.cs b/Assets/Editor/LiveDofFocusRegression.cs index 34d71eb..af1fced 100644 --- a/Assets/Editor/LiveDofFocusRegression.cs +++ b/Assets/Editor/LiveDofFocusRegression.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Reflection; using Gallop; using Gallop.Live; @@ -54,10 +54,14 @@ public static class LiveDofFocusRegression bool previousDof = GallopImageEffect.UserDofEnabled; var root = new GameObject("DofFocusRegression"); root.SetActive(false); + var timelineData = ScriptableObject.CreateInstance(); + timelineData.maxForcalSize = 30f; + var worksheet = ScriptableObject.CreateInstance(); try { var director = root.AddComponent(); var timeline = root.AddComponent(); + timeline.data = timelineData; director._liveTimelineControl = timeline; var cameraObject = new GameObject("DofTestCamera"); cameraObject.transform.SetParent(root.transform); @@ -84,7 +88,9 @@ public static class LiveDofFocusRegression dofSmoothness = 0.5f, dofQuality = 1, charactor = 1 }; var update = typeof(Director).GetMethod("OnUpdatePostEffect_Dof", PrivateInstance); - Action apply = () => update.Invoke(director, new object[] { key }); + var resolve = typeof(LiveTimelineControl).GetMethod("ResolveDofWorldFocus", PrivateInstance); + Action apply = () => update.Invoke(director, + new[] { (object)key, resolve.Invoke(timeline, new object[] { key }) }); PostImageEffectFeature.ResetRuntimeParameter(); GallopImageEffect.SetUserDofEnabled(true); apply(); @@ -118,6 +124,44 @@ public static class LiveDofFocusRegression RequirePreparedFocus(4f); + // A valid focus does not override the author's DOF enable flag (bit18). + // Bit19 is point-ball-blur mode, not permission to turn DOF on. + key.attribute = (LiveTimelineKeyAttribute)0x90000; + apply(); + state = PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay; + Require(!state.IsEnableDof && state.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionBloom, + "An authored disabled key must keep the frame sharp while preserving Bloom/Diffusion."); + GallopImageEffect.SetUserDofEnabled(false); + GallopImageEffect.SetUserDofEnabled(true); + Require(!PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.IsEnableDof, + "The user toggle must not resurrect author-disabled DOF while paused."); + key.attribute = (LiveTimelineKeyAttribute)0x50000; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.IsEnableDof, + "The next authored enabled key must restore positional DOF."); + + // Explicit render auto state, not the unrelated source constructor default. + PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.IsEnableDofAutoDisable = true; + key.forcalSize = 29f; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionDofBloom, + "Size29 below the authored30 threshold must remain a DOF render mode."); + key.forcalSize = 30f; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionBloom, + "Equality to the authored threshold must bypass only DOF."); + timelineData.maxForcalSize = 31f; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionDofBloom, + "Changing the authored threshold must release temporary disable, not retain size history."); + timelineData.maxForcalSize = 30f; + PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.IsEnableDofAutoDisable = false; + apply(); + // Invalid target bypasses only DOF, rather than falling back to 1m. SetProperty(timeline, "HasDofCameraLookAt", false); apply(); @@ -136,11 +180,62 @@ public static class LiveDofFocusRegression state = PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay; Require(state.IsEnableDof && state.DofFocalType == DepthBlurAndBloom.DofFocalType.Position, "Re-enabling while paused must restore positional focus."); - Debug.Log("[LiveDofFocusRegression] PASS: startup look-at, metric focus, camera cut, missing target, depth request, prepared focal depths/sharp intervals, DOF gate, paused restore."); + + // The NEXT key owns interpolation; focus endpoints have independent flags. + Set(timeline, "_liveStageCenterPos", new Vector3(4f, 1f, 12f)); + worksheet.postEffectDOFKeys = new LiveTimelineKeyPostEffectDOFDataList(); + worksheet.postEffectDOFKeys.thisList.Add(key); + worksheet.postEffectDOFKeys.thisList.Add(new LiveTimelineKeyPostEffectDOFData + { + frame = 60, attribute = (LiveTimelineKeyAttribute)0x20000, charactor = 0, + forcalSize = 10f, dofFocalPoint = 8f, dofQuality = 5, + interpolateType = LiveCameraInterpolateType.Curve, + curve = AnimationCurve.Linear(0f, 1.25f, 1f, 1.25f) + }); + timeline.OnUpdatePostEffect_Dof += (sample, world) => + update.Invoke(director, new object[] { sample, world }); + typeof(LiveTimelineControl).GetMethod("AlterUpdate_PostEffect_Dof", PrivateInstance) + .Invoke(timeline, new object[] { worksheet, 30 }); + state = PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay; + Require(state.DofFocalType == DepthBlurAndBloom.DofFocalType.Position && + state.DofFocalPosition == new Vector3(4.75f, 0.75f, 14f), + "Mixed look-at/character targets must interpolate world focus without changing the current coordinate mode."); + Require(Mathf.Approximately(state.DofFocalSize, 5f) && state.IsEnableDof, + "An overshooting next curve must retain signed, unclamped sampling and the current enable flag."); + apply(); + + // Real Live subtype owns auto-disable; a plain/helper adapter must not inherit it. + var liveCameraObject = new GameObject("LiveDofTestCamera"); + liveCameraObject.transform.SetParent(root.transform); + var liveCamera = liveCameraObject.AddComponent(); + var liveEffect = liveCameraObject.AddComponent(); + liveEffect.DofDiffusionBloomOverlayParam.IsEnableBloom = true; + liveEffect.DofDiffusionBloomOverlayParam.IsEnableDiffusion = true; + Set(director, "_cameraObjects", new[] { camera, liveCamera }); + Set(director, "_activeCameraIndex", 1); + key.forcalSize = 30f; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionBloom, + "Live initialization must make a threshold-wide shot sharp without removing Bloom/Diffusion."); + key.forcalSize = 1f; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionDofBloom, + "A Live close-up below the authored threshold must still render DOF."); + Set(director, "_activeCameraIndex", 0); + key.forcalSize = 30f; + apply(); + Require(PostImageEffectFeature.RuntimeParameter.DofDiffuionBloomOverlay.UseDofDiffusionBloomType == + Gallop.ImageEffect.DofDiffusionBloomOverlayParam.DofDiffusionBloomType.DiffusionDofBloom, + "Switching from Live to a plain adapter must not leak the Live auto-disable state."); + Debug.Log("[LiveDofFocusRegression] PASS: focus modes, authored enable, threshold equality/recovery, Live/helper camera isolation, user gate and paused restore."); } finally { UnityEngine.Object.DestroyImmediate(root); + UnityEngine.Object.DestroyImmediate(timelineData); + UnityEngine.Object.DestroyImmediate(worksheet); typeof(Director).GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic).SetValue(null, null); typeof(PostImageEffectFeature).GetField("_runtimeParameter", BindingFlags.Static | BindingFlags.NonPublic) .SetValue(null, previousRuntime); diff --git a/Assets/Editor/LiveRenderCapture.cs b/Assets/Editor/LiveRenderCapture.cs index 51a0513..ed9d3a3 100644 --- a/Assets/Editor/LiveRenderCapture.cs +++ b/Assets/Editor/LiveRenderCapture.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR +#if UNITY_EDITOR using System; using System.Collections.Generic; using System.Globalization; @@ -208,8 +208,11 @@ public static class LiveRenderCapture var live = main.Lives.FirstOrDefault(x => x.MusicId == plan.songId); if (live == null || main.Characters.Count < live.MemberCount) return; var selections = new List(); - if (live.MemberCount != plan.characters.Length || live.BackGroundId != plan.stageId) - throw new InvalidOperationException("Reference song/stage/member count differs from loaded Live metadata."); + // Reference identity includes optional actors created by the native + // channel expansion; only MemberCount identities are selected in UI. + // The complete instantiated cast is still checked below. + if (live.MemberCount <= 0 || live.MemberCount > plan.characters.Length || live.BackGroundId != plan.stageId) + throw new InvalidOperationException("Reference song/stage/selected members differ from loaded Live metadata."); for (int i = 0; i < live.MemberCount; ++i) { var item = new GameObject("CaptureSelection_" + i).AddComponent(); diff --git a/Assets/Editor/LiveRenderSetup.cs b/Assets/Editor/LiveRenderSetup.cs index 9fe4434..dc2a505 100644 --- a/Assets/Editor/LiveRenderSetup.cs +++ b/Assets/Editor/LiveRenderSetup.cs @@ -26,10 +26,54 @@ public static class LiveRenderSetup renderer.SetDirty(); EditorUtility.SetDirty(feature); EditorUtility.SetDirty(renderer); + InstallMirrorRenderer(renderer); AssetDatabase.SaveAssets(); Debug.Log("[LiveRenderSetup] Installed recovered post effects: " + path); } + private static void InstallMirrorRenderer(UniversalRendererData source) + { + const string path = "Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset"; + var pipeline = AssetDatabase.LoadAssetAtPath( + "Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset"); + if (pipeline == null) throw new InvalidOperationException("Missing Live pipeline"); + var simple = AssetDatabase.LoadAssetAtPath(path); + if (simple == null) + { + simple = UnityEngine.Object.Instantiate(source); + simple.name = "UMASimpleMirrorRenderer"; + simple.rendererFeatures.Clear(); + simple.opaqueLayerMask = 0; + simple.transparentLayerMask = 0; + AssetDatabase.CreateAsset(simple, path); + foreach (bool opaque in new[] { true, false }) + { + var draw = ScriptableObject.CreateInstance(); + draw.name = opaque ? "SimpleMirrorOpaque" : "SimpleMirrorTransparent"; + draw.settings.Event = opaque ? RenderPassEvent.BeforeRenderingOpaques : RenderPassEvent.BeforeRenderingTransparents; + draw.settings.filterSettings.LayerMask = -1; + draw.settings.filterSettings.RenderQueueType = opaque + ? UnityEngine.Experimental.Rendering.Universal.RenderQueueType.Opaque + : UnityEngine.Experimental.Rendering.Universal.RenderQueueType.Transparent; + draw.settings.filterSettings.PassNames = new[] { "SimpleMirrorCaster" }; + AssetDatabase.AddObjectToAsset(draw, simple); + simple.rendererFeatures.Add(draw); + EditorUtility.SetDirty(draw); + } + simple.SetDirty(); + EditorUtility.SetDirty(simple); + } + var serialized = new SerializedObject(pipeline); + var renderers = serialized.FindProperty("m_RendererDataList"); + if (renderers.arraySize > 1 && renderers.GetArrayElementAtIndex(1).objectReferenceValue != null && + renderers.GetArrayElementAtIndex(1).objectReferenceValue != simple) + throw new InvalidOperationException("Renderer slot 1 is already owned by another renderer"); + if (renderers.arraySize < 2) renderers.arraySize = 2; + renderers.GetArrayElementAtIndex(1).objectReferenceValue = simple; + serialized.ApplyModifiedPropertiesWithoutUndo(); + EditorUtility.SetDirty(pipeline); + } + // Batch-mode contract checks. These validate state routing, not rendered pixels. public static void Validate() { diff --git a/Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset b/Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset new file mode 100644 index 0000000..00c60c5 --- /dev/null +++ b/Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset @@ -0,0 +1,157 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2427507773835696840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: SimpleMirrorTransparent + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: RenderObjectsFeature + Event: 450 + filterSettings: + RenderQueueType: 1 + LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + PassNames: + - SimpleMirrorCaster + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideShader: {fileID: 0} + overrideShaderPassIndex: 0 + overrideMode: 1 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: UMASimpleMirrorRenderer + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + m_RendererFeatures: + - {fileID: 2511524374758812546} + - {fileID: -2427507773835696840} + m_RendererFeatureMap: a2e53b18a90641ffaee5ec1f99bbce1c + m_UseNativeRenderPass: 0 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, + type: 3} + samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} + materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} + terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, + type: 3} + terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, + type: 3} + terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, + type: 3} + m_AssetVersion: 2 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 0 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 0 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 + m_AccurateGbufferNormals: 0 + m_IntermediateTextureMode: 1 +--- !u!114 &2511524374758812546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: SimpleMirrorOpaque + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: RenderObjectsFeature + Event: 250 + filterSettings: + RenderQueueType: 0 + LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + PassNames: + - SimpleMirrorCaster + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideShader: {fileID: 0} + overrideShaderPassIndex: 0 + overrideMode: 1 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 diff --git a/Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset.meta b/Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset.meta new file mode 100644 index 0000000..9f04d0b --- /dev/null +++ b/Assets/Resources/RenderPipeline/UMASimpleMirrorRenderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e7a4aa0d4373cf4c8147b114d770906 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset b/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset index e324473..285f8e9 100644 --- a/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset +++ b/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4f8c5d0b81b4504419b0d6335567efde, type: 2} + - {fileID: 11400000, guid: 9e7a4aa0d4373cf4c8147b114d770906, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 1 m_RequireOpaqueTexture: 1 diff --git a/Assets/Scripts/Audio/UmaWaveStream.cs b/Assets/Scripts/Audio/UmaWaveStream.cs index e402246..a37a030 100644 --- a/Assets/Scripts/Audio/UmaWaveStream.cs +++ b/Assets/Scripts/Audio/UmaWaveStream.cs @@ -1,4 +1,4 @@ -using NAudio.Wave; +using NAudio.Wave; using System; using UnityEngine; using System.IO; @@ -9,19 +9,13 @@ namespace UmaMusumeAudio { public class UmaWaveStream : WaveStream { - /* - * Open Umamusume > umamusume_Data > resources.assets with a hex editor. - * Check the results when finding the string "StreamingAssets". - * The key should be near a string named "cri_auth". - */ - private const ulong umaMusumeKey = 75923756697503; - private readonly HcaWaveStream hcaWaveStream; public UmaWaveStream(AwbReader awbReader, int waveId) { + ulong audioKey = Config.Instance.GetAudioKey(); Stream awbSubfile = awbReader.GetWaveSubfileStream(awbReader.Waves.Find((wave) => wave.WaveId == waveId)); - hcaWaveStream = new HcaWaveStream(awbSubfile, MixKey(umaMusumeKey, awbReader.Subkey)); + hcaWaveStream = new HcaWaveStream(awbSubfile, MixKey(audioKey, awbReader.Subkey)); } public override WaveFormat WaveFormat => hcaWaveStream.WaveFormat; diff --git a/Assets/Scripts/Config.cs b/Assets/Scripts/Config.cs index 7e4bcc9..d88f099 100644 --- a/Assets/Scripts/Config.cs +++ b/Assets/Scripts/Config.cs @@ -23,6 +23,9 @@ public class Config public string ABKeyTip = "Key to read asset bundles"; public string ABKeyText; + public string AudioKeyTip = "Hexadecimal key to read game audio files (up to 16 hex digits, without 0x prefix)"; + public string AudioKeyText = ""; + public string LanguageTip = "Affects Uma names on the list. Language options: 0 - En, 1 - Jp, 2 - Simplified Chinese"; public Language Language = Language.En; @@ -53,9 +56,15 @@ public class Config public string AntiAliasingTip = "Display, screenshot antialiasing level. 0 - no AA, 1 - 2x MSAA, 2 - 4x MSAA, 3 - 8x MSAA"; public int AntiAliasing = 2; - public string TargetFrameRateTip = "Limits application frame rate. Available values: 60, 30"; + public string TargetFrameRateTip = "Application frame rate: positive integer FPS, 0 = unlimited (desktop)."; public int TargetFrameRate = 60; + public int RenderScalePercent = 100; + public int AnisotropicFiltering = 2; + public int TextureMipmapLimit = 0; + public float LodBias = 2f; + public float ShadowDistance = 50f; + public bool RegionDetectionPassed = false; public string VmdMorphConvertSettingTip = "The mapping of MMD mprphs to UMA mprphs during VMD recording, multiple UMA expression weights will be combined (not exceeding 1)"; @@ -223,9 +232,26 @@ public class Config } } + public ulong GetAudioKey() + { + if (string.IsNullOrWhiteSpace(AudioKeyText)) + { + throw new InvalidOperationException("AudioKeyText is missing. Supply your authorized audio key in Config.json and restart the application."); + } + + string keyText = AudioKeyText.Trim(); + if (keyText.Length > 16 || !ulong.TryParse(keyText, System.Globalization.NumberStyles.AllowHexSpecifier, + System.Globalization.CultureInfo.InvariantCulture, out ulong key) || key == 0) + { + throw new InvalidOperationException("AudioKeyText must be a nonzero hexadecimal key of at most 16 digits, without a 0x prefix."); + } + + return key; + } + public int GetTargetFrameRate() { - return TargetFrameRate == 30 ? 30 : 60; + return TargetFrameRate <= 0 ? -1 : TargetFrameRate; } public bool TryGetNetworkProxyUri(out Uri proxyUri, out string error) diff --git a/Assets/Scripts/LiveAutoSelection.cs b/Assets/Scripts/LiveAutoSelection.cs new file mode 100644 index 0000000..5803846 --- /dev/null +++ b/Assets/Scripts/LiveAutoSelection.cs @@ -0,0 +1,166 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Globalization; +using UnityEngine; + +public static class LiveAutoSelection +{ + private sealed class Candidate + { + public CharaEntry Character; + public string CostumeId; + public Sprite Icon; + public int BodyTypeSub; + } + + // Existing character, body costume and head costume choices are never replaced. + public static bool FillMissing(UmaViewerMain main, LiveEntry live, + IList slots, Sprite fallbackIcon = null) + { + if (main == null || live == null || slots == null) return false; + bool needsDefaults = false; + var used = new HashSet(); + foreach (var slot in slots) + { + if (slot == null) continue; + if (slot.CharaEntry != null && slot.CharaEntry.Id > 0) used.Add(slot.CharaEntry.Id); + if (slot.CharaEntry == null || slot.CharaEntry.Id <= 0 || string.IsNullOrEmpty(slot.CostumeId)) needsDefaults = true; + } + if (!needsDefaults) return true; + + var defaults = GetWinningCostumes(main, fallbackIcon); + var singerIds = GetSingerIds(main, live.MusicId); + var singers = new List(); + var others = new List(); + foreach (var character in main.Characters) + { + if (character == null || character.IsMob || !defaults.TryGetValue(character.Id, out var candidate)) continue; + candidate.Character = character; + (singerIds.Contains(character.Id) ? singers : others).Add(candidate); + } + Shuffle(singers); + Shuffle(others); + + foreach (var slot in slots) + { + if (slot == null) continue; + bool missingCharacter = slot.CharaEntry == null || slot.CharaEntry.Id <= 0; + bool missingCostume = string.IsNullOrEmpty(slot.CostumeId); + if (!missingCharacter && !missingCostume) continue; + + Candidate selected; + if (missingCharacter) + { + selected = FindCandidate(main, singers, used, slot.CostumeId, true) + ?? FindCandidate(main, others, used, slot.CostumeId, true) + ?? FindCandidate(main, singers, used, slot.CostumeId, false) + ?? FindCandidate(main, others, used, slot.CostumeId, false); + } + else + { + defaults.TryGetValue(slot.CharaEntry.Id, out selected); + if (slot.CharaEntry.IsMob) selected = null; + } + if (selected == null) return false; + + if (missingCharacter) slot.CharaEntry = selected.Character; + if (missingCostume) slot.CostumeId = selected.CostumeId; + used.Add(slot.CharaEntry.Id); + if (slot.CharaImage != null) + { + slot.CharaImage.enabled = true; + slot.CharaImage.sprite = slot.CharaEntry.Icon; + } + if (missingCostume && slot.CostumeImage != null) + slot.CostumeImage.sprite = selected.Icon; + } + return true; + } + + private static Dictionary GetWinningCostumes(UmaViewerMain main, Sprite fallbackIcon) + { + var result = new Dictionary(); + var rows = UmaDatabaseController.Instance.DressData; + if (rows == null) return result; + foreach (DataRow row in rows) + { + if (Convert.ToInt32(row["costume_type"]) != 1) continue; + int characterId = Convert.ToInt32(row["chara_id"]); + int subtype = Convert.ToInt32(row["body_type_sub"]); + string costumeId = subtype.ToString("D2", CultureInfo.InvariantCulture); + string body = UmaDatabaseController.BodyPath + $"bdy{characterId}_{costumeId}/pfb_bdy{characterId}_{costumeId}"; + if (characterId <= 0 || !main.AbList.TryGetValue(body, out var entry) || entry == null) continue; + if (result.TryGetValue(characterId, out var previous) && previous.BodyTypeSub <= subtype) continue; + Sprite icon = fallbackIcon; + foreach (var costume in main.Costumes) + { + if (costume.CharaId != characterId || costume.BodyTypeSub != subtype) continue; + if (costume.Icon != null) icon = costume.Icon; + break; + } + result[characterId] = new Candidate { CostumeId = costumeId, Icon = icon, BodyTypeSub = subtype }; + } + return result; + } + + private static HashSet GetSingerIds(UmaViewerMain main, int musicId) + { + string song = musicId.ToString("D4", CultureInfo.InvariantCulture); + string prefix = $"sound/l/{song}/snd_bgm_live_{song}_chara_"; + var result = new HashSet(); + foreach (var sound in main.AbSounds) + { + string name = sound.Name; + if (!name.StartsWith(prefix, StringComparison.Ordinal) || !name.EndsWith("awb", StringComparison.OrdinalIgnoreCase)) continue; + int separator = name.IndexOf('_', prefix.Length); + if (separator < 0 || !name.Substring(separator).StartsWith("_01", StringComparison.Ordinal)) continue; + if (int.TryParse(name.Substring(prefix.Length, separator - prefix.Length), out int characterId)) + result.Add(characterId); + } + return result; + } + + private static Candidate FindCandidate(UmaViewerMain main, List candidates, + HashSet used, string costumeId, bool distinct) + { + if (candidates.Count == 0) return null; + int start = distinct ? 0 : UnityEngine.Random.Range(0, candidates.Count); + for (int i = 0; i < candidates.Count; i++) + { + var candidate = candidates[(start + i) % candidates.Count]; + if (distinct && used.Contains(candidate.Character.Id)) continue; + if (string.IsNullOrEmpty(costumeId) || HasBody(main, candidate.Character, costumeId)) return candidate; + } + return null; + } + + private static bool HasBody(UmaViewerMain main, CharaEntry character, string costumeId) + { + if (costumeId.Length < 4) + return main.AbList.ContainsKey(UmaDatabaseController.BodyPath + $"bdy{character.Id}_{costumeId}/pfb_bdy{character.Id}_{costumeId}"); + int separator = costumeId.LastIndexOf('_'); + if (separator < 0) return false; + var rows = UmaDatabaseController.Instance.CharaData; + if (rows == null) return false; + foreach (var row in rows) + { + if (Convert.ToInt32(row["id"]) != character.Id) continue; + string shortId = costumeId.Substring(0, separator); + string body = UmaDatabaseController.BodyPath + $"bdy{shortId}/pfb_bdy{costumeId}_{row["height"]}_{row["shape"]}_{row["bust"]}"; + return main.AbList.ContainsKey(body); + } + return false; + } + + private static void Shuffle(List candidates) + { + for (int i = candidates.Count - 1; i > 0; i--) + { + int other = UnityEngine.Random.Range(0, i + 1); + var candidate = candidates[i]; + candidates[i] = candidates[other]; + candidates[other] = candidate; + } + } +} diff --git a/Assets/Scripts/LiveAutoSelection.cs.meta b/Assets/Scripts/LiveAutoSelection.cs.meta new file mode 100644 index 0000000..b84ff44 --- /dev/null +++ b/Assets/Scripts/LiveAutoSelection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e208e92f2051441da44fe056b39ee550 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LiveToolBox/LiveViewerUI.cs b/Assets/Scripts/LiveToolBox/LiveViewerUI.cs index d804bc9..4d38707 100644 --- a/Assets/Scripts/LiveToolBox/LiveViewerUI.cs +++ b/Assets/Scripts/LiveToolBox/LiveViewerUI.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UIElements; @@ -23,7 +23,6 @@ public class LiveViewerUI : MonoBehaviour public List CurrentLyrics = new List(); private UnityEngine.UI.Text progressSeconds; - private UnityEngine.UI.Text dofButtonLabel; private int displayedCurrentTenth = -1; private int displayedTotalTenth = -1; @@ -36,6 +35,8 @@ public class LiveViewerUI : MonoBehaviour new Config(); } ApplyFrameRateOptions(); + UISettingsGraphics.Build(FrameRateDropDown); + RuntimeGraphicsSettings.Apply(); UmaViewerMain.ApplyFrameRateLimit(); height = BottonUITransform.rect.height; @@ -59,32 +60,6 @@ public class LiveViewerUI : MonoBehaviour progressSeconds.alignment = TextAnchor.MiddleRight; progressSeconds.text = "0.0s / 0.0s"; - var buttonObject = new GameObject("DofDiagnosticToggle", typeof(RectTransform), - typeof(UnityEngine.UI.Image), typeof(UnityEngine.UI.Button)); - buttonObject.layer = BottonUITransform.gameObject.layer; - var buttonRect = (RectTransform)buttonObject.transform; - buttonRect.SetParent(BottonUITransform, false); - buttonRect.anchorMin = buttonRect.anchorMax = new Vector2(0, 0.5f); - buttonRect.pivot = new Vector2(0, 0.5f); - buttonRect.anchoredPosition = new Vector2(8, 0); - buttonRect.sizeDelta = new Vector2(176, 24); - var image = buttonObject.GetComponent(); - image.color = new Color(0.08f, 0.08f, 0.08f, 0.9f); - var button = buttonObject.GetComponent(); - button.targetGraphic = image; - button.navigation = new UnityEngine.UI.Navigation { mode = UnityEngine.UI.Navigation.Mode.None }; - button.onClick.AddListener(() => - { - Gallop.GallopImageEffect.SetUserDofEnabled(!Gallop.GallopImageEffect.UserDofEnabled); - RefreshDofLabel(); - OnMouse(true); - OnMouse(false); - }); - dofButtonLabel = CreateDiagnosticText("Label", buttonRect); - dofButtonLabel.rectTransform.anchorMin = Vector2.zero; - dofButtonLabel.rectTransform.anchorMax = Vector2.one; - dofButtonLabel.rectTransform.sizeDelta = Vector2.zero; - RefreshDofLabel(); } private UnityEngine.UI.Text CreateDiagnosticText(string name, RectTransform parent) @@ -106,11 +81,6 @@ public class LiveViewerUI : MonoBehaviour return text; } - private void RefreshDofLabel() - { - if (dofButtonLabel != null) - dofButtonLabel.text = Gallop.GallopImageEffect.UserDofEnabled ? "DOF: ON (test)" : "DOF: OFF"; - } private void LateUpdate() { @@ -157,7 +127,7 @@ public class LiveViewerUI : MonoBehaviour public void SetFrameRate(int fps) { - Config.Instance.TargetFrameRate = fps == 1 ? 30 : 60; + Config.Instance.TargetFrameRate = UISettingsGraphics.FrameRateAt(fps); Config.Instance.UpdateConfig(false); UmaViewerMain.ApplyFrameRateLimit(); } @@ -167,8 +137,8 @@ public class LiveViewerUI : MonoBehaviour if (FrameRateDropDown == null) return; FrameRateDropDown.ClearOptions(); - FrameRateDropDown.AddOptions(new List { "60", "30" }); - FrameRateDropDown.SetValueWithoutNotify(Config.Instance.GetTargetFrameRate() == 30 ? 1 : 0); + FrameRateDropDown.AddOptions(UISettingsGraphics.FrameRateLabels()); + FrameRateDropDown.SetValueWithoutNotify(UISettingsGraphics.FrameRateIndex()); FrameRateDropDown.RefreshShownValue(); } diff --git a/Assets/Scripts/Settings/RuntimeGraphicsSettings.cs b/Assets/Scripts/Settings/RuntimeGraphicsSettings.cs new file mode 100644 index 0000000..4527501 --- /dev/null +++ b/Assets/Scripts/Settings/RuntimeGraphicsSettings.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +// Quality changes affect an in-memory copy, never the authored pipeline asset. +public static class RuntimeGraphicsSettings +{ + private static UniversalRenderPipelineAsset source; + private static UniversalRenderPipelineAsset runtime; + private static readonly int[] Samples = { 1, 2, 4, 8 }; + + public static void Apply() + { + var config = Config.Instance; + if (config == null) return; + int samples = Samples[Mathf.Clamp(config.AntiAliasing, 0, 3)]; + QualitySettings.antiAliasing = samples == 1 ? 0 : samples; + QualitySettings.anisotropicFiltering = (AnisotropicFiltering)Mathf.Clamp(config.AnisotropicFiltering, 0, 2); + QualitySettings.globalTextureMipmapLimit = Mathf.Clamp(config.TextureMipmapLimit, 0, 3); + QualitySettings.lodBias = Mathf.Clamp(config.LodBias, 0.3f, 2f); + + var active = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset; + if (active == null) return; + if (active != runtime) + { + if (active != source || runtime == null) + { + if (runtime != null) Object.Destroy(runtime); + source = active; + runtime = Object.Instantiate(active); + runtime.name = active.name + " (Runtime Graphics)"; + runtime.hideFlags = HideFlags.DontSave; + } + // A quality-level override takes precedence over the default pipeline. + if (QualitySettings.renderPipeline != null) QualitySettings.renderPipeline = runtime; + else GraphicsSettings.renderPipelineAsset = runtime; + } + runtime.msaaSampleCount = samples; + runtime.renderScale = Mathf.Clamp(config.RenderScalePercent / 100f, 0.5f, 2f); + runtime.shadowDistance = Mathf.Clamp(config.ShadowDistance, 0f, 150f); + } +} diff --git a/Assets/Scripts/Settings/RuntimeGraphicsSettings.cs.meta b/Assets/Scripts/Settings/RuntimeGraphicsSettings.cs.meta new file mode 100644 index 0000000..d2b77f2 --- /dev/null +++ b/Assets/Scripts/Settings/RuntimeGraphicsSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a07c0541500d4eae8c5910a73925a6c3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsCamera.cs b/Assets/Scripts/Settings/UISettingsCamera.cs index 8ad1552..832ab81 100644 --- a/Assets/Scripts/Settings/UISettingsCamera.cs +++ b/Assets/Scripts/Settings/UISettingsCamera.cs @@ -122,14 +122,12 @@ public class UISettingsCamera : MonoBehaviour /// Converts values 1-4 to valid AA values public void ChangeAntiAliasing(int value) { - int[] aaValues = { 0, 2, 4, 8 }; - - QualitySettings.antiAliasing = aaValues[value]; if (Config.Instance.AntiAliasing != value) { Config.Instance.AntiAliasing = value; Config.Instance.UpdateConfig(false); } + RuntimeGraphicsSettings.Apply(); } } diff --git a/Assets/Scripts/Settings/UISettingsGraphics.cs b/Assets/Scripts/Settings/UISettingsGraphics.cs new file mode 100644 index 0000000..2d68134 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsGraphics.cs @@ -0,0 +1,217 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using UnityEngine; +using UnityEngine.UI; + +public static class UISettingsGraphics +{ + private static readonly int[] Rates = { 60, 30, 90, 120, 144, 165, 240, 0 }; + + public static List FrameRateLabels() + { + var labels = new List(); + foreach (int rate in Rates) labels.Add(rate == 0 ? "Unlimited" : rate + " FPS"); + if (FrameRateIndex() == Rates.Length) labels.Add(Config.Instance.TargetFrameRate + " FPS"); + return labels; + } + + public static int FrameRateIndex() + { + int rate = Math.Max(0, Config.Instance.TargetFrameRate); + int index = Array.IndexOf(Rates, rate); + return index < 0 ? Rates.Length : index; + } + + public static int FrameRateAt(int index) + { + return index >= 0 && index < Rates.Length ? Rates[index] : Config.Instance.TargetFrameRate; + } + + public static InputField AddFrameRateInput(Transform parent, Action refresh, Font font = null) + { + return AddNumber(parent, "Custom FPS (0 = unlimited)", Config.Instance.TargetFrameRate.ToString(), true, + text => + { + if (!int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out int rate) || rate < 0) + return Config.Instance.TargetFrameRate.ToString(); + Config.Instance.TargetFrameRate = rate; + Config.Instance.UpdateConfig(false); + UmaViewerMain.ApplyFrameRateLimit(); + refresh(); + return rate.ToString(); + }, font); + } + + public static void Build(Dropdown frameRate) + { + if (frameRate == null) return; + var template = (RectTransform)frameRate.transform.parent; + var parent = (RectTransform)template.parent; + if (parent.Find("GraphicsOptions") != null) return; + var window = parent.parent as RectTransform; + if (window != null) window.sizeDelta = new Vector2(340, 400); + var layout = parent.GetComponent(); + if (layout != null) + { + layout.childControlWidth = true; + layout.childForceExpandWidth = true; + } + var font = frameRate.captionText.font; + FitDropdown(template, frameRate, "Frame Rate"); + + // Keep the original camera/lyrics controls and put quality rows in their parent. + // Scrolling keeps all options reachable on smaller windows. + var scrollObject = new GameObject("GraphicsOptions", typeof(RectTransform), typeof(Image), typeof(ScrollRect), typeof(LayoutElement)); + scrollObject.transform.SetParent(parent, false); + scrollObject.layer = parent.gameObject.layer; + var scrollRect = (RectTransform)scrollObject.transform; + scrollRect.sizeDelta = new Vector2(320, 280); + scrollObject.GetComponent().preferredHeight = 280; + scrollObject.GetComponent().color = new Color(0, 0, 0, 0.1f); + var viewport = new GameObject("Viewport", typeof(RectTransform), typeof(RectMask2D)); + viewport.transform.SetParent(scrollRect, false); + Stretch((RectTransform)viewport.transform, 0, 1, 0, 0); + var contentObject = new GameObject("Content", typeof(RectTransform), typeof(VerticalLayoutGroup), typeof(ContentSizeFitter)); + contentObject.transform.SetParent(viewport.transform, false); + var content = (RectTransform)contentObject.transform; + content.anchorMin = new Vector2(0, 1); + content.anchorMax = Vector2.one; + content.pivot = new Vector2(0.5f, 1); + content.sizeDelta = Vector2.zero; + var contentLayout = contentObject.GetComponent(); + contentLayout.spacing = 5; + contentLayout.childControlHeight = false; + contentLayout.childForceExpandHeight = false; + contentLayout.childControlWidth = true; + contentObject.GetComponent().verticalFit = ContentSizeFitter.FitMode.PreferredSize; + var scroll = scrollObject.GetComponent(); + scroll.viewport = (RectTransform)viewport.transform; + scroll.content = content; + scroll.horizontal = false; + scroll.movementType = ScrollRect.MovementType.Clamped; + scroll.scrollSensitivity = 30; + + var customFps = AddFrameRateInput(content, () => RefreshFrameRate(frameRate), font); + frameRate.onValueChanged.AddListener(index => customFps.SetTextWithoutNotify(FrameRateAt(index).ToString())); + AddChoice(content, template, "MSAA", new[] { "Off", "2x", "4x", "8x" }, Config.Instance.AntiAliasing, + value => Config.Instance.AntiAliasing = value); + AddNumber(content, "Render Scale (%)", Config.Instance.RenderScalePercent.ToString(), true, text => + { + if (int.TryParse(text, out int value) && value >= 50 && value <= 200) + Config.Instance.RenderScalePercent = value; + SaveGraphics(); + return Config.Instance.RenderScalePercent.ToString(); + }, font); + AddChoice(content, template, "Anisotropic Filter", new[] { "Off", "Per Texture", "Force On" }, Config.Instance.AnisotropicFiltering, + value => Config.Instance.AnisotropicFiltering = value); + AddChoice(content, template, "Texture Quality", new[] { "Full", "Half", "Quarter", "Eighth" }, Config.Instance.TextureMipmapLimit, + value => Config.Instance.TextureMipmapLimit = value); + AddNumber(content, "LOD Bias (0.3 - 2)", Config.Instance.LodBias.ToString(CultureInfo.InvariantCulture), false, text => + { + if (float.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out float value) && value >= 0.3f && value <= 2f) + Config.Instance.LodBias = value; + SaveGraphics(); + return Config.Instance.LodBias.ToString(CultureInfo.InvariantCulture); + }, font); + AddNumber(content, "Shadow Distance", Config.Instance.ShadowDistance.ToString(CultureInfo.InvariantCulture), false, text => + { + if (float.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out float value) && value >= 0 && value <= 150) + Config.Instance.ShadowDistance = value; + SaveGraphics(); + return Config.Instance.ShadowDistance.ToString(CultureInfo.InvariantCulture); + }, font); + } + + private static void RefreshFrameRate(Dropdown dropdown) + { + dropdown.ClearOptions(); + dropdown.AddOptions(FrameRateLabels()); + dropdown.SetValueWithoutNotify(FrameRateIndex()); + dropdown.RefreshShownValue(); + } + + private static void SaveGraphics() + { + Config.Instance.UpdateConfig(false); + RuntimeGraphicsSettings.Apply(); + if (UmaViewerUI.Instance != null && UmaViewerUI.Instance.CameraSettings != null) + UmaViewerUI.Instance.CameraSettings.AAModeDropdown.SetValueWithoutNotify(Config.Instance.AntiAliasing); + } + + private static void AddChoice(Transform parent, RectTransform template, string label, string[] options, int value, Action change) + { + var row = UnityEngine.Object.Instantiate(template.gameObject, parent); + row.name = label; + var dropdown = row.GetComponentInChildren(); + dropdown.onValueChanged = new Dropdown.DropdownEvent(); + dropdown.ClearOptions(); + dropdown.AddOptions(new List(options)); + dropdown.SetValueWithoutNotify(Mathf.Clamp(value, 0, options.Length - 1)); + dropdown.onValueChanged.AddListener(index => { change(index); SaveGraphics(); }); + FitDropdown((RectTransform)row.transform, dropdown, label); + } + + private static void FitDropdown(RectTransform row, Dropdown dropdown, string label) + { + row.sizeDelta = new Vector2(320, 30); + Stretch((RectTransform)dropdown.transform, 0.58f, 1, 0, 0); + foreach (var text in row.GetComponentsInChildren(true)) + { + if (text.transform.IsChildOf(dropdown.transform)) continue; + text.text = label; + text.fontSize = 14; + text.alignment = TextAnchor.MiddleLeft; + Stretch(text.rectTransform, 0, 0.56f, 0, 0); + } + } + + private static InputField AddNumber(Transform parent, string label, string value, bool integer, Func submit, Font font) + { + var row = new GameObject(label, typeof(RectTransform), typeof(LayoutElement)); + row.transform.SetParent(parent, false); + row.layer = parent.gameObject.layer; + ((RectTransform)row.transform).sizeDelta = new Vector2(320, 30); + row.GetComponent().preferredHeight = 30; + var caption = AddText(row.transform, "Label", label, font); + Stretch(caption.rectTransform, 0, 0.58f, 0, 0); + var field = new GameObject("Input", typeof(RectTransform), typeof(Image), typeof(InputField)); + field.transform.SetParent(row.transform, false); + field.layer = row.layer; + Stretch((RectTransform)field.transform, 0.6f, 1, 0, 0); + field.GetComponent().color = Color.white; + var text = AddText(field.transform, "Text", value, font); + text.color = Color.black; + Stretch(text.rectTransform, 0, 1, 6, -6); + var input = field.GetComponent(); + input.targetGraphic = field.GetComponent(); + input.textComponent = text; + input.contentType = integer ? InputField.ContentType.IntegerNumber : InputField.ContentType.DecimalNumber; + input.text = value; + input.onEndEdit.AddListener(raw => input.SetTextWithoutNotify(submit(raw))); + return input; + } + + private static Text AddText(Transform parent, string name, string value, Font font) + { + var go = new GameObject(name, typeof(RectTransform), typeof(Text)); + go.transform.SetParent(parent, false); + go.layer = parent.gameObject.layer; + var text = go.GetComponent(); + text.font = font != null ? font : Resources.GetBuiltinResource("LegacyRuntime.ttf"); + text.fontSize = 14; + text.color = Color.white; + text.alignment = TextAnchor.MiddleLeft; + text.raycastTarget = false; + text.text = value; + return text; + } + + private static void Stretch(RectTransform rect, float left, float right, float insetLeft, float insetRight) + { + rect.anchorMin = new Vector2(left, 0); + rect.anchorMax = new Vector2(right, 1); + rect.offsetMin = new Vector2(insetLeft, 0); + rect.offsetMax = new Vector2(insetRight, 0); + } +} diff --git a/Assets/Scripts/Settings/UISettingsGraphics.cs.meta b/Assets/Scripts/Settings/UISettingsGraphics.cs.meta new file mode 100644 index 0000000..7ba293b --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsGraphics.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ff4d9bec2d640c58a313788b1e66813 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsOther.cs b/Assets/Scripts/Settings/UISettingsOther.cs index 3ffb485..63bc384 100644 --- a/Assets/Scripts/Settings/UISettingsOther.cs +++ b/Assets/Scripts/Settings/UISettingsOther.cs @@ -23,6 +23,7 @@ public class UISettingsOther : MonoBehaviour public TMP_Dropdown LanguageDropdown; public TMP_Dropdown FrameRateDropdown; private GameObject _runtimeFrameRateRow; + private InputField _customFrameRateInput; private IEnumerator _updateResVerCoroutine; public void ApplySettings() @@ -32,8 +33,8 @@ public class UISettingsOther : MonoBehaviour WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode); RegionDropdown.SetValueWithoutNotify((int)Config.Instance.Region); LanguageDropdown.SetValueWithoutNotify(LanguageToDropdownValue(Config.Instance.Language)); - FrameRateDropdown?.SetValueWithoutNotify(FrameRateToDropdownValue(Config.Instance.GetTargetFrameRate())); - FrameRateDropdown?.RefreshShownValue(); + if (FrameRateDropdown != null) RefreshFrameRateOptions(); + if (_customFrameRateInput != null) _customFrameRateInput.SetTextWithoutNotify(Config.Instance.TargetFrameRate.ToString()); UmaViewerMain.ApplyFrameRateLimit(); UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone); } @@ -120,32 +121,27 @@ public class UISettingsOther : MonoBehaviour FrameRateDropdown = _runtimeFrameRateRow.GetComponentInChildren(true); FrameRateDropdown.name = "FrameRateDropdown"; FrameRateDropdown.ClearOptions(); - FrameRateDropdown.AddOptions(new List { "60 FPS", "30 FPS" }); + FrameRateDropdown.AddOptions(UISettingsGraphics.FrameRateLabels()); FrameRateDropdown.onValueChanged = new TMP_Dropdown.DropdownEvent(); FrameRateDropdown.onValueChanged.AddListener(ChangeFrameRate); + var customInput = UISettingsGraphics.AddFrameRateInput(parent, RefreshFrameRateOptions); + _customFrameRateInput = customInput; + FrameRateDropdown.onValueChanged.AddListener(index => customInput.SetTextWithoutNotify(UISettingsGraphics.FrameRateAt(index).ToString())); + customInput.transform.parent.SetSiblingIndex(_runtimeFrameRateRow.transform.GetSiblingIndex() + 1); var parentRect = parent as RectTransform; var sourceRect = sourceRow as RectTransform; if (parentRect != null && sourceRect != null) { - parentRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, parentRect.rect.height + sourceRect.rect.height); + parentRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, parentRect.rect.height + sourceRect.rect.height + 30); LayoutRebuilder.MarkLayoutForRebuild(parentRect); } } - private int FrameRateToDropdownValue(int frameRate) - { - return frameRate == 30 ? 1 : 0; - } - - private int DropdownValueToFrameRate(int value) - { - return value == 1 ? 30 : 60; - } public void ChangeFrameRate(int value) { - var frameRate = DropdownValueToFrameRate(value); + var frameRate = UISettingsGraphics.FrameRateAt(value); if (Config.Instance.TargetFrameRate != frameRate) { Config.Instance.TargetFrameRate = frameRate; @@ -154,6 +150,14 @@ public class UISettingsOther : MonoBehaviour UmaViewerMain.ApplyFrameRateLimit(); } + private void RefreshFrameRateOptions() + { + FrameRateDropdown.ClearOptions(); + FrameRateDropdown.AddOptions(UISettingsGraphics.FrameRateLabels()); + FrameRateDropdown.SetValueWithoutNotify(UISettingsGraphics.FrameRateIndex()); + FrameRateDropdown.RefreshShownValue(); + } + public void ChangeLanguage(int lang) { Language language = DropdownValueToLanguage(lang); diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index a949efa..58ea32d 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -88,6 +88,110 @@ public class UmaContainerCharacter : UmaContainer private Material[] _faceMaterials; private bool _faceLightInitialized; + private readonly HashSet _mirrorHeadRenderers = new HashSet(); + private GameObject[] _mirrorAllRendererObjects = Array.Empty(); + private GameObject[] _mirrorBodyRendererObjects = Array.Empty(); + private GameObject[] _mirrorChangedObjects = Array.Empty(); + private int[] _mirrorOriginalLayers = Array.Empty(); + private int _mirrorChangedCount; + private bool _mirrorLayerCacheDirty = true; + private bool _mirrorLayerCacheReady; + + private void RegisterMirrorHeadRenderers(GameObject source) + { + RestoreMirrorChangedLayers(); + if (source != null) + { + var renderers = source.GetComponentsInChildren(true); + for (int i = 0; i < renderers.Length; i++) + _mirrorHeadRenderers.Add(renderers[i]); + } + InvalidateMirrorLayerCache(); + } + + private void InvalidateMirrorLayerCache() + { + RestoreMirrorChangedLayers(); + _mirrorLayerCacheDirty = true; + if (_mirrorLayerCacheReady) + PrepareMirrorLayerCache(); + } + + internal void PrepareMirrorLayerCache() + { + if (!_mirrorLayerCacheDirty) + return; + + RestoreMirrorChangedLayers(); + var renderers = GetComponentsInChildren(true); + var all = new List(renderers.Length); + var body = new List(renderers.Length); + var seen = new HashSet(); + var headObjects = new HashSet(); + for (int i = 0; i < renderers.Length; i++) + if (renderers[i] != null && _mirrorHeadRenderers.Contains(renderers[i])) + headObjects.Add(renderers[i].gameObject); + for (int i = 0; i < renderers.Length; i++) + { + var renderer = renderers[i]; + if (renderer == null || !seen.Add(renderer.gameObject)) + continue; + all.Add(renderer.gameObject); + if (!headObjects.Contains(renderer.gameObject)) + body.Add(renderer.gameObject); + } + _mirrorAllRendererObjects = all.ToArray(); + _mirrorBodyRendererObjects = body.ToArray(); + if (_mirrorChangedObjects.Length < all.Count) + { + _mirrorChangedObjects = new GameObject[all.Count]; + _mirrorOriginalLayers = new int[all.Count]; + } + _mirrorLayerCacheDirty = false; + _mirrorLayerCacheReady = true; + } + + internal void SetLayerBeforeMirrorCameraRendering(bool bodyBit, bool headBit, int layer) + { + if (!bodyBit || layer < 0) + return; + + RestoreMirrorChangedLayers(); + var objects = headBit ? _mirrorAllRendererObjects : _mirrorBodyRendererObjects; + for (int i = 0; i < objects.Length; i++) + { + var obj = objects[i]; + if (obj == null) + continue; + _mirrorChangedObjects[_mirrorChangedCount] = obj; + _mirrorOriginalLayers[_mirrorChangedCount] = obj.layer; + _mirrorChangedCount++; + obj.layer = layer; + } + } + + internal void RestoreMirrorChangedLayers() + { + while (_mirrorChangedCount > 0) + { + int index = --_mirrorChangedCount; + var obj = _mirrorChangedObjects[index]; + _mirrorChangedObjects[index] = null; + if (obj != null) + obj.layer = _mirrorOriginalLayers[index]; + } + } + + private void OnDisable() + { + RestoreMirrorChangedLayers(); + } + + private void OnDestroy() + { + RestoreMirrorChangedLayers(); + } + private static readonly int ID_FaceCenterPos = Shader.PropertyToID("_FaceCenterPos"); private static readonly int ID_FaceUp = Shader.PropertyToID("_FaceUp"); private static readonly int ID_FaceForward = Shader.PropertyToID("_FaceForward"); @@ -184,6 +288,10 @@ public class UmaContainerCharacter : UmaContainer public void MergeModel() { if (!Body) return; + RestoreMirrorChangedLayers(); + // Capture source identity before MergeModel reparents Head/Hair children. + RegisterMirrorHeadRenderers(Head); + RegisterMirrorHeadRenderers(Hair); var bodySkinnedMeshRenderer = Body.GetComponentInChildren(); var bodyBones = bodySkinnedMeshRenderer.bones.ToDictionary(bone => bone.name, bone => bone.transform); List emptyBones = new List(); @@ -300,12 +408,16 @@ public class UmaContainerCharacter : UmaContainer } } } + InvalidateMirrorLayerCache(); + PrepareMirrorLayerCache(); } public void MergeHairModel() { if (!Head || !Hair) return; + RestoreMirrorChangedLayers(); + RegisterMirrorHeadRenderers(Hair); var bodyBones = Head.GetComponentInChildren().bones.ToDictionary(bone => bone.name, bone => bone.transform); List emptyBones = new List(); @@ -326,6 +438,7 @@ public class UmaContainerCharacter : UmaContainer Hair.gameObject.SetActive(false); emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); }); + InvalidateMirrorLayerCache(); } public void SetHeight(int scale = 0) @@ -1048,6 +1161,7 @@ public class UmaContainerCharacter : UmaContainer BodyShaderEffectData.Initialize(); } } + InvalidateMirrorLayerCache(); } public void LoadHead(UmaDatabaseEntry entry) @@ -1055,6 +1169,7 @@ public class UmaContainerCharacter : UmaContainer var textures = MobHeadTextures; GameObject head = InstantiateEntry(entry, transform); Head = head; + RegisterMirrorHeadRenderers(head); AssetTable table = null; if (!IsMini) @@ -1229,6 +1344,7 @@ public class UmaContainerCharacter : UmaContainer { GameObject hair = InstantiateEntry(entry, transform); Hair = hair; + RegisterMirrorHeadRenderers(hair); var textures = MobHeadTextures; foreach (Renderer r in hair.GetComponentsInChildren()) { @@ -1282,6 +1398,7 @@ public class UmaContainerCharacter : UmaContainer { GameObject go = entry.Get(); Tail = Instantiate(go, transform); + InvalidateMirrorLayerCache(); } @@ -1305,6 +1422,7 @@ public class UmaContainerCharacter : UmaContainer } } } + InvalidateMirrorLayerCache(); } public void LoadTear(UmaDatabaseEntry entry) @@ -1897,6 +2015,8 @@ public class UmaContainerCharacter : UmaContainer emotionDriven.FaceDrivenKeyTarget = faceDriven; emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData; emotionDriven.Initialize(); + // Facial attachments are explicit head renderers, including inactive manga/tears. + RegisterMirrorHeadRenderers(headBone); } public void SetupBoneHandles() diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 0113bf9..66c07d2 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using Gallop; using System; @@ -111,39 +111,36 @@ public class PartEntry public int SingerCount = 0; public PartEntry(string data) { - string[] lines = data.Split('\n'); - - string[] names = lines[0].Split(','); - - foreach (var name in names) + var lines = data.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); + var names = lines[0].Split(','); + var columns = new Dictionary(StringComparer.Ordinal); + for (int j = 0; j < names.Length; j++) { - var temp = name; - temp.Replace("lleft", "left2"); - temp.Replace("rright", "right2"); - temp.Replace("llleft", "left3"); - temp.Replace("rrright", "right3"); - PartSettings[temp] = new List(); + string name = names[j].Trim(); + int suffix = name.IndexOf('_'); + string part = suffix < 0 ? name : name.Substring(0, suffix); + switch (part) + { + case "lleft": part = "left2"; break; + case "rright": part = "right2"; break; + case "llleft": part = "left3"; break; + case "rrright": part = "right3"; break; + } + name = part + (suffix < 0 ? "" : name.Substring(suffix)); + columns[name] = j; + PartSettings[name] = new List(); } - - for (int i = 1; i < lines.Length - 1; i++) + for (int i = 1; i < lines.Length; i++) { var values = lines[i].Split(','); - for (int j = 0; j < names.Length; j++) - { - PartSettings[names[j]].Add((float)Convert.ToDouble(values[j])); - } + foreach (var column in columns) + PartSettings[column.Key].Add(float.Parse(values[column.Value], System.Globalization.CultureInfo.InvariantCulture)); } - - foreach(var part in PartSettings) + foreach (var part in PartSettings) { - if (part.Key != "time" && !part.Key.Contains("_")) - { - if (part.Value.FindAll(v => v > 0).Count > 0) - { - SingerCount += 1; - } - } - } + if (part.Key != "time" && !part.Key.Contains("_") && part.Value.Exists(v => v > 0f)) + SingerCount++; + } } } diff --git a/Assets/Scripts/UmaViewerAudio.cs b/Assets/Scripts/UmaViewerAudio.cs index e9625b8..5c842f0 100644 --- a/Assets/Scripts/UmaViewerAudio.cs +++ b/Assets/Scripts/UmaViewerAudio.cs @@ -29,6 +29,7 @@ public class UmaViewerAudio { if (cur_active_source == index && !forceUpdate) return; cur_active_source = index; + activeSource = null; for(int i = 0; i < sourceList.Count; i++) { if (i + 1 == index) @@ -46,16 +47,14 @@ public class UmaViewerAudio public void SetVolume(float volume) { - if (volume == this.volume || !activeSource) return; this.volume = volume; - activeSource.volume = volume; + if (activeSource) activeSource.volume = volume; } public void SetPanStereo(float pan) { - if (pan == this.pan || !activeSource) return; this.pan = pan; - activeSource.panStereo = pan; + if (activeSource) activeSource.panStereo = pan; } } @@ -132,111 +131,70 @@ public class UmaViewerAudio right3 = 6, } + // Original .cctor 0x1b8ea00, GetVolume 0x1b8d670 and GetPartData 0x1b8d290. + static readonly float[] DefaultVolumes = { 0f, .79f, .89f, 1f, 1.12f, 1.26f }; + static readonly float[] DefaultVolumeRates = { 0f, .79f, .79f, .56f, .53f, .47f, .42f, .37f }; + static readonly int[][] DefaultVolumeIndices = { + new[] { 0 }, new[] { 5 }, new[] { 2, 2 }, new[] { 3, 5, 3 }, + new[] { 3, 3, 3, 3 }, new[] { 1, 2, 4, 2, 1 }, + new[] { 3, 3, 3, 3, 3, 3 }, new[] { 1, 1, 2, 4, 2, 1, 1 } + }; + static readonly float[][] DefaultPans = { + new[] { 0f }, new[] { 0f }, new[] { -.15f, .15f }, new[] { -.3f, 0f, .3f }, + new[] { -.3f, -.1f, .1f, .3f }, new[] { -.3f, -.15f, 0f, .15f, .3f }, + new[] { -.3f, -.2f, -.1f, .1f, .2f, .3f }, new[] { -.3f, -.2f, -.1f, 0f, .1f, .2f, .3f } + }; + static readonly string[] OrderedParts = { "left3", "left2", "left", "center", "right", "right2", "right3" }; + static public void AlterUpdate(float _liveCurrentTime, PartEntry partInfo, List liveVocal, bool forceUpdate = false) { - - var timeLineData = partInfo.PartSettings["time"]; - - var targetIndex = 0; - for (int i = timeLineData.Count - 1; i >= 0; i--) - { - if (_liveCurrentTime >= (double)timeLineData[i] / 1000) - { - targetIndex = i; - break; - } - } - - if (LastAudioPartIndex == targetIndex) return; + if (partInfo == null || liveVocal == null || + !partInfo.PartSettings.TryGetValue("time", out var times)) return; + int targetIndex = times.Count - 1; + while (targetIndex >= 0 && _liveCurrentTime < times[targetIndex] / 1000.0) targetIndex--; + if (targetIndex < 0 || (!forceUpdate && LastAudioPartIndex == targetIndex)) return; LastAudioPartIndex = targetIndex; - - float volume_rate = 1; - if (partInfo.PartSettings.ContainsKey("volume_rate")) + int activeCount = 0; + foreach (string part in OrderedParts) { - volume_rate = partInfo.PartSettings["volume_rate"][targetIndex]; + var vocal = FindVocal(liveVocal, part); + if (vocal != null && PartValue(partInfo, part, targetIndex, 0f) > 0f) activeCount++; } - - if (volume_rate == 999) //chorus + // Original AlterUpdate 0x1b8c31d and 0x1b8c562: >=900 means default, + // not zero. An explicit zero remains authored silence. + float rate = PartValue(partInfo, "volume_rate", targetIndex, 901f); + if (rate >= 900f) rate = activeCount < DefaultVolumeRates.Length ? DefaultVolumeRates[activeCount] : 1f; + int rank = 0; + foreach (string part in OrderedParts) { - var activeVocal = new List(); - for (int i = 0; i < liveVocal.Count; i++) - { - var vocal = liveVocal[i]; - var partName = vocal.tag; - var active_index = (int)partInfo.PartSettings[partName][targetIndex]; - vocal.SwitchActiveSource(active_index, forceUpdate); - - if (partInfo.PartSettings.ContainsKey(partName + "_pan")) - { - var part = partInfo.PartSettings[partName + "_pan"]; - var pan = part[targetIndex]; - vocal.SetPanStereo(pan == 999 ? 0 : pan); - } - - if (active_index > 0) - { - activeVocal.Add(vocal); - } - } - - switch(activeVocal.Count) - { - case 1: - activeVocal[0].SetVolume(0.9954f); - break; - case 2: - activeVocal[0].SetVolume(0.7031f); - activeVocal[1].SetVolume(0.7031f); - break; - case 3: - activeVocal[0].SetVolume(0.7056f); - activeVocal[1].SetVolume(0.56f); - activeVocal[1].SetVolume(0.56f); - break; - default: - var per_vol = CalculateApproximateDBValues(0.9954f, activeVocal.Count); - activeVocal.ForEach(v => v.SetVolume(per_vol)); - break; - } + var vocal = FindVocal(liveVocal, part); + if (vocal == null) continue; + int index = (int)PartValue(partInfo, part, targetIndex, 0f); + vocal.SwitchActiveSource(index, forceUpdate); + bool active = index > 0; + int row = activeCount < DefaultVolumeIndices.Length ? activeCount : 0; + int column = active && row > 0 ? rank++ : 0; + if (!active) row = 0; + float volume = PartValue(partInfo, part + "_vol", targetIndex, 901f); + float pan = PartValue(partInfo, part + "_pan", targetIndex, 901f); + if (volume >= 900f) volume = DefaultVolumes[DefaultVolumeIndices[row][column]]; + if (pan >= 900f) pan = DefaultPans[row][column]; + vocal.SetVolume(volume * rate); + vocal.SetPanStereo(pan); } - else - { - for (int i = 0; i < liveVocal.Count; i++) - { - var vocal = liveVocal[i]; - var partName = vocal.tag; - var active_index = (int)partInfo.PartSettings[partName][targetIndex]; - vocal.SwitchActiveSource(active_index, forceUpdate); - - if (partInfo.PartSettings.ContainsKey(partName)) - { - - if (partInfo.PartSettings.ContainsKey(partName + "_vol")) - { - var part = partInfo.PartSettings[partName + "_vol"]; - var volume = part[targetIndex]; - vocal.SetVolume(volume == 999 ? 0 : volume); - } - - if (partInfo.PartSettings.ContainsKey(partName + "_pan")) - { - var part = partInfo.PartSettings[partName + "_pan"]; - var pan = part[targetIndex]; - vocal.SetPanStereo(pan == 999 ? 0 : pan); - } - } - } - } - } - static public float CalculateApproximateDBValues(float total_volume, int num_sounds) + static CuteAudioSource FindVocal(List vocals, string part) { - var total_db = 15f; - var P0 = total_volume * (Math.Pow(10, total_db / 10)); - var P_per_sound = P0 / num_sounds; - var per_volume = 10 * Math.Log10(P_per_sound / total_volume); - return (float)(per_volume / total_db); + for (int i = 0; i < vocals.Count; i++) + if (vocals[i].tag == part) return vocals[i]; + return null; + } + + static float PartValue(PartEntry data, string column, int row, float fallback) + { + return data.PartSettings.TryGetValue(column, out var values) && row < values.Count + ? values[row] : fallback; } } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 71885bd..c3b9d4e 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1,4 +1,4 @@ -using CriWareFormats; +using CriWareFormats; using Gallop; using Gallop.Live; using Gallop.Live.Cutt; @@ -841,20 +841,18 @@ public string[] NormalBodyKeywords = new[] { "skin", "body", "bdy", "face", "he public void LoadLive(LiveEntry live, List characters) { - characters.ForEach(a => + if (!LiveAutoSelection.FillMissing(Main, live, characters, UI.CostumeIconDefault)) { - if (a.CharaEntry == null || string.IsNullOrEmpty(a.CostumeId)) - { - a.CharaEntry = Main.Characters[Random.Range(0, Main.Characters.Count / 2)]; - a.CostumeId = "0002_00_00"; - } - }); + UI.ShowMessage("Cannot fill the live selection: no available character-owned winning costume matches an empty slot.", UIMessageType.Error); + return; + } // 在旧 UI 场景卸载前复制成普通 C# 数据。后续异步加载不会丢角色选择。 List liveCharacters = LiveCharacterLoadData.CaptureAll(characters); bool requireStage = UI.isRequireStage; + int liveMode = UI.LiveMode; // Opt-in diagnostics begin before root registration, then follow the // exact dependency-expanded request count shown by the progress UI. LiveRuntimeDiagnostics.BeginPreload(live, liveCharacters, requireStage); @@ -912,26 +910,20 @@ public string[] NormalBodyKeywords = new[] { "skin", "body", "bdy", "face", "he controller.Initialize(); LiveRuntimeDiagnostics.RecordPhase("director_initialized", controller); - - int actualMemberCount = controller - ._liveTimelineControl - .data - .worksheetList[0] - .charaMotSeqList - .Count; - - if (actualMemberCount > liveCharacters.Count && liveCharacters.Count > 0) + // Native full-mode callback (RVA 0x1ba8981..0x1ba8b76) cycles + // selected identities through the raw authored channel count. + // Simple mode uses only the UI's basic-motion selection capacity. + int motionChannelCount = controller._liveTimelineControl.data.worksheetList[0].charaMotSeqList.Count; + if (liveMode == 1 && liveCharacters.Count > 0 && motionChannelCount > liveCharacters.Count) { - Debug.LogWarning( - $"actual member count is {actualMemberCount} current {liveCharacters.Count}"); - - var expandedCharacters = new List(); - for (int i = 0; i < actualMemberCount; i++) - expandedCharacters.Add(liveCharacters[i % liveCharacters.Count]); - - liveCharacters = expandedCharacters; + var channelCharacters = new List(motionChannelCount); + for (int i = 0; i < motionChannelCount; i++) + channelCharacters.Add(liveCharacters[i % liveCharacters.Count]); + liveCharacters = channelCharacters; } + + LoadLiveUma(liveCharacters); LiveRuntimeDiagnostics.RecordPhase("characters_loaded", controller); @@ -989,7 +981,7 @@ public string[] NormalBodyKeywords = new[] { "skin", "body", "bdy", "face", "he { if (director == null) return; director.InitializeUI(); - director.InitializeTimeline(liveCharacters, UI.LiveMode); + director.InitializeTimeline(liveCharacters, liveMode); director.InitializeMusic(live.MusicId, liveCharacters); LiveRuntimeDiagnostics.RecordPhase("timeline_music_initialized", director); director.Play(); diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index 465f8d5..57bd952 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -85,17 +85,18 @@ public class UmaViewerMain : MonoBehaviour - // Online English names take priority. LocalizeEn remains the offline fallback. + // Reuse downloaded English names; only fetch when no usable cache exists. + bool downloadTranslations = false; + string cachePath = Path.Combine(Application.persistentDataPath, EnglishNamesCacheFileName); + if (Config.Instance.Language == Language.En) + downloadTranslations = !TryLoadEnglishNamesCache(cachePath); + loadingUI.LoadingProgressChange( loadingStep++, loadingStepsTotal, - Config.Instance.Language == Language.En ? "Downloading Translations" : "Loading Translations"); - if (Config.Instance.Language == Language.En) + downloadTranslations ? "Downloading Translations" : "Loading Translations"); + if (downloadTranslations) { - string cachePath = Path.Combine( - Application.persistentDataPath, - EnglishNamesCacheFileName); - TryLoadEnglishNamesCache(cachePath); yield return UmaViewerDownload.DownloadText(LocalizeEn.TranslationUrl, json => { @@ -284,9 +285,9 @@ public class UmaViewerMain : MonoBehaviour } } - private static void TryLoadEnglishNamesCache(string cachePath) + private static bool TryLoadEnglishNamesCache(string cachePath) { - if (!File.Exists(cachePath)) return; + if (!File.Exists(cachePath)) return false; try { @@ -301,13 +302,17 @@ public class UmaViewerMain : MonoBehaviour Dictionary charaNames = ReadEnglishNameTable(reader); Dictionary mobNames = ReadEnglishNameTable(reader); + if (charaNames.Count == 0 || mobNames.Count == 0) + throw new InvalidDataException("English name cache is missing required name tables."); ApplyEnglishNames(charaNames, mobNames); Debug.Log($"Loaded cached English names: {charaNames.Count} characters, {mobNames.Count} mobs."); } + return true; } catch (Exception ex) { Debug.LogWarning($"Could not load the cached English names. Using LocalizeEn fallback: {ex.Message}"); + return false; } } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 2a58764..337338d 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -189,8 +189,9 @@ public class UmaViewerUI : MonoBehaviour public IEnumerator ApplyGraphicsSettings() { yield return 0; - CameraSettings.ChangeAntiAliasing(Config.Instance.AntiAliasing); + CameraSettings.AAModeDropdown.SetValueWithoutNotify(Config.Instance.AntiAliasing); GraphicsSettings.renderPipelineAsset = Config.Instance.Region == Region.Global ? null : UmaViewerMain.Instance.DefaultRenderPipeline; + RuntimeGraphicsSettings.Apply(); } public void HighlightChildImage(Transform mainObject, UmaUIContainer child) @@ -867,61 +868,60 @@ public class UmaViewerUI : MonoBehaviour } } - void ShowLiveSelectPanel(LiveEntry entry) + void ShowLiveSelectPanel(LiveEntry entry, bool loadPreview = true) { LiveSelectPannel.SetActive(true); - Builder.loadLivePreviewSound(entry.MusicId); - for (int i = LiveSelectList.content.childCount - 1; i >= 0; i--) + if (loadPreview) Builder.loadLivePreviewSound(entry.MusicId); + bool keepSelections = currentLive == entry; + CurrentSeletChara = null; + if (!keepSelections) { - Destroy(LiveSelectList.content.GetChild(i).gameObject); + for (int i = LiveSelectList.content.childCount - 1; i >= 0; i--) + { + var child = LiveSelectList.content.GetChild(i); + child.SetParent(null); + Destroy(child.gameObject); + } } - if(LiveMode == 1) + currentLive = entry; + LiveSelectImage.sprite = entry.Icon; + int memberCount = entry.MemberCount; + if (LiveMode == 0) { - currentLive = entry; - LiveSelectImage.sprite = entry.Icon; - LiveSelectInfoText.text = $"{entry.SongName}\nMembers Count: {entry.MemberCount}"; - for (int i = 0; i < entry.MemberCount; i++) + memberCount = Main.AbMotions.Count(a => a.Name.StartsWith($"3d/motion/live/body/son{entry.MusicId}") && Path.GetFileName(a.Name).Split('_').Length == 4); + LiveSelectInfoText.text = $"{entry.SongName}\nMain Members Count: {memberCount}"; + } + else + { + LiveSelectInfoText.text = $"{entry.SongName}\nMembers Count: {memberCount}"; + } + + var selections = new List(LiveSelectList.content.GetComponentsInChildren()); + for (int i = selections.Count - 1; i >= memberCount; i--) + { + selections[i].transform.SetParent(null); + Destroy(selections[i].gameObject); + selections.RemoveAt(i); + } + for (int i = selections.Count; i < memberCount; i++) + { + var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent(); + chara.IndexText.text = (i + 1).ToString(); + chara.GetComponent