Commit Graph
100 Commits
Author SHA1 Message Date
dingyuntian dd994fc912 Merge branch 'feature/石头完善' into 'develop'
feat(blockpuzzle): 重构方块交互事件并支持点击拖拽模式切换

See merge request aibis-dream/aibis-dream!630
2026-02-28 10:05:32 +00:00
dingyuntian 443a1bd0a8 chore: 添加拆分提交流程命令并补齐TimelineKit元数据
Made-with: Cursor
2026-02-28 15:56:04 +08:00
dingyuntian f8394fd59d docs: 添加提交规范并更新仓库协作说明
Made-with: Cursor
2026-02-28 15:55:44 +08:00
dingyuntian 19c290091e refactor: 移除SpriteGroupKit并清理诊疗旧指令
Made-with: Cursor
2026-02-28 15:55:29 +08:00
dingyuntian cf0a6696c8 art(blockpuzzle): 更新引擎组件动画与层级表现
Made-with: Cursor
2026-02-28 15:55:10 +08:00
dingyuntian b5a5e853a7 scene(blockpuzzle): 调整拼图测试场景与预制体交互参数
Made-with: Cursor
2026-02-28 15:54:50 +08:00
dingyuntian 756a04213f feat(blockpuzzle): 重构方块交互事件并支持点击拖拽模式切换
Made-with: Cursor
2026-02-28 15:54:26 +08:00
dingyuntian 2e83515f6d Merge branch 'feature/石头完善' into 'develop'
Feature/石头完善

See merge request aibis-dream/aibis-dream!629
2026-02-26 11:04:49 +00:00
dingyuntian 8f24bfce61 Update README_TimelineKit.md 2026-02-26 19:04:09 +08:00
dingyuntian 1b072f875f timeline工具 2026-02-26 19:01:28 +08:00
dingyuntian ba6326616c Merge branch 'bugfix/交互系统锁定功能' into 'develop'
Update EventSystemEx.cs

See merge request aibis-dream/aibis-dream!627
2026-02-26 07:51:59 +00:00
dingyuntian 8e25d779c8 Update EventSystemEx.cs 2026-02-26 15:45:58 +08:00
dingyuntian b6d19e8a8c Timeline工具 2026-02-26 15:42:27 +08:00
dingyuntian 67b830b50f 资源分组调整 2026-02-26 14:14:44 +08:00
dingyuntian 2f6abce552 临时提交一下 2026-02-26 13:47:39 +08:00
dingyuntian 5555b0c361 Merge branch '火山头部美术替换' into feature/石头完善 2026-02-25 20:49:34 +08:00
dingyuntian 7273a37e76 石头手感调整 2026-02-11 21:04:26 +08:00
dingyuntian 35add10992 Merge branch '火山头部美术替换' into 'develop'
火山头部替换

See merge request aibis-dream/aibis-dream!625
2026-02-11 09:44:41 +00:00
dingyuntian ae276152dd 火山头部替换 2026-02-11 17:39:27 +08:00
dingyuntian 3de32fa91c 短按改长按 2026-02-11 17:28:58 +08:00
dingyuntian 71ee3d8b57 时间切换 2026-02-09 21:52:47 +08:00
dingyuntian 2746a672ab Merge branch 'feature/英理更新' into 'develop'
英理资产更新

See merge request aibis-dream/aibis-dream!622
2026-02-09 06:43:47 +00:00
dingyuntian 2c7cefadd2 英理资产更新 2026-02-09 14:43:06 +08:00
dingyuntian 6d4f6d3f9f 石头完善 2026-02-09 14:40:41 +08:00
dingyuntian 906aa86f13 时间流转 2026-02-08 22:29:44 +08:00
dingyuntian ef8893ce97 时间流转 2026-02-08 21:48:16 +08:00
dingyuntian 7fedffa764 带测试代码,可跑,问题待修改 2026-02-05 22:37:38 +08:00
dingyuntian 1d1ea4488c 初版石头功能可用 2026-02-04 23:53:16 +08:00
dingyuntian b054e2ee86 侧边栏配置 2026-02-04 16:04:46 +08:00
dingyuntian 2109610194 灯光部分修正 2026-02-03 20:49:52 +08:00
dingyuntian ec629982be 石头维修美术替换 2026-02-03 20:23:17 +08:00
dingyuntian 0c04085749 美术资源替换 2026-02-02 16:04:32 +08:00
dingyuntian 40bf50ed45 Merge branch 'bugfix/佩佩动画微调' into 'develop'
Bugfix/佩佩动画微调

See merge request aibis-dream/aibis-dream!621
2026-01-28 08:32:21 +00:00
dingyuntian 1637304121 Merge branch 'feature/佩佩更新' into develop 2026-01-28 16:29:41 +08:00
dingyuntian 7d7e2fcdf0 屏幕问题 2026-01-28 16:20:19 +08:00
dingyuntian 7464cd8b6c 更新 2026-01-22 18:16:11 +08:00
dingyuntian f2fe6fbf04 组装 2026-01-11 21:26:52 +08:00
dingyuntian 179a971629 编辑器完善 2026-01-08 14:00:08 +08:00
dingyuntian bba4f96175 Merge branch 'feature/动画改进' into 'develop'
Feature/动画改进

See merge request aibis-dream/aibis-dream!615
2026-01-06 10:58:12 +00:00
dingyuntian e5a72a33b1 动画工具 2026-01-06 18:51:59 +08:00
dingyuntian d31146a164 动画序列控制器 2026-01-05 20:49:01 +08:00
dingyuntian 19a1ff9ab3 Merge branch 'develop' into feature/动画改进 2026-01-05 14:31:16 +08:00
dingyuntian 5da498bd34 Merge branch 'bugfix/梦境起床' into 'develop'
Bugfix/梦境起床

See merge request aibis-dream/aibis-dream!614
2026-01-04 13:24:58 +00:00
dingyuntian 5bcce1f325 打包后 2026-01-04 21:21:44 +08:00
dingyuntian 309b65da88 Merge branch 'develop' into bugfix/梦境起床 2026-01-04 21:10:49 +08:00
dingyuntian 22e49c29c1 细节调整 2026-01-04 21:10:38 +08:00
dingyuntian 05d3ae2a8a Merge branch 'bugfix/1.4优化' into 'develop'
问题修复

See merge request aibis-dream/aibis-dream!612
2026-01-04 07:40:30 +00:00
dingyuntian 8ab73ca5a9 问题修复
增加单行的选项界面
2026-01-04 15:39:20 +08:00
dingyuntian 974e026264 新选项 2026-01-04 14:44:23 +08:00
dingyuntian c2897127de Merge branch 'bugfix/1.4优化' into 'develop'
问题修复

See merge request aibis-dream/aibis-dream!608
2026-01-03 09:42:08 +00:00
dingyuntian 24d23b29d1 问题修复
1. CenterText效果异常修复
2. 部分气泡宽度不合预期修复
3. 删除切割日志
2026-01-03 17:40:11 +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
dingyuntian 7c63d38a4e 状态机尝试 2025-12-31 17:35:31 +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
dingyuntian 3e3efcd713 动画测试 2025-12-31 15:26:51 +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
dingyuntian 78838fe220 玩法示例已配置 2025-12-12 23:11:24 +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
dingyuntian 7cc41f3562 Merge branch 'develop' into feature/配置项相关 2025-12-12 15:16:11 +08:00
dingyuntian 4ad0714dbf 石头接入 2025-12-11 23:42:41 +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
dingyuntian 6ca3e4a60f 吸附功能 2025-12-01 20:44:20 +08:00
dingyuntian 4f1002e64b 方块系统 2025-11-28 21:37:11 +08:00
dingyuntian 32242ce4a1 Merge branch 'feature/变量打印' into 'develop'
添加变量打印功能

See merge request aibis-dream/aibis-dream!572
2025-11-27 14:44:53 +00:00
dingyuntian 2316143300 添加变量打印功能 2025-11-27 22:44:20 +08:00
dingyuntian 10b95d0da9 背包系统实现 2025-11-27 21:12:11 +08:00
dingyuntian a6ead432e3 Merge branch 'build/11.19' into 'develop'
Update languageTest.unity

See merge request aibis-dream/aibis-dream!571
2025-11-27 10:17:47 +00:00
dingyuntian cda6ff46a2 Merge branch 'develop' into build/11.19 2025-11-27 18:17:05 +08:00
dingyuntian 06a68cda8e 方块拼图 2025-11-27 18:14:24 +08:00
dingyuntian cf1a7aac4b Merge branch 'bugfix/音频' into 'develop'
问题修复

See merge request aibis-dream/aibis-dream!570
2025-11-21 17:01:39 +00:00
dingyuntian 76809a829e 网格功能 2025-11-20 18:07:15 +08:00
dingyuntian 7ba61cda00 部分问题修改 2025-11-20 15:35:11 +08:00
dingyuntian 7912de9384 Merge branch 'pack' into 'develop'
Ver.0.3.3.3

See merge request aibis-dream/aibis-dream!569
2025-11-19 13:07:16 +00:00