Commit Graph
1220 Commits
Author SHA1 Message Date
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
dingyuntian 3ac8f41e52 合并 2025-06-14 20:55:51 +08:00
dingyuntian 662000ab91 提交 2025-06-13 22:43:40 +08:00
dingyuntian 1b1ee53954 合并 2025-06-13 22:23:48 +08:00
dingyuntian deedb9aa5a Merge branch 'develop' into feature/地铁 2025-06-13 22:20:32 +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
dingyuntian 5475b9a34c 美术资源替换 2025-06-13 22:06:14 +08:00
dingyuntian 63fa19266c Merge branch 'develop' into bugfix/小调整 2025-06-13 16:24:45 +08:00
dingyuntian 83d103871c 对话框调整 2025-06-13 16:24:38 +08:00
dingyuntian 10d964d3b0 地铁功能新增 2025-06-12 22:40:40 +08:00
chenziqin 95cfc58207 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!447
2025-06-12 10:32:05 +00:00
Ovid c5e282be6c update defib sfx 2025-06-12 18:30:30 +08:00
dingyuntian 29b5a5779e 气泡丢失 2025-06-12 14:47:58 +08:00
dingyuntian 8c367b22fb Update Art Resources.asset 2025-06-12 14:40:42 +08:00
dingyuntian 2c00d8ecff Merge branch 'develop' into 6.11bug修复 2025-06-12 14:36:11 +08:00
dingyuntian 1461a7c796 层级修改 2025-06-12 14:36:04 +08:00
Ovid 879feb00e0 Merge branch 'develop' into feature/czq_0610 2025-06-12 03:53:45 +08:00
chenziqin f2d2d8bf41 Merge branch 'feature/czq_0610' into 'develop'
开头(双关)音频上传

See merge request aibis-dream/aibis-dream!444
2025-06-11 19:53:35 +00:00
Ovid 318318235e 开头(双关)音频上传 2025-06-12 03:51:34 +08:00
bottlefish 7626f9bd48 修复记忆胶片问题 2025-06-12 03:27:07 +08: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
dingyuntian 2784ae99df 相机 2025-06-11 21:59:36 +08:00
bottlefish 65b5866565 提交 2025-06-11 21:58:29 +08:00
dingyuntian 32ecdd1591 Merge branch 'bugfix/bubble' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!441
2025-06-11 11:15:52 +00:00
dingyuntian fe3b907d12 问题修改 2025-06-11 19:15:15 +08:00
Ovid 46082924b4 去掉开头梦的妈妈 2025-06-11 18:47:56 +08:00
Ovid 590e9fd09c Merge branch 'develop' into feature/czq_0610 2025-06-11 18:46:22 +08:00
Ovid 5ac068f1e3 音频优化 2025-06-11 18:41:29 +08: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
dingyuntian 36ef851e15 Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正

See merge request aibis-dream/aibis-dream!438
2025-06-11 09:54:58 +00:00
dingyuntian e6709e621d 选项修改 2025-06-11 17:54:19 +08:00
bottlefish 76ad603b52 找回警告窗口 2025-06-11 17:34:31 +08: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
dingyuntian ae9ce6312b 气泡长度问题 2025-06-11 16:31:24 +08:00
dingyuntian 5eb19999f9 提交 2025-06-11 16:16:44 +08:00
dingyuntian fb0a3565cc 旧资源清理 2025-06-11 16:07:49 +08:00
dingyuntian 8ebcfb5188 问题修改 2025-06-11 14:41:06 +08:00
dingyuntian 2ead6c8241 对话框补回去 2025-06-11 14:07:15 +08:00
dingyuntian d2c897bc1f 问题修改 2025-06-11 13:52:30 +08:00
dingyuntian 12869ac835 Merge branch 'develop' into feature/海浪 2025-06-11 13:12:37 +08:00
dingyuntian 2610f6b3d5 修改 2025-06-11 13:12:04 +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