Commit Graph
100 Commits
Author SHA1 Message Date
bottlefishandCursor 3debdb39e4 merge: 合并 develop 到 7.22春优化
保留 PullUpCable 线缆收起逻辑,并接入 develop 的 BodyModule 退出清屏。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:30:10 +08:00
bottlefishandCursor 04edf9b355 chore(devsave): 清理 Huoshan1 开发存档快照
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:26:01 +08:00
bottlefishandCursor 6854679bcb yarn(peipei): 补充阶段切换时的放线指令
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:25:50 +08:00
bottlefishandCursor 515f57e28c yarn(huoshan): 重构任务面板流程并移除 Stage7 插线检查
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:25:36 +08:00
bottlefishandCursor 97ef0972fd art(fixsystem): 调整物理线缆色阶与高光参数
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:25:17 +08:00
bottlefishandCursor 2fb32c44e8 fix(fixsystem): 修复发条归零时充能状态未重置
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:25:05 +08:00
bottlefishandCursor 3d65941b03 fix(fixsystem): 修复线缆收放状态与阶段切换竞态
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:24:52 +08:00
bottlefish 52db661484 fix(dialog): 修复D2 Sleep换图与门观察表现 2026-07-22 00:50:59 +08:00
bottlefish aed9998d1a refactor: 拆分D2 Sleep表现并接入快照 2026-07-22 00:50:16 +08:00
bottlefishandCursor 0d59e7d91e chore(devsave): 移除 Day2Sleep 开发存档条目
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:16:56 +08:00
bottlefishandCursor 859d780b78 yarn(FP_Day2_sleep): 简化风筝放手与推门演出并更新梦境素材
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:16:46 +08:00
bottlefishandCursor 7ee6cba2ae fix(yarn): 修正 Stage6 hide_full_screen 拼写
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:16:46 +08:00
bottlefishandCursor 6159704116 feat(cable): 线缆暖色配色与拉紧驱动线盘转动
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:16:41 +08:00
bottlefishandCursor 74f5989802 fix(memory): 调整记忆播放结束复位时序
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:16:34 +08:00
bottlefishandCursor 0b848d8040 fix(peipei): 收紧 Eye 聚焦平移边界与视口计算
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:13:22 +08:00
bottlefishandCursor 96b309992c refactor(save): 移除 Showcase 快照持久化
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:13:11 +08:00
bottlefish 1547055cc2 Revert "scene(peipei): 添加Bloom并调整维修场景布局"
This reverts commit 9ef6bc9bff.
2026-07-21 18:51:48 +08:00
bottlefishandCursor 3d119dcd92 refactor(knob): 移除旋钮旋转光标交互逻辑
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 18:50:57 +08:00
bottlefishandCursor c4ef30b151 style(screen): 调整维修面板标题与日志文本配色
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 18:50:48 +08:00
bottlefishandCursor 12c5735466 feat(ui): 添加 TerminalText 正文颜色设置方法
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 18:50:03 +08:00
bottlefishandCursor 35451363a5 scene(yingli): 调整场景物件位置
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:48:30 +08:00
bottlefishandCursor 9ef6bc9bff scene(peipei): 添加Bloom并调整维修场景布局
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:48:27 +08:00
bottlefishandCursor 97f0fabd3c scene(clinic): 调整英里初登场等待与Timeline
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:44:26 +08:00
bottlefishandCursor 018e9d3b52 fix(bar): 修复醉酒状态切换抽搐并收紧过渡
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:44:17 +08:00
bottlefishandCursor c0e58d56b4 feat(scene-mgmt): 调整轱辘拉锯为发力微颤
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:43:00 +08:00
bottlefishandCursor cffb99a52c fix(cutline): 剪线后立即禁用避免重复触发
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:59 +08:00
bottlefishandCursor 597e97c5d7 fix(bodymodule): 切割入场同步全部模块CutText
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:58 +08:00
bottlefishandCursor 7a8f7dbbd7 fix(cable): 强制收线改用运动学收拢避免甩鞭
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:50 +08:00
bottlefishandCursor 8fee89db36 fix(heatmap): 按Sprite几何中心旋转风扇避免散架
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:44 +08:00
bottlefishandCursor 046b1a9efb fix(memory): 优化彩色褪色扫光并复位拉杆视觉
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:41:46 +08:00
bottlefishandCursor c7c0e96110 scene(open): 固定Emergency气泡Timeline时长
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:41:40 +08:00
bottlefish f6f87c3109 Merge branch 'develop' into 7.20春优化 2026-07-21 01:39:29 +08:00
bottlefishandCursor 98dfb644c5 feat(scene-mgmt): 放缓轱辘拉锯幅度与节奏
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:20:13 +08:00
bottlefishandCursor 845f46b924 fix(memory): 记忆结束增加短闪雪花过渡
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:20:04 +08:00
bottlefishandCursor 5f31cd5635 fix(peipei-uf): 重绑垂手脸图并加固faceIn
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:19:16 +08:00
bottlefishandCursor 1e8ec2e64f feat(eye): 眨眼仅用于想象上色并关闭自动眨眼
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:18:46 +08:00
bottlefishandCursor e7a0089a46 feat(cutline): Timeline黑场交接UI避免剪线露头
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:18:16 +08:00
bottlefishandCursor 2ac0b4695d feat(fix-panel): Warning回落增加闪烁淡出并对齐等待
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:18:03 +08:00
bottlefishandCursor ecfefa5b87 fix(bodymodule): 切割时按舱外状态同步CutText
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:17:52 +08:00
bottlefishandCursor 3164fd7d8c feat(shock): 拉杆接入EventTriggerEx并统一光标
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:17:41 +08:00
bottlefishandCursor dc0488f085 fix(eventsystem): 修复锁定时松手未清理导致光标卡住
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:16:57 +08:00
bottlefishandCursor 164e3dd50e revert(huoshan): 将释放log表现回退至6月版本
保留 Stage6 当前台词,仅恢复粒子与完成表现及 start_expression 参数。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 00:03:31 +08:00
bottlefish dc6fe93afb 提交结尾场景为天桥 2026-07-20 03:53:07 +08:00
bottlefish bd30cdabd0 Merge branch 'develop' into 7.19春优化 2026-07-20 03:50:37 +08:00
bottlefishandCursor 32d2fcc0a2 yarn(dream): 优化 Day2 梦境演出与放手流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 03:47:13 +08:00
bottlefishandCursor cca5404f0c feat(scene-mgmt): 支持无线轱辘分层与加速晃动
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 03:47:05 +08:00
bottlefishandCursor 6e5e5d5790 art(dream): 添加 Day2 梦境 aseprite 源文件
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 03:46:54 +08:00
bottlefishandCursor ad759a6e83 art(dream): 新增 Day2 梦境演出贴图并更新素材
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 03:46:33 +08:00
bottlefishandCursor 65205e2552 yarn(huoshan): 简化 Stage7 直接回诊室流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 03:46:11 +08:00
bottlefishandCursor 1444e43449 chore(scene): 调整 Playtest 结束流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:27:30 +08:00
bottlefishandCursor 6e7bb3f637 art(bridge): 更新下雪序列帧并接入天桥场景
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:22:04 +08:00
bottlefishandCursor 5ab204b476 fix(yarn): 修正 Day2 night BE detour 节点名
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:21:55 +08:00
bottlefishandCursor 84192cb7c4 yarn(dialog): 优化 Day2 梦境 Bloom 与全屏演出流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:21:48 +08:00
bottlefishandCursor c98644c723 art(dream): 新增 Day2 梦境天花板风扇与星图素材
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:21:23 +08:00
bottlefishandCursor 15aba8e805 feat(dialog): 新增全屏序列帧与模糊 Yarn 指令
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:21:07 +08:00
bottlefishandCursor 90c75d1f45 feat(scene-mgmt): 全屏图柔焦模糊与序列帧播放
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:20:52 +08:00
bottlefishandCursor f8821b1b3e fix(fix-system): 切割进入时支持 Cut Text 闪烁
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:20:25 +08:00
bottlefishandCursor 41ca1927a0 fix(heatmap): 低温段改为蓝色噪点并保留发热色带
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:20:12 +08:00
bottlefish 14fd64e7bd fix(dialog): 修复 Day2 梦境终端过渡异常 2026-07-19 22:39:19 +08:00
bottlefish 5a37f529ab fix(dialog): 修复快进时后处理渐变回写 2026-07-19 22:36:45 +08:00
bottlefish 06d6127c69 chore(merge): 合并 develop 并整合 Day2 梦境剧情与演出 2026-07-19 21:25:30 +08:00
bottlefish 5408fd5320 build(config): 改用本地 Unity MCP 包 2026-07-19 20:42:51 +08:00
bottlefish 1f6208a094 yarn(dialog): 调整 Day2 天桥后处理权重 2026-07-19 20:42:19 +08:00
bottlefish 772a6bbbe8 yarn(dialog): 优化 Day2 梦境演出流程 2026-07-19 20:41:35 +08:00
bottlefish bfc61a0097 feat(scene-mgmt): 重构梦境门海浪切换演出 2026-07-19 20:40:20 +08:00
bottlefish bfbfe494c4 art(scene-mgmt): 更新梦境门框与海浪动画资源 2026-07-19 20:38:28 +08:00
bottlefish 297075e0f0 feat(dialog): 添加后处理参数 Yarn 指令 2026-07-19 20:37:32 +08:00
bottlefish 7034b82aa4 perf(scene-mgmt): 优化星空失焦模糊效果 2026-07-19 20:36:06 +08:00
bottlefish eb127371f1 fix(localization): 补充终端特殊字符字形 2026-07-19 20:32:48 +08:00
bottlefish cec2dae5e0 yarn(dialog): 为火山头冷台词添加振动演出 2026-07-19 20:32:09 +08:00
bottlefish ba19c2eff5 feat(scene-mgmt): 添加角色立绘持续振动指令 2026-07-19 20:31:16 +08:00
bottlefish 7fa12e3d46 style(ui): 调整任务条目文字颜色 2026-07-19 20:30:29 +08:00
bottlefish bb6b3dd599 feat(fix-system): 区分维修终端错误提示颜色 2026-07-19 20:30:05 +08:00
bottlefish d7030f36d2 feat(fix-system): 优化低温热力图视觉表现 2026-07-19 20:29:30 +08:00
bottlefish 94a817f5fa feat(tarot): 添加塔罗展示背景压暗 2026-07-19 20:29:01 +08:00
bottlefish bfdcb41116 art(tarot): 更新塔罗牌面资源 2026-07-19 20:28:25 +08:00
bottlefish 6ace48dba2 art(scene-bar): 修正酒吧角色动画表现 2026-07-19 20:27:00 +08:00
bottlefish ce00539c18 feat(save): 迁移并完善开发跳转存档 2026-07-18 22:15:52 +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
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 7dfd87e868 test(save): 添加开发存档清单校验测试 2026-07-16 18:40:14 +08:00
bottlefish 8deff54e48 feat(save): 增强开发存档跳转与严格校验 2026-07-16 18:39:50 +08:00
bottlefish 7b287a6248 test(save): 更新开发跳转测试存档与清单 2026-07-16 18:37:14 +08:00
bottlefish 51fb062225 build(config): 更新项目构建版本 2026-07-16 17:55:05 +08:00
bottlefish e0318026d7 scene(ui): 调整持久场景终端界面配置 2026-07-16 17:54:50 +08:00
bottlefish cc354cb37d scene(scene-flow): 更新剧情场景流转配置 2026-07-16 17:54:33 +08:00
bottlefish eaba7ea5ab fix(dialog): 修正时段初始化与角色气泡 2026-07-16 17:54:06 +08:00
bottlefish 5ab8498be5 art: 更新医生与英里角色资源 2026-07-16 17:53:51 +08:00
bottlefish fa79a4bed1 art(bar): 更新调酒妹动画与状态机 2026-07-16 17:53:31 +08:00
bottlefish f0a92553fb feat(kite): 完善风筝回合动态表现 2026-07-16 17:53:08 +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 0039beb5f9 art(huoshan): 调整火山角色表情动画 2026-07-16 17:51:23 +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