Commit Graph
2024 Commits
Author SHA1 Message Date
Ovid 3ad37ef229 bugfix 2026-01-03 17:45:04 +08:00
chenziqin c6bbf09175 Merge branch 'feature/d1dream_obj' into 'develop'
d1s obj 添加

See merge request aibis-dream/aibis-dream!607
2026-01-02 21:40:19 +00:00
Ovid 661803427d d1s obj 添加 2026-01-03 05:39:28 +08:00
chenziqin dc4e640595 Merge branch 'feature/fic_adj' into 'develop'
Feature/fic adj

See merge request aibis-dream/aibis-dream!606
2026-01-02 17:01:44 +00:00
Ovid f16afc20a9 debug 2026-01-03 01:01:26 +08:00
Ovid a5d3edca65 Merge branch 'develop' into feature/fic_adj 2026-01-03 01:01:19 +08:00
Ovid 361982921d sfx/mus上传 2026-01-03 00:57:04 +08:00
dingyuntian fb7a3c2b98 Merge branch 'bugfix/1.4优化' into 'develop'
1.4优化

See merge request aibis-dream/aibis-dream!605
2026-01-02 15:19:45 +00:00
dingyuntian 0168b03234 1.4优化
1. 新建梦境专用场景
2. 增加单行对话框,梦境中全程使用该对话框
3. 增加已选择选项标记功能

TODO
1. 增加梦境选择框
2. 为选项增加已选择表现
2026-01-02 23:19:06 +08:00
Ovid 84b8bb7e34 Merge branch 'develop' into feature/fic_adj 2026-01-02 16:36:36 +08:00
chenziqin 6b437918fc Merge branch 'feature/fic_adj' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!604
2026-01-02 07:46:06 +00:00
Ovid 15fcf79198 bugfix 2026-01-02 15:44:49 +08:00
chenziqin 5da97b9bdf Merge branch 'feature/fic_adj' into 'develop'
Feature/fic adj

See merge request aibis-dream/aibis-dream!603
2025-12-31 09:32:10 +00:00
Ovid ae59b44e96 梦调整文本 2025-12-31 17:30:35 +08:00
Ovid ac669694e2 mid直接接sleep 2025-12-31 16:19:08 +08:00
Ovid 668937b06c Merge branch 'develop' into feature/fic_adj 2025-12-31 16:03:20 +08:00
dingyuntian c08a111afd Merge branch 'bugfix/补图' into 'develop'
补图、

See merge request aibis-dream/aibis-dream!602
2025-12-31 07:30:31 +00:00
dingyuntian c540249d68 补图、 2025-12-31 15:29:55 +08:00
Ovid 56b907de31 temp 2025-12-31 01:04:58 +08:00
dingyuntian c2958767e0 Merge branch 'feature/12月资源替换' into 'develop'
Update 酒吧场景.unity

See merge request aibis-dream/aibis-dream!601
2025-12-30 12:55:44 +00:00
dingyuntian 5d9990860f Update 酒吧场景.unity 2025-12-30 20:55:15 +08:00
dingyuntian af5085fb7d Merge branch 'feature/12月资源替换' into 'develop'
12月包美术替换

See merge request aibis-dream/aibis-dream!600
2025-12-30 12:49:50 +00:00
dingyuntian 9959fcf674 Timeline管理器单独拆分 2025-12-30 20:49:17 +08:00
dingyuntian 174dcf522c 12月包美术替换
1. 新增天桥夜晚素材
2. 替换部分梦境图片
3. 增加调酒蒙太奇以及Timeline管理工具
2025-12-30 20:46:27 +08:00
dingyuntian d43c18e57c Merge branch 'bugfix/动画混合树' into 'develop'
酒吧调整

See merge request aibis-dream/aibis-dream!598
2025-12-29 06:08:42 +00:00
dingyuntian 90c814bc1a 酒吧调整 2025-12-29 14:06:55 +08:00
dingyuntian abb82cec15 Merge branch 'feature/签字功能' into 'develop'
Feature/签字功能

See merge request aibis-dream/aibis-dream!597
2025-12-25 14:20:20 +00:00
dingyuntian bc9fbb797b 签字功能恢复 2025-12-25 22:19:50 +08:00
dingyuntian 0d7e5dd102 签字功能 2025-12-25 22:08:33 +08:00
dingyuntian 40756fff95 Merge branch 'develop' into feature/签字功能 2025-12-25 22:02:33 +08:00
dingyuntian 012ba3b5a4 Merge branch 'bugfix/文字动画' into 'develop'
文字弹出效果调整

See merge request aibis-dream/aibis-dream!596
2025-12-25 13:55:26 +00:00
dingyuntian aa995fe60e 文字弹出效果调整 2025-12-25 21:54:50 +08:00
dingyuntian 430e0dd971 Merge branch 'bugfix/屏幕文本逻辑' into 'develop'
问题修复

See merge request aibis-dream/aibis-dream!594
2025-12-23 12:44:24 +00:00
dingyuntian 4025bc61a4 问题修复 2025-12-23 20:43:46 +08:00
dingyuntian 40c6c7124e Merge branch 'bugfix/安卓优化合入' into 'develop'
安卓优化

See merge request aibis-dream/aibis-dream!593
2025-12-22 13:16:25 +00:00
dingyuntian 43cad617af 安卓优化 2025-12-22 21:10:37 +08:00
dingyuntian 0cd5c55789 Merge branch 'feature/石头新系统接入' into 'develop'
Feature/石头新系统接入

See merge request aibis-dream/aibis-dream!589
2025-12-18 08:31:42 +00:00
dingyuntian b2d9613d5f Merge branch 'develop' into feature/石头新系统接入 2025-12-16 21:13:43 +08:00
dingyuntian 012ccea517 石头新系统配置 2025-12-16 20:08:11 +08:00
bottlefish 35561f14df Merge branch '修复梦境主流程bug' into 'develop'
修复梦境主流程bug

See merge request aibis-dream/aibis-dream!588
2025-12-15 13:25:12 +00:00
bottlefish 899146c0e6 提交 2025-12-15 21:23:14 +08:00
bottlefish b861f7c6bf 提交 2025-12-15 21:18:18 +08:00
chenziqin d7be004dd6 Merge branch 'feature/1211build' into 'develop'
Feature/1211build

See merge request aibis-dream/aibis-dream!587
2025-12-15 10:06:52 +00:00
Ovid 15e4edddb7 Merge branch 'develop' into feature/1211build 2025-12-15 18:06:39 +08:00
Ovid ba6de84384 bugfix 2025-12-15 18:05:52 +08:00
Ovid d23c9e8321 调酒妹动画测试上传 2025-12-15 18:01:41 +08:00
bottlefish 4ae11774e0 Merge branch 'bugfix/25.12.15火山bug修复' into 'develop'
修复bug

See merge request aibis-dream/aibis-dream!586
2025-12-15 09:07:17 +00:00
bottlefish 6aea5f89b9 修复bug 2025-12-15 17:06:13 +08:00
Ovid 4d2397a0fa bugfix test 2025-12-15 16:35:02 +08:00
chenziqin 99bb904bc4 Merge branch 'feature/1211build' into 'develop'
huoshan text

See merge request aibis-dream/aibis-dream!585
2025-12-15 08:08:30 +00:00