Commit Graph
1618 Commits
Author SHA1 Message Date
chenziqin 414d6ec10f Merge branch 'feature/czq_0617' into 'develop'
再试着修下drill,现在只要拿起drill就开始播,开始切就设置is_drill_cutting为1,停设0

See merge request aibis-dream/aibis-dream!480
2025-06-18 10:16:19 +00:00
Ovid 701ed989ef 再试着修下drill,现在只要拿起drill就开始播,开始切就设置is_drill_cutting为1,停设0 2025-06-18 18:15:18 +08:00
chenziqin 9eeb9a8f3b Merge branch 'feature/czq_0617' into 'develop'
修复drill,把is_drill_cutting初始值改为1

See merge request aibis-dream/aibis-dream!479
2025-06-18 09:55:48 +00:00
Ovid 82f20c3f79 修复drill,把is_drill_cutting初始值改为1 2025-06-18 17:55:16 +08:00
chenziqin cb0737d11b Merge branch 'feature/czq_0617' into 'develop'
Merge branch 'develop' into feature/czq_0617

See merge request aibis-dream/aibis-dream!478
2025-06-18 09:03:20 +00:00
Ovid 4055010747 现在drill需要将is_drill_cutting拉到0之后延迟0.9s stop 2025-06-18 17:02:04 +08:00
Ovid 38759629f5 Merge branch 'develop' into feature/czq_0617 2025-06-18 16:55:50 +08:00
chenziqin 1072f22d9a Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!477
2025-06-18 08:55:46 +00:00
Ovid f49d94da1c defib_shock减少延迟 2025-06-18 16:55:15 +08:00
Ovid 8f6024f117 Merge branch 'develop' into feature/czq_0617 2025-06-18 16:43:25 +08:00
chenziqin 938b420197 Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!476
2025-06-18 08:43:10 +00:00
Ovid 800aa29911 defib现在不会自动升高 2025-06-18 16:40:43 +08:00
Ovid cdbe8d4bb9 添加plugpick&plugdrop 2025-06-18 16:15:05 +08:00
dingyuntian 8de9cd5999 Merge branch 'bugfix/peipei2' into 'develop'
Bugfix/peipei2

See merge request aibis-dream/aibis-dream!475
2025-06-18 08:11:45 +00:00
Ovid 1031993f93 添加lightflicker 2025-06-18 15:39:23 +08:00
dingyuntian 55952aa38c 诊疗记录问题 2025-06-18 14:51:51 +08:00
chenziqin 421ba89470 Merge branch 'feature/czq_0617' into 'develop'
开头音频优化

See merge request aibis-dream/aibis-dream!474
2025-06-17 16:52:03 +00:00
Ovid d35a097550 提前一点出地铁声 2025-06-18 00:51:33 +08:00
Ovid 632b15c323 开头音频优化 2025-06-18 00:47:50 +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
dingyuntian 60b08a5167 佩佩2问题修改 2025-06-16 20:53:23 +08:00
dingyuntian b3d75fe056 Merge branch 'bugfix/version' into 'develop'
Bugfix/version

See merge request aibis-dream/aibis-dream!472
Ver.0.3.0.10
2025-06-16 09:55:00 +00:00
dingyuntian 9b7d03e2d0 增加计时器功能 2025-06-16 17:54:16 +08:00
dingyuntian 8d74bb2f2b 版本号更新 2025-06-16 15:47:07 +08:00
dingyuntian eb41646e10 单空格变多空格 2025-06-16 15:31:53 +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
chenziqin 7650e286a7 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!470
2025-06-15 15:59:11 +00:00
Ovid bb106106c2 开头优化 2025-06-15 23:58:22 +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
Ovid 120e40a1ee Merge branch 'develop' into feature/czq_0610 2025-06-15 22:57:55 +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
dingyuntian dade5622c0 Merge branch 'bugfix/version' into 'develop'
Bugfix/version

See merge request aibis-dream/aibis-dream!467
2025-06-15 14:21:48 +00:00
dingyuntian 08b5b03770 问题修改 2025-06-15 22:19:55 +08:00
dingyuntian fe314c2891 Merge branch 'develop' into bugfix/version 2025-06-15 21:46:51 +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
dingyuntian c7cb1a69d1 Merge branch 'develop' into bugfix/version 2025-06-15 21:28:50 +08:00
dingyuntian b68c99a485 Merge branch 'develop' into bugfix/version 2025-06-15 21:28:31 +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
dingyuntian 497a8447d8 美术资源替换 2025-06-15 21:26:55 +08:00
bottlefish ba52bbd828 修改timeline播放方式 2025-06-15 21:26:38 +08:00
dingyuntian 7683f9fc64 Merge branch 'bugfix/version' into 'develop'
Update ProjectSettings.asset

See merge request aibis-dream/aibis-dream!464
2025-06-15 12:40:43 +00:00
dingyuntian 707051e066 Update ProjectSettings.asset 2025-06-15 20:38:29 +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