264 Commits
Author SHA1 Message Date
dingyuntian 96796f6b80 fix: 动画错误 2026-07-25 01:04:49 +08:00
Ovid 5faa81c3c2 debug 2026-07-25 01:00:21 +08:00
Ovid dfdb75f833 Merge branch 'develop' into feature/音乐介入 2026-07-25 00:39:36 +08:00
Ovid c368ff416d debug 2026-07-25 00:38:04 +08:00
Ovid 1e56b83e06 音乐接入 2026-07-25 00:30:36 +08:00
dingyuntian c6bcd0b798 yarn: 节点调整 2026-07-24 16:40:43 +08:00
dingyuntian 94e27b4d11 Merge branch '0723火山表情添加1' into 'develop'
上传

See merge request aibis-dream/aibis-dream!777
2026-07-24 05:24:27 +00:00
bottlefishandCursor ce468ea9cc yarn(huoshan): 改写 Stage6 LOG1 真假争夺演出
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 23:50:56 +08:00
NeologismWu 8a68e0676b 1
11
2026-07-23 22:09:58 +08:00
bottlefishandCursor 2d3cef3875 yarn(huoshan): 更新Stage6 Log释放演出流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 18:54:39 +08:00
NeologismWu 132098f70c 上传
上传
2026-07-23 10:47:34 +08:00
Ovid a4fec41afb D2S开头去掉 2026-07-23 01:00:47 +08:00
Ovid d7e2e8e690 乌鸦改金色背景 2026-07-23 00:31:19 +08:00
Ovid e4697e2462 Merge branch 'develop' into feature/demo脚本改动0722 2026-07-23 00:27:00 +08:00
Ovid 9a3cb3f054 结尾! 2026-07-23 00:26:47 +08:00
dingyuntian 0825204666 Merge branch 'develop' into bugfix/美术素材填充 2026-07-22 21:55:45 +08:00
dingyuntian 1af6f0b47d yarn: 改错别字 2026-07-22 21:50:44 +08:00
Ovid 4a0e3ba0b9 debug 2026-07-22 20:18:29 +08:00
Ovid e3762e5462 Merge branch 'develop' into feature/demo脚本改动0722 2026-07-22 17:55:35 +08:00
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 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
Ovid 5091851ead 结尾调整进行中 2026-07-22 04:23:37 +08:00
dingyuntian b7fdcf97fe fix: 插头不拔出屏幕不刷新 2026-07-22 04:01:52 +08:00
dingyuntian ba0ce38c11 art: 美术素材问题 2026-07-22 03:17:40 +08:00
dingyuntian 3b5d05260e Merge branch 'bugfix/已知问题修复' into 'develop'
Bugfix/已知问题修复

See merge request aibis-dream/aibis-dream!764
2026-07-21 18:33:48 +00:00
dingyuntian f4488a68d0 feat: 检索及彩带Timeline 2026-07-22 02:32:42 +08:00
Ovid d655887a02 debug一些 2026-07-22 02:25:43 +08:00
Ovid adbcd89918 Merge branch 'develop' into feature/demo脚本改动0722 2026-07-22 02:10:50 +08:00
dingyuntian 8a5d83d888 Merge branch 'develop' into '0720-振彤火山文本迭代'
# Conflicts:
#   Assets/Yarn/FP/FP_Day2_mid/Day2_mid.yarn
2026-07-21 17:26:22 +00:00
Ovid 71a803fd72 Merge branch 'develop' into feature/demo脚本改动0722 2026-07-22 01:25:08 +08:00
Ovid 672d554b40 PP2调整上传 2026-07-22 01:23:01 +08:00
NeologismWu 4259306e1f 0722提交
0722提交
2026-07-22 01:21:10 +08:00
bottlefish 52db661484 fix(dialog): 修复D2 Sleep换图与门观察表现 2026-07-22 00:50:59 +08:00
dingyuntian 9f61f53b7f art: 地铁火山更新 2026-07-22 00:06:10 +08:00
dingyuntian 9627586130 Merge branch 'develop' into bugfix/已知问题修复 2026-07-21 22:28:53 +08:00
dingyuntian 28cc1127f5 fix: 部分小问题修复 2026-07-21 22:27:51 +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 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 7a8f7dbbd7 fix(cable): 强制收线改用运动学收拢避免甩鞭
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:50 +08:00
bottlefish f6f87c3109 Merge branch 'develop' into 7.20春优化 2026-07-21 01:39:29 +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 164e3dd50e revert(huoshan): 将释放log表现回退至6月版本
保留 Stage6 当前台词,仅恢复粒子与完成表现及 start_expression 参数。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 00:03:31 +08:00
dingyuntian a9f58fc683 fix: 已知问题修复 2026-07-20 23:15:34 +08:00
dingyuntian 94823354b5 feat: 延时auto_next 2026-07-20 22:34:23 +08:00
dingyuntian 1318636bee yarn: 补Day2_mid节点跳转对话 2026-07-20 18:11:26 +08:00
dingyuntian 41d3e07a55 yarn: 文本修改 2026-07-20 14:41:08 +08:00