Commit Graph
1557 Commits
Author SHA1 Message Date
dingyuntian 9cfaf979da Merge branch 'bugfix/小修改' into 'develop'
Bugfix/小修改

See merge request aibis-dream/aibis-dream!458
2025-06-15 08:46:30 +00:00
dingyuntian 89e331af5f Update 医生SMOKE.anim 2025-06-15 15:52:00 +08:00
dingyuntian 6c05a428b6 小修改 2025-06-15 15:51:27 +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
dingyuntian f7669e0e84 Merge branch 'bugfix/合并后测试' into 'develop'
美术资源替换

See merge request aibis-dream/aibis-dream!455
2025-06-14 15:02:12 +00:00
dingyuntian 36643009bb 美术资源替换 2025-06-14 22:59:52 +08:00
dingyuntian c36b36844f Merge branch 'bugfix/合并后测试' into 'develop'
合并

See merge request aibis-dream/aibis-dream!454
2025-06-14 13:50:34 +00:00
dingyuntian cde651f0ff 合并 2025-06-14 21:50:00 +08:00
dingyuntian 89b3d546f9 Merge branch 'feature/地铁' into 'develop'
版本号

See merge request aibis-dream/aibis-dream!453
2025-06-14 13:15:54 +00: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
dingyuntian a7e086a68a 版本号 2025-06-14 21:10:28 +08:00
bottlefish 5746d70125 提交 2025-06-14 21:09:52 +08:00
dingyuntian 22c5af978e Merge branch 'feature/地铁' into 'develop'
Feature/地铁

See merge request aibis-dream/aibis-dream!451
2025-06-14 12:56:48 +00:00
dingyuntian 79f35c0f41 Merge branch 'develop' into feature/地铁 2025-06-14 20:56:14 +08:00
dingyuntian 3ac8f41e52 合并 2025-06-14 20:55:51 +08:00
dingyuntian 7118eb038b Merge branch 'feature/地铁' into 'develop'
Feature/地铁

See merge request aibis-dream/aibis-dream!450
2025-06-13 14:44:57 +00: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 ce8303cc87 Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整

See merge request aibis-dream/aibis-dream!448
2025-06-13 08:28:03 +00: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 338e593c4d Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整

See merge request aibis-dream/aibis-dream!446
2025-06-12 06:51:08 +00: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 de0b708d06 Merge branch '6.11bug修复' into 'develop'
6.11bug修复

See merge request aibis-dream/aibis-dream!445
2025-06-12 06:37:24 +00: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 09c6e5cd25 Merge branch 'develop' into feature/czq_0610 2025-06-12 13:51:37 +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 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