dingyuntian 6591001416 Merge branch 'develop' into '7.26春表现优化' ...

# Conflicts:
#   Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn

2026-07-26 15:50:44 +00:00

..

AddressableAssetsData

Merge branch 'develop' into 火山log释放迭代

2026-07-25 18:33:50 +08:00

Animation

art(huoshan): 新增LOG3短头痛Timeline

2026-07-25 18:29:40 +08:00

Camera Filter Pack

…

CameraData

scene(camera): 添加 Dream Camera 镜头混合规则

2026-07-08 15:21:23 +08:00

Config

…

Editor

feat(save): 为存档锚点增加显式恢复标记并加固退出档

2026-07-26 23:37:47 +08:00

FMOD Banks

更新VO和说话人

2026-07-25 21:44:37 +08:00

Font

art: 更新对话字体与 Fallback

2026-07-26 23:44:54 +08:00

GameContent

Merge branch 'develop' into '7.26春表现优化'

2026-07-26 15:50:44 +00:00

Language

feat(huoshan): 接入表达界面序列帧与本地化文字

2026-07-26 13:06:25 +08:00

Materials

fix(huoshan): 优化攻击段愤怒红屏反馈

2026-07-26 14:16:53 +08:00

Plugins

art: 更新对话字体与 Fallback

2026-07-26 23:44:54 +08:00

Prefabs

Merge branch 'bugfix/问题修复' into 'develop'

2026-07-26 10:09:09 +00:00

Prototype

art(prototype): 添加线缆原型截图素材

2026-07-09 00:52:01 +08:00

RawResources

feat(huoshan): 接入表达界面序列帧与本地化文字

2026-07-26 13:06:25 +08:00

Render

scene(fix-system): 调整维修场景表现参数

2026-07-26 17:35:56 +08:00

Resources_moved

yarn(dialog): 调整佩佩 FP 维修脚本存档边界 tag

2026-06-18 14:34:42 +08:00

Samples

…

Scenes

scene(fix-system): 调整维修场景表现参数

2026-07-26 17:35:56 +08:00

Screenshots

…

ScriptableObjects

提交结尾场景为天桥

2026-07-20 03:53:07 +08:00

Scripts

Merge branch 'develop' into '7.26春表现优化'

2026-07-26 15:50:44 +00:00

Settings

…

Shader

fix(huoshan): 重构记忆放映失真效果

2026-07-26 13:03:58 +08:00

Shapes

…

Signal

…

StreamingAssets

更新VO和说话人

2026-07-25 21:44:37 +08:00

Tests

test: 隔离帧动画导入测试临时目录

2026-07-26 23:38:41 +08:00

UI

art(ui): 更新终端界面美术资源与预制体

2026-07-02 02:44:28 +08:00

UI Toolkit

…

Yarn

Merge branch 'develop' into '7.26春表现优化'

2026-07-26 15:50:44 +00:00

AddressableAssetsData.meta

…

Animation.meta

…

Camera Filter Pack.meta

…

CameraData.meta

…

Config.meta

…

Editor.meta

…

FadeIn.signal

…

FadeIn.signal.meta

…

FMOD Banks.meta

…

Font.meta

…

GameContent.meta

…

glitch.asset

…

glitch.asset.meta

…

Language.meta

…

Materials.meta

…

PlayTimeline.signal

…

PlayTimeline.signal.meta

…

Plugins.meta

…

Prefabs.meta

…

Prototype.meta

…

RawResources.meta

…

Render.meta

…

Resources_moved.meta

…

Samples.meta

…

Scenes.meta

…

Screenshots.meta

…

ScriptableObjects.meta

…

Scripts.meta

…

Settings.meta

…

Shader.meta

…

Shapes.meta

…

Signal.meta

…

StreamingAssets.meta

…

Tests.meta

feat(frameAnima): 动画系统前四个阶段

2026-07-15 15:13:56 +08:00

UI Toolkit.meta

…

UI.meta

…

UniversalRenderPipelineGlobalSettings.asset

…

UniversalRenderPipelineGlobalSettings.asset.meta

…

Yarn.meta

…