tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,444 Commits 21 Branches 14 Tags
1fdca74bfb1f30b3a5682b116e0ba6e8cf418c8c
Commit Graph
3444 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
dingyuntian 1fdca74bfb Merge branch 'develop' into feature/帧动画编辑器重构 2026-07-22 21:59:35 +08:00
dingyuntian b20b936966 Merge branch 'feature/demo脚本改动0722' into 'develop' 
Feature/demo脚本改动0722

See merge request aibis-dream/aibis-dream!769
 2026-07-22 12:19:02 +00:00
Ovid 4a0e3ba0b9 debug 2026-07-22 20:18:29 +08:00
dingyuntian 2a1cfbc208 Merge branch 'feature/demo脚本改动0722' into 'develop' 
Feature/demo脚本改动0722

See merge request aibis-dream/aibis-dream!768
 2026-07-22 10:40:12 +00:00
Ovid e3762e5462 Merge branch 'develop' into feature/demo脚本改动0722 2026-07-22 17:55:35 +08:00
dingyuntian 5029a4b9b5 Merge branch '7.22春优化' into 'develop' 
fix(fixsystem): 修复线缆收放状态与阶段切换竞态

See merge request aibis-dream/aibis-dream!767
 2026-07-22 08:33:58 +00: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 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
Ovid 5091851ead 结尾调整进行中 2026-07-22 04:23:37 +08:00
dingyuntian 4411bfa4b6 Merge branch 'bugfix/美术素材填充' into 'develop' 
fix: 保证离开BodyModule一定清屏

See merge request aibis-dream/aibis-dream!766
 2026-07-21 20:06:30 +00:00
dingyuntian 02d3fc04e6 fix: 保证离开BodyModule一定清屏 2026-07-22 04:05:46 +08:00
dingyuntian ef3c14d3de Merge branch 'bugfix/美术素材填充' into 'develop' 
Bugfix/美术素材填充

See merge request aibis-dream/aibis-dream!765
 2026-07-21 20:02:51 +00: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
dingyuntian c6c76666ef feat: 帧动画系统Timeline兼容 2026-07-22 02:32:04 +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 9b2caf64c9 art: 部分图像配置与按钮更新 2026-07-22 01:53:07 +08:00
dingyuntian 82b20a8fab art: 火山彩带资源 2026-07-22 01:46:39 +08:00
dingyuntian 0f06041fa2 Merge branch '0720-振彤火山文本迭代' into 'develop' 
火山stage8和第二天中午文本

See merge request aibis-dream/aibis-dream!763
 2026-07-21 17:26:30 +00: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
dingyuntian 8b16aebc6b Merge branch '7.21春优化' into 'develop' 
7.21春优化

See merge request aibis-dream/aibis-dream!762
 2026-07-21 16:56:47 +00: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
dingyuntian 3919ea9a75 fix: 气泡时序问题 2026-07-22 00:07:54 +08:00
dingyuntian 3891b6bd37 editor: 编辑器微调 2026-07-22 00:06:59 +08:00
dingyuntian 9f61f53b7f art: 地铁火山更新 2026-07-22 00:06:10 +08:00
dingyuntian 6dc0983961 Merge branch 'bugfix/已知问题修复' into 'develop' 
Bugfix/已知问题修复

See merge request aibis-dream/aibis-dream!761
 2026-07-21 14:29:31 +00: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
dingyuntian 532d9fb320 Merge branch '7.20春优化' into 'develop' 
revert(huoshan): 将释放log表现回退至6月版本

See merge request aibis-dream/aibis-dream!760
 2026-07-21 14:25:04 +00: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