Commit Graph
1996 Commits
Author SHA1 Message Date
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
Ovid bc294687ad huoshan text 2025-12-15 16:07:08 +08:00
chenziqin 990463db83 Merge branch 'feature/1211build' into 'develop'
Feature/1211build

See merge request aibis-dream/aibis-dream!583
2025-12-12 19:51:46 +00:00
Ovid c8485e98be Merge branch 'develop' into feature/1211build 2025-12-13 03:51:20 +08:00
Ovid 69585a3336 Update 酒吧调酒妹.aseprite 2025-12-13 03:49:51 +08:00
dingyuntian 78838fe220 玩法示例已配置 2025-12-12 23:11:24 +08:00
Ovid 42c7762dd8 拼anim 2025-12-12 21:34:26 +08:00
Ovid 5ee5cf545a 串通 2025-12-12 17:20:12 +08:00
dingyuntian b699d59310 Merge branch 'develop' into feature/配置项相关 2025-12-12 15:41:33 +08:00
dingyuntian 1f8d443884 Update Persistence.unity 2025-12-12 15:34:19 +08:00
chenziqin fbdec8a12e Merge branch 'feature/1201build' into 'develop'
Feature/1201build

See merge request aibis-dream/aibis-dream!582
2025-12-12 07:18:56 +00:00
dingyuntian 7cc41f3562 Merge branch 'develop' into feature/配置项相关 2025-12-12 15:16:11 +08:00
Ovid 73badeddb1 debug 2025-12-12 00:37:41 +08:00
Ovid fb0315c702 上传梦境改 2025-12-12 00:36:42 +08:00
dingyuntian 4ad0714dbf 石头接入 2025-12-11 23:42:41 +08:00
bottlefish bc541625a2 Merge branch '火山继续开发12.8' into 'develop'
火山继续开发12.8

See merge request aibis-dream/aibis-dream!581
2025-12-11 10:29:37 +00:00
bottlefish e3128229ee Merge branch 'develop' into 火山继续开发12.8 2025-12-11 18:29:21 +08:00
bottlefish 8ee256b214 火山流程串联 2025-12-11 18:27:51 +08:00
bottlefish 258fec3fb7 提交,系统构建完成 2025-12-11 01:55:54 +08:00
Ovid 3082f78cb8 temp 2025-12-11 00:01:13 +08:00
bottlefish ec1eeb2f31 提交 2025-12-09 21:42:49 +08:00
dingyuntian c77dfa0ba1 配置 2025-12-09 19:21:59 +08:00
dingyuntian 50989bf825 Merge branch 'feature/方块拼图' into 'develop'
酒吧素材填充

See merge request aibis-dream/aibis-dream!580
2025-12-09 08:14:12 +00:00
dingyuntian 627f88131e 酒吧素材填充 2025-12-09 16:13:32 +08:00
dingyuntian e26a33573d Merge branch 'feature/方块拼图' into 'develop'
Feature/方块拼图

See merge request aibis-dream/aibis-dream!579
2025-12-08 11:56:43 +00:00
dingyuntian c8a091f66f Merge branch 'develop' into feature/方块拼图 2025-12-08 19:55:02 +08:00
dingyuntian 07c9a5ff50 方块拼图完整版 2025-12-08 19:54:35 +08:00
Ovid 90edf64d5b 增加自由探索部分 2025-12-08 04:10:49 +08:00
Ovid 625fb9f5cd Update Day2_night.yarn 2025-12-05 19:31:30 +08:00