Commit Graph
1475 Commits
Author SHA1 Message Date
bottlefish 8e86014717 Merge branch '修复佩佩场景配置问题' into 'develop'
修复佩佩场景配置问题

See merge request aibis-dream/aibis-dream!432
2025-06-11 05:08:36 +00:00
bottlefish 04adb252a6 调整timeline 2025-06-11 13:07:11 +08:00
bottlefish 0ae9b57dbb 去除遗留的测试指令 2025-06-11 12:19:49 +08:00
chenziqin df1410c230 Merge branch 'feature/czq_0610' into 'develop'
序章优化

See merge request aibis-dream/aibis-dream!431
2025-06-10 16:37:15 +00:00
Ovid 137291469b 序章优化 2025-06-11 00:36:16 +08:00
chenziqin d64d70bd95 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!430
2025-06-10 16:32:50 +00:00
Ovid 6b8c3fb589 开头梦节奏优化 2025-06-11 00:31:30 +08:00
bottlefish a72c9f95c6 提交 2025-06-10 23:10:36 +08:00
dingyuntian 8143e6c447 Merge branch 'feature/海浪' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!429
2025-06-10 14:58:00 +00:00
dingyuntian f0bd5920e5 问题修改 2025-06-10 22:57:10 +08:00
Ovid c11b1f2252 Merge branch 'develop' into feature/czq_0610 2025-06-10 22:34:53 +08:00
dingyuntian 96171407dc Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!428
2025-06-10 14:27:51 +00:00
dingyuntian 6e5d68a18d Merge remote-tracking branch 'origin/优化6.10.21' into feature/海浪 2025-06-10 22:26:08 +08:00
dingyuntian 6866723746 2025-06-10 22:25:35 +08:00
bottlefish 825179906f Merge branch 'develop' into 优化6.10.21 2025-06-10 22:21:39 +08:00
dingyuntian f80e3823b6 Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!427
2025-06-10 14:21:28 +00:00
dingyuntian d00c668681 Merge branch 'develop' into feature/海浪 2025-06-10 22:20:49 +08:00
bottlefish 3e72c1744e Merge branch 'develop' into 优化6.10.21 2025-06-10 22:20:45 +08:00
bottlefish b7c7db9204 提交 2025-06-10 22:20:09 +08:00
dingyuntian 83d606cf1f 问题调整 2025-06-10 22:19:48 +08:00
Ovid b7ef1b6ef6 Merge branch 'develop' into feature/czq_0610 2025-06-10 21:49:25 +08:00
chenziqin 47ca2dcebb Merge branch 'feature/czq_0610' into 'develop'
上传drill音效

See merge request aibis-dream/aibis-dream!426
2025-06-10 13:49:20 +00:00
chenziqin f30c0de856 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!425
2025-06-10 13:43:19 +00:00
Ovid 837635a1f9 上传drill音效 2025-06-10 21:42:28 +08:00
dingyuntian 9ef261b8c1 Merge branch 'develop' into feature/海浪 2025-06-10 18:53:52 +08:00
dingyuntian 95c25a0f85 Merge branch '全流程6.10.15' into 'develop'
气泡

See merge request aibis-dream/aibis-dream!424
2025-06-10 10:52:14 +00:00
dingyuntian 2ab6004d8f 气泡 2025-06-10 18:49:40 +08:00
Ovid f76dbd6aeb Merge branch 'develop' into feature/czq_0610 2025-06-10 17:39:03 +08:00
dingyuntian 890d06d66d Merge branch '全流程6.10.15' into 'develop'
全流程6.10.15

See merge request aibis-dream/aibis-dream!423
2025-06-10 09:35:01 +00:00
dingyuntian 38f93d5695 Update Stage2-5_切割.yarn 2025-06-10 17:33:29 +08:00
Ovid e4da61cace VO修正:提高音量,修改YL音频,修改HS的EQ不那么刺耳 2025-06-10 17:26:51 +08:00
dingyuntian 7d76a275e5 新Dialog 2025-06-10 17:11:10 +08:00
bottlefish 6c5b265852 海浪部分整合 2025-06-10 16:58:24 +08:00
bottlefish 88ba60fda1 Merge branch 'develop' into 全流程6.10.15 2025-06-10 16:33:56 +08:00
dingyuntian 37f0d93c28 Merge branch 'feature/海浪' into 'develop'
海浪

See merge request aibis-dream/aibis-dream!422
2025-06-10 08:32:47 +00:00
dingyuntian 2cab2c3b64 海浪 2025-06-10 16:30:26 +08:00
bottlefish 510d607343 Merge branch 'develop' into 全流程6.10.15 2025-06-10 16:03:56 +08:00
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
bottlefish f08e6449e8 Merge branch 'develop' into 全流程6.10.15 2025-06-10 15:48:05 +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
bottlefish a5f8784d56 去掉测试指令 2025-06-10 15:30:52 +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