Commit Graph
1436 Commits
Author SHA1 Message Date
dingyuntian c047a6132b Merge branch 'feature/海浪' into 'develop'
复原

See merge request aibis-dream/aibis-dream!421
2025-06-10 08:03:07 +00:00
dingyuntian 040ffdc497 复原 2025-06-10 16:01:48 +08:00
dingyuntian a344d8c701 Merge branch 'feature/海浪' into 'develop'
rebuild fmod

See merge request aibis-dream/aibis-dream!420
2025-06-10 07:40:36 +00:00
Ovid d5eaec5286 rebuild fmod 2025-06-10 15:37:38 +08:00
dingyuntian 775a57d00d Merge branch 'bugfix/merge' into 'develop'
Bugfix/merge

See merge request aibis-dream/aibis-dream!419
2025-06-10 07:11:23 +00:00
dingyuntian 745fa81f14 Merge branch 'develop' into bugfix/merge 2025-06-10 15:10:27 +08:00
dingyuntian 965500f408 Merge branch '6.4.20全流程优化' into bugfix/merge 2025-06-10 15:09:42 +08:00
chenziqin 9a91edd55e Merge branch 'feature/day0&1_dream' into 'develop'
update day0 day1两个梦

See merge request aibis-dream/aibis-dream!412
2025-06-10 06:48:51 +00:00
Ovid 83d23a04bc Merge branch 'develop' into feature/day0&1_dream 2025-06-10 14:41:47 +08:00
Ovid 2f47bd7083 Revert "Update 剪影.png"
This reverts commit acb2211084.
2025-06-10 14:34:45 +08:00
Ovid 0359d1a51c Revert "Update 剪影.png"
This reverts commit acb2211084.
2025-06-10 14:34:33 +08:00
Ovid acb2211084 Update 剪影.png 2025-06-10 14:27:44 +08:00
dingyuntian 4a9b842d91 Merge branch 'feature/新对话框' into 'develop'
Feature/新对话框

See merge request aibis-dream/aibis-dream!417
2025-06-10 06:11:24 +00:00
dingyuntian b9978e96b7 相机 2025-06-10 14:10:58 +08:00
dingyuntian cf090fa347 Merge branch 'develop' into feature/新对话框 2025-06-10 13:59:32 +08:00
chenziqin dbab7fcedb Merge branch 'feature/day0_night' into 'develop'
day0night

See merge request aibis-dream/aibis-dream!416
2025-06-09 15:50:49 +00:00
Ovid 939fac5c1f merge <<set_time_of_day "Evening">> 2025-06-09 23:49:51 +08:00
Ovid c04165c3d8 Merge branch 'develop' into feature/day0_night 2025-06-09 23:49:21 +08:00
Ovid db23fdf7a7 day0night 2025-06-09 23:46:55 +08:00
dingyuntian 4686f42a01 指针切换 2025-06-09 23:40:22 +08:00
dingyuntian e87c1f4ad2 Merge branch 'feature/新对话框' into 'develop'
Feature/新对话框

See merge request aibis-dream/aibis-dream!415
2025-06-09 14:12:17 +00:00
dingyuntian 9b54b16b23 开头调通 2025-06-09 22:11:19 +08:00
dingyuntian f815c36936 Merge branch 'develop' into feature/新对话框 2025-06-09 18:14:05 +08:00
dingyuntian 43c375ff89 对话框调整 2025-06-09 18:12:56 +08:00
chenziqin 666e94ed43 Merge branch 'feature/DAY1_text_update' into 'develop'
Feature/day1 text update

See merge request aibis-dream/aibis-dream!414
2025-06-09 10:04:10 +00:00
Ovid 997dcd4f4c 加入BB机音效 2025-06-09 18:02:57 +08:00
Ovid 3579459b12 day1mid用回佩佩版本 2025-06-09 17:56:42 +08:00
dingyuntian 20b580d675 Merge branch 'develop' into feature/新对话框 2025-06-09 14:46:27 +08:00
dingyuntian 0e2d2cee07 对话框 2025-06-09 14:43:58 +08:00
dingyuntian 9ae715c71a 地铁 2025-06-08 23:46:23 +08:00
chenziqin e22d9baff7 Merge branch 'feature/DAY1_text_update' into 'develop'
day0day1台本更新

See merge request aibis-dream/aibis-dream!413
2025-06-08 15:45:21 +00:00
Ovid c6c10410bb day0day1台本更新 2025-06-08 23:44:20 +08:00
Ovid 6b07365dce update day0 day1两个梦 2025-06-07 23:36:25 +08:00
dingyuntian e194fb9fbc 对话框配置 2025-06-06 22:58:50 +08:00
dingyuntian 0589ce17e1 对话框风格设置 2025-06-06 14:04:26 +08:00
dingyuntian c195a3bb15 Merge branch 'develop' into feature/新对话框 2025-06-05 22:24:43 +08:00
dingyuntian 3a46dc1142 删除部分图片 2025-06-05 22:20:30 +08:00
dingyuntian 66e5e48876 对话系统 2025-06-05 22:02:26 +08:00
bottlefish 123e60e176 添加音效 2025-06-05 20:26:52 +08:00
chenziqin 6d96508132 Merge branch 'feature/audio-dash_0610' into 'develop'
Feature/audio dash 0610

See merge request aibis-dream/aibis-dream!411
2025-06-05 12:13:59 +00:00
Ovid 3db0fe5c9e mem_fader vol up, update vo 2025-06-05 20:12:20 +08:00
dingyuntian c839eb4c12 Merge branch '6.4.20全流程优化' of ssh://114.67.212.218:2222/aibis-dream/aibis-dream into 6.4.20全流程优化 2025-06-05 16:12:56 +08:00
dingyuntian 9243f4afc6 对话框 2025-06-05 16:12:17 +08:00
dingyuntian 4c031bfa3e 一些本地化修改 2025-06-05 14:34:32 +08:00
bottlefish 8a7341b907 渲染修改 2025-06-05 13:41:17 +08:00
dingyuntian f14cdf90f6 对话框 2025-06-04 21:45:50 +08:00
bottlefish dd03898de0 提交 2025-06-04 21:45:33 +08:00
bottlefish 4048d1f4a8 修复渲染问题 2025-06-04 20:55:25 +08:00
bottlefish cd0b8f4e85 Merge branch '新开头整合5.26' into 'develop'
新开头整合5.26

See merge request aibis-dream/aibis-dream!410
2025-06-04 12:32:12 +00:00
bottlefish ef30ad4b26 Merge branch 'develop' into 新开头整合5.26 2025-06-04 20:30:51 +08:00