Commit Graph
100 Commits
Author SHA1 Message Date
bottlefish a33dd71f9a 提交 2025-06-20 12:21:44 +08:00
bottlefish 06859f0c9f Merge branch '6.18音频接入' into 'develop'
6.18音频接入

See merge request aibis-dream/aibis-dream!483
2025-06-18 11:22:55 +00:00
bottlefish 4eb1c70402 提交 2025-06-18 19:21:35 +08:00
bottlefish 40777eb750 Merge branch 'develop' into 6.18音频接入 2025-06-18 19:07:46 +08:00
bottlefish 0200c43008 Merge branch 'develop' into 6.18音频接入 2025-06-18 18:48:37 +08:00
bottlefish df2b784868 Merge branch 'develop' into 6.18音频接入 2025-06-18 18:27:24 +08:00
bottlefish f4bd6d204b Merge branch 'develop' into 6.18音频接入 2025-06-18 17:56:37 +08:00
bottlefish 45d052c9b1 Merge branch 'develop' into 6.18音频接入 2025-06-18 17:10:20 +08:00
bottlefish 3478026944 添加音效 2025-06-18 17:08:32 +08:00
bottlefish 1dadc15169 Merge branch '打包' into 'develop'
修复指令错误

See merge request aibis-dream/aibis-dream!473
2025-06-17 11:16:57 +00:00
bottlefish f279668136 Merge branch 'develop' into 打包 2025-06-17 19:16:34 +08:00
bottlefish 51b5bc9ef8 修复指令错误 2025-06-16 13:12:39 +08:00
bottlefish baeb678d91 Merge branch '修复佩佩表情问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!471
2025-06-16 04:43:37 +00:00
bottlefish 6aafd412a7 提交 2025-06-16 12:41:29 +08:00
bottlefish bb4a99d50d Merge branch '6.15打包前最后优化' into 'develop'
timeline对齐音频

See merge request aibis-dream/aibis-dream!469
2025-06-15 15:25:11 +00:00
bottlefish 7584d61582 timeline对齐音频 2025-06-15 23:24:31 +08:00
bottlefish 698975735e Merge branch '6.15打包前最后优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!468
2025-06-15 14:32:13 +00:00
bottlefish 68e81c71be 提交 2025-06-15 22:31:43 +08:00
bottlefish 8739d77f78 Merge branch '6.15.21小bug修复' into 'develop'
提交

See merge request aibis-dream/aibis-dream!466
2025-06-15 13:45:58 +00:00
bottlefish 7b034479af 提交 2025-06-15 21:45:37 +08:00
bottlefish 5f99d591fc Merge branch '修复timeline打包问题' into 'develop'
修改timeline播放方式

See merge request aibis-dream/aibis-dream!465
2025-06-15 13:27:26 +00:00
bottlefish ba52bbd828 修改timeline播放方式 2025-06-15 21:26:38 +08:00
bottlefish e41522fab2 Merge branch '修复timeline打包问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!463
2025-06-15 12:24:11 +00:00
bottlefish 1f37808e5a 提交 2025-06-15 20:23:37 +08:00
bottlefish 1adfae9fc2 Merge branch '修复timeline打包问题' into 'develop'
修复timeline打包问题

See merge request aibis-dream/aibis-dream!462
2025-06-15 12:06:34 +00:00
bottlefish c2f071de81 修正timeline问题 2025-06-15 20:05:44 +08:00
bottlefish e727f0adb3 提交log 2025-06-15 18:47:05 +08:00
bottlefish aa15c5e2ea Merge branch '调整地铁timeline' into 'develop'
提交

See merge request aibis-dream/aibis-dream!461
2025-06-15 09:59:15 +00:00
bottlefish deb2dc84b2 提交 2025-06-15 17:58:24 +08:00
bottlefish feafc3f09f Merge branch '6.15.16-优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!459
2025-06-15 09:15:56 +00:00
bottlefish a819278503 Merge branch 'develop' into 6.15.16-优化 2025-06-15 17:15:34 +08:00
bottlefish 6ce4838a48 提交 2025-06-15 17:02:44 +08:00
bottlefish e97ed10849 Merge branch '6.15优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!457
2025-06-15 07:50:33 +00:00
bottlefish f525a48c42 提交 2025-06-15 15:49:50 +08:00
bottlefish 8de4647ce2 Merge branch '6.14.21修复和优化' into 'develop'
6.14.21修复和优化

See merge request aibis-dream/aibis-dream!456
2025-06-15 06:23:06 +00:00
bottlefish 3985773809 Merge branch 'develop' into 6.14.21修复和优化 2025-06-15 14:22:50 +08:00
bottlefish 03338b0f3f 提交 2025-06-15 14:21:39 +08:00
bottlefish e3ae4a64a8 提交 2025-06-15 13:50:48 +08:00
bottlefish bb59a8f4ac Merge branch '6.14优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!452
2025-06-14 13:14:11 +00:00
bottlefish 62d72d487e Merge branch 'develop' into 6.14优化 2025-06-14 21:13:41 +08:00
bottlefish 5746d70125 提交 2025-06-14 21:09:52 +08:00
bottlefish c9391248bc Merge branch '6.13维修崩溃部分优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!449
2025-06-13 14:16:06 +00:00
bottlefish 6606e792f1 提交 2025-06-13 22:13:07 +08:00
bottlefish 94821cf2e9 Merge branch '6.12.03优化和修复' into 'develop'
修复记忆胶片问题

See merge request aibis-dream/aibis-dream!443
2025-06-11 19:28:42 +00:00
bottlefish 7626f9bd48 修复记忆胶片问题 2025-06-12 03:27:07 +08:00
bottlefish 2f87aadfe6 Merge branch '6.11bug修复' into 'develop'
6.11bug修复

See merge request aibis-dream/aibis-dream!442
2025-06-11 18:38:22 +00:00
bottlefish 79252946b2 提交 2025-06-12 02:37:37 +08:00
bottlefish aede60a0a3 提交 2025-06-11 22:57:31 +08:00
bottlefish 109f25ba8f 修复UICamera问题 2025-06-11 22:07:47 +08:00
bottlefish 65b5866565 提交 2025-06-11 21:58:29 +08:00
bottlefish 94e39396a7 Merge branch '6.11优化' into 'develop'
6.11优化

See merge request aibis-dream/aibis-dream!439
2025-06-11 10:22:30 +00:00
bottlefish 4a1fcae515 提交 2025-06-11 18:21:17 +08:00
bottlefish db8847af70 Merge branch 'develop' into 6.11优化 2025-06-11 18:00:03 +08:00
bottlefish 76ad603b52 找回警告窗口 2025-06-11 17:34:31 +08:00
bottlefish 56baa0fd4e Merge branch '6.4.20全流程优化' into 'develop'
6.4.20全流程优化

See merge request aibis-dream/aibis-dream!437
2025-06-11 08:45:38 +00:00
bottlefish eded0a8621 Merge branch 'develop' into 6.4.20全流程优化 2025-06-11 16:43:59 +08:00
bottlefish 49e9e814a1 提交 2025-06-11 16:40:45 +08:00
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
bottlefish a72c9f95c6 提交 2025-06-10 23:10:36 +08:00
bottlefish 825179906f Merge branch 'develop' into 优化6.10.21 2025-06-10 22:21:39 +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
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
bottlefish 510d607343 Merge branch 'develop' into 全流程6.10.15 2025-06-10 16:03:56 +08:00
bottlefish f08e6449e8 Merge branch 'develop' into 全流程6.10.15 2025-06-10 15:48:05 +08:00
bottlefish a5f8784d56 去掉测试指令 2025-06-10 15:30:52 +08:00
bottlefish 07c40c4420 Merge branch 'develop' into 6.4.20全流程优化 2025-06-10 14:37:21 +08:00
bottlefish dfad412e8c Merge branch 'develop' of http://114.67.212.218:8011/aibis-dream/aibis-dream into develop 2025-06-09 11:42:22 +08:00
bottlefish 7ae0acf0ac 提交 2025-06-06 20:13:37 +08:00
bottlefish 123e60e176 添加音效 2025-06-05 20:26:52 +08:00
bottlefish 8a7341b907 渲染修改 2025-06-05 13:41:17 +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
bottlefish 8ecf1f3c9a 提交 2025-06-04 20:27:27 +08:00
bottlefish b53b639d7b 提交 2025-06-04 16:33:04 +08:00
bottlefish d93e9b186e 提交 2025-06-04 16:13:47 +08:00
bottlefish c8b0f8b375 提交 2025-06-03 21:50:35 +08:00
bottlefish 5bd103ceec 提交 2025-05-30 18:47:02 +08:00
bottlefish c1c3413639 修bug 2025-05-30 18:01:13 +08:00
bottlefish 64ac24ca5e 插线提交 2025-05-30 17:47:02 +08:00
bottlefish 73fd121052 处理plug和线缆以及几个bug 2025-05-30 15:13:06 +08:00
bottlefish bdb514fc46 通了一版 2025-05-30 11:31:59 +08:00
bottlefish 262ffad009 通了一版 2025-05-29 16:31:57 +08:00
bottlefish 2610c769d9 提交 2025-05-29 15:27:49 +08:00
bottlefish 08a377724b 基本齐全了 2025-05-29 13:59:11 +08:00
bottlefish 31e8ae41be 提交 2025-05-27 21:16:58 +08:00
bottlefish f23affbabd 提交 2025-05-27 19:20:03 +08:00
bottlefish b28044f602 提交 2025-05-27 18:18:41 +08:00
bottlefish ebf9dd0237 提交 2025-05-26 15:40:53 +08:00
bottlefish b603f4986f Merge branch '开头优化5.16.15.51' into 'develop'
开头优化5.16.15.51

See merge request aibis-dream/aibis-dream!403
2025-05-26 05:06:58 +00:00
bottlefish 8c3ae43975 Merge branch 'develop' into 开头优化5.16.15.51 2025-05-26 13:06:36 +08:00
bottlefish aeca4b7ee6 提交 2025-05-23 22:57:35 +08:00
bottlefish 75ba953134 提交 2025-05-23 22:07:20 +08:00
bottlefish e60a938319 补充提交 2025-05-22 19:02:51 +08:00
bottlefish c54db1085e 提交破碎效果 2025-05-22 19:00:40 +08:00