Commit Graph
853 Commits
Author SHA1 Message Date
dingyuntian eae34b7d6e 合并 2025-02-21 02:01:39 +08:00
dingyuntian 934c1d96df Merge branch 'develop' into feature/spritegroup 2025-02-21 00:37:05 +08:00
dingyuntian 76d2332c2c 自动生成 2025-02-21 00:37:00 +08:00
chenziqin 24a890e577 Merge branch 'feature/Yarn_0219' into 'develop'
Feature/yarn 0219

See merge request aibis-dream/aibis-dream!251
2025-02-20 16:36:25 +00:00
Ovid 7c1df6cda9 Merge branch 'develop' into feature/Yarn_0219 2025-02-21 00:35:15 +08:00
Ovid 990c53389f shitou2_eyetext_fix 2025-02-21 00:33:10 +08:00
dingyuntian 13e0db49fd Merge branch 'develop' into feature/spritegroup 2025-02-21 00:31:29 +08:00
Ovid adeea6cfda music fix 2025-02-21 00:31:05 +08:00
dingyuntian e199a98666 Merge branch 'bugfix/shitouscene' into 'develop'
Bugfix/shitouscene

See merge request aibis-dream/aibis-dream!249
2025-02-20 16:24:29 +00:00
dingyuntian 65c5c6d32d 全屏展示图片 2025-02-21 00:23:55 +08:00
dingyuntian 6cedae4d07 scene 2025-02-21 00:14:59 +08:00
dingyuntian 9ee1c48083 Kit 2025-02-21 00:06:45 +08:00
chenziqin 8f3d205016 Merge branch 'feature/Yarn_0219' into 'develop'
+music

See merge request aibis-dream/aibis-dream!248
2025-02-20 14:23:30 +00:00
Ovid fc1ca9543e +music 2025-02-20 22:22:53 +08:00
chenziqin 4ac53dd89d Merge branch 'feature/Yarn_0219' into 'develop'
+peipei2analyze

See merge request aibis-dream/aibis-dream!247
2025-02-20 12:31:57 +00:00
Ovid ba2c675f6b +peipei2analyze 2025-02-20 20:31:17 +08:00
dingyuntian a70b05737c Merge branch 'bugfix/timeline' into 'develop'
修改

See merge request aibis-dream/aibis-dream!246
2025-02-20 11:54:59 +00:00
dingyuntian 9b04f250e4 修改 2025-02-20 19:52:00 +08:00
chenziqin 40a76d7b52 Merge branch 'feature/Yarn_0219' into 'develop'
+peipei1analyze

See merge request aibis-dream/aibis-dream!245
2025-02-20 10:56:13 +00:00
Ovid fb0a075d94 +peipei1analyze 2025-02-20 18:55:09 +08:00
bottlefish 58bf374958 Merge branch 'bugfix2.20' into 'develop'
修复

See merge request aibis-dream/aibis-dream!244
2025-02-20 08:33:43 +00:00
bottlefish 7b7933e9b2 修复 2025-02-20 16:12:23 +08:00
chenziqin 113526aaba Merge branch 'feature/Yarn_0219' into 'develop'
+task

See merge request aibis-dream/aibis-dream!242
2025-02-19 18:17:05 +00:00
Ovid 9d2e4247a0 +task 2025-02-20 02:15:34 +08:00
dingyuntian 4edffabe0e Merge branch 'bugfix/timeline' into 'develop'
Bugfix/timeline

See merge request aibis-dream/aibis-dream!241
2025-02-19 17:40:39 +00:00
dingyuntian 9b4c0ddfeb 美术替换 2025-02-20 01:40:04 +08:00
dingyuntian 7c27fbc7b4 Merge branch 'develop' into bugfix/timeline 2025-02-20 00:55:56 +08:00
dingyuntian 543ecf49b1 美术资源替换 2025-02-20 00:55:14 +08:00
bottlefish be2fb7d992 Merge branch '视觉UF检查RGB值' into 'develop'
增加RGB值

See merge request aibis-dream/aibis-dream!240
2025-02-19 13:20:51 +00:00
chenziqin b7d6a9f35e Merge branch 'feature/yarn_0219' into 'develop'
自测yarn

See merge request aibis-dream/aibis-dream!239
2025-02-19 13:19:23 +00:00
Ovid b5db9b8b44 自测yarn 2025-02-19 21:18:13 +08:00
bottlefish 20893f337c 增加RGB值 2025-02-19 17:48:17 +08:00
bottlefish 33c28c7469 Merge branch 'feature/插线相关调整' into 'develop'
Feature/插线相关调整

See merge request aibis-dream/aibis-dream!238
2025-02-19 09:27:41 +00:00
bottlefish 430ab63f5c 插头修改提交 2025-02-19 17:25:37 +08:00
bottlefish 722a3013ab Merge branch 'develop' into feature/插线相关调整 2025-02-19 14:30:43 +08:00
bottlefish 10455608af 提交 2025-02-19 14:30:13 +08:00
dingyuntian e8cfa0fce4 Merge branch 'bugfix/timeline' into 'develop'
Bugfix/timeline

See merge request aibis-dream/aibis-dream!237
2025-02-17 03:35:47 +00:00
dingyuntian 9874a8b41f timeline 2025-02-17 11:34:51 +08:00
dingyuntian e5a6610637 Merge branch 'bugfix/old' into bugfix/timeline 2025-02-17 11:28:28 +08:00
dingyuntian 12baf16e53 timeline 2025-02-17 11:27:55 +08:00
bottlefish 57a6b4ba9d Merge branch 'bugfix2.17' into 'develop'
暂时修复阻碍bug

See merge request aibis-dream/aibis-dream!236
2025-02-17 02:07:09 +00:00
bottlefish 3e59ccc71e 暂时修复阻碍bug 2025-02-17 10:06:06 +08:00
dingyuntian c0e354856c Merge branch 'feature/screen' into 'develop'
Feature/screen

See merge request aibis-dream/aibis-dream!235
2025-02-15 08:00:18 +00:00
dingyuntian e0e103287e 新屏幕 2025-02-15 15:49:42 +08:00
dingyuntian 56c4d81539 Merge branch 'develop' into feature/screen 2025-02-15 15:29:43 +08:00
dingyuntian fbea809af3 Update Box.prefab 2025-02-15 15:25:43 +08:00
dingyuntian 5166b15b96 对话框 2025-02-15 14:15:33 +08:00
chenziqin 2741dfa45e Merge branch 'yarn_0216' into 'develop'
Yarn 0216

See merge request aibis-dream/aibis-dream!234
2025-02-15 01:35:11 +00:00
Ovid ea4d116a21 Merge branch 'develop' into yarn_0216 2025-02-15 09:32:50 +08:00
Ovid 6a2e25966e yarn edit 2025-02-15 09:25:31 +08:00