264 Commits
Author SHA1 Message Date
dingyuntian 45fb678f39 Merge branch 'develop' into bugfix/存档功能过严 2026-07-27 20:24:37 +08:00
dingyuntian 1fb2e63866 audio: 彩带音频并入Timeline 2026-07-27 19:49:50 +08:00
dingyuntian bc4475ae66 Merge branch 'bugfix7.27' into 'develop'
yarn(day1): 将塔罗描述卡牌改为卡面

See merge request aibis-dream/aibis-dream!799
2026-07-27 08:04:02 +00:00
dingyuntian 31e6ae87be fix: 存档功能修理 2026-07-27 16:00:30 +08:00
bottlefishandCursor 1a6184dc82 yarn(prologue): 修正切割流程两处错字
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 15:16:42 +08:00
bottlefishandCursor ca345a51c6 yarn(huoshan): 修正 Stage5 临时改造台词说话人
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 15:16:34 +08:00
bottlefishandCursor b38343e427 yarn(day2): 修正 VERIFYING 拼写与多处文案
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 15:16:26 +08:00
bottlefishandCursor aa2b2d2e65 yarn(day1): 将塔罗描述卡牌改为卡面
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 15:16:17 +08:00
dingyuntian 3e6fab9762 Merge branch '7.27早春晖bugfix' into 'develop'
yarn(peipei): 手术入口淡出后跳转到手术准备

See merge request aibis-dream/aibis-dream!797
2026-07-27 06:42:53 +00:00
dingyuntian c0e7f2ddb4 Merge branch 'bugfix/美术问题调整' into 'develop'
fix: 跳转和位置修复

See merge request aibis-dream/aibis-dream!798
2026-07-27 06:42:42 +00:00
dingyuntian 05df341bcd fix: 跳转和位置修复 2026-07-27 14:42:18 +08:00
bottlefishandCursor 1bdcacd2ff yarn(prologue): 调整切割台词与切换工具的顺序
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 14:37:32 +08:00
bottlefishandCursor ec8246a193 yarn(peipei): 手术入口淡出后跳转到手术准备
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 14:37:01 +08:00
bottlefishandCursor f91579ba8a yarn(huoshan): 将 Center 初始 gameStage 重置为 1
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 14:22:01 +08:00
Yuntien 55ffaf494f Merge branch 'develop' into feature/d2sSFX 2026-07-27 13:19:16 +08:00
Ovid 0ef54b04cb HS1上传 2026-07-27 07:51:30 +08:00
Ovid f0e85493d7 debug 2026-07-27 04:28:04 +08:00
Ovid 81b0828ba9 D2S debug 2026-07-27 04:12:43 +08:00
bottlefishandCursor af36da918c yarn(huoshan): 修复维修阶段跳转与任务流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-27 02:12:10 +08:00
Ovid a98d230e05 sfxUpdate 2026-07-27 01:46:26 +08:00
dingyuntian 4b7887cd17 Merge branch 'develop' into feature/增加结尾保存节点 2026-07-27 00:57:05 +08:00
dingyuntian 784801b500 yarn: 给维修过程打标签 2026-07-27 00:49:59 +08:00
Ovid e8940ca7da Merge branch 'develop' into feature/d2sSFX 2026-07-27 00:22:27 +08:00
Ovid 90f075d51f D2SMUS 2026-07-27 00:12:34 +08:00
dingyuntian d4673bf851 Merge branch 'develop' into 'feature/增加结尾保存节点'
# Conflicts:
#   Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
2026-07-26 16:03:46 +00:00
dingyuntian f78da1de4d fix: 冲突处理 2026-07-27 00:03:14 +08:00
dingyuntian 8c4c99aecf art: 天桥佩佩更新 2026-07-27 00:01:02 +08:00
dingyuntian 6591001416 Merge branch 'develop' into '7.26春表现优化'
# Conflicts:
#   Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn
2026-07-26 15:50:44 +00:00
bottlefishandCursor d4c8b8db64 yarn(dialog): 修正佩佩分析对话空行与命令拼写
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:49:58 +08:00
bottlefishandCursor 9dab57ab87 yarn(dialog): 为对话加入语义标记与停顿
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:43:47 +08:00
dingyuntianandCursor efe9c5baaa yarn: 添加 Day2 sleep 重构剧本草稿
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:38:27 +08:00
dingyuntianandCursor 02967a5468 art(huoshan): 更新火山像素版动画并同步状态名
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:38:14 +08:00
dingyuntianandCursor d06a67bcb1 yarn(peipei): 将维修入口改为 interaction 退出存档
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 23:38:01 +08:00
bottlefish 05e074b19a yarn(dialog): 调整火山结尾屏幕特效顺序 2026-07-26 17:36:15 +08:00
bottlefish 681ac01eb9 Merge branch 'develop' into 表现优化春 2026-07-26 16:28:58 +08:00
bottlefishandCursor 29b02c57b1 yarn(huoshan): 调整 Stage6 真相收束时序
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 14:33:36 +08:00
bottlefish 3c27b0ef03 fix(day2sleep): 修复风筝坠落与文本表现不一致 2026-07-26 13:05:24 +08:00
bottlefishandCursor c16e9d06ee fix(huoshan): 修复记忆淡入被noise遮挡并恢复材质失真交接
进记忆前保留 glitch_transition noise,begin 时透明淡出并改由 HuoshanMemory 材质承接轻微失真;记忆渲染进 HuoshanScreen 以进入 VolFx 合成。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 23:26:56 +08:00
Ovid 5f14efe12a 更新VO和说话人 2026-07-25 21:44:37 +08:00
bottlefishandCursor 166b0ac4af fix(dreamdoor): 近景门框改大图并修复 closeup 残留
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 21:24:56 +08:00
bottlefishandCursor be1ab7ed80 chore(huoshan): 移除表达开发预览与调试快捷键残留
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 19:48:06 +08:00
bottlefishandCursor 0d40b8db14 feat(open): 支持按记忆模块切换电击闪烁图
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 19:47:57 +08:00
bottlefish dae9aa100e Merge branch 'develop' into 火山log释放迭代 2026-07-25 18:33:50 +08:00
bottlefishandCursor d62124d72b yarn(huoshan): 收紧LOG释放节奏并改用头痛3
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 18:30:01 +08:00
bottlefishandCursor 78d01dfe8f yarn(huoshan): Stage6改用屏幕蓄压与冲击命令
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 17:28:48 +08:00
bottlefishandCursor 1017ff4e90 yarn(huoshan): 更新Stage6与Day1开场对话
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 15:57:24 +08:00
bottlefishandCursor 1620c25f82 yarn(huoshan): 改用固定红并细化LOG3攻击节奏
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 02:42:43 +08:00
bottlefishandCursor fc530e77b4 yarn(huoshan): 改写Stage6演出并恢复Stage8出口
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 02:00:27 +08:00
dingyuntian b315bf144b Merge branch 'feature/音乐介入' into 'develop'
Feature/音乐介入

See merge request aibis-dream/aibis-dream!781
2026-07-24 17:12:58 +00:00
bottlefishandCursor 886ed05ab0 yarn(huoshan): 改写Stage6 LOG1与LOG2演出流程
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-25 01:12:49 +08:00