dingyuntian
|
c617e44813
|
Merge branch 'develop' into feature/帧动画系统
|
2026-07-16 23:43:54 +08:00 |
|
dingyuntian
|
5d07012cb6
|
fix: 预览模式问题
|
2026-07-16 23:11:36 +08:00 |
|
dingyuntian
|
1a113dbd25
|
fix: 冲突合并问题,修复线缆相关
|
2026-07-16 23:05:46 +08:00 |
|
dingyuntian
|
3959561686
|
Merge branch 'develop' into feature/帧动画系统
|
2026-07-16 20:56:53 +08:00 |
|
bottlefish
|
509e0ae169
|
Merge branch 'develop' into '7.11春优化'
# Conflicts:
# Assets/Scripts/FixSystemNew/Screen System/FixPanel/CablePanel.cs
|
2026-07-16 11:11:07 +00:00 |
|
bottlefish
|
fd79ff9d93
|
feat(fix-system): 优化线缆松手下坠与插头朝向
|
2026-07-16 19:09:25 +08:00 |
|
bottlefish
|
8b1fe28edb
|
fix(fix-system): 移除线缆拖拽的插孔自动吸附
|
2026-07-16 19:08:31 +08:00 |
|
dingyuntian
|
b4f0cebc1d
|
fix: 插孔打开时机
|
2026-07-16 18:50:00 +08:00 |
|
dingyuntian
|
46602803dc
|
feat: 动画系统第五阶段(未验收)
|
2026-07-16 18:49:12 +08:00 |
|
bottlefish
|
cb1ddc1f93
|
Merge branch 'develop' into 7.11春优化
|
2026-07-16 18:42:23 +08:00 |
|
bottlefish
|
6c75ceaa35
|
docs(save): 补充严格开发跳转使用说明
|
2026-07-16 18:41:20 +08:00 |
|
bottlefish
|
cfb4ff96c4
|
fix(ui): 修复场景卸载后透明遮罩阻塞交互
|
2026-07-16 18:40:53 +08:00 |
|
bottlefish
|
8deff54e48
|
feat(save): 增强开发存档跳转与严格校验
|
2026-07-16 18:39:50 +08:00 |
|
dingyuntian
|
9b6d008263
|
Merge branch 'develop' into feature/帧动画系统
|
2026-07-16 18:06:01 +08:00 |
|
dingyuntian
|
56045b4bcd
|
fix(fade-kit): 修复 FadeKit 空引用和零时长异常
- 增加 Image 空引用保护
- 处理 duration 小于等于 0 的边界情况
- 动画开始前调用 DOKill 避免冲突
- 使用 DOFade 替代 DOBlendableColor,行为更明确
|
2026-07-16 17:56:59 +08:00 |
|
dingyuntian
|
f51a670239
|
refactor: 将淡入淡出迁移到 ScreenTransitionPanel
- 将 BaseYarnCommand、FixSystemNew 各状态、GameManager、
SaveSystem、PlayToolPanel 中的 PlayToolPanel 遮罩调用
统一迁移到 ScreenTransitionPanel
- 从 PlayToolPanel 移除 _fadeImage 及相关 fade 方法
- 从 Play Tool Panel Prefab 移除 Fade Image 子对象
|
2026-07-16 17:56:51 +08:00 |
|
dingyuntian
|
4100232162
|
feat: 添加全局屏幕转场面板
- 新增 ScreenTransitionPanel,支持 fade_in/out、fade_in_white、flash_white、
wipe_in/out、shutter_in/out 等多种转场效果
- 新增 Screen Transition Panel Prefab 并在 Persistence 场景挂载
- UIManager 启动时自动显示该面板
- BaseYarnCommand 新增对应的 Yarn 全局转场指令
|
2026-07-16 17:56:33 +08:00 |
|
bottlefish
|
85de341cd2
|
fix(ui): 修复梦境终端输入法交互
|
2026-07-16 17:52:49 +08:00 |
|
bottlefish
|
ea95111f2a
|
feat(dream): 完善梦境门与星空聚焦演出
|
2026-07-16 17:52:34 +08:00 |
|
bottlefish
|
96164e1887
|
feat(huoshan): 重构笑话发生器像素噪点表现
|
2026-07-16 17:51:01 +08:00 |
|
bottlefish
|
754d03b47d
|
feat(fix-system): 优化损坏模块火花表现
|
2026-07-16 17:50:48 +08:00 |
|
bottlefish
|
3be0bf8201
|
feat(fix-system): 重构序章维修流程与面板启动表现
|
2026-07-16 17:50:35 +08:00 |
|
dingyuntian
|
8c795f4474
|
Merge branch 'develop' into feature/新动画系统
|
2026-07-15 20:21:37 +08:00 |
|
bottlefish
|
8c37a0bd09
|
Merge remote-tracking branch 'origin/feature/demo脚本调整' into 7.11春优化
|
2026-07-15 19:55:59 +08:00 |
|
bottlefish
|
fd77b5c248
|
feat(effects): 优化故障噪声与场景后处理表现
|
2026-07-15 19:39:43 +08:00 |
|
bottlefish
|
fa66dbc7c9
|
feat(kite): 优化风筝镜头追赶与双捕捉表现
|
2026-07-15 19:39:12 +08:00 |
|
bottlefish
|
92087b81ef
|
feat(dream): 添加梦境数据溢出与虚焦表现
|
2026-07-15 19:38:42 +08:00 |
|
bottlefish
|
1f931e987f
|
fix(huoshan): 优化语言粒子布局与状态重置
|
2026-07-15 19:37:37 +08:00 |
|
bottlefish
|
7ace1f255a
|
fix(fix-system): 修复维修场景鼠标视差偏移
|
2026-07-15 19:36:58 +08:00 |
|
bottlefish
|
21321074bf
|
fix(fix-system): 优化温控器风扇停止流程
|
2026-07-15 19:36:24 +08:00 |
|
bottlefish
|
89850c75f3
|
feat(fix-system): 优化线缆与警报灯表现
|
2026-07-15 19:35:47 +08:00 |
|
bottlefish
|
d075d1e0f8
|
feat(fix-system): 添加维修模块运行状态表现
|
2026-07-15 19:34:50 +08:00 |
|
bottlefish
|
161fe6ac7d
|
test(dev-save): 支持从测试归档恢复阶段存档
|
2026-07-15 19:27:53 +08:00 |
|
bottlefish
|
c38c2f75be
|
fix(save): 修复跨章节存档恢复校验
|
2026-07-15 19:27:18 +08:00 |
|
dingyuntian
|
06d85d6460
|
refactor(ui): 移除 InfoPanel 的 I 键变量栏切换
删除 Update 中通过 I 键切换 variableBar 显隐的调试代码,
避免与现有输入冲突并保持面板职责单一。
|
2026-07-15 16:52:08 +08:00 |
|
dingyuntian
|
91ffbeb130
|
feat(ui): 添加录制工具面板
新增 RecordingToolPanel,按 Ctrl+R 唤出侧边栏,可独立控制光标、
版本号、Top Bar 与对话视觉的显隐。移除旧的
UIEventEnum.RecordingModeChanged 事件,改为各子系统提供显式
SetVisible API。在 Persistence 场景中配置面板层级与四个开关。
|
2026-07-15 16:51:55 +08:00 |
|
dingyuntian
|
b14599d18c
|
fix(dialog): 修复点击 UI 时对话被误推进
在 LineAdvanceInput 中通过 UIManager.IsPointerOverUI 判断
鼠标是否位于主 UI Canvas 的射线接收元素上,避免点击录制工具
等 UI 时推进对话。
|
2026-07-15 16:51:11 +08:00 |
|
dingyuntian
|
85a3fc9e14
|
feat(frameAnima): 动画系统前四个阶段
|
2026-07-15 15:13:56 +08:00 |
|
 bottlefishandCursor
|
423a3954dd
|
feat(dev-save): 强化 Huoshan 阶段存档提升与跳转校验
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-15 13:57:21 +08:00 |
|
 bottlefishandCursor
|
431401c52f
|
fix(huoshan): 修复发条终点判定与越界拖拽
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 22:55:12 +08:00 |
|
 bottlefishandCursor
|
0ed1253a40
|
feat(huoshan): 旋钮改为三态切图外观
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 22:54:58 +08:00 |
|
 bottlefishandCursor
|
4f59e41b03
|
feat(subway): 添加车厢加速度驱动与扶手摆动
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 22:54:43 +08:00 |
|
 bottlefishandCursor
|
51b8d86603
|
fix(dialog): 兼容 load_scene 多余淡入时长参数
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 22:53:10 +08:00 |
|
 bottlefishandCursor
|
c4dbdc098b
|
feat(timeline): 添加 wait_timeline 以支持黑屏起播
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 22:52:54 +08:00 |
|
 bottlefishandCursor
|
b98214632e
|
feat(dream): 实现风筝镜头补偿与虚焦驱动
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 20:56:51 +08:00 |
|
 bottlefishandCursor
|
2c74ec2030
|
feat(tarot): 优化摊牌缩放与逆位动画节奏
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 20:56:33 +08:00 |
|
 bottlefishandCursor
|
c601dda9de
|
fix(huoshan): 调整销售滑片角度并完善发条调试可视化
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 20:56:14 +08:00 |
|
 bottlefishandCursor
|
1422161844
|
feat(huoshan): 增强表达模块干扰表现与完成释放效果
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 20:56:00 +08:00 |
|
 bottlefishandCursor
|
52e0e9002f
|
fix(huoshan): 优化发条完成判定并防止销售轮次重复触发
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 14:24:05 +08:00 |
|
 bottlefishandCursor
|
4b3260dfcd
|
feat(huoshan): 为聚焦文本添加 Glitch 平静场
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-13 14:23:41 +08:00 |
|