Compare commits

..
Author SHA1 Message Date
Ovid 4fa14075ba day1b更新 2026-02-13 18:45:10 +08:00
Ovid f039d5a8e7 上传新D2S 2026-02-09 20:21:32 +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 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
bottlefish 1687dc781e Merge branch '火山web原型' into 'develop'
火山web原型

See merge request aibis-dream/aibis-dream!620
2026-01-13 11:23:01 +00:00
bottlefish 5ea28074e0 Merge branch 'develop' of http://114.67.212.218:8011/aibis-dream/aibis-dream into develop 2026-01-13 19:20:18 +08:00
bottlefish 16c7563566 提交web原型存档 2026-01-13 19:20:06 +08:00
chenziqin 3eb56900ce Merge branch 'feature/d2s' into 'develop'
开头加fadeout

See merge request aibis-dream/aibis-dream!619
2026-01-13 09:50:49 +00:00
Ovid 10d8e01700 开头加fadeout 2026-01-13 17:50:13 +08:00
chenziqin 00cd21478e Merge branch 'feature/d2s' into 'develop'
Feature/d2s

See merge request aibis-dream/aibis-dream!618
2026-01-13 09:34:42 +00:00
Ovid 9e76775ad8 bugfix 2026-01-13 17:34:06 +08:00
Ovid f8233e8b92 loc update 2026-01-13 17:31:26 +08:00
Ovid af81e885fc Merge branch 'develop' into feature/d2s 2026-01-12 19:13:12 +08:00
Ovid 6be1277fe6 png update 2026-01-12 19:12:40 +08:00
chenziqin 1c57e78ff6 Merge branch 'feature/d2s' into 'develop'
d2s update

See merge request aibis-dream/aibis-dream!616
2026-01-11 20:02:20 +00:00
Ovid 0c436cda0e d2s update 2026-01-12 04:01:35 +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
chenziqin c4790923ec Merge branch 'feature/text_adj' into 'develop'
text adj

See merge request aibis-dream/aibis-dream!613
2026-01-04 12:00:08 +00:00
Ovid 206787a827 text adj 2026-01-04 19:59:36 +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
chenziqin ad9d875e65 Merge branch 'd1s-debug' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!611
2026-01-03 11:00:27 +00:00
Ovid 8039ce51b8 bugfix 2026-01-03 19:00:02 +08:00
chenziqin c5ce1e1e58 Merge branch 'd1s-debug' into 'develop'
星空到海浪

See merge request aibis-dream/aibis-dream!610
2026-01-03 10:12:05 +00:00
Ovid e337c77cd3 星空到海浪 2026-01-03 18:11:07 +08:00
chenziqin 1ff03076bc Merge branch 'd1s-debug' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!609
2026-01-03 09:48:45 +00:00
Ovid a855b86612 Merge branch 'develop' into d1s-debug 2026-01-03 17:46:44 +08:00
Ovid 3ad37ef229 bugfix 2026-01-03 17:45:04 +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
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
dingyuntian 7c63d38a4e 状态机尝试 2025-12-31 17:35:31 +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
dingyuntian 3e3efcd713 动画测试 2025-12-31 15:26:51 +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
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
bottlefish fa8f6895f2 Merge branch '火山流程继续开发11.27' into 'develop'
火山流程继续开发11.27

See merge request aibis-dream/aibis-dream!578
2025-12-04 12:40:17 +00:00
bottlefish 778952b413 Merge branch 'develop' into 火山流程继续开发11.27 2025-12-04 20:39:53 +08:00
bottlefish f1c2c5a1ee 提交 2025-12-04 20:38:02 +08:00
dingyuntian 6ca3e4a60f 吸附功能 2025-12-01 20:44:20 +08:00
Ovid 266cad1ccb Update Day2_night.yarn 2025-12-01 18:09:46 +08:00
Ovid 92c8706307 day2fic 2025-12-01 13:43:33 +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
bottlefish 3290f9a270 修复错误 2025-11-27 21:27:42 +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
Yuntien 5f2d07d496 问题修复
1. 自动模式下无法手动点击跳过
2. 部分情况下鼠标指针错误
3. 版本号现在可在主界面显示
4. 增加展会版本计时器功能
5. Demo结束时打开结尾UI
2025-11-22 01:00:53 +08:00
Yuntien 2f234b4a0c 问题修复 2025-11-21 05:36:09 +08:00
Ovid 4f7d8c2603 连通从火山到day2night 2025-11-20 21:44:17 +08: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
chenziqin b8d08733d0 Merge branch 'feature/fic_gts1' into 'build/11.19'
Feature/fic gts1

See merge request aibis-dream/aibis-dream!568
2025-11-19 13:06:22 +00:00
Ovid 06988e9695 Merge remote-tracking branch 'origin/build/11.19' into feature/fic_gts1 2025-11-19 21:05:33 +08:00
dingyuntian 6edd8b096c Ver.0.3.3.3 2025-11-19 21:04:38 +08:00
Ovid 62d828914d 不知道改了啥 2025-11-19 21:04:01 +08:00
Ovid f9c36fc722 串通DAY1 2025-11-19 21:02:20 +08:00
dingyuntian cf1d020b99 签字功能完成 2025-11-19 15:08:08 +08:00
Ovid 44ae3bef42 bugfix 2025-11-18 20:52:58 +08:00
bottlefish 9f3229e97a Merge branch '11.18火山流程合入' into build/11.19 2025-11-18 20:51:21 +08:00
dingyuntian 3f328c1b74 签名 2025-11-18 20:49:28 +08:00
bottlefish 68e87dc6e8 火山流程合入 2025-11-18 20:48:13 +08:00
dingyuntian 080246982f Merge branch 'bugfix/跳字' into 'develop'
Update ConstRef.cs

See merge request aibis-dream/aibis-dream!566
2025-11-18 12:20:07 +00:00
dingyuntian 5b0adad41f Update ConstRef.cs 2025-11-18 20:19:16 +08:00
dingyuntian c9d1acdbc1 Update ConstRef.cs 2025-11-18 20:15:15 +08:00
dingyuntian b853d1382b 签字 2025-11-18 20:07:45 +08:00
bottlefish 8add0f18f8 Merge branch '火山语言模块原型制作' into 11.18火山流程合入 2025-11-18 16:36:04 +08:00
bottlefish 8b0df7eccf 提交yarn 2025-11-18 16:35:02 +08:00
dingyuntian b4a6a8d342 Merge branch 'build' into 'develop'
Ver.0.3.3.2

See merge request aibis-dream/aibis-dream!565
2025-11-18 08:16:54 +00:00
dingyuntian b7061692d6 Ver.0.3.3.2 2025-11-18 16:16:10 +08:00
chenziqin 658ee2e9c6 Merge branch 'feature/volume调整' into 'develop'
Feature/volume调整

See merge request aibis-dream/aibis-dream!564
2025-11-18 07:10:40 +00:00
Ovid 3de5bbdc6f Merge branch 'develop' of http://114.67.212.218:8011/aibis-dream/aibis-dream into develop 2025-11-18 14:51:15 +08:00
Ovid d976952b37 全局音量提高20个dB,drill简单重调EQ 2025-11-18 14:46:20 +08:00
dingyuntian a3c360f437 Merge branch 'develop' into feature/签字功能 2025-11-18 13:50:30 +08:00
dingyuntian 0a77641d6d Merge branch 'build' into 'develop'
版本号更新

See merge request aibis-dream/aibis-dream!563
2025-11-17 15:00:38 +00:00
dingyuntian c16bbe6e6d 版本号更新 2025-11-17 23:00:11 +08:00
bottlefish 5dc31bc905 Merge branch 'weplay版本bug修复' into 'develop'
Weplay版本bug修复

See merge request aibis-dream/aibis-dream!562
2025-11-17 14:29:14 +00:00
bottlefish c21e2fd0b2 Merge branch 'develop' of http://114.67.212.218:8011/aibis-dream/aibis-dream into develop 2025-11-17 22:27:27 +08:00
bottlefish 110419635f 小问题修复,优化切割手感 2025-11-17 22:27:13 +08:00
dingyuntian 668dd84362 Merge branch 'bugfix/weplay问题修复' into 'develop'
Update CutLine.playable

See merge request aibis-dream/aibis-dream!561
2025-11-17 14:07:51 +00:00
dingyuntian eb2b166b14 Update CutLine.playable 2025-11-17 22:00:21 +08:00
dingyuntian 4f26677980 Merge branch 'bugfix/weplay问题修复' into 'develop'
Update setting.json

See merge request aibis-dream/aibis-dream!560
2025-11-17 13:22:40 +00:00
dingyuntian b2eb91f99a Update setting.json 2025-11-17 21:19:17 +08:00
bottlefish 65463b8f64 表达模块接入
去除旧的火山表达模块玩法,接入新的表达模块玩法
2025-11-17 21:07:58 +08:00
dingyuntian bf368e5aa7 Merge branch 'feature/TextUpdate' into 'develop'
Feature/text update

See merge request aibis-dream/aibis-dream!559
2025-11-17 12:43:45 +00:00
dingyuntian c1aa8ebe01 鼠标指针问题修复 2025-11-17 20:42:47 +08:00
dingyuntian 69ba967065 Merge branch 'develop' into feature/TextUpdate 2025-11-17 17:44:33 +08:00
dingyuntian 777e0b98ac Merge branch 'feature/美术资源替换' into 'develop'
Feature/美术资源替换

See merge request aibis-dream/aibis-dream!558
2025-11-17 09:30:48 +00:00
dingyuntian f36ebb4b67 美术替换完成 2025-11-17 17:29:06 +08:00
dingyuntian dc58b2e719 签字功能实现 2025-11-17 16:23:41 +08:00
bottlefish 392fe80ebd Update languageTest.unity
效果更新
2025-11-15 22:10:36 +08:00
dingyuntian f693734b72 素材替换问题处理完毕 2025-11-15 21:34:02 +08:00
dingyuntian 6465835444 小问题调整 2025-11-15 18:54:48 +08:00
dingyuntian de32c54ecd 托盘 2025-11-14 23:06:07 +08:00
dingyuntian 22e06c1b47 美术替换基本完成 2025-11-14 22:54:41 +08:00
Ovid f0584a8563 首次跑起来 2025-11-14 19:38:30 +08:00
bottlefish 6bbd0612c2 更新效果 2025-11-14 18:19:00 +08:00
dingyuntian f77049ed1c 主维修场景替换完成 2025-11-14 17:11:59 +08:00
dingyuntian 13c165b208 主维修场景更新 2025-11-14 17:07:28 +08:00
Ovid 346b9065e1 gts1首次提交 2025-11-13 21:02:28 +08:00
bottlefish c2d2c87fbe 提交新的效果 2025-11-13 20:30:13 +08:00
dingyuntian 32b152fd1c 温控器素材替换 2025-11-13 15:54:24 +08:00
dingyuntian 007ce78844 温控器像素化 2025-11-13 15:52:00 +08:00
dingyuntian ef260e5d43 文本系统重做完成 2025-11-12 20:00:18 +08:00
bottlefish 8cf629b1c6 语言模块基础迭代 2025-11-12 19:46:16 +08:00
dingyuntian 845ac9cc27 合并 2025-11-11 21:07:02 +08:00
dingyuntian 98d86a4aed 提交 2025-11-07 17:01:39 +08:00
dingyuntian 20b0b1444a 提交 2025-11-06 18:41:52 +08:00
dingyuntian b10e641105 更新 2025-11-05 23:59:55 +08:00
bottlefish a634d92b9c 初步尝试 2025-11-03 18:24:38 +08:00
dingyuntian 80b26ade3b 对话系统第一次修改 2025-10-23 21:30:31 +08:00
dingyuntian 9fafd91ea5 指针 2025-10-16 18:30:55 +08:00
dingyuntian b15a27cdb7 文字 2025-10-16 16:19:59 +08:00
dingyuntian 577b5c7080 Merge branch 'feature/TextUpdate' into 'develop'
文字动画改为逐字显示

See merge request aibis-dream/aibis-dream!557
2025-10-16 07:44:34 +00:00
dingyuntian 15493a3e0d 文字动画改为逐字动画 2025-10-16 15:38:23 +08:00
dingyuntian 3e343f61fa Merge branch 'feature/scroll' into 'develop'
Feature/scroll

See merge request aibis-dream/aibis-dream!555
2025-09-23 07:51:34 +00:00
dingyuntian 7f36a9e28f Ver.0.3.2.23 2025-09-23 15:50:54 +08:00
dingyuntian efcc1aea6c 设置界面和记录界面修复 2025-09-22 19:45:38 +08:00
dingyuntian 8512be13b2 Merge branch 'develop' into feature/scroll 2025-09-22 19:41:39 +08:00
dingyuntian 541dfdc6b2 新对话记录 2025-09-19 20:50:09 +08:00
dingyuntian 644f530304 Merge branch 'bugfix/setting' into feature/scroll 2025-09-16 17:22:16 +08:00
dingyuntian bd1cf171c2 Merge branch 'bugfix/setting' into 'develop'
区域性调整

See merge request aibis-dream/aibis-dream!554
2025-09-16 09:19:45 +00:00
dingyuntian 7bd0ac998e 区域性调整
解决在德语法语等区设置不可用的问题
2025-09-16 17:18:46 +08:00
dingyuntian 60e1b72edc 滚动列表 2025-09-16 17:13:21 +08:00
dingyuntian 2558cdb560 Merge branch 'bugfi/resource_clean' into 'develop'
Bugfi/resource clean

See merge request aibis-dream/aibis-dream!553
2025-09-08 13:30:10 +00:00
dingyuntian e94f66f205 Ver.0.3.2.19 2025-09-08 21:29:16 +08:00
dingyuntian 58862136ed Merge remote-tracking branch 'origin/develop' into bugfi/resource_clean 2025-09-08 18:55:52 +08:00
bottlefish 622e746274 Merge branch '修复台词错误' into 'develop'
修复台词错误

See merge request aibis-dream/aibis-dream!552
2025-09-08 10:52:32 +00:00
bottlefish 56d70232f1 提交 2025-09-08 18:50:45 +08:00
dingyuntian b07a2efc25 分辨率和UI问题修复 2025-09-08 18:00:46 +08:00
bottlefish 0040af2bdd 提交 2025-09-08 17:42:26 +08:00
zhouziqian 8e9e5178f1 石头像素立绘和诊室门口医生更新 2025-09-07 17:24:29 +08:00
zhouziqian d42b000367 Update 佩佩像素版-通用动画.aseprite 2025-09-06 14:39:54 +08:00
dingyuntian be91190c47 废弃资源 2025-09-04 17:39:09 +08:00
dingyuntian 53cf454294 Merge branch 'bugfix/黑边' into 'develop'
Bugfix/黑边

See merge request aibis-dream/aibis-dream!550
2025-09-04 07:31:24 +00:00
dingyuntian 178338af66 问题修复 2025-09-04 15:29:44 +08:00
dingyuntian 056f739a61 Merge branch 'develop' into bugfix/黑边 2025-09-04 15:04:11 +08:00
bottlefish 7d7b82beb0 Merge branch 'Debug/修复英文问卷链接' into 'develop'
Debug/修复英文问卷链接

See merge request aibis-dream/aibis-dream!549
2025-09-04 06:49:50 +00:00
bottlefish 969af52a17 提交 2025-09-04 14:49:17 +08:00
bottlefish 8cfb0004a5 提交 2025-09-04 14:40:23 +08:00
dingyuntian 3eb30d6aec 黑边修复 2025-09-03 20:01:54 +08:00
bottlefish becc66df36 Merge branch 'Debug/0903playtest修复' into 'develop'
Debug/0903playtest修复

See merge request aibis-dream/aibis-dream!548
2025-09-03 10:58:14 +00:00
bottlefish 9c5344ed94 修复07后面文字丢失的问题 2025-09-03 18:44:15 +08:00
bottlefish a7a3998687 修复一系列问题 2025-09-03 18:39:27 +08:00
dingyuntian 2f13e68968 Merge branch 'bugfix/动画替换时保留loop选项' into 'develop'
Bugfix/动画替换时保留loop选项

See merge request aibis-dream/aibis-dream!547
2025-09-03 10:04:33 +00:00
dingyuntian ecc699564f Merge branch 'develop' into bugfix/动画替换时保留loop选项 2025-09-03 18:03:14 +08:00
dingyuntian 1e3c42b974 动画替换时保留LoopTime 2025-09-03 18:02:22 +08:00
chenziqin 7f68e6822f Merge branch 'bugfix/ppemo' into 'develop'
Bugfix/ppemo

See merge request aibis-dream/aibis-dream!546
2025-09-03 09:58:32 +00:00
Ovid 0ffda5d6ac 微调文本(无增删 2025-09-03 17:57:09 +08:00
Ovid e9faeb4fb9 pp剧情动画取消循环 2025-09-03 17:48:31 +08:00
dingyuntian 1d3cdb2fca Update StorageSystem.cs 2025-09-02 17:53:29 +08:00
dingyuntian b956cffdff Merge branch 'bugfix/为playtest小修' into 'develop'
Bugfix/为playtest小修

See merge request aibis-dream/aibis-dream!545
2025-09-02 08:01:41 +00:00
dingyuntian 62d3ebf6ae 问题修复 2025-09-02 15:56:53 +08:00
Yuntien a08290e50c 去重 2025-09-02 05:05:05 +08:00
bottlefish e789b22d2a Merge branch 'bugfix/为playtest小修' of http://114.67.212.218:8011/aibis-dream/aibis-dream into bugfix/为playtest小修 2025-09-02 04:51:09 +08:00
bottlefish e94641235f 提交 2025-09-02 04:50:05 +08:00
Yuntien 161e3194ac Merge branch 'bugfix/为playtest小修' of http://114.67.212.218:8011/aibis-dream/aibis-dream into bugfix/为playtest小修 2025-09-02 04:42:26 +08:00
Yuntien 623c91a2ab 本地化 2025-09-02 04:40:47 +08:00
bottlefish 9213457067 修复英文问题,添加遗漏本地化 2025-09-02 04:38:54 +08:00
bottlefish 63d531e527 提交 2025-09-02 03:59:20 +08:00
bottlefish 4c4ce99e02 提交 2025-09-02 03:07:30 +08:00
bottlefish 977bc30e61 修改 2025-09-02 02:42:14 +08:00
bottlefish 013fd31476 提交 2025-09-02 02:36:33 +08:00
chenziqin 111c143fdf Merge branch 'feature/临时音乐替换' into 'develop'
PP音乐替换临时

See merge request aibis-dream/aibis-dream!544
2025-09-01 18:19:53 +00:00
dingyuntian 8dfe4f9614 Merge branch 'bugfix/level' into 'develop'
Bugfix/level

See merge request aibis-dream/aibis-dream!543
2025-09-01 18:15:59 +00:00
Ovid 1d76a0f530 PP音乐替换临时 2025-09-02 02:15:19 +08:00
Yuntien d474569561 UI 2025-09-02 02:13:54 +08:00
Yuntien 3b3018d57a Merge branch 'develop' of http://114.67.212.218:8011/aibis-dream/aibis-dream into develop 2025-09-02 02:05:55 +08:00
Yuntien cf3be54a6c prefab 2025-09-02 02:05:18 +08:00
bottlefish 22e2d9c050 Merge branch '确认playtest相关链接' into 'develop'
提交

See merge request aibis-dream/aibis-dream!542
2025-09-01 18:04:19 +00:00
bottlefish b66667bf88 Merge branch 'develop' into 确认playtest相关链接 2025-09-02 02:03:34 +08:00
bottlefish 42bf9e97aa 提交 2025-09-02 01:26:29 +08:00
dingyuntian 42c7a9e9d8 Merge branch 'feature/存档功能更新' into 'develop'
Feature/存档功能更新

See merge request aibis-dream/aibis-dream!541
2025-09-01 14:03:42 +00:00
dingyuntian 0b9ca103a8 Merge branch 'develop' into feature/存档功能更新 2025-09-01 22:01:53 +08:00
dingyuntian 1f6d573b13 合并 2025-09-01 21:58:50 +08:00
bottlefish a7b3084668 Merge branch 'Debug/crash问题检查' into 'develop'
提交

See merge request aibis-dream/aibis-dream!540
2025-09-01 13:27:27 +00:00
bottlefish 6a32cc3f24 提交 2025-09-01 21:25:54 +08:00
chenziqin f9c8bba4b2 Merge branch 'feature/yingli1fp' into 'develop'
Feature/yingli1fp

See merge request aibis-dream/aibis-dream!539
2025-08-25 00:47:53 +00:00
Ovid 11f027ff15 更新剧情 2025-08-25 08:46:29 +08:00
Ovid 6c85521c8d Merge branch 'develop' into feature/yingli1fp 2025-08-20 21:10:49 +08:00
dingyuntian f1d06949ca Merge branch 'bugfix/打地鼠回调' into 'develop'
打地鼠回调

See merge request aibis-dream/aibis-dream!538
2025-08-20 12:47:18 +00:00
dingyuntian 00c7124b93 打地鼠回调 2025-08-20 20:46:18 +08:00
dingyuntian e71ea15242 存档 2025-08-20 20:32:04 +08:00
dingyuntian 724efb883f Merge branch 'bugfix/UI小修改' into 'develop'
Bugfix/ui小修改

See merge request aibis-dream/aibis-dream!537
2025-08-20 06:05:55 +00:00
dingyuntian ded24da791 石头美术资源替换 2025-08-20 14:04:32 +08:00
dingyuntian f1fa0a5a33 石头功能重置 2025-08-19 20:45:12 +08:00
Ovid 579f190807 英理玩法合并 2025-08-15 19:22:51 +08:00
dingyuntian 2dda5e9e6b Merge branch 'bugfix/UI小修改' into 'develop'
本地化问题修复

See merge request aibis-dream/aibis-dream!536
2025-08-13 09:09:17 +00:00
dingyuntian b458219336 本地化问题修复 2025-08-13 16:59:51 +08:00
dingyuntian f51b4f31c6 Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!535
2025-08-13 07:01:27 +00:00
dingyuntian fca58603f0 其他变化 2025-08-13 14:59:33 +08:00
dingyuntian 1ed9ef5595 Merge branch 'develop' into feature/yingli 2025-08-13 14:57:13 +08:00
dingyuntian 0e41999c54 英理玩法 2025-08-13 14:54:13 +08:00
dingyuntian 7f7283a1d6 Merge branch 'bugfiox/options' into 'develop'
选项不可用时UI界面不呈现

See merge request aibis-dream/aibis-dream!534
2025-08-12 09:44:12 +00:00
dingyuntian 47ab1014e5 可选 2025-08-12 17:42:37 +08:00
dingyuntian 4d5abff7d8 英理问题 2025-08-12 17:33:05 +08:00
dingyuntian be809b9f8b Merge branch 'bugfix/actor' into 'develop'
actormanager修改

See merge request aibis-dream/aibis-dream!533
2025-08-12 07:24:51 +00:00
dingyuntian 54084d6277 actormanager修改 2025-08-12 15:22:33 +08:00
dingyuntian 9369c1a369 Update SubWay.unity 2025-08-11 19:51:33 +08:00
dingyuntian d2210e5387 右上角游戏 2025-08-11 19:34:53 +08:00
dingyuntian f1aeeb6bf3 验证码功能 2025-08-08 12:36:25 +08:00
dingyuntian a9b64e7d9d Merge branch 'bugfix/master' into 'develop'
Bugfix/master

See merge request aibis-dream/aibis-dream!531
2025-08-06 08:10:59 +00:00
dingyuntian 4b64c1adb9 Merge branch 'develop' into bugfix/master 2025-08-06 16:10:09 +08:00
dingyuntian a9b98e388e Ver.0.3.1.3 2025-08-06 16:00:26 +08:00
dingyuntian c07242fb6a 验证码 2025-08-06 14:59:33 +08:00
dingyuntian 106fc165ba 0.3.1.2打包 2025-08-06 12:46:58 +08:00
chenziqin 39c6dc9bf1 Merge branch 'feature/重刷81包本地化' into 'develop'
重刷81包新增yarn本地化

See merge request aibis-dream/aibis-dream!530
2025-08-05 13:25:08 +00:00
Ovid 350203723d 重刷81包新增yarn本地化 2025-08-05 21:23:11 +08:00
dingyuntian 910242abd2 齿轮控制 2025-08-05 21:06:40 +08:00
dingyuntian 18d95f855e 英理 2025-08-05 14:36:28 +08:00
chenziqin 20ec008568 Merge branch 'feature/yingli1fic' into 'develop'
Feature/yingli1fic

See merge request aibis-dream/aibis-dream!528
2025-08-04 11:31:22 +00:00
Ovid ce5ac26174 81包全串通 2025-08-04 19:30:23 +08:00
dingyuntian 3923cb0e9a Merge branch 'bugfix/shitou' into 'develop'
Update ExpressFixScene.unity

See merge request aibis-dream/aibis-dream!522
2025-08-04 06:27:14 +00:00
dingyuntian 14ca1bf8d8 Update ExpressFixScene.unity 2025-08-04 14:23:36 +08:00
dingyuntian bc3108867b 合并 2025-08-04 13:20:22 +08:00
Ovid e5969a5151 上传DAY1-4 2025-08-02 21:20:16 +08:00
Ovid 8b789da446 Merge branch 'develop' into feature/yingli1fic 2025-08-02 18:02:30 +08:00
dingyuntian 4a881b2a53 Update CameraKit.cs 2025-08-01 17:33:06 +08:00
dingyuntian 336a909b7c 分拣 2025-08-01 17:11:10 +08:00
Ovid f84159aa8e bug 2025-08-01 17:09:26 +08:00
dingyuntian 01c5b1fda3 Merge branch 'feature/yingli' into 'develop'
英理打地鼠功能

See merge request aibis-dream/aibis-dream!521
2025-08-01 07:26:53 +00:00
dingyuntian 11ab2d04bd Merge branch 'develop' into feature/yingli 2025-08-01 15:26:16 +08:00
dingyuntian 171bae4663 打地鼠重置 2025-08-01 15:18:12 +08:00
Ovid 2013dd41e0 yingli1 2025-07-25 19:28:47 +08:00
Ovid 06770f567c Merge branch 'develop' into feature/yingli1fic 2025-07-25 15:46:25 +08:00
Ovid fcd9292164 stage2对话补完 2025-07-24 18:30:22 +08:00
dingyuntian 3c2128f709 Merge branch 'bugfix/merge' into 'develop'
Bugfix/merge

See merge request aibis-dream/aibis-dream!518
2025-07-24 09:15:54 +00:00
dingyuntian e13988d4c9 合并 2025-07-24 17:13:35 +08:00
dingyuntian fe63f99d02 Merge remote-tracking branch 'origin/保底全流程包' into develop 2025-07-24 17:12:36 +08:00
dingyuntian f883c502f7 随机触发 2025-07-24 17:10:39 +08:00
Ovid 9bd67dfa86 Merge branch 'develop' into feature/yingli1fic 2025-07-24 16:34:14 +08:00
Ovid 93eef68beb 暂存 2025-07-24 16:33:03 +08:00
Ovid d8eb9770a2 没做完不知道改了啥 2025-07-23 19:45:40 +08:00
dingyuntian 7eda71e153 Merge branch 'feature/yingli' into 'develop'
结果

See merge request aibis-dream/aibis-dream!517
2025-07-23 11:44:14 +00:00
dingyuntian 085366f836 结果 2025-07-23 19:43:45 +08:00
dingyuntian eb73b38110 Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!516
2025-07-23 11:40:06 +00:00
dingyuntian ec7c7a8356 英理功能增加 2025-07-23 19:37:24 +08:00
dingyuntian 37d6dbf254 英理测试 2025-07-23 15:37:07 +08:00
bottlefish 34fe52fc2f 提交 2025-07-21 15:55:16 +08:00
chenziqin f85c73c57f Merge branch 'feature/huoshan1fic' into 'develop'
debugdebugdebugdebug

See merge request aibis-dream/aibis-dream!515
2025-07-18 14:56:20 +00:00
Ovid d5258c8315 debugdebugdebugdebug 2025-07-18 22:53:21 +08:00
chenziqin b4ac76355e Merge branch 'feature/huoshan1fic' into 'develop'
+localization

See merge request aibis-dream/aibis-dream!514
2025-07-18 13:55:24 +00:00
Ovid 79eee45019 +localization 2025-07-18 21:54:15 +08:00
chenziqin 343ffe8283 Merge branch 'feature/huoshan1fic' into 'develop'
debug

See merge request aibis-dream/aibis-dream!513
2025-07-18 13:41:31 +00:00
Ovid ef38d5aaa9 debug 2025-07-18 21:39:53 +08:00
chenziqin 6675fff982 Merge branch 'feature/huoshan1fic' into 'develop'
Feature/huoshan1fic

See merge request aibis-dream/aibis-dream!512
2025-07-18 13:27:23 +00:00
Ovid eec76cb0b1 +表情,debug 2025-07-18 21:26:21 +08:00
chenziqin 88572dd62d Merge branch 'develop' into 'feature/huoshan1fic'
Develop

See merge request aibis-dream/aibis-dream!511
2025-07-18 11:34:55 +00:00
dingyuntian d2c644fa6e Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!510
2025-07-18 11:33:48 +00:00
dingyuntian 23e2a5c741 火山临时 2025-07-18 19:32:27 +08:00
Ovid 8463d9caa8 huoshan1fic 2025-07-18 19:32:14 +08:00
dingyuntian 27eec345f6 添加火山PSB版 2025-07-18 19:23:53 +08:00
dingyuntian 6ecde1fa8a Merge branch 'develop' into feature/yingli 2025-07-18 19:18:51 +08:00
Ovid 65d79d8b8e 提交火山fic 2025-07-18 18:44:53 +08:00
Ovid 9324f928ba debugshitou2 2025-07-15 21:13:45 +08:00
Ovid 3d1c072687 Merge branch '保底全流程包' of http://114.67.212.218:8011/aibis-dream/aibis-dream into 保底全流程包 2025-07-15 21:11:21 +08:00
Ovid e218dbc547 配置shitou2peipei3表情、shitoupeipei的ta全改它、去掉小机体的说法改为小小的机体 2025-07-15 21:10:40 +08:00
bottlefish 7aebe851af 提交石头修改 2025-07-15 17:42:33 +08:00
bottlefish 77470d42ce 修改结尾 2025-07-15 16:20:59 +08:00
bottlefish 18f52c317e 跑通!并且可以八倍速跑通! 2025-07-15 16:05:13 +08:00
bottlefish 2a18f7dc8b 提交 2025-07-15 11:02:32 +08:00
bottlefish c27bb3258f 回退下 2025-07-14 22:55:38 +08:00
bottlefish 9274281fcb 回复下 2025-07-14 22:50:10 +08:00
bottlefish ed067faad6 提交 2025-07-14 22:35:28 +08:00
bottlefish 594e3c5ceb 修复day3本地化问题,修复天气问题 2025-07-14 21:39:17 +08:00
bottlefish b8512ddaa3 再次尝试稳定快速模式 2025-07-14 20:30:15 +08:00
bottlefish 02ed2fb7aa 试图修复快进模式卡流程的问题 2025-07-14 19:46:24 +08:00
bottlefish 1fa92e420c 修复各种问题来串通流程 2025-07-14 18:45:21 +08:00
dingyuntian d235885235 打地鼠 序列配置 2025-07-11 16:04:51 +08:00
bottlefish 15f90e2e73 Merge branch '火山适配最新系统' into 'develop'
修复火山的系统

See merge request aibis-dream/aibis-dream!509
2025-07-10 09:09:37 +00:00
bottlefish cd928081d2 修复火山的系统 2025-07-09 18:30:14 +08:00
bottlefish 21624e64c0 提交,串通佩佩Day3 2025-07-09 17:40:41 +08:00
bottlefish 0bcc682c3c Merge branch '补充必要的本地化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!508
2025-07-09 07:56:08 +00:00
bottlefish 91520974e5 提交 2025-07-09 15:42:45 +08:00
chenziqin 22cf6a1622 Merge branch 'huoshan1打包成通用模板' into 'develop'
Huoshan1打包成通用模板

See merge request aibis-dream/aibis-dream!507
2025-07-08 12:10:22 +00:00
Ovid 59b605ae45 huoshan1fiction未完成但是打了模板 2025-07-08 20:09:40 +08:00
dingyuntian 491a9980cf Merge branch 'feature/animator' into 'develop'
动画片段匹配工具

See merge request aibis-dream/aibis-dream!504
2025-07-08 07:23:27 +00:00
dingyuntian 2fcb97d1bc 合并 2025-07-08 15:22:34 +08:00
dingyuntian 66930dbe17 Merge branch 'develop' into feature/animator 2025-07-08 15:18:21 +08:00
dingyuntian 637d9de6d2 动画片段匹配工具 2025-07-08 15:16:31 +08:00
bottlefish d4fd1f3d65 Merge branch '修复本地化问题' into 'develop'
修复本地化问题

See merge request aibis-dream/aibis-dream!503
2025-06-26 13:02:58 +00:00
bottlefish 14089f66be 提交 2025-06-26 21:02:29 +08:00
bottlefish 578387269a Merge branch 'develop' into 修复本地化问题 2025-06-26 19:36:47 +08:00
chenziqin 852b73049b Merge branch 'bugfix/emobugs' into 'develop'
Bugfix/emobugs

See merge request aibis-dream/aibis-dream!502
2025-06-26 11:35:43 +00:00
Ovid 7a6f633804 bugfix: 通用动画的结束时间看起来过长 2025-06-26 19:34:23 +08:00
Ovid 51b11f2ef6 bugfix: 通用动画的结束时间看起来过长 2025-06-26 19:34:03 +08:00
Ovid ad515f1db9 bugfix: 表情错乱、同时有多个呼吸机声音、peipei1结尾海浪收的太突兀 2025-06-26 19:26:59 +08:00
bottlefish c08aedd573 Merge branch 'develop' into 修复本地化问题 2025-06-26 19:21:30 +08:00
dingyuntian 3c0fc60391 Merge branch 'bugfix/screen' into 'develop'
Update GameManager.cs

See merge request aibis-dream/aibis-dream!501
2025-06-26 11:20:14 +00:00
Yuntien ce2ad56255 Update GameManager.cs 2025-06-26 19:18:12 +08:00
bottlefish 4d5295e057 上传diymid修复 2025-06-26 19:14:58 +08:00
bottlefish aedba82e69 Merge branch '打包6.26' into 'develop'
打包6.26

See merge request aibis-dream/aibis-dream!500
2025-06-26 10:16:49 +00:00
bottlefish dead40d875 提交打包信息 2025-06-26 18:16:04 +08:00
bottlefish cbc08105da Merge branch 'develop' into 打包6.26 2025-06-26 18:04:11 +08:00
bottlefish 3df0365d10 提交打包信息和bug修复 2025-06-26 18:03:18 +08:00
chenziqin 7d3e152815 Merge branch 'bugfix/emergencyLevel' into 'develop'
peipei1设置emergencyLevel=0

See merge request aibis-dream/aibis-dream!499
2025-06-26 10:00:20 +00:00
Ovid da2b439b37 peipei1设置emergencyLevel=0 2025-06-26 17:57:41 +08:00
dingyuntian 971904f1f3 Merge branch 'bugfix/clue' into 'develop'
生成器问题

See merge request aibis-dream/aibis-dream!498
2025-06-26 09:24:03 +00:00
Yuntien 6334b9406d 生成器问题 2025-06-26 17:22:18 +08:00
chenziqin fd1df3e812 Merge branch 'feature/text_bugfixes' into 'develop'
bugfixes

See merge request aibis-dream/aibis-dream!497
2025-06-26 09:09:09 +00:00
Ovid 9066a55095 bugfixes 2025-06-26 17:08:16 +08:00
bottlefish e7c5419fde Merge branch '修复音频bug' into 'develop'
修复音频bug

See merge request aibis-dream/aibis-dream!496
2025-06-26 08:44:47 +00:00
bottlefish f9807d06d2 暂时把拉条音频停掉 2025-06-26 16:43:42 +08:00
bottlefish 3ab633a736 Merge branch 'develop' into 修复音频bug 2025-06-26 14:39:53 +08:00
bottlefish 24773dbc56 提交 2025-06-26 14:20:15 +08:00
dingyuntian c85e6a1895 Merge branch 'bugfix/clue' into 'develop'
Bugfix/clue

See merge request aibis-dream/aibis-dream!495
2025-06-26 04:27:41 +00:00
Yuntien 5f1734cbdb 售货机替换 2025-06-26 12:24:49 +08:00
Yuntien ef2d6c29a5 Update Persistence.unity 2025-06-25 23:42:16 +08:00
chenziqin 0344c1c5c4 Merge branch 'feature/佩佩表情替换' into 'develop'
Feature/佩佩表情替换

See merge request aibis-dream/aibis-dream!494
2025-06-25 12:17:55 +00:00
Ovid 89b7ce3807 文本微调 2025-06-25 20:17:10 +08:00
Ovid a28a58f32e 台词br wait等的处理 2025-06-25 20:05:11 +08:00
Ovid af6c1acc0f 佩佩微调文本 2025-06-24 20:12:23 +08:00
dingyuntian 226f56a860 Merge branch 'bugfix/624' into 'develop'
打包

See merge request aibis-dream/aibis-dream!493
2025-06-24 11:01:12 +00:00
dingyuntian f82e2cd105 打包 2025-06-24 19:00:33 +08:00
dingyuntian fadfd5a401 Merge branch 'bugfix/地铁资产替换' into 'develop'
Bugfix/地铁资产替换

See merge request aibis-dream/aibis-dream!492
2025-06-24 07:12:03 +00:00
dingyuntian 17134c1ae4 Update Center.yarn 2025-06-24 14:53:33 +08:00
dingyuntian 05a4f21133 问题修复 2025-06-24 14:28:18 +08:00
Ovid 534a5aa24a 佩佩表情配置 2025-06-23 20:10:04 +08:00
Ovid 71bdd451fb 配置佩佩表情 2025-06-23 19:58:48 +08:00
dingyuntian 33bba18691 美术素材更新 2025-06-23 17:33:25 +08:00
bottlefish 8ca121f9de Merge branch '修复佩佩day2的问题' into 'develop'
修复佩佩day2的问题

See merge request aibis-dream/aibis-dream!491
2025-06-23 07:19:41 +00:00
bottlefish e147e5f1a5 Merge branch 'develop' into 修复佩佩day2的问题 2025-06-23 15:19:20 +08:00
dingyuntian bf04f5ce82 Merge branch 'develop' into feature/佩佩表情替换 2025-06-20 17:21:48 +08:00
dingyuntian 8b058e5d8d 对话框微调 2025-06-20 17:18:21 +08:00
Ovid f4e3a85867 anim test 2025-06-20 16:46:19 +08:00
Ovid 9e42f1b346 Merge branch 'feature/佩佩表情替换' of http://114.67.212.218:8011/aibis-dream/aibis-dream into feature/佩佩表情替换 2025-06-20 15:47:58 +08:00
dingyuntian f6c7700a14 相机注册错误 2025-06-20 15:15:13 +08:00
bottlefish aef498daa9 提交 2025-06-20 14:43:25 +08:00
dingyuntian 0ddf3478cf Merge branch 'bugfix/图太糊' into 'develop'
素材修改

See merge request aibis-dream/aibis-dream!490
2025-06-20 05:52:04 +00:00
dingyuntian af963efc61 素材修改 2025-06-20 13:47:07 +08:00
bottlefish a33dd71f9a 提交 2025-06-20 12:21:44 +08:00
Ovid eb0e43ac2a 上传佩佩表情配置和yarn标记 2025-06-19 21:28:06 +08:00
dingyuntian 1059a92147 佩佩 2025-06-19 15:48:19 +08:00
dingyuntian b6bb76bffe 佩佩动画 2025-06-19 14:34:17 +08:00
bottlefish 8a7c9dc0a5 Merge branch '6.19打包' into 'develop'
提交打包信息

See merge request aibis-dream/aibis-dream!489
2025-06-19 04:44:55 +00:00
bottlefish 57009e439e 提交打包信息 2025-06-19 12:35:07 +08:00
chenziqin 001b4056ee Merge branch 'feature/czq_0617' into 'develop'
prologueEnding上传

See merge request aibis-dream/aibis-dream!488
2025-06-18 17:51:41 +00:00
Ovid a091a4c9bd prologueEnding上传 2025-06-19 01:50:20 +08:00
chenziqin 5abbdf4bf5 Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!487
2025-06-18 14:11:51 +00:00
Ovid 1389266f46 火车进站音效修正 2025-06-18 22:10:53 +08:00
dingyuntian 2f7a68c4b3 Merge branch 'develop' into feature/佩佩表情替换 2025-06-18 22:06:52 +08:00
dingyuntian d605e7c36f Merge branch 'feature/佩佩表情替换' into 'develop'
Update SubwayCenter.cs

See merge request aibis-dream/aibis-dream!486
2025-06-18 14:06:48 +00:00
dingyuntian b2b980105d Update SubwayCenter.cs 2025-06-18 22:05:40 +08:00
dingyuntian 7f2bb57505 Merge branch 'feature/佩佩表情替换' into 'develop'
Update SubWay.unity

See merge request aibis-dream/aibis-dream!485
2025-06-18 14:05:01 +00:00
dingyuntian ac4a820ea4 Update SubWay.unity 2025-06-18 22:03:42 +08:00
Ovid 6d9ca111be Merge branch 'develop' into feature/czq_0617 2025-06-18 21:33:36 +08:00
Ovid f03cdc6101 Merge branch 'develop' into feature/czq_0617 2025-06-18 20:34:07 +08:00
chenziqin 0c0a5ea0cb Merge branch 'feature/czq_0617' into 'develop'
上传地铁进站音效(已配置

See merge request aibis-dream/aibis-dream!484
2025-06-18 12:33:57 +00:00
Ovid fdaec2a97c 上传地铁进站音效(已配置 2025-06-18 20:33:03 +08:00
bottlefish 06859f0c9f Merge branch '6.18音频接入' into 'develop'
6.18音频接入

See merge request aibis-dream/aibis-dream!483
2025-06-18 11:22:55 +00:00
bottlefish 4eb1c70402 提交 2025-06-18 19:21:35 +08:00
bottlefish 40777eb750 Merge branch 'develop' into 6.18音频接入 2025-06-18 19:07:46 +08:00
chenziqin ce614d7ae4 Merge branch 'feature/czq_0617' into 'develop'
drill声音不正常修复

See merge request aibis-dream/aibis-dream!482
2025-06-18 11:07:27 +00:00
Ovid ce61ce58f7 drill声音不正常修复 2025-06-18 19:06:52 +08:00
bottlefish 0200c43008 Merge branch 'develop' into 6.18音频接入 2025-06-18 18:48:37 +08:00
chenziqin ce1364c5e3 Merge branch 'feature/czq_0617' into 'develop'
sfx优化(忘了做了啥,好像是event:/ActionFB/mod_cutout

See merge request aibis-dream/aibis-dream!481
2025-06-18 10:48:14 +00:00
Ovid f1b38bbbc9 sfx优化(忘了做了啥,好像是event:/ActionFB/mod_cutout 2025-06-18 18:45:36 +08:00
bottlefish df2b784868 Merge branch 'develop' into 6.18音频接入 2025-06-18 18:27:24 +08:00
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
bottlefish f4bd6d204b Merge branch 'develop' into 6.18音频接入 2025-06-18 17:56:37 +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
bottlefish 45d052c9b1 Merge branch 'develop' into 6.18音频接入 2025-06-18 17:10:20 +08:00
bottlefish 3478026944 添加音效 2025-06-18 17:08:32 +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
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
bottlefish 1adfae9fc2 Merge branch '修复timeline打包问题' into 'develop'
修复timeline打包问题

See merge request aibis-dream/aibis-dream!462
2025-06-15 12:06:34 +00:00
bottlefish c2f071de81 修正timeline问题 2025-06-15 20:05:44 +08:00
bottlefish e727f0adb3 提交log 2025-06-15 18:47:05 +08:00
bottlefish aa15c5e2ea Merge branch '调整地铁timeline' into 'develop'
提交

See merge request aibis-dream/aibis-dream!461
2025-06-15 09:59:15 +00:00
bottlefish deb2dc84b2 提交 2025-06-15 17:58:24 +08:00
dingyuntian 53c6dd67b5 Merge branch 'vision' into 'develop'
Update ProjectSettings.asset

See merge request aibis-dream/aibis-dream!460
2025-06-15 09:44:03 +00:00
dingyuntian a7add8ba93 Update ProjectSettings.asset 2025-06-15 17:42:27 +08:00
bottlefish feafc3f09f Merge branch '6.15.16-优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!459
2025-06-15 09:15:56 +00:00
bottlefish a819278503 Merge branch 'develop' into 6.15.16-优化 2025-06-15 17:15:34 +08:00
bottlefish 6ce4838a48 提交 2025-06-15 17:02:44 +08:00
dingyuntian 9cfaf979da Merge branch 'bugfix/小修改' into 'develop'
Bugfix/小修改

See merge request aibis-dream/aibis-dream!458
2025-06-15 08:46:30 +00:00
dingyuntian 89e331af5f Update 医生SMOKE.anim 2025-06-15 15:52:00 +08:00
dingyuntian 6c05a428b6 小修改 2025-06-15 15:51:27 +08:00
bottlefish e97ed10849 Merge branch '6.15优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!457
2025-06-15 07:50:33 +00:00
bottlefish f525a48c42 提交 2025-06-15 15:49:50 +08:00
bottlefish 8de4647ce2 Merge branch '6.14.21修复和优化' into 'develop'
6.14.21修复和优化

See merge request aibis-dream/aibis-dream!456
2025-06-15 06:23:06 +00:00
bottlefish 3985773809 Merge branch 'develop' into 6.14.21修复和优化 2025-06-15 14:22:50 +08:00
bottlefish 03338b0f3f 提交 2025-06-15 14:21:39 +08:00
bottlefish e3ae4a64a8 提交 2025-06-15 13:50:48 +08:00
dingyuntian f7669e0e84 Merge branch 'bugfix/合并后测试' into 'develop'
美术资源替换

See merge request aibis-dream/aibis-dream!455
2025-06-14 15:02:12 +00:00
dingyuntian 36643009bb 美术资源替换 2025-06-14 22:59:52 +08:00
dingyuntian c36b36844f Merge branch 'bugfix/合并后测试' into 'develop'
合并

See merge request aibis-dream/aibis-dream!454
2025-06-14 13:50:34 +00:00
dingyuntian cde651f0ff 合并 2025-06-14 21:50:00 +08:00
dingyuntian 89b3d546f9 Merge branch 'feature/地铁' into 'develop'
版本号

See merge request aibis-dream/aibis-dream!453
2025-06-14 13:15:54 +00:00
bottlefish bb59a8f4ac Merge branch '6.14优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!452
2025-06-14 13:14:11 +00:00
bottlefish 62d72d487e Merge branch 'develop' into 6.14优化 2025-06-14 21:13:41 +08:00
dingyuntian a7e086a68a 版本号 2025-06-14 21:10:28 +08:00
bottlefish 5746d70125 提交 2025-06-14 21:09:52 +08:00
dingyuntian 22c5af978e Merge branch 'feature/地铁' into 'develop'
Feature/地铁

See merge request aibis-dream/aibis-dream!451
2025-06-14 12:56:48 +00:00
dingyuntian 79f35c0f41 Merge branch 'develop' into feature/地铁 2025-06-14 20:56:14 +08:00
dingyuntian 3ac8f41e52 合并 2025-06-14 20:55:51 +08:00
dingyuntian 7118eb038b Merge branch 'feature/地铁' into 'develop'
Feature/地铁

See merge request aibis-dream/aibis-dream!450
2025-06-13 14:44:57 +00:00
dingyuntian 662000ab91 提交 2025-06-13 22:43:40 +08:00
dingyuntian 1b1ee53954 合并 2025-06-13 22:23:48 +08:00
dingyuntian deedb9aa5a Merge branch 'develop' into feature/地铁 2025-06-13 22:20:32 +08:00
bottlefish c9391248bc Merge branch '6.13维修崩溃部分优化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!449
2025-06-13 14:16:06 +00:00
bottlefish 6606e792f1 提交 2025-06-13 22:13:07 +08:00
dingyuntian 5475b9a34c 美术资源替换 2025-06-13 22:06:14 +08:00
dingyuntian ce8303cc87 Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整

See merge request aibis-dream/aibis-dream!448
2025-06-13 08:28:03 +00:00
dingyuntian 63fa19266c Merge branch 'develop' into bugfix/小调整 2025-06-13 16:24:45 +08:00
dingyuntian 83d103871c 对话框调整 2025-06-13 16:24:38 +08:00
dingyuntian 10d964d3b0 地铁功能新增 2025-06-12 22:40:40 +08:00
Ovid 39e0d4a65f Merge branch 'develop' into feature/czq_0610 2025-06-12 18:32:14 +08:00
chenziqin 95cfc58207 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!447
2025-06-12 10:32:05 +00:00
Ovid c5e282be6c update defib sfx 2025-06-12 18:30:30 +08:00
dingyuntian 338e593c4d Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整

See merge request aibis-dream/aibis-dream!446
2025-06-12 06:51:08 +00:00
dingyuntian 29b5a5779e 气泡丢失 2025-06-12 14:47:58 +08:00
dingyuntian 8c367b22fb Update Art Resources.asset 2025-06-12 14:40:42 +08:00
dingyuntian de0b708d06 Merge branch '6.11bug修复' into 'develop'
6.11bug修复

See merge request aibis-dream/aibis-dream!445
2025-06-12 06:37:24 +00:00
dingyuntian 2c00d8ecff Merge branch 'develop' into 6.11bug修复 2025-06-12 14:36:11 +08:00
dingyuntian 1461a7c796 层级修改 2025-06-12 14:36:04 +08:00
Ovid 09c6e5cd25 Merge branch 'develop' into feature/czq_0610 2025-06-12 13:51:37 +08:00
Ovid 879feb00e0 Merge branch 'develop' into feature/czq_0610 2025-06-12 03:53:45 +08:00
chenziqin f2d2d8bf41 Merge branch 'feature/czq_0610' into 'develop'
开头(双关)音频上传

See merge request aibis-dream/aibis-dream!444
2025-06-11 19:53:35 +00:00
Ovid 318318235e 开头(双关)音频上传 2025-06-12 03:51:34 +08:00
bottlefish 94821cf2e9 Merge branch '6.12.03优化和修复' into 'develop'
修复记忆胶片问题

See merge request aibis-dream/aibis-dream!443
2025-06-11 19:28:42 +00:00
bottlefish 7626f9bd48 修复记忆胶片问题 2025-06-12 03:27:07 +08:00
bottlefish 2f87aadfe6 Merge branch '6.11bug修复' into 'develop'
6.11bug修复

See merge request aibis-dream/aibis-dream!442
2025-06-11 18:38:22 +00:00
bottlefish 79252946b2 提交 2025-06-12 02:37:37 +08:00
bottlefish aede60a0a3 提交 2025-06-11 22:57:31 +08:00
bottlefish 109f25ba8f 修复UICamera问题 2025-06-11 22:07:47 +08:00
dingyuntian 2784ae99df 相机 2025-06-11 21:59:36 +08:00
bottlefish 65b5866565 提交 2025-06-11 21:58:29 +08:00
dingyuntian 32ecdd1591 Merge branch 'bugfix/bubble' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!441
2025-06-11 11:15:52 +00:00
dingyuntian fe3b907d12 问题修改 2025-06-11 19:15:15 +08:00
chenziqin 61c31a318a Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!440
2025-06-11 10:50:31 +00:00
Ovid 46082924b4 去掉开头梦的妈妈 2025-06-11 18:47:56 +08:00
Ovid 590e9fd09c Merge branch 'develop' into feature/czq_0610 2025-06-11 18:46:22 +08:00
Ovid 5ac068f1e3 音频优化 2025-06-11 18:41:29 +08:00
bottlefish 94e39396a7 Merge branch '6.11优化' into 'develop'
6.11优化

See merge request aibis-dream/aibis-dream!439
2025-06-11 10:22:30 +00:00
bottlefish 4a1fcae515 提交 2025-06-11 18:21:17 +08:00
bottlefish db8847af70 Merge branch 'develop' into 6.11优化 2025-06-11 18:00:03 +08:00
dingyuntian 36ef851e15 Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正

See merge request aibis-dream/aibis-dream!438
2025-06-11 09:54:58 +00:00
dingyuntian e6709e621d 选项修改 2025-06-11 17:54:19 +08:00
bottlefish 76ad603b52 找回警告窗口 2025-06-11 17:34:31 +08:00
bottlefish 56baa0fd4e Merge branch '6.4.20全流程优化' into 'develop'
6.4.20全流程优化

See merge request aibis-dream/aibis-dream!437
2025-06-11 08:45:38 +00:00
bottlefish eded0a8621 Merge branch 'develop' into 6.4.20全流程优化 2025-06-11 16:43:59 +08:00
bottlefish 49e9e814a1 提交 2025-06-11 16:40:45 +08:00
dingyuntian ae9ce6312b 气泡长度问题 2025-06-11 16:31:24 +08:00
dingyuntian 93e8ae09fa Merge branch 'feature/地铁补正' into 'develop'
提交

See merge request aibis-dream/aibis-dream!436
2025-06-11 08:17:12 +00:00
dingyuntian 5eb19999f9 提交 2025-06-11 16:16:44 +08:00
dingyuntian a0c4f25c44 Merge branch 'feature/地铁补正' into 'develop'
旧资源清理

See merge request aibis-dream/aibis-dream!435
2025-06-11 08:08:38 +00:00
dingyuntian fb0a3565cc 旧资源清理 2025-06-11 16:07:49 +08:00
dingyuntian 9b8b8b278c Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正

See merge request aibis-dream/aibis-dream!434
2025-06-11 06:41:44 +00:00
dingyuntian 8ebcfb5188 问题修改 2025-06-11 14:41:06 +08:00
dingyuntian 2ead6c8241 对话框补回去 2025-06-11 14:07:15 +08:00
dingyuntian 5745883d40 Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!433
2025-06-11 05:53:18 +00:00
dingyuntian d2c897bc1f 问题修改 2025-06-11 13:52:30 +08:00
dingyuntian 12869ac835 Merge branch 'develop' into feature/海浪 2025-06-11 13:12:37 +08:00
dingyuntian 2610f6b3d5 修改 2025-06-11 13:12:04 +08:00
bottlefish 8e86014717 Merge branch '修复佩佩场景配置问题' into 'develop'
修复佩佩场景配置问题

See merge request aibis-dream/aibis-dream!432
2025-06-11 05:08:36 +00:00
bottlefish 04adb252a6 调整timeline 2025-06-11 13:07:11 +08:00
bottlefish 0ae9b57dbb 去除遗留的测试指令 2025-06-11 12:19:49 +08:00
chenziqin df1410c230 Merge branch 'feature/czq_0610' into 'develop'
序章优化

See merge request aibis-dream/aibis-dream!431
2025-06-10 16:37:15 +00:00
Ovid 137291469b 序章优化 2025-06-11 00:36:16 +08:00
chenziqin d64d70bd95 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!430
2025-06-10 16:32:50 +00:00
Ovid 6b8c3fb589 开头梦节奏优化 2025-06-11 00:31:30 +08:00
bottlefish a72c9f95c6 提交 2025-06-10 23:10:36 +08:00
dingyuntian 8143e6c447 Merge branch 'feature/海浪' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!429
2025-06-10 14:58:00 +00:00
dingyuntian f0bd5920e5 问题修改 2025-06-10 22:57:10 +08:00
Ovid c11b1f2252 Merge branch 'develop' into feature/czq_0610 2025-06-10 22:34:53 +08:00
dingyuntian 96171407dc Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!428
2025-06-10 14:27:51 +00:00
dingyuntian 6e5d68a18d Merge remote-tracking branch 'origin/优化6.10.21' into feature/海浪 2025-06-10 22:26:08 +08:00
dingyuntian 6866723746 2025-06-10 22:25:35 +08:00
bottlefish 825179906f Merge branch 'develop' into 优化6.10.21 2025-06-10 22:21:39 +08:00
dingyuntian f80e3823b6 Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!427
2025-06-10 14:21:28 +00:00
dingyuntian d00c668681 Merge branch 'develop' into feature/海浪 2025-06-10 22:20:49 +08:00
bottlefish 3e72c1744e Merge branch 'develop' into 优化6.10.21 2025-06-10 22:20:45 +08:00
bottlefish b7c7db9204 提交 2025-06-10 22:20:09 +08:00
dingyuntian 83d606cf1f 问题调整 2025-06-10 22:19:48 +08:00
Ovid b7ef1b6ef6 Merge branch 'develop' into feature/czq_0610 2025-06-10 21:49:25 +08:00
chenziqin 47ca2dcebb Merge branch 'feature/czq_0610' into 'develop'
上传drill音效

See merge request aibis-dream/aibis-dream!426
2025-06-10 13:49:20 +00:00
chenziqin f30c0de856 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!425
2025-06-10 13:43:19 +00:00
Ovid 837635a1f9 上传drill音效 2025-06-10 21:42:28 +08:00
dingyuntian 9ef261b8c1 Merge branch 'develop' into feature/海浪 2025-06-10 18:53:52 +08:00
dingyuntian 95c25a0f85 Merge branch '全流程6.10.15' into 'develop'
气泡

See merge request aibis-dream/aibis-dream!424
2025-06-10 10:52:14 +00:00
dingyuntian 2ab6004d8f 气泡 2025-06-10 18:49:40 +08:00
Ovid f76dbd6aeb Merge branch 'develop' into feature/czq_0610 2025-06-10 17:39:03 +08:00
dingyuntian 890d06d66d Merge branch '全流程6.10.15' into 'develop'
全流程6.10.15

See merge request aibis-dream/aibis-dream!423
2025-06-10 09:35:01 +00:00
dingyuntian 38f93d5695 Update Stage2-5_切割.yarn 2025-06-10 17:33:29 +08:00
Ovid e4da61cace VO修正:提高音量,修改YL音频,修改HS的EQ不那么刺耳 2025-06-10 17:26:51 +08:00
dingyuntian 7d76a275e5 新Dialog 2025-06-10 17:11:10 +08:00
bottlefish 6c5b265852 海浪部分整合 2025-06-10 16:58:24 +08:00
bottlefish 88ba60fda1 Merge branch 'develop' into 全流程6.10.15 2025-06-10 16:33:56 +08:00
dingyuntian 37f0d93c28 Merge branch 'feature/海浪' into 'develop'
海浪

See merge request aibis-dream/aibis-dream!422
2025-06-10 08:32:47 +00:00
dingyuntian 2cab2c3b64 海浪 2025-06-10 16:30:26 +08:00
bottlefish 510d607343 Merge branch 'develop' into 全流程6.10.15 2025-06-10 16:03:56 +08:00
dingyuntian c047a6132b Merge branch 'feature/海浪' into 'develop'
复原

See merge request aibis-dream/aibis-dream!421
2025-06-10 08:03:07 +00:00
dingyuntian 040ffdc497 复原 2025-06-10 16:01:48 +08:00
bottlefish f08e6449e8 Merge branch 'develop' into 全流程6.10.15 2025-06-10 15:48:05 +08:00
dingyuntian a344d8c701 Merge branch 'feature/海浪' into 'develop'
rebuild fmod

See merge request aibis-dream/aibis-dream!420
2025-06-10 07:40:36 +00:00
Ovid d5eaec5286 rebuild fmod 2025-06-10 15:37:38 +08:00
bottlefish a5f8784d56 去掉测试指令 2025-06-10 15:30:52 +08:00
dingyuntian 775a57d00d Merge branch 'bugfix/merge' into 'develop'
Bugfix/merge

See merge request aibis-dream/aibis-dream!419
2025-06-10 07:11:23 +00:00
dingyuntian 745fa81f14 Merge branch 'develop' into bugfix/merge 2025-06-10 15:10:27 +08:00
dingyuntian 965500f408 Merge branch '6.4.20全流程优化' into bugfix/merge 2025-06-10 15:09:42 +08:00
chenziqin 9a91edd55e Merge branch 'feature/day0&1_dream' into 'develop'
update day0 day1两个梦

See merge request aibis-dream/aibis-dream!412
2025-06-10 06:48:51 +00:00
Ovid 83d23a04bc Merge branch 'develop' into feature/day0&1_dream 2025-06-10 14:41:47 +08:00
bottlefish 07c40c4420 Merge branch 'develop' into 6.4.20全流程优化 2025-06-10 14:37:21 +08:00
Ovid 2f47bd7083 Revert "Update 剪影.png"
This reverts commit acb2211084.
2025-06-10 14:34:45 +08:00
Ovid 0359d1a51c Revert "Update 剪影.png"
This reverts commit acb2211084.
2025-06-10 14:34:33 +08:00
Ovid acb2211084 Update 剪影.png 2025-06-10 14:27:44 +08:00
dingyuntian 4a9b842d91 Merge branch 'feature/新对话框' into 'develop'
Feature/新对话框

See merge request aibis-dream/aibis-dream!417
2025-06-10 06:11:24 +00:00
dingyuntian b9978e96b7 相机 2025-06-10 14:10:58 +08:00
dingyuntian cf090fa347 Merge branch 'develop' into feature/新对话框 2025-06-10 13:59:32 +08:00
chenziqin dbab7fcedb Merge branch 'feature/day0_night' into 'develop'
day0night

See merge request aibis-dream/aibis-dream!416
2025-06-09 15:50:49 +00:00
Ovid 939fac5c1f merge <<set_time_of_day "Evening">> 2025-06-09 23:49:51 +08:00
Ovid c04165c3d8 Merge branch 'develop' into feature/day0_night 2025-06-09 23:49:21 +08:00
Ovid db23fdf7a7 day0night 2025-06-09 23:46:55 +08:00
dingyuntian 4686f42a01 指针切换 2025-06-09 23:40:22 +08:00
dingyuntian e87c1f4ad2 Merge branch 'feature/新对话框' into 'develop'
Feature/新对话框

See merge request aibis-dream/aibis-dream!415
2025-06-09 14:12:17 +00:00
dingyuntian 9b54b16b23 开头调通 2025-06-09 22:11:19 +08:00
dingyuntian f815c36936 Merge branch 'develop' into feature/新对话框 2025-06-09 18:14:05 +08:00
dingyuntian 43c375ff89 对话框调整 2025-06-09 18:12:56 +08:00
chenziqin 666e94ed43 Merge branch 'feature/DAY1_text_update' into 'develop'
Feature/day1 text update

See merge request aibis-dream/aibis-dream!414
2025-06-09 10:04:10 +00:00
Ovid 997dcd4f4c 加入BB机音效 2025-06-09 18:02:57 +08:00
Ovid 3579459b12 day1mid用回佩佩版本 2025-06-09 17:56:42 +08:00
dingyuntian 20b580d675 Merge branch 'develop' into feature/新对话框 2025-06-09 14:46:27 +08:00
dingyuntian 0e2d2cee07 对话框 2025-06-09 14:43:58 +08:00
bottlefish dfad412e8c Merge branch 'develop' of http://114.67.212.218:8011/aibis-dream/aibis-dream into develop 2025-06-09 11:42:22 +08:00
dingyuntian 9ae715c71a 地铁 2025-06-08 23:46:23 +08:00
chenziqin e22d9baff7 Merge branch 'feature/DAY1_text_update' into 'develop'
day0day1台本更新

See merge request aibis-dream/aibis-dream!413
2025-06-08 15:45:21 +00:00
Ovid c6c10410bb day0day1台本更新 2025-06-08 23:44:20 +08:00
Ovid 6b07365dce update day0 day1两个梦 2025-06-07 23:36:25 +08:00
dingyuntian e194fb9fbc 对话框配置 2025-06-06 22:58:50 +08:00
bottlefish 7ae0acf0ac 提交 2025-06-06 20:13:37 +08:00
dingyuntian 0589ce17e1 对话框风格设置 2025-06-06 14:04:26 +08:00
dingyuntian c195a3bb15 Merge branch 'develop' into feature/新对话框 2025-06-05 22:24:43 +08:00
dingyuntian 3a46dc1142 删除部分图片 2025-06-05 22:20:30 +08:00
dingyuntian 66e5e48876 对话系统 2025-06-05 22:02:26 +08:00
bottlefish 123e60e176 添加音效 2025-06-05 20:26:52 +08:00
chenziqin 6d96508132 Merge branch 'feature/audio-dash_0610' into 'develop'
Feature/audio dash 0610

See merge request aibis-dream/aibis-dream!411
2025-06-05 12:13:59 +00:00
Ovid 3db0fe5c9e mem_fader vol up, update vo 2025-06-05 20:12:20 +08:00
dingyuntian c839eb4c12 Merge branch '6.4.20全流程优化' of ssh://114.67.212.218:2222/aibis-dream/aibis-dream into 6.4.20全流程优化 2025-06-05 16:12:56 +08:00
dingyuntian 9243f4afc6 对话框 2025-06-05 16:12:17 +08:00
dingyuntian 4c031bfa3e 一些本地化修改 2025-06-05 14:34:32 +08:00
bottlefish 8a7341b907 渲染修改 2025-06-05 13:41:17 +08:00
dingyuntian f14cdf90f6 对话框 2025-06-04 21:45:50 +08:00
bottlefish dd03898de0 提交 2025-06-04 21:45:33 +08:00
bottlefish 4048d1f4a8 修复渲染问题 2025-06-04 20:55:25 +08:00
bottlefish cd0b8f4e85 Merge branch '新开头整合5.26' into 'develop'
新开头整合5.26

See merge request aibis-dream/aibis-dream!410
2025-06-04 12:32:12 +00:00
bottlefish ef30ad4b26 Merge branch 'develop' into 新开头整合5.26 2025-06-04 20:30:51 +08:00
bottlefish 8ecf1f3c9a 提交 2025-06-04 20:27:27 +08:00
bottlefish b53b639d7b 提交 2025-06-04 16:33:04 +08:00
bottlefish d93e9b186e 提交 2025-06-04 16:13:47 +08:00
dingyuntian c468c8b070 批量生成点 2025-06-04 14:53:27 +08:00
dingyuntian 23e665f34c 一些修改 2025-06-04 12:11:21 +08:00
bottlefish c8b0f8b375 提交 2025-06-03 21:50:35 +08:00
Ovid 8199de18b7 Merge branch 'develop' into feature/audio-dash_0610 2025-06-03 14:34:13 +08:00
dingyuntian d99bfe5c30 更新 2025-05-30 19:00:55 +08:00
bottlefish 5bd103ceec 提交 2025-05-30 18:47:02 +08:00
dingyuntian d364ab8d36 小修正 2025-05-30 18:41:41 +08:00
dingyuntian 00d10fe0ad Yarn命令变化 2025-05-30 18:38:00 +08:00
bottlefish c1c3413639 修bug 2025-05-30 18:01:13 +08:00
dingyuntian beba63b987 Merge branch 'develop' into feature/environment 2025-05-30 17:58:30 +08:00
dingyuntian 71f71aee36 人物工具,环境工具,生成器 2025-05-30 17:58:07 +08:00
bottlefish 64ac24ca5e 插线提交 2025-05-30 17:47:02 +08:00
bottlefish 73fd121052 处理plug和线缆以及几个bug 2025-05-30 15:13:06 +08:00
Ovid 3c40861323 Merge branch 'develop' into feature/audio-dash_0610 2025-05-30 14:36:07 +08:00
bottlefish bdb514fc46 通了一版 2025-05-30 11:31:59 +08:00
chenziqin 0432545274 Merge branch 'feature/audio-dash_0610' into 'develop'
更新一些音效

See merge request aibis-dream/aibis-dream!409
2025-05-29 11:57:31 +00:00
Ovid fc2c3dfc3e 更新一些音效 2025-05-29 19:57:05 +08:00
bottlefish 262ffad009 通了一版 2025-05-29 16:31:57 +08:00
dingyuntian 1dd27a51b9 Update CameraKit.cs 2025-05-29 15:31:02 +08:00
dingyuntian b23af0626f 物体生成 2025-05-29 15:27:58 +08:00
bottlefish 2610c769d9 提交 2025-05-29 15:27:49 +08:00
dingyuntian 0777f4810a Update CameraKit.cs 2025-05-29 15:27:15 +08:00
dingyuntian a3d9d07a27 Merge branch 'develop' into feature/environment 2025-05-29 15:11:22 +08:00
bottlefish 08a377724b 基本齐全了 2025-05-29 13:59:11 +08:00
dingyuntian fb0c39ccbf 场景和角色管理替换 2025-05-28 21:48:33 +08:00
chenziqin 5c261608a3 Merge branch 'feature/audio-dash_0610' into 'develop'
音频优化:打孔带相关、记忆相关

See merge request aibis-dream/aibis-dream!408
2025-05-28 13:04:02 +00:00
Ovid 749c88743d 音频优化:打孔带相关、记忆相关 2025-05-28 21:03:18 +08:00
dingyuntian 08e777a9ce Merge branch 'feature/dialog' into 'develop'
Feature/dialog

See merge request aibis-dream/aibis-dream!406
2025-05-28 08:22:51 +00:00
dingyuntian a9d05f69fb 按钮 2025-05-28 16:22:11 +08:00
dingyuntian 4a63249e0c 选项选择后隐藏 2025-05-28 16:19:03 +08:00
dingyuntian 26e48ec37f 对话框优化 2025-05-28 15:58:50 +08:00
bottlefish 31e8ae41be 提交 2025-05-27 21:16:58 +08:00
bottlefish f23affbabd 提交 2025-05-27 19:20:03 +08:00
bottlefish b28044f602 提交 2025-05-27 18:18:41 +08:00
dingyuntian 34f6aac9a1 Merge branch 'feature/scene' into 'develop'
人物

See merge request aibis-dream/aibis-dream!405
2025-05-26 09:14:20 +00:00
dingyuntian b14eb20e9f 人物 2025-05-26 17:13:37 +08:00
dingyuntian 8f46e75e52 Merge branch 'feature/actorManager' into 'develop'
Feature/actor manager

See merge request aibis-dream/aibis-dream!404
2025-05-26 07:47:51 +00:00
dingyuntian 68f50dd1b2 Merge branch 'develop' into feature/actorManager 2025-05-26 15:44:42 +08:00
bottlefish ebf9dd0237 提交 2025-05-26 15:40:53 +08:00
dingyuntian 24ce8bd05e yarn 2025-05-26 15:38:03 +08:00
dingyuntian f6a0a87fda 动画系统 2025-05-26 14:59:42 +08:00
bottlefish b603f4986f Merge branch '开头优化5.16.15.51' into 'develop'
开头优化5.16.15.51

See merge request aibis-dream/aibis-dream!403
2025-05-26 05:06:58 +00:00
bottlefish 8c3ae43975 Merge branch 'develop' into 开头优化5.16.15.51 2025-05-26 13:06:36 +08:00
bottlefish aeca4b7ee6 提交 2025-05-23 22:57:35 +08:00
bottlefish 75ba953134 提交 2025-05-23 22:07:20 +08:00
bottlefish e60a938319 补充提交 2025-05-22 19:02:51 +08:00
bottlefish c54db1085e 提交破碎效果 2025-05-22 19:00:40 +08:00
bottlefish a6d2f1f199 提交 2025-05-22 15:04:16 +08:00
bottlefish 7a4a3fee67 提交 2025-05-22 12:58:02 +08:00
dingyuntian d6fd171720 Merge branch 'feature/screen' into 'develop'
Feature/screen

See merge request aibis-dream/aibis-dream!402
2025-05-21 13:04:38 +00:00
dingyuntian 250dda0436 插线系统更新 2025-05-21 21:03:52 +08:00
dingyuntian 576de0c719 Update ChillBitmap_16px SDF.asset 2025-05-21 17:58:53 +08:00
dingyuntian cae274f271 Merge branch 'develop' into feature/dialogUI 2025-05-21 17:49:50 +08:00
dingyuntian 386bb2f2f1 Merge branch 'bugfix/font' into 'develop'
字体订正

See merge request aibis-dream/aibis-dream!401
2025-05-21 09:07:06 +00:00
dingyuntian 5367fe9d74 字体订正 2025-05-21 17:04:58 +08:00
dingyuntian dba10f8c0b Merge branch 'bugfix/font' into 'develop'
字体变化

See merge request aibis-dream/aibis-dream!400
2025-05-21 08:52:55 +00:00
dingyuntian 75a4d9cb74 字体变化 2025-05-21 16:52:17 +08:00
dingyuntian aec424fcd5 修改 2025-05-21 16:47:17 +08:00
dingyuntian 1881cdf686 Merge branch 'develop' into feature/dialogUI 2025-05-20 20:26:52 +08:00
dingyuntian 4bb4a051cb Merge branch 'feature/camera' into 'develop'
相机更新

See merge request aibis-dream/aibis-dream!399
2025-05-20 12:21:48 +00:00
dingyuntian 8cf479df99 Merge branch 'develop' into feature/camera 2025-05-20 20:21:14 +08:00
chenziqin 3dcc51706f Merge branch 'FP_Prologue' into 'develop'
Fp prologue

See merge request aibis-dream/aibis-dream!398
2025-05-20 11:37:41 +00:00
Ovid 7ac52ca4e2 Merge branch 'develop' into FP_Prologue 2025-05-20 19:37:10 +08:00
dingyuntian 11949828a3 相机更新 2025-05-20 19:31:35 +08:00
Ovid b068a882ee peipei1情绪部分优化 2025-05-20 19:30:42 +08:00
bottlefish 9fb81dcdd2 切割接入 2025-05-20 19:28:58 +08:00
dingyuntian 095b753acc 场外 2025-05-20 18:41:49 +08:00
dingyuntian c1148bfbd4 新插线 2025-05-20 17:05:56 +08:00
dingyuntian 376c7acdf4 Merge branch 'develop' into feature/dialogUI 2025-05-20 13:23:05 +08:00
dingyuntian 4a60159e60 Merge branch 'develop' into feature/dialogUI 2025-05-19 22:49:39 +08:00
dingyuntian 0f3ace7e6d Merge branch 'bugfix/local' into 'develop'
Bugfix/local

See merge request aibis-dream/aibis-dream!397
2025-05-19 14:47:45 +00:00
dingyuntian ed70f945e5 快进按钮 2025-05-19 22:45:58 +08:00
dingyuntian 0645adf5b8 本地化 2025-05-19 22:20:03 +08:00
bottlefish cfe8f8e5c1 提交 2025-05-19 21:27:58 +08:00
dingyuntian edef6fa96a Merge branch 'bugfix/local' into 'develop'
本地化

See merge request aibis-dream/aibis-dream!396
2025-05-19 13:26:35 +00:00
dingyuntian 68f3e327f1 本地化 2025-05-19 21:13:41 +08:00
dingyuntian 9ec4d60034 替换 2025-05-19 21:13:01 +08:00
dingyuntian b050870ca0 Merge branch 'feature/dialogUI' into 'develop'
打包

See merge request aibis-dream/aibis-dream!395
2025-05-19 12:19:51 +00:00
dingyuntian 1993e0bf47 Merge branch 'develop' into feature/dialogUI 2025-05-19 20:19:38 +08:00
dingyuntian 3b754c8a5d 打包 2025-05-19 20:17:28 +08:00
Ovid a4f478ab82 +peipei1music 2025-05-19 20:06:16 +08:00
dingyuntian 1e3f976c86 Merge branch 'feature/dialog' into 'develop'
打包

See merge request aibis-dream/aibis-dream!394
2025-05-19 11:18:51 +00:00
dingyuntian f5c0d3afdd Merge branch 'feature/dialog' into 'develop'
Feature/dialog

See merge request aibis-dream/aibis-dream!393
2025-05-19 11:17:58 +00:00
dingyuntian df4b259e2a 打包 2025-05-19 19:16:54 +08:00
dingyuntian ea2e3f1559 Merge branch 'develop' into feature/dialog 2025-05-19 19:02:13 +08:00
dingyuntian f2fa277a56 本地化 2025-05-19 19:00:23 +08:00
bottlefish 10037bb66b Merge branch '渲染bug修复' into 'develop'
提交render修改

See merge request aibis-dream/aibis-dream!392
2025-05-19 08:45:10 +00:00
bottlefish 59d97a3f14 提交render修改 2025-05-19 16:41:50 +08:00
bottlefish 34aa1b7bf4 提交 2025-05-19 16:10:21 +08:00
bottlefish de34465cdf 基本交互和视觉效果确定 2025-05-18 02:23:06 +08:00
Ovid 1be2dea70d D0D1串通 2025-05-17 20:17:31 +08:00
Ovid 86d3be64fb Merge branch 'develop' into FP_Prologue 2025-05-17 19:27:53 +08:00
Ovid 8e8fa431a6 d0d1串通 2025-05-17 19:26:45 +08:00
bottlefish 3ef8e4441d 优化效果 2025-05-17 17:28:45 +08:00
bottlefish 1983ad53fc 调整齿轮吸附位置 2025-05-17 04:51:54 +08:00
bottlefish b8709a86e7 增加卷边 2025-05-17 04:36:56 +08:00
bottlefish 7b8c648f66 增加进度指示 2025-05-17 03:43:37 +08:00
bottlefish 54594940b8 细分下片段 2025-05-17 03:17:14 +08:00
bottlefish 5ba424eee1 优化算法 2025-05-17 01:49:05 +08:00
bottlefish 4608886f5f 还可以的效果 2025-05-17 01:39:39 +08:00
bottlefish 9a88f6bee9 提交 2025-05-17 01:07:08 +08:00
bottlefish c69da76dbd 提交 2025-05-16 22:44:59 +08:00
bottlefish a0e0ab6ea0 提交下 2025-05-16 22:31:11 +08:00
dingyuntian 6213a7ab4f Merge branch 'feature/dialog' into 'develop'
Feature/dialog

See merge request aibis-dream/aibis-dream!391
2025-05-16 14:11:05 +00:00
dingyuntian d682e98fee 合并 2025-05-16 22:10:37 +08:00
dingyuntian ce6b3b9803 Merge branch 'develop' into feature/dialog 2025-05-16 21:51:24 +08:00
dingyuntian 851070f3cf 本地化问题修改 2025-05-16 21:47:35 +08:00
bottlefish 13e4b4603b Merge branch '修复佩佩场景问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!390
2025-05-16 13:08:13 +00:00
bottlefish 2e55a45829 提交 2025-05-16 21:06:38 +08:00
bottlefish c9218275d7 存档 2025-05-16 21:01:05 +08:00
bottlefish 7be5180ac1 存个档 2025-05-16 19:23:56 +08:00
Ovid 52ae98018e 本地化问题修复 2025-05-16 19:15:27 +08:00
bottlefish 45acd0d93a 新增切割状态 2025-05-16 16:58:45 +08:00
bottlefish 1a1531f9d9 Merge branch '开头优化5.16' into 'develop'
开头优化5.16

See merge request aibis-dream/aibis-dream!389
2025-05-16 07:42:12 +00:00
bottlefish b1303664ae 提交渲染相关设置 2025-05-16 15:35:42 +08:00
bottlefish e3c5436b37 修复一些合并导致的问题 2025-05-16 15:34:13 +08:00
Ovid 77be2a94c0 提交FICTION_DAY1_BEGIN/MID/END待debug(本地化报错 2025-05-16 15:24:21 +08:00
dingyuntian 6638b42997 Merge branch 'develop' into feature/dialog 2025-05-16 14:16:30 +08:00
dingyuntian 7d4543eeab dialog 2025-05-16 14:11:27 +08:00
chenziqin 0540b3748d Merge branch 'develop' into 'FP_Prologue'
Develop

See merge request aibis-dream/aibis-dream!388
2025-05-16 05:57:14 +00:00
Ovid 39e2c1dae4 Merge branch 'develop' into FP_Prologue 2025-05-16 13:51:47 +08:00
bottlefish dab5c97b11 Merge branch '开头优化' into 'develop'
开头优化

See merge request aibis-dream/aibis-dream!387
2025-05-16 05:30:49 +00:00
bottlefish aca80b35b5 修复 2025-05-16 13:27:45 +08:00
bottlefish 0f3e781a6e 提交 2025-05-16 12:37:26 +08:00
Ovid d3f6094b3e 串通D0D1 2025-05-15 22:12:46 +08:00
dingyuntian 0915763ef6 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!385
2025-05-15 13:32:34 +00:00
dingyuntian 720c6933b0 字体替换 2025-05-15 21:32:07 +08:00
Ovid 42f4216224 Merge branch 'develop' into FP_Prologue 2025-05-15 21:30:07 +08:00
dingyuntian 3a477eec75 字体更新 2025-05-15 21:27:13 +08:00
dingyuntian 89829f1c1a Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!384
2025-05-15 12:59:42 +00:00
dingyuntian 874b2d5ef2 酒吧 2025-05-15 20:51:47 +08:00
bottlefish ad73e96b21 Merge branch '情绪分支测试' into 'develop'
情绪分支测试

See merge request aibis-dream/aibis-dream!383
2025-05-15 09:53:37 +00:00
bottlefish 843bb4f0e9 Merge branch 'develop' into 情绪分支测试 2025-05-15 17:52:54 +08:00
bottlefish 5c13601fcb Merge branch 'develop' into 情绪分支测试 2025-05-15 17:51:09 +08:00
bottlefish 8d8aed74c2 Merge branch 'FP_Prologue' into 'develop'
Fp prologue

See merge request aibis-dream/aibis-dream!382
2025-05-15 09:49:34 +00:00
bottlefish 9ae7520a28 Merge branch 'develop' into FP_Prologue 2025-05-15 17:47:10 +08:00
bottlefish 4c84d6ef28 修复部分问题 2025-05-15 17:45:33 +08:00
dingyuntian 976517d7b9 Merge branch 'bugfix/tasl' into 'develop'
Bugfix/tasl

See merge request aibis-dream/aibis-dream!381
2025-05-15 09:22:54 +00:00
dingyuntian 362b4608bd Update ProjectSettings.asset 2025-05-15 17:20:10 +08:00
dingyuntian d1c1b25f27 task 2025-05-15 16:50:49 +08:00
dingyuntian 9815400bb0 Task 2025-05-15 16:37:10 +08:00
dingyuntian bc5bf8f411 Merge branch 'develop' into feature/open 2025-05-15 16:23:14 +08:00
dingyuntian 8abdd6d1f8 Playable 2025-05-15 16:22:22 +08:00
dingyuntian ff22df0ab3 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!380
2025-05-15 07:39:11 +00:00
dingyuntian 650d1f3edd 临时对话条 2025-05-15 15:37:45 +08:00
dingyuntian 2d726f8c9d link 2025-05-15 13:09:42 +08:00
dingyuntian f0e02a04dd Merge branch 'bugfix/fix' into 'develop'
奇怪问题

See merge request aibis-dream/aibis-dream!379
2025-05-14 14:42:17 +00:00
dingyuntian 6d46818012 奇怪问题 2025-05-14 22:40:24 +08:00
dingyuntian 16c3dfcb04 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!378
2025-05-14 13:28:20 +00:00
dingyuntian 569e29f261 文本问题 2025-05-14 21:27:31 +08:00
dingyuntian 0eb77750fb Merge branch 'develop' into feature/open 2025-05-14 21:21:10 +08:00
dingyuntian b68122f7d4 惊醒 2025-05-14 21:17:26 +08:00
bottlefish 42e106f756 Merge branch '本地化bug修复' into 'develop'
修复本地化问题

See merge request aibis-dream/aibis-dream!377
2025-05-14 13:13:52 +00:00
bottlefish 5f8af70d0a 本地化问题修复 2025-05-14 21:12:49 +08:00
Ovid 29b5e0a6f9 FP_PROLOGUE 2025-05-14 20:59:26 +08:00
bottlefish a9dabe26c7 修复本地化问题
修复缺漏
2025-05-14 20:28:56 +08:00
bottlefish f6ec90cfc9 完成接入 2025-05-14 17:03:19 +08:00
chenziqin d1482298cb Merge branch 'develop' into 'FP_Prologue'
Develop

See merge request aibis-dream/aibis-dream!376
2025-05-14 08:08:57 +00:00
Ovid 27e62dc6b4 上传一些东西 2025-05-14 15:52:33 +08:00
bottlefish 6dc1abc958 接入火山情绪模块深入 2025-05-14 15:35:28 +08:00
dingyuntian 5177527835 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!375
2025-05-14 07:34:40 +00:00
dingyuntian b146acb1e8 拼起 2025-05-14 15:27:42 +08:00
dingyuntian 1a34865c75 结束事件 2025-05-14 14:54:36 +08:00
dingyuntian a8babd0faf 开头拼起 2025-05-14 14:51:54 +08:00
bottlefish 578171e884 增加yarn相关的配置,填充占位文本 2025-05-14 13:26:08 +08:00
dingyuntian d957bde000 Merge branch 'develop' into feature/open 2025-05-14 13:06:40 +08:00
dingyuntian 4120482e88 开头合并 2025-05-14 13:03:08 +08:00
bottlefish 28f43ac3fc 提交 2025-05-13 20:43:34 +08:00
bottlefish 10af7f2258 修复渲染问题 2025-05-13 19:01:52 +08:00
bottlefish 7faadd1b6b Merge branch 'develop' into 情绪分支测试 2025-05-13 18:35:24 +08:00
bottlefish 662f52614d Merge branch '火山表达模块交互优化' into 'develop'
火山表达模块交互优化

See merge request aibis-dream/aibis-dream!374
2025-05-13 10:07:16 +00:00
bottlefish 734c5c26ed 提交火山第一次维修的交互优化 2025-05-13 18:05:53 +08:00
dingyuntian 4d34b96154 把临时注释改回来 2025-05-13 17:30:04 +08:00
dingyuntian a9a6b0f9df 循环 2025-05-13 17:22:19 +08:00
bottlefish 82c33b995c Merge branch 'develop' into 火山表达模块交互优化 2025-05-13 14:00:56 +08:00
bottlefish d9b17441b2 存档 2025-05-13 13:46:38 +08:00
dingyuntian fb4211e6ad OP 2025-05-12 20:08:43 +08:00
dingyuntian a2c5614ed2 Merge branch 'develop' into feature/open 2025-05-12 18:36:56 +08:00
dingyuntian 17ad2204dc Merge branch 'bugfix/task' into 'develop'
修复

See merge request aibis-dream/aibis-dream!373
2025-05-12 10:26:04 +00:00
dingyuntian af7c11a635 修复 2025-05-12 18:25:19 +08:00
dingyuntian ce03fdb5e8 深入 2025-05-12 17:12:27 +08:00
dingyuntian 1d566ece7e Merge branch 'bugfix/task' into 'develop'
Update TaskPanel.cs

See merge request aibis-dream/aibis-dream!372
2025-05-12 06:51:47 +00:00
dingyuntian 8389caa8b7 Update TaskPanel.cs 2025-05-12 14:49:02 +08:00
dingyuntian 0e6681c3af Loop 2025-05-12 14:44:45 +08:00
dingyuntian cb09393f3f Merge branch 'develop' into feature/open 2025-05-09 18:59:53 +08:00
dingyuntian 9c4021d840 Merge branch 'bugfix/loacl' into 'develop'
Bugfix/loacl

See merge request aibis-dream/aibis-dream!371
2025-05-09 10:55:36 +00:00
dingyuntian e7b30e25e5 本地化问题修改 2025-05-09 18:54:30 +08:00
bottlefish cb67880a2a 基本功能完成 2025-05-09 18:05:29 +08:00
bottlefish ff0b000b84 存档 2025-05-09 17:51:35 +08:00
bottlefish a44a2c8a0b 存档 2025-05-09 13:42:17 +08:00
bottlefish f84cb9cb45 存档 2025-05-09 13:39:19 +08:00
bottlefish db9c66b260 提交 2025-05-09 13:28:36 +08:00
bottlefish 64b1251fe9 提交 2025-05-09 12:48:59 +08:00
bottlefish 53683ea8e4 提交存档 2025-05-09 12:41:07 +08:00
bottlefish a44a80edee 让人绝望的bug,存档 2025-05-08 22:08:01 +08:00
bottlefish ac545da1bd 存档 2025-05-08 21:45:20 +08:00
bottlefish 3a1ac08c14 存档 2025-05-08 19:41:02 +08:00
bottlefish e461982627 存档 2025-05-08 19:08:31 +08:00
dingyuntian 141166fc02 Update ResourceKit.cs 2025-05-08 18:29:14 +08:00
dingyuntian 107a6cbc4b 本地化问题修改 2025-05-08 18:26:08 +08:00
bottlefish 552955f3d4 中间版本存档 2025-05-08 16:17:49 +08:00
bottlefish d3d400d75b 过程存档 2025-05-08 12:23:51 +08:00
dingyuntian c822bb6f6c 指针 2025-05-08 12:01:05 +08:00
bottlefish 094b436246 效果更新 2025-05-07 17:03:48 +08:00
bottlefish 94c11a0000 提交火山情绪视觉基础 2025-05-07 16:36:48 +08:00
bottlefish 14a0f5648b 提交shapes和VFX graph 2025-05-07 15:07:44 +08:00
dingyuntian 967113f30b 卡住了 2025-05-06 16:19:54 +08:00
dingyuntian 87d0f1f6af Merge branch 'develop' into feature/open 2025-05-05 18:40:10 +08:00
dingyuntian 25e6cb638e Merge branch 'bugfix/localized' into 'develop'
全部本地化

See merge request aibis-dream/aibis-dream!370
2025-05-05 09:16:08 +00:00
dingyuntian 554240961b 全部本地化 2025-05-05 17:14:02 +08:00
dingyuntian 14220c5b52 定制OP 2025-05-05 14:57:20 +08:00
dingyuntian febb5d273d Merge branch 'develop' into feature/moduleRemove 2025-05-04 14:14:57 +08:00
dingyuntian 3a7765939b Merge branch 'develop' into feature/moduleRemove 2025-05-02 17:38:01 +08:00
dingyuntian 38192fda26 Merge branch 'bugfix/localized' into 'develop'
Bugfix/localized

See merge request aibis-dream/aibis-dream!369
2025-05-02 09:37:45 +00:00
dingyuntian aa192c8e47 本地化更新 2025-05-02 17:37:12 +08:00
dingyuntian c7a3bfb46d 补全LineId 2025-05-02 17:26:47 +08:00
dingyuntian 10179d5453 切割功能 2025-05-02 16:06:06 +08:00
dingyuntian 4f7dece3ca 线条切割 2025-05-02 14:30:04 +08:00
chenziqin fe8830db79 Merge branch 'feature/fiction_day1-day3' into 'develop'
Feature/fiction day1 day3

See merge request aibis-dream/aibis-dream!368
2025-04-30 09:18:05 +00:00
Ovid c030de4e08 Merge branch 'develop' into feature/fiction_day1-day3 2025-04-30 17:16:10 +08:00
Ovid 6088ce6792 day1 fiction draft 2025-04-30 17:15:46 +08:00
dingyuntian 1807699ca5 边缘 2025-04-29 19:31:24 +08:00
bottlefish 4ded082881 Merge branch '火山表达模块开发' into 'develop'
火山表达模块开发

See merge request aibis-dream/aibis-dream!367
2025-04-28 08:55:56 +00:00
bottlefish 0350ac8481 Merge branch 'develop' into 火山表达模块开发 2025-04-28 16:54:35 +08:00
dingyuntian ae24d91515 Merge branch 'develop' into feature/moduleRemove 2025-04-27 20:53:22 +08:00
dingyuntian e003786f99 Merge branch 'feature/localization' into 'develop'
Feature/localization

See merge request aibis-dream/aibis-dream!366
2025-04-27 12:45:25 +00:00
dingyuntian 5d39c9783e 全屏切换 2025-04-27 20:44:05 +08:00
dingyuntian 53e08d231c Merge branch 'develop' into feature/localization 2025-04-27 14:31:13 +08:00
dingyuntian 459c86a0cb Merge branch 'develop' into feature/localization 2025-04-25 21:21:16 +08:00
dingyuntian 334e08c0eb Merge branch 'feature/localization' into 'develop'
Feature/localization

See merge request aibis-dream/aibis-dream!365
2025-04-25 13:21:03 +00:00
dingyuntian d69ad072ea 本地化 2025-04-25 20:24:11 +08:00
bottlefish 8f55e4fdd1 火山功能跑通 2025-04-24 18:04:28 +08:00
dingyuntian 165d154784 本地化基础表 2025-04-24 16:55:00 +08:00
bottlefish be332cc9a9 Merge branch 'develop' into 火山表达模块开发 2025-04-24 15:18:03 +08:00
dingyuntian 7125b499b4 Merge branch 'feature/localization' into 'develop'
Feature/localization

See merge request aibis-dream/aibis-dream!364
2025-04-24 07:17:19 +00:00
dingyuntian 0a762fafde Update GameManager.cs 2025-04-24 15:15:25 +08:00
bottlefish c51a777c22 提交火山功能合入流程 2025-04-24 15:15:17 +08:00
bottlefish c6c98acbd8 提交火山场景 2025-04-24 13:55:35 +08:00
bottlefish bd35051467 Merge branch 'develop' into 火山表达模块开发 2025-04-24 13:41:03 +08:00
bottlefish 016f59df7e 火山机制初版 2025-04-24 13:38:18 +08:00
chenziqin febe29f953 Merge branch 'prologue_temp' into 'develop'
序章没上传完

See merge request aibis-dream/aibis-dream!363
2025-04-23 08:59:11 +00:00
Ovid 2cbd2bd529 eventnode删除多余的 2025-04-23 16:58:24 +08:00
Ovid e3f0e92fdc Merge branch 'develop' into prologue_temp 2025-04-23 16:56:12 +08:00
Ovid 549daff298 序章没上传完 2025-04-23 16:53:56 +08:00
chenziqin 83a21337e2 Merge branch 'feature/prologue_yarn' into 'develop'
Feature/prologue yarn

See merge request aibis-dream/aibis-dream!362
2025-04-23 08:37:54 +00:00
Ovid 83912de980 Merge branch 'develop' into feature/prologue_yarn 2025-04-23 16:36:53 +08:00
dingyuntian 63f7d352c3 小修复 2025-04-23 14:56:24 +08:00
dingyuntian 8f2e12622d remove 2025-04-23 12:56:20 +08:00
Ovid e34977904c 序章更新 2025-04-22 19:18:03 +08:00
dingyuntian b47e96ea9e 模块拆除功能 2025-04-22 17:07:31 +08:00
dingyuntian 319ee90b7e Merge branch 'feature/UI' into 'develop'
UI工具翻新

See merge request aibis-dream/aibis-dream!361
2025-04-21 10:54:54 +00:00
dingyuntian 9f20ef52d8 UI工具翻新
1. 增加UI工具
2. 增加设置页面
3. GameLoop更新
4. 导入ActionKit工具
2025-04-21 18:53:30 +08:00
Ovid 7862a0fa15 day0 script 2025-04-14 19:08:02 +08:00
Ovid 435c438565 Merge branch 'develop' into feature/prologue_yarn 2025-04-14 15:02:28 +08:00
dingyuntian 563ceaaaf6 Merge branch 'feature/storage' into 'develop'
增加高亮功能

See merge request aibis-dream/aibis-dream!360
2025-04-02 10:29:13 +00:00
dingyuntian 2c46185f49 增加高亮功能 2025-04-02 18:28:34 +08:00
dingyuntian c68f66f3ac Merge branch 'feature/storage' into 'develop'
Feature/storage

See merge request aibis-dream/aibis-dream!359
2025-04-02 05:39:12 +00:00
dingyuntian 8fb3940158 Update ProjectSettings.asset 2025-04-02 13:38:48 +08:00
dingyuntian 92bef81f76 版本号升级 2025-04-02 13:23:00 +08:00
dingyuntian be2c587979 头和身体可切换 2025-04-02 13:19:54 +08:00
Ovid 10bfa1554c 序章占位yarn 2025-04-02 12:31:36 +08:00
dingyuntian ca2729b009 增加BodyModule切换功能 2025-04-01 19:01:54 +08:00
dingyuntian f505be1f68 Merge branch 'feature/storage' into 'develop'
Feature/storage

See merge request aibis-dream/aibis-dream!358
2025-03-27 13:50:33 +00:00
dingyuntian 82e22d8b38 新存储系统可用 2025-03-27 21:49:34 +08:00
dingyuntian 79ed1149ca 存储系统更新 2025-03-26 17:22:40 +08:00
dingyuntian 66a18acd65 删除 2025-03-26 14:42:01 +08:00
dingyuntian bcb1544611 存储功能测试 2025-03-26 14:39:10 +08:00
dingyuntian 7f5c17dff8 存储功能更新 2025-03-25 23:14:01 +08:00
dingyuntian cbe042fec1 新存储系统 2025-03-24 20:47:58 +08:00
dingyuntian 7bd6430fe0 新存储 2025-03-24 18:45:33 +08:00
dingyuntian 6b51907af4 Merge branch 'bugfix/reorder_resource' into 'develop'
Bugfix/reorder resource

See merge request aibis-dream/aibis-dream!356
2025-03-24 07:25:12 +00:00
dingyuntian d75c019b97 资源清理 2025-03-24 15:24:11 +08:00
dingyuntian 8528fb7d29 git设置 2025-03-21 21:59:31 +08:00
dingyuntian 98391fc753 资源位置转移 2025-03-21 21:52:38 +08:00
dingyuntian e6528a47b5 Update EditorSettings.asset 2025-03-21 20:50:34 +08:00
dingyuntian d820084a2e 资源清理 2025-03-21 17:41:58 +08:00
dingyuntian a6d5c91907 旧资源清理 2025-03-21 15:31:50 +08:00
dingyuntian 290c925997 Merge branch 'version' into 'develop'
Version

See merge request aibis-dream/aibis-dream!354
2025-03-21 05:29:20 +00:00
dingyuntian d83dc035ff Update ProjectSettings.asset 2025-03-21 13:28:25 +08:00
dingyuntian 6d40b102bb Merge branch 'develop' into version 2025-03-21 13:10:19 +08:00
dingyuntian 11a242d450 Merge branch 'typo_fix' into 'develop'
typo_fix:术前对话2-你想把UF装上-应为色觉晶圆

See merge request aibis-dream/aibis-dream!353
2025-03-21 05:09:43 +00:00
Ovid 0272a9601f typo_fix:术前对话2-你想把UF装上-应为色觉晶圆 2025-03-20 18:40:49 +08:00
dingyuntian b47fe2ff6e Update ProjectSettings.asset 2025-03-20 18:35:40 +08:00
bottlefish 25fb9a5780 Merge branch '修复记忆打孔带部分bug' into 'develop'
提交

See merge request aibis-dream/aibis-dream!352
2025-03-20 05:35:34 +00:00
bottlefish d7a171ff81 提交 2025-03-20 13:33:01 +08:00
dingyuntian 26a457426b Merge branch 'bugfix/version' into 'develop'
版本号更新

See merge request aibis-dream/aibis-dream!351
2025-03-19 09:58:23 +00:00
dingyuntian 76294aafe9 版本号更新 2025-03-19 17:56:36 +08:00
dingyuntian 8b861763cd Merge branch 'bugfix/cursor' into 'develop'
问题修复

See merge request aibis-dream/aibis-dream!350
2025-03-19 07:48:05 +00:00
dingyuntian 72f63d8598 问题修复
1. 指针切换问题
2. 不同分辨率适配问题
2025-03-19 15:46:06 +08:00
chenziqin 6c72fd74d3 Merge branch 'peipei-a-lil-bit-to-the-left' into 'develop'
佩佩往左挪一点点

See merge request aibis-dream/aibis-dream!349
2025-03-19 03:46:47 +00:00
Ovid 60c08085b9 佩佩往左挪一点点 2025-03-19 11:46:04 +08:00
dingyuntian eec2a61dc4 Merge branch 'bugfix/font' into 'develop'
字体

See merge request aibis-dream/aibis-dream!348
2025-03-18 13:48:40 +00:00
dingyuntian c308a66654 字体 2025-03-18 21:44:02 +08:00
bottlefish 5544efddb2 Merge branch '修复K键导致的跳转卡死' into 'develop'
修复k键导致的跳转卡死

See merge request aibis-dream/aibis-dream!347
2025-03-18 13:14:19 +00:00
chenziqin b0d8733c3b Merge branch 'feature/font_adjust' into 'develop'
Feature/font adjust

See merge request aibis-dream/aibis-dream!346
2025-03-18 13:10:53 +00:00
Ovid c9e60c30a3 Merge branch 'develop' into feature/font_adjust 2025-03-18 21:10:32 +08:00
Ovid 090cedc4f5 对话框向右挪一点,距离人物更近一些 2025-03-18 21:09:16 +08:00
Ovid 0df7752bc3 边框小调整 2025-03-18 21:07:24 +08:00
bottlefish 04578e4491 补充视觉检查hightlight消失 2025-03-18 21:06:23 +08:00
bottlefish dd0aad5a42 修复 2025-03-18 21:00:05 +08:00
chenziqin 289cfe68c0 Merge branch 'peipei2+be_emo' into 'develop'
peipei2+be_emo

See merge request aibis-dream/aibis-dream!345
2025-03-18 10:04:33 +00:00
Ovid 0b70079135 peipei2+be_emo 2025-03-18 18:03:44 +08:00
dingyuntian 5beda46c83 Merge branch 'bugfix/jumpline' into 'develop'
问题修复

See merge request aibis-dream/aibis-dream!344
2025-03-18 06:38:41 +00:00
dingyuntian f22b7087fb 问题修复
1. 保存存档时立绘信息未保存
2. AMB切到Main时失效
3. 跳过对话功能不停止语音
2025-03-18 14:37:40 +08:00
chenziqin 5e83999be8 Merge branch 'fmod_amb_crash_when_switch_to_main_bugfix' into 'develop'
Fmod amb crash when switch to main bugfix

See merge request aibis-dream/aibis-dream!343
2025-03-18 06:29:12 +00:00
Ovid 1883fba4c4 bugfix 2025-03-18 14:25:18 +08:00
Ovid 015fd3480d 石头、佩佩角色位置微调 2025-03-17 22:17:48 +08:00
Ovid dea2aec26a 对话框大小位置微调整,并整体再向上抬了一点点 2025-03-17 22:13:18 +08:00
Ovid ba1f6645d2 对话框调整 2025-03-17 22:05:43 +08:00
4188 changed files with 906493 additions and 87277 deletions
+2
View File
@@ -97,3 +97,5 @@ fmod_editor.log
# 排除Sim的自动保存
.history/*
**/.history/*
.fake
+1
View File
@@ -1,6 +1,7 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 09546aca93a801441859af2a811fe53b
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: b53f304e2338ce70db1045411843d66c
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
@@ -46,17 +46,20 @@ MonoBehaviour:
m_GroupAssets:
- {fileID: 11400000, guid: ac71ee7888fd1754bb3280725ad0076b, type: 2}
- {fileID: 11400000, guid: b9026802c7966cf4799a8df997d603e3, type: 2}
- {fileID: 11400000, guid: d582f9080605ab34cbcde3249c980030, type: 2}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 46e5fd2db66266e4698be9ad1b299913, type: 2}
- {fileID: 11400000, guid: 6ea418572850f5a4496b8bf2ea95ea43, type: 2}
- {fileID: 11400000, guid: 2bd43310d2c9f7147948458ae24b7969, type: 2}
- {fileID: 11400000, guid: cda52eeaeb664b94996e70b2b0e9ef69, type: 2}
- {fileID: 11400000, guid: 54799118a585dda439cab043d56ec68c, type: 2}
- {fileID: 11400000, guid: b593dc98ea11a484995123de77d9bf1a, type: 2}
- {fileID: 11400000, guid: 1e521cfc13b314642b1e682e3be7ea17, type: 2}
- {fileID: 11400000, guid: 62a92c74b9bd5bd439690727c1831500, type: 2}
- {fileID: 11400000, guid: b593dc98ea11a484995123de77d9bf1a, type: 2}
- {fileID: 11400000, guid: 54799118a585dda439cab043d56ec68c, type: 2}
- {fileID: 11400000, guid: d582f9080605ab34cbcde3249c980030, type: 2}
- {fileID: 11400000, guid: 724eed66b2d8eef4faf77a4bee4d2845, type: 2}
- {fileID: 11400000, guid: aafc8258a2111e94d8339a3152cf50e0, type: 2}
- {fileID: 11400000, guid: 7e4ab0de168458b43a21dc2f9e811ff5, type: 2}
- {fileID: 11400000, guid: 87e1e3fa2e9ad1d4188cc368fdef2059, type: 2}
- {fileID: 11400000, guid: cf2940a91bcc1604b90ce7598e03ffbe, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
@@ -82,6 +82,36 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dc2e1a393256c414d88652162e05b699
m_Address: "Animation/\u9152\u5427\u533B\u751F"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: af92c8803a884704093ca4bd3cdb30b8
m_Address: "Animation/\u9152\u5427\u706B\u5C71"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6df720d15b0ce4247b4481c891d2054a
m_Address: "Animation/\u9152\u5427\u8C03\u9152\u59B9"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7ba8eca4e18291341a10ef7c8c858bd9
m_Address: "Animation/\u9152\u5427\u533B\u751F"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5f26e5dcbc809104f92f908082de97d5
m_Address: "Animation/\u8C03\u9152\u59B9\u6D4B\u8BD5"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7985fcc6bb83afa43b21d52f4c463f81
m_Address: "AnimationConfig/\u8C03\u9152\u59B9\u6D4B\u8BD5"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -77,6 +77,36 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 467ca6472bd01724c8546cec9cc079d7
m_Address: "CG/\u5F00\u573A1"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 441bc569aab15334e92b2a3232d9093c
m_Address: "CG/\u5F00\u573A2"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c0724ae6698e0454da14fa5f9e87918a
m_Address: "BlockShape/\u6761\u72B6"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f55dac113f9a76c44b13c06b35a5f1e8
m_Address: "BlockPuzzle/\u65B9\u5757\u4E34\u65F6"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: df312fbc70840a04e82c04ac39efb188
m_Address: "BlockPuzzle/\u793A\u4F8B"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 149e01175167ecd4da5d9e258cd2d37a
m_Address: BlockPuzzle/Close
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -62,8 +62,13 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d6c3173f84145714f908d4f8c45ab92a
m_Address: YingliFixScene
- m_GUID: f30bd88801730144fb8628e970058d3e
m_Address: "\u9152\u5427\u573A\u666F"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 30073b2193480e3469efae4338cb89b6
m_Address: "\u68A6\u5883"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-Chinese (Simplified) (zh-Hans)
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-Chinese (Simplified) (zh-Hans)
m_Data:
m_SerializedData: []
m_GUID: 400397bf1b085a145baa334bad44785d
m_SerializeEntries:
- m_GUID: de4c589f11ea4fe4788deae4fa812d42
m_Address: sprite_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: fffc86e2fbf4ade43921cf63a4c8ecb6, type: 2}
- {fileID: 11400000, guid: 71dd08da4a466da4e852541657c20d3e, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 724eed66b2d8eef4faf77a4bee4d2845
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-English (en)
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-English (en)
m_Data:
m_SerializedData: []
m_GUID: 5a8ad9197340ae74b9108d350233652b
m_SerializeEntries:
- m_GUID: 8ba648392211f5f4a9a9d7678ca0d597
m_Address: sprite_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 975b430517deeb2488e8f04f352bed31, type: 2}
- {fileID: 11400000, guid: dcebae3aaf84c4640b3f5fd438f9067c, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1e521cfc13b314642b1e682e3be7ea17
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Assets-Chinese (Simplified) (zh-Hans)
m_EditorClassIdentifier:
m_GroupName: Localization-Assets-Chinese (Simplified) (zh-Hans)
m_Data:
m_SerializedData: []
m_GUID: b848f030a719ba04c9f1e343f17ddc0c
m_SerializeEntries:
- m_GUID: 6d8ee72f781acf64abfe82ab659f5771
m_Address: 03_qq_symbol
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 055e1a14dd45b2949a688bc4ab6c151d, type: 2}
- {fileID: 11400000, guid: 6f2e1a0a238afe444932be27faa4579e, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7e4ab0de168458b43a21dc2f9e811ff5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Assets-English (en)
m_EditorClassIdentifier:
m_GroupName: Localization-Assets-English (en)
m_Data:
m_SerializedData: []
m_GUID: 50aef5699023b21459e68677a9449d80
m_SerializeEntries:
- m_GUID: 032b1b5e09139ae45b6de51d35baae79
m_Address: discord-square-color-icon
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 895c7c97ef5802446a395377ef704940, type: 2}
- {fileID: 11400000, guid: 8004f70cd10ce4a439cb9e822bb078c2, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aafc8258a2111e94d8339a3152cf50e0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -37,8 +37,9 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c3bb987a03bd4284687e2e4bd17ef561
m_Address: Assets/Language/Config/Config Shared Data.asset
- m_GUID: 0cb567219be64c04b9552ecc61f8396a
m_Address: Assets/Language/Dialog/Fiction_Day1_night/Fiction_Day1_night Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -83,7 +84,7 @@ MonoBehaviour:
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: da47117d0e2720c4a8dc0bac3acb3cac
m_Address: Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset
m_Address: Assets/Language/Dialog/Test/Test Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -97,12 +98,6 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29f3df93ff78c16479dd8db51e939090
m_Address: Assets/Language/Dialog/Fiction_Day1_night/Fiction_Day1_night Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f6d220fec7b888b4f89463b5da038e62
m_Address: Assets/Language/Dialog/Fiction_Day1_mid/Fiction_Day1_mid Shared Data.asset
m_ReadOnly: 1
@@ -124,6 +119,88 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0ee8d3542a2395745b4ad6bf55e3b097
m_Address: Assets/Language/Dialog/Fiction_Day2_mid/Fiction_Day2_mid Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 771ed3ef48efbb645827ce5c29d63754
m_Address: Assets/Language/Dialog/Fiction_Day2_night/Fiction_Day2_night Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aaa27d8b7dfc3fc4294bda026ae135f2
m_Address: Assets/Language/Dialog/Fiction_Day3_mid/Fiction_Day3_mid Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3c243fd229013b84e9c88091eaa74103
m_Address: Assets/Language/Dialog/Fiction_Day3_night/Fiction_Day3_night Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bb8e2763fb266ff4d8b9c0b0f37882e2
m_Address: Assets/Language/Dialog/Fiction_Day4_mid/Fiction_Day4_mid Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bb6fa95706f665c469e270567be5cfe9
m_Address: Assets/Language/Dialog/Fiction_Huoshan1/New Table Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 042ab1d25056cbd4984621037ac848f0
m_Address: Assets/Language/Dialog/Fiction_Yingli1/Fiction_Yingli1 Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 70f8ff033cddcd543a618974781d0bb0
m_Address: Assets/Language/Dialog/FP_Day3_night/FP_Day3_night Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 08cb937dd06038b4486d6a3662539542
m_Address: Assets/Language/Dialog/Test_GeneralEnd/New Table Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9abdd56d318b1ec459c7e866748d6878
m_Address: Assets/Language/Sprite/sprite Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4b7004709baa3f942998e7994b48bd38
m_Address: "\u7B7E\u540D\u5B57\u8FF9"
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dd4a0fe1d258fbc4384ab1db825d5ae3
m_Address: Gts1/Fiction_Gts1 Shared Data.asset/Fiction_Gts1 Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 57cfa4d941133b840b4345cf815dda66
m_Address: Assets/Language/Dialog/Fiction_Day2_begin/Fiction_Day2_begin Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c3d23bd971e02d34cb356b2029523427
m_Address: Assets/Language/Dialog/Fiction_Day1_sleep/Fiction_Day1_sleep Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e3c75f951d9792449906a3a8010d2e74
m_Address: Assets/Language/Dialog/Fiction_Day2_sleep/Fiction_Day2_sleep Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -41,12 +41,6 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 780b504d9b462a746b7d00d64022773a
m_Address: Config_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d6149a0fedb6cc24ba2a318aedab1de0
m_Address: FP_Day1_mid_zh-Hans
m_ReadOnly: 1
@@ -96,7 +90,7 @@ MonoBehaviour:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 533b33b4a1f64604c99fc25138b1a50a
m_Address: Test_OP_zh-Hans
m_Address: Test_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
@@ -113,8 +107,8 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 72f4481345eb6c24594911deb872e0be
m_Address: Fiction_Day1_night_zh-Hans
- m_GUID: fb51befc2226dfa44bbde7203364c019
m_Address: Fiction_Day2_mid_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
@@ -125,12 +119,6 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 999ab1a8772cb1a4cba0325144ff5488
m_Address: Fiction_Day1_begin_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 72755a9b5a5ca5c4e92028ca44c66a6d
m_Address: FP_Peipei3_zh-Hans
m_ReadOnly: 1
@@ -143,6 +131,84 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a75bb4d4a30c22f40ad5c7d70c8276d4
m_Address: Fiction_Day1_night_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b2f0a2aa5e0b95346bf499980c2994d4
m_Address: Fiction_Day2_night_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6c498406bf979ca45b345e5bdbd3cc4b
m_Address: Fiction_Day3_mid_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8e5812f1d9f10a4488702f35405d197d
m_Address: Fiction_Day3_night_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 35f017da97194574da316391464204b2
m_Address: Fiction_Day4_mid_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 75ed4030af85d794f832919dbe427f51
m_Address: Fiction_Huoshan1_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4b181f70ec2e65f4cab1545662415306
m_Address: Fiction_Yingli1_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a525b6d2bcfeb2446b2f4d2b36b043c7
m_Address: FP_Day3_night_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1f031d78df49e5645a4ceaafa7283f91
m_Address: Test_GeneralEnd_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9cecc6d4b999d5c489b69406176bab99
m_Address: Fiction_Gts1_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fbfb0ced2ba1bf44e86964158ae53d72
m_Address: Fiction_Day1_sleep_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 999ab1a8772cb1a4cba0325144ff5488
m_Address: Fiction_Day1_begin_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4d88b47f4a7e3f249b44203f411e4adf
m_Address: Fiction_Day2_sleep_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-String-Tables-Chinese (Simplified)
m_EditorClassIdentifier:
m_GroupName: Localization-String-Tables-Chinese (Simplified)
m_Data:
m_SerializedData: []
m_GUID: 9348dd0a8788924488a90c1620b5c896
m_SerializeEntries:
- m_GUID: fb7e715498f89454486d42d98aebfec5
m_Address: Fiction_Day2_begin_zh-Hans
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh-Hans
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 443ec58daf8fe0d4b8cfdb39efd4f3e5, type: 2}
- {fileID: 11400000, guid: c0d471a5cc8ca8a4e85145f6af285176, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cf2940a91bcc1604b90ce7598e03ffbe
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -41,12 +41,6 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 02d98e7d7f864944d96d3b345224d9fa
m_Address: Config_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 30ab319b5e0bafe46aa622bb93381c7e
m_Address: FP_Day1_mid_en
m_ReadOnly: 1
@@ -96,7 +90,7 @@ MonoBehaviour:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 58ce8964b8b71fd43989e4688bb56792
m_Address: Test_OP_en
m_Address: Test_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
@@ -113,8 +107,8 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d9da3ee8cbe1f3f40a93ee2c3042330d
m_Address: Fiction_Day1_night_en
- m_GUID: eb9ebf027dd4b564cb035d7167ff8099
m_Address: Fiction_Day2_mid_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
@@ -125,12 +119,6 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 30a0c1ae8c45da34f8e3f90692e96e11
m_Address: Fiction_Day1_begin_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fde90ade684482142af49533e4f4ed62
m_Address: FP_Peipei3_en
m_ReadOnly: 1
@@ -143,6 +131,84 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0d2928a7d58c26a4ca78abf2f5da1373
m_Address: Fiction_Day1_night_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 59fc388134f5d884c8d7ca28f2d7017e
m_Address: Fiction_Day2_night_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 379ead226bea4f844b1c136c4f748633
m_Address: Fiction_Day3_mid_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aaf54fb66c2fa9d4ab68626ced632a7a
m_Address: Fiction_Day3_night_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c0c8b8aea11da444ea41eece5a698e5f
m_Address: Fiction_Day4_mid_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2a14b1d82f4aef94aac2b230392605fc
m_Address: Fiction_Huoshan1_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 79ccbc35144b91a45bb9fdf9732d238a
m_Address: Fiction_Yingli1_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0e9bb0974017aa346a379b78126f6f7b
m_Address: FP_Day3_night_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 27ad0341432ae0b46a8fe117eb5c73e2
m_Address: Test_GeneralEnd_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1adbe96b15171134584c9a2d7d69c045
m_Address: Fiction_Gts1_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9d72f86c018628e418747a7d0a66cb21
m_Address: Fiction_Day1_sleep_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 30a0c1ae8c45da34f8e3f90692e96e11
m_Address: Fiction_Day1_begin_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 36d94b46b4a12b54b8e084d8d275e675
m_Address: Fiction_Day2_sleep_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-String-Tables-English
m_EditorClassIdentifier:
m_GroupName: Localization-String-Tables-English
m_Data:
m_SerializedData: []
m_GUID: 63ce97e1ddac4bc43807a808493c0a93
m_SerializeEntries:
- m_GUID: 3c43e9ea4ead9374490aa31c3778b299
m_Address: Fiction_Day2_begin_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: e47bd2f8e7497a945bb6b80906bf1484, type: 2}
- {fileID: 11400000, guid: 3b18c16658755cc4fb71ea6ad7abc855, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 87e1e3fa2e9ad1d4188cc368fdef2059
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -67,6 +67,36 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 89145aa76e4c0d340b560adaea8492ca
m_Address: PipelinePrefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 396b6acd14ffd2d46abab1fdb04af60c
m_Address: Chapter Item
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 003f8d83e417e6a44a58ed1929b4eafd
m_Address: RecordItem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 03e5e9a1437535042ae48b2ba034dd93
m_Address: BlockShape
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f0804046fd11f7a4a8f27886f2bd3cb0
m_Address: ShapeCreateButton
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 89fde357592cf2e44a0b73131b150869
m_Address: ActorAnimaEx
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Localization-Asset-Tables-Chinese (Simplified) (zh-Hans)_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 724eed66b2d8eef4faf77a4bee4d2845, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5
m_LoadPath:
m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 1
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fffc86e2fbf4ade43921cf63a4c8ecb6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Localization-Asset-Tables-Chinese (Simplified) (zh-Hans)_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 724eed66b2d8eef4faf77a4bee4d2845, type: 2}
m_StaticContent: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 71dd08da4a466da4e852541657c20d3e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Localization-Asset-Tables-English (en)_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 1e521cfc13b314642b1e682e3be7ea17, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5
m_LoadPath:
m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 1
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 975b430517deeb2488e8f04f352bed31
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Localization-Asset-Tables-English (en)_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 1e521cfc13b314642b1e682e3be7ea17, type: 2}
m_StaticContent: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dcebae3aaf84c4640b3f5fd438f9067c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Localization-Assets-Chinese (Simplified) (zh-Hans)_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 7e4ab0de168458b43a21dc2f9e811ff5, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5
m_LoadPath:
m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 1
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 055e1a14dd45b2949a688bc4ab6c151d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Localization-Assets-Chinese (Simplified) (zh-Hans)_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 7e4ab0de168458b43a21dc2f9e811ff5, type: 2}
m_StaticContent: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6f2e1a0a238afe444932be27faa4579e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Localization-Assets-English (en)_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: aafc8258a2111e94d8339a3152cf50e0, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5
m_LoadPath:
m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 1
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 895c7c97ef5802446a395377ef704940
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Localization-Assets-English (en)_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: aafc8258a2111e94d8339a3152cf50e0, type: 2}
m_StaticContent: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8004f70cd10ce4a439cb9e822bb078c2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Localization-String-Tables-Chinese (Simplified)_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: cf2940a91bcc1604b90ce7598e03ffbe, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5
m_LoadPath:
m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 1
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 443ec58daf8fe0d4b8cfdb39efd4f3e5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Localization-String-Tables-Chinese (Simplified)_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: cf2940a91bcc1604b90ce7598e03ffbe, type: 2}
m_StaticContent: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c0d471a5cc8ca8a4e85145f6af285176
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Localization-String-Tables-English_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 87e1e3fa2e9ad1d4188cc368fdef2059, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5
m_LoadPath:
m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 1
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e47bd2f8e7497a945bb6b80906bf1484
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Localization-String-Tables-English_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 87e1e3fa2e9ad1d4188cc368fdef2059, type: 2}
m_StaticContent: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3b18c16658755cc4fb71ea6ad7abc855
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -28,6 +28,16 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d9e560aff5c70fb4dbeedb5ce64a0055
m_Address: BubbleStyle
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9a92289d23953c445ba2d385f1698f30
m_Address: BlockPuzzleValidtor
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: c1e857482a330e24a880d6543c7a379f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 75a25991cf429bd4aac957f77cfe911a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,43 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
namespace AibisDream
{
[CustomEditor(typeof(BlockPuzzleSystem))]
public class BlockPuzzleEditor : Editor
{
private string _shapeKey;
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
var example = (BlockPuzzleSystem)target;
EditorGUILayout.BeginHorizontal();
if (GUILayout.Button("加载"))
{
example.LoadConfig();
}
if (GUILayout.Button("应用"))
{
example.ApplyConfig();
}
if (GUILayout.Button("保存"))
{
example.SaveConfig();
}
EditorGUILayout.EndHorizontal();
EditorGUILayout.Space();
GUILayout.Label("创建图形");
EditorGUILayout.BeginHorizontal();
_shapeKey = EditorGUILayout.TextField("形状名称", _shapeKey);
if (GUILayout.Button("创建"))
{
example.CreateShapeInEditor(_shapeKey);
}
EditorGUILayout.EndHorizontal();
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fe1f9b10108e095408c3816b817d4980
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,43 @@
using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
{
[CustomEditor(typeof(BlockShape))]
public class BlockShapeEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
var example = (BlockShape)target;
EditorGUILayout.BeginHorizontal();
// 增加绘制形状和保存形状按钮
if (GUILayout.Button("绘制"))
{
example.DrawShape();
}
if (GUILayout.Button("保存"))
{
example.SaveShape();
}
EditorGUILayout.EndHorizontal();
GUILayout.Label("编辑器下吸附");
EditorGUILayout.BeginHorizontal();
if (GUILayout.Button("旋转"))
{
example.RotateClockwise();
}
if (GUILayout.Button("吸附"))
{
example.SnapToGrid();
}
if (GUILayout.Button("删除"))
{
example.DeleteShape();
}
EditorGUILayout.EndHorizontal();
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 73fc356b22fa6a147be7a2eb9c78f123
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,19 @@
using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
{
[CustomEditor(typeof(GridVisualizer))]
public class GridVisualizerEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
var example = (GridVisualizer)target;
EditorGUILayout.LabelField("层级设置", EditorStyles.boldLabel);
example.sortingLayer = EditorKit.SortingLayerField("目标层级", example.sortingLayer);
example.sortingOrder = EditorGUILayout.IntField("层级顺序", example.sortingOrder);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 37faa5e9015d2ce4285ec9f35c871fe1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d6d1e89d1670e074a9f74578cfc6bc00
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,27 @@
using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
{
public static class BlockPuzzleMenuItemCreator
{
private const string BLOCK_SHAPE_PREFAB_PATH = "Assets/Prefabs/BlockPuzzle/BlockShape.prefab";
[MenuItem("GameObject/Block Puzzle/Shape")]
public static BlockShape CreateBlockPuzzleShape()
{
var prefabAsset =AssetDatabase.LoadAssetAtPath<GameObject>(BLOCK_SHAPE_PREFAB_PATH);
if (prefabAsset == null)
{
throw new System.InvalidOperationException(
$"Can't create a new Block Shape: Can't find the prefab to create a Block Shape from."
);
}
var instantiatedPrefab = (GameObject)PrefabUtility.InstantiatePrefab(prefabAsset);
PrefabUtility.UnpackPrefabInstance(instantiatedPrefab, PrefabUnpackMode.Completely, InteractionMode.UserAction);
return instantiatedPrefab.GetComponent<BlockShape>();
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 71b77fc2d917b61489a45c2a36d5d049
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -287,7 +287,12 @@ namespace AibisDream.SystemEditor
if (idx != -1)
{
var newClip = AssetDatabase.LoadAssetAtPath<AnimationClip>(_clipsCache[idx]);
Debug.Log(_clipsCache[idx]);
var oldClip = state.state.motion;
var settings = AnimationUtility.GetAnimationClipSettings(newClip);
settings.loopTime = oldClip.isLooping;
AnimationUtility.SetAnimationClipSettings(newClip, settings);
state.state.motion = newClip;
}
}
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 349305695e512ac4aa4fa63995c55809
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,83 +0,0 @@
using UnityEditor;
using UnityEditor.Animations;
using UnityEngine;
using UnityEngine.UIElements;
public class SimpleCustomEditor : EditorWindow
{
[MenuItem("Window/UI Toolkit/MyCustomEditor")]
public static void ShowExample()
{
SimpleCustomEditor wnd = GetWindow<SimpleCustomEditor>();
wnd.titleContent = new GUIContent("MyCustomEditor");
}
[SerializeField]
private VisualTreeAsset m_UXMLTree = default;
private int m_ClickCount = 0;
private const string m_ButtonPrefix = "button";
public void CreateGUI()
{
// Each editor window contains a root VisualElement object
VisualElement root = rootVisualElement;
// VisualElements objects can contain other VisualElement following a tree hierarchy.
Label label = new Label("These controls were created using C# code.");
root.Add(label);
Button button = new Button();
button.name = "button3";
button.text = "This is button3.";
root.Add(button);
Toggle toggle = new Toggle();
toggle.name = "toggle3";
toggle.label = "Number?";
root.Add(toggle);
// Instantiate UXML created automatically which is set as the default VisualTreeAsset.
root.Add(m_UXMLTree.Instantiate());
// Import UXML created manually.
var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/UXML/Editor Simple/SimpleCustomEditor_uxml.uxml");
VisualElement labelFromUXML_uxml = visualTree.Instantiate();
root.Add(labelFromUXML_uxml);
//Call the event handler
SetupButtonHandler();
}
//Functions as the event handlers for your button click and number counts
private void SetupButtonHandler()
{
VisualElement root = rootVisualElement;
var buttons = root.Query<Button>();
buttons.ForEach(RegisterHandler);
}
private void RegisterHandler(Button button)
{
button.RegisterCallback<ClickEvent>(PrintClickMessage);
}
private void PrintClickMessage(ClickEvent evt)
{
VisualElement root = rootVisualElement;
++m_ClickCount;
//Because of the names we gave the buttons and toggles, we can use the
//button name to find the toggle name.
Button button = evt.currentTarget as Button;
string buttonNumber = button.name.Substring(m_ButtonPrefix.Length);
string toggleName = "toggle" + buttonNumber;
Toggle toggle = root.Q<Toggle>(toggleName);
Debug.Log("Button was clicked!" +
(toggle.value ? " Count: " + m_ClickCount : ""));
}
}
@@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 0465714253b841b4284cdd223157ac53
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences:
- m_ViewDataDictionary: {instanceID: 0}
- m_UXMLTree: {fileID: 9197481963319205126, guid: 070bb0363fb0b0f4c85a9c529a716276, type: 3}
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,5 +0,0 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:Label text="These controls were created in UI Builder." />
<ui:Button text="This is button1" name="button1"/>
<ui:Toggle label="Number?" name="toggle1"/>
</ui:UXML>
@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 070bb0363fb0b0f4c85a9c529a716276
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
@@ -1,5 +0,0 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:Label text="These controls were created with UXML." />
<ui:Button text="This is button2" name="button2"/>
<ui:Toggle label="Number?" name="toggle2"/>
</ui:UXML>
@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 208c3b2cf9e22504689a630983c0b2bc
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cfd74cd0e7d421b41b6fb4fe5306d4c1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+132
View File
@@ -0,0 +1,132 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace AibisDream.SystemEditor
{
// 帧数据
[Serializable]
public class FrameData
{
public string name;
public int x;
public int y;
public int width;
public int height;
public float duration; // 毫秒
}
// 动画片段数据
[Serializable]
public class AnimationData
{
public string name;
public List<int> frameIndices;
public bool loop;
public float? frameDuration; // 可选的,覆盖全局frameDuration
public int? sampleRate; // 可选的,覆盖全局sampleRate
}
// Aseprite JSON格式的数据结构
[Serializable]
public class AsepriteFrameInfo
{
public AsepriteFrameRect frame;
public bool rotated;
public bool trimmed;
public AsepriteFrameRect spriteSourceSize;
public AsepriteSize sourceSize;
public float duration; // 毫秒
}
[Serializable]
public class AsepriteFrameRect
{
public int x;
public int y;
public int w;
public int h;
}
[Serializable]
public class AsepriteSize
{
public int w;
public int h;
}
[Serializable]
public class AsepriteFrameTag
{
public string name;
public int from;
public int to;
public string direction;
}
[Serializable]
public class AsepriteMeta
{
public string app;
public string version;
public string image;
public string format;
public AsepriteSize size;
public string scale;
public List<AsepriteFrameTag> frameTags;
public List<object> layers;
public List<object> slices;
}
// Aseprite JSON的包装类(因为Unity JsonUtility不支持Dictionary
[Serializable]
public class AsepriteFrameEntry
{
public string key;
public AsepriteFrameInfo value;
}
[Serializable]
public class AsepriteJsonData
{
public AsepriteMeta meta;
// frames将通过手动解析处理
}
// 手动JSON格式的数据结构
[Serializable]
public class ManualLayout
{
public int rows;
public int columns;
public int? frameCount; // 可选
public string direction; // "horizontal" 或 "vertical"
}
[Serializable]
public class ManualJsonData
{
public string type;
public ManualLayout layout;
public float frameDuration; // 毫秒
public int sampleRate;
public List<AnimationData> animations;
}
// 统一的内部数据格式
public class ProcessedAnimationData
{
public List<FrameData> frames;
public List<ProcessedAnimationClip> animations;
}
public class ProcessedAnimationClip
{
public string name;
public List<int> frameIndices;
public bool loop;
public float frameDuration; // 毫秒(已应用覆盖逻辑)
public int sampleRate; // 已应用覆盖逻辑
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5cd60e41866d0ec418dfc6fdce37a8ba
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,208 @@
using System.IO;
using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
{
public class AnimationClipGenerator : EditorWindow
{
private Texture2D selectedTexture;
private TextAsset selectedJson;
private DefaultAsset outputFolder;
private string outputPath = "";
// 动画类型选项
private enum AnimationTargetType
{
SpriteRenderer, // Sprite动画
Image // UIImage动画
}
private AnimationTargetType animationType = AnimationTargetType.SpriteRenderer;
// Pivot 设置选项
private enum PivotAlignment
{
Center, // 中心 (0.5, 0.5)
TopLeft, // 左上 (0, 1)
TopRight, // 右上 (1, 1)
BottomLeft, // 左下 (0, 0)
BottomRight, // 右下 (1, 0)
TopCenter, // 上中 (0.5, 1)
BottomCenter, // 下中 (0.5, 0)
LeftCenter, // 左中 (0, 0.5)
RightCenter, // 右中 (1, 0.5)
Custom // 自定义
}
private PivotAlignment pivotAlignment = PivotAlignment.Center;
private Vector2 customPivot = new Vector2(0.5f, 0.5f);
[MenuItem("Tools/动画片段生成器(Animation Clip Generator)")]
public static void ShowWindow()
{
GetWindow<AnimationClipGenerator>("动画片段生成器(Animation Clip Generator)");
}
private void OnGUI()
{
// 图片文件选择
EditorGUILayout.LabelField("图片文件 (PNG/JPG)", EditorStyles.boldLabel);
selectedTexture = (Texture2D)EditorGUILayout.ObjectField(
"Texture", selectedTexture, typeof(Texture2D), false);
EditorGUILayout.Space();
// JSON文件选择
EditorGUILayout.LabelField("JSON文件", EditorStyles.boldLabel);
selectedJson = (TextAsset)EditorGUILayout.ObjectField(
"JSON", selectedJson, typeof(TextAsset), false);
EditorGUILayout.Space();
// 动画类型选择
EditorGUILayout.LabelField("动画类型", EditorStyles.boldLabel);
animationType = (AnimationTargetType)EditorGUILayout.EnumPopup(
"Animation Type", animationType);
EditorGUILayout.HelpBox(
animationType == AnimationTargetType.SpriteRenderer
? "生成用于SpriteRenderer的动画(绑定到m_Sprite属性)"
: "生成用于Unity UI Image的动画(绑定到m_Sprite属性)",
MessageType.Info);
EditorGUILayout.Space();
// Pivot 设置
EditorGUILayout.LabelField("Pivot 设置", EditorStyles.boldLabel);
pivotAlignment = (PivotAlignment)EditorGUILayout.EnumPopup(
"Pivot Alignment", pivotAlignment);
if (pivotAlignment == PivotAlignment.Custom)
{
customPivot = EditorGUILayout.Vector2Field("Custom Pivot", customPivot);
// 限制 pivot 值在 0-1 范围内
customPivot.x = Mathf.Clamp01(customPivot.x);
customPivot.y = Mathf.Clamp01(customPivot.y);
EditorGUILayout.HelpBox(
"自定义 Pivot 值范围: X 和 Y 应在 0-1 之间\n" +
"例如: (0, 0) = 左下角, (0.5, 0.5) = 中心, (1, 1) = 右上角",
MessageType.Info);
}
else
{
Vector2 previewPivot = GetPivotFromAlignment(pivotAlignment);
EditorGUILayout.HelpBox(
$"当前 Pivot: ({previewPivot.x:F2}, {previewPivot.y:F2})",
MessageType.Info);
}
EditorGUILayout.Space();
// 输出目录选择
EditorGUILayout.LabelField("输出目录", EditorStyles.boldLabel);
outputFolder = (DefaultAsset)EditorGUILayout.ObjectField(
"Output Folder", outputFolder, typeof(DefaultAsset), false);
// 显示输出路径
if (outputFolder != null)
{
outputPath = AssetDatabase.GetAssetPath(outputFolder);
EditorGUILayout.HelpBox($"输出路径: {outputPath}", MessageType.Info);
}
else
{
outputPath = "";
}
EditorGUILayout.Space();
// 生成按钮
GUI.enabled = selectedTexture != null && selectedJson != null && outputFolder != null;
if (GUILayout.Button("生成 AnimationClip", GUILayout.Height(30)))
{
GenerateAnimationClips();
}
GUI.enabled = true;
EditorGUILayout.Space();
// 说明信息
EditorGUILayout.HelpBox(
"使用说明:\n" +
"1. 选择PNG或JPG图片文件\n" +
"2. 选择JSON文件(Aseprite格式或手动格式)\n" +
"3. 选择输出目录\n" +
"4. 点击生成按钮\n\n" +
"注意: 如果图片的SpriteMode是Single,工具会自动根据JSON切图。",
MessageType.Info);
}
private void GenerateAnimationClips()
{
if (selectedTexture == null || selectedJson == null || outputFolder == null)
{
EditorUtility.DisplayDialog("错误", "请选择图片文件、JSON文件和输出目录", "确定");
return;
}
string texturePath = AssetDatabase.GetAssetPath(selectedTexture);
string jsonPath = AssetDatabase.GetAssetPath(selectedJson);
// 验证文件扩展名
string textureExt = Path.GetExtension(texturePath).ToLower();
if (textureExt != ".png" && textureExt != ".jpg" && textureExt != ".jpeg")
{
EditorUtility.DisplayDialog("错误", "图片文件必须是PNG或JPG格式", "确定");
return;
}
try
{
bool isImageAnimation = animationType == AnimationTargetType.Image;
Vector2 pivot = pivotAlignment == PivotAlignment.Custom
? customPivot
: GetPivotFromAlignment(pivotAlignment);
// 确保 pivot 值在有效范围内
pivot.x = Mathf.Clamp01(pivot.x);
pivot.y = Mathf.Clamp01(pivot.y);
AnimationClipGeneratorCore.GenerateClips(texturePath, jsonPath, outputPath, isImageAnimation, pivot);
EditorUtility.DisplayDialog("成功", $"AnimationClip已生成到: {outputPath}", "确定");
// 刷新资源数据库
AssetDatabase.Refresh();
}
catch (System.Exception e)
{
EditorUtility.DisplayDialog("错误", $"生成失败: {e.Message}", "确定");
Debug.LogError(e);
}
}
private Vector2 GetPivotFromAlignment(PivotAlignment alignment)
{
switch (alignment)
{
case PivotAlignment.Center:
return new Vector2(0.5f, 0.5f);
case PivotAlignment.TopLeft:
return new Vector2(0f, 1f);
case PivotAlignment.TopRight:
return new Vector2(1f, 1f);
case PivotAlignment.BottomLeft:
return new Vector2(0f, 0f);
case PivotAlignment.BottomRight:
return new Vector2(1f, 0f);
case PivotAlignment.TopCenter:
return new Vector2(0.5f, 1f);
case PivotAlignment.BottomCenter:
return new Vector2(0.5f, 0f);
case PivotAlignment.LeftCenter:
return new Vector2(0f, 0.5f);
case PivotAlignment.RightCenter:
return new Vector2(1f, 0.5f);
case PivotAlignment.Custom:
return customPivot;
default:
return new Vector2(0.5f, 0.5f);
}
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7472aae8191639b47af5d9ba115b39b5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,668 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEditor.U2D.Sprites;
using UnityEngine;
namespace AibisDream.SystemEditor
{
public static class AnimationClipGeneratorCore
{
// 检查SpriteMode
public static SpriteImportMode CheckSpriteMode(string texturePath)
{
TextureImporter textureImporter = AssetImporter.GetAtPath(texturePath) as TextureImporter;
if (textureImporter == null)
{
throw new Exception($"无法加载纹理导入器: {texturePath}");
}
return textureImporter.spriteImportMode;
}
// 解析Aseprite JSON
public static ProcessedAnimationData ParseAsepriteJson(string jsonPath, string texturePath)
{
string jsonContent = File.ReadAllText(jsonPath);
// Unity的JsonUtility不支持Dictionary,需要手动解析frames对象
// 使用SimpleJSON或手动解析
ProcessedAnimationData result = ParseAsepriteJsonManual(jsonContent);
if (result.frames == null || result.frames.Count == 0)
{
throw new Exception("无效的Aseprite JSON格式:无法解析frames");
}
return result;
}
private static ProcessedAnimationData ParseAsepriteJsonManual(string jsonContent)
{
List<FrameData> frames = new List<FrameData>();
List<ProcessedAnimationClip> animations = new List<ProcessedAnimationClip>();
try
{
// 解析meta部分
int metaStart = jsonContent.IndexOf("\"meta\":");
if (metaStart == -1)
{
throw new Exception("找不到meta部分");
}
// 找到meta对象的结束位置
int metaBraceStart = jsonContent.IndexOf('{', metaStart);
int metaBraceEnd = FindMatchingBrace(jsonContent, metaBraceStart);
string metaJson = jsonContent.Substring(metaBraceStart, metaBraceEnd - metaBraceStart + 1);
// 移除可能的尾随逗号
metaJson = metaJson.TrimEnd(',', ' ', '\n', '\r');
AsepriteMeta meta = JsonUtility.FromJson<AsepriteMeta>(metaJson);
// 解析frameTags
if (meta.frameTags != null)
{
foreach (var tag in meta.frameTags)
{
List<int> frameIndices = new List<int>();
int start = tag.from;
int end = tag.to;
if (tag.direction == "forward" || tag.direction == "pingpong" || string.IsNullOrEmpty(tag.direction))
{
for (int i = start; i <= end; i++)
{
frameIndices.Add(i);
}
}
else if (tag.direction == "reverse")
{
for (int i = end; i >= start; i--)
{
frameIndices.Add(i);
}
}
animations.Add(new ProcessedAnimationClip
{
name = tag.name,
frameIndices = frameIndices,
loop = true,
frameDuration = 0,
sampleRate = 100
});
}
}
// 解析frames对象 - 使用正则表达式或手动解析
int framesStart = jsonContent.IndexOf("\"frames\":");
if (framesStart == -1)
{
throw new Exception("找不到frames部分");
}
// 找到frames对象的开始和结束
int framesBraceStart = jsonContent.IndexOf('{', framesStart);
int framesBraceEnd = FindMatchingBrace(jsonContent, framesBraceStart);
string framesContent = jsonContent.Substring(framesBraceStart + 1, framesBraceEnd - framesBraceStart - 1);
// 解析每个帧条目
ParseFramesContent(framesContent, frames);
// 按名称排序帧(确保顺序正确)
frames = frames.OrderBy(f => ExtractFrameNumber(f.name)).ThenBy(f => f.name).ToList();
}
catch (Exception e)
{
throw new Exception($"解析Aseprite JSON失败: {e.Message}\n{e.StackTrace}");
}
return new ProcessedAnimationData
{
frames = frames,
animations = animations
};
}
private static void ParseFramesContent(string framesContent, List<FrameData> frames)
{
int pos = 0;
while (pos < framesContent.Length)
{
// 跳过空白字符和逗号
while (pos < framesContent.Length && (char.IsWhiteSpace(framesContent[pos]) || framesContent[pos] == ','))
pos++;
if (pos >= framesContent.Length) break;
// 查找帧名称(在引号中)
if (framesContent[pos] != '"')
{
pos++;
continue;
}
int nameStart = pos + 1;
int nameEnd = framesContent.IndexOf('"', nameStart);
if (nameEnd == -1) break;
string frameName = framesContent.Substring(nameStart, nameEnd - nameStart);
pos = nameEnd + 1;
// 跳过冒号和空白
while (pos < framesContent.Length && (char.IsWhiteSpace(framesContent[pos]) || framesContent[pos] == ':'))
pos++;
if (pos >= framesContent.Length) break;
// 查找帧数据对象
if (framesContent[pos] != '{')
{
continue;
}
int dataStart = pos;
int dataEnd = FindMatchingBrace(framesContent, dataStart);
if (dataEnd == -1) break;
string frameDataJson = framesContent.Substring(dataStart, dataEnd - dataStart + 1);
pos = dataEnd + 1;
try
{
AsepriteFrameInfo frameInfo = JsonUtility.FromJson<AsepriteFrameInfo>(frameDataJson);
if (frameInfo.frame != null)
{
frames.Add(new FrameData
{
name = frameName,
x = frameInfo.frame.x,
y = frameInfo.frame.y,
width = frameInfo.frame.w,
height = frameInfo.frame.h,
duration = frameInfo.duration
});
}
}
catch (Exception e)
{
Debug.LogWarning($"解析帧数据失败: {frameName}, 错误: {e.Message}");
}
}
}
private static int ExtractFrameNumber(string frameName)
{
// 尝试从帧名称中提取数字(例如 "调酒妹侧头 0.aseprite" -> 0
int lastSpace = frameName.LastIndexOf(' ');
if (lastSpace >= 0 && lastSpace < frameName.Length - 1)
{
string numberPart = frameName.Substring(lastSpace + 1);
int dotIndex = numberPart.IndexOf('.');
if (dotIndex > 0)
{
numberPart = numberPart.Substring(0, dotIndex);
}
if (int.TryParse(numberPart, out int number))
{
return number;
}
}
return int.MaxValue; // 如果无法解析,放在最后
}
private static int FindMatchingBrace(string str, int startIndex)
{
if (startIndex < 0 || startIndex >= str.Length) return -1;
int braceCount = 0;
bool foundStart = false;
for (int i = startIndex; i < str.Length; i++)
{
if (str[i] == '{')
{
braceCount++;
foundStart = true;
}
else if (str[i] == '}')
{
braceCount--;
if (braceCount == 0 && foundStart)
{
return i;
}
}
}
return -1;
}
// 解析手动JSON
public static ProcessedAnimationData ParseManualJson(string jsonPath, string texturePath)
{
string jsonContent = File.ReadAllText(jsonPath);
ManualJsonData manualData = JsonUtility.FromJson<ManualJsonData>(jsonContent);
if (manualData.layout == null || manualData.animations == null)
{
throw new Exception("无效的手动JSON格式");
}
// 验证layout参数
if (manualData.layout.rows <= 0 || manualData.layout.columns <= 0)
{
throw new Exception("rows和columns必须大于0");
}
// 读取图片尺寸
TextureImporter textureImporter = AssetImporter.GetAtPath(texturePath) as TextureImporter;
if (textureImporter == null)
{
throw new Exception($"无法加载纹理导入器: {texturePath}");
}
Texture2D texture = AssetDatabase.LoadAssetAtPath<Texture2D>(texturePath);
if (texture == null)
{
throw new Exception($"无法加载纹理: {texturePath}");
}
int imageWidth = texture.width;
int imageHeight = texture.height;
// 计算sprite尺寸
int spriteWidth = imageWidth / manualData.layout.columns;
int spriteHeight = imageHeight / manualData.layout.rows;
// 验证图片尺寸能被行列数整除
if (imageWidth % manualData.layout.columns != 0 || imageHeight % manualData.layout.rows != 0)
{
throw new Exception($"图片尺寸({imageWidth}x{imageHeight})无法被行列数({manualData.layout.columns}x{manualData.layout.rows})整除");
}
// 计算总帧数
int totalFrames = manualData.layout.frameCount ?? (manualData.layout.rows * manualData.layout.columns);
if (totalFrames > manualData.layout.rows * manualData.layout.columns)
{
throw new Exception($"frameCount({totalFrames})不能超过rows*columns({manualData.layout.rows * manualData.layout.columns})");
}
// 生成帧数据
List<FrameData> frames = new List<FrameData>();
bool isHorizontal = manualData.layout.direction == "horizontal";
for (int frameIndex = 0; frameIndex < totalFrames; frameIndex++)
{
int row, column;
if (isHorizontal)
{
// 横向排列:按行扫描,从左到右,从上到下
row = frameIndex / manualData.layout.columns;
column = frameIndex % manualData.layout.columns;
}
else
{
// 纵向排列:按列扫描,从上到下,从左到右
column = frameIndex / manualData.layout.rows;
row = frameIndex % manualData.layout.rows;
}
// 使用左上角为(0,0)的坐标系,向右向下为正轴
// 在SliceSprites中会统一转换为Unity的左下角坐标系
int x = column * spriteWidth;
int y = row * spriteHeight;
frames.Add(new FrameData
{
name = $"frame_{frameIndex}",
x = x,
y = y,
width = spriteWidth,
height = spriteHeight,
duration = manualData.frameDuration
});
}
// 处理动画片段
List<ProcessedAnimationClip> animations = new List<ProcessedAnimationClip>();
foreach (var anim in manualData.animations)
{
// 应用参数覆盖逻辑
float frameDuration = anim.frameDuration ?? manualData.frameDuration;
int sampleRate = anim.sampleRate ?? manualData.sampleRate;
animations.Add(new ProcessedAnimationClip
{
name = anim.name,
frameIndices = anim.frameIndices,
loop = anim.loop,
frameDuration = frameDuration,
sampleRate = sampleRate
});
}
return new ProcessedAnimationData
{
frames = frames,
animations = animations
};
}
// 根据JSON信息切图
public static void SliceSprites(string texturePath, List<FrameData> frames, Vector2 pivot)
{
TextureImporter textureImporter = AssetImporter.GetAtPath(texturePath) as TextureImporter;
if (textureImporter == null)
{
throw new Exception($"无法加载纹理导入器: {texturePath}");
}
// 获取纹理尺寸
Texture2D texture = AssetDatabase.LoadAssetAtPath<Texture2D>(texturePath);
if (texture == null)
{
throw new Exception($"无法加载纹理: {texturePath}");
}
int textureHeight = texture.height;
// 设置spriteMode为Multiple
textureImporter.spriteImportMode = SpriteImportMode.Multiple;
// 使用新的Sprite Editor Data Provider API (Unity 2020.2+)
var spriteDataProviderFactories = new SpriteDataProviderFactories();
spriteDataProviderFactories.Init();
var dataProvider = spriteDataProviderFactories.GetSpriteEditorDataProviderFromObject(textureImporter);
if (dataProvider == null)
{
throw new Exception($"无法获取Sprite Editor Data Provider: {texturePath}");
}
dataProvider.InitSpriteEditorDataProvider();
// 创建SpriteRect数组
// 注意:JSON中的坐标是以左上角为(0,0),向右向下为正轴
// Unity的纹理坐标系统是左下角为(0,0),向上为正轴
// 需要将Y坐标从左上角坐标系转换为Unity的左下角坐标系
var spriteRects = new SpriteRect[frames.Count];
for (int i = 0; i < frames.Count; i++)
{
var frame = frames[i];
// 坐标转换:从左上角(0,0)坐标系转换为Unity左下角(0,0)坐标系
// Unity Y = 纹理高度 - (原始Y + 高度)
float unityY = textureHeight - (frame.y + frame.height);
// 根据 pivot 值确定 alignment
SpriteAlignment alignment = SpriteAlignment.Custom;
if (pivot == new Vector2(0.5f, 0.5f))
alignment = SpriteAlignment.Center;
else if (pivot == new Vector2(0f, 1f))
alignment = SpriteAlignment.TopLeft;
else if (pivot == new Vector2(1f, 1f))
alignment = SpriteAlignment.TopRight;
else if (pivot == new Vector2(0f, 0f))
alignment = SpriteAlignment.BottomLeft;
else if (pivot == new Vector2(1f, 0f))
alignment = SpriteAlignment.BottomRight;
else if (pivot == new Vector2(0.5f, 1f))
alignment = SpriteAlignment.TopCenter;
else if (pivot == new Vector2(0.5f, 0f))
alignment = SpriteAlignment.BottomCenter;
else if (pivot == new Vector2(0f, 0.5f))
alignment = SpriteAlignment.LeftCenter;
else if (pivot == new Vector2(1f, 0.5f))
alignment = SpriteAlignment.RightCenter;
spriteRects[i] = new SpriteRect
{
name = frame.name,
rect = new Rect(frame.x, unityY, frame.width, frame.height),
pivot = pivot,
alignment = alignment
};
}
dataProvider.SetSpriteRects(spriteRects);
dataProvider.Apply();
AssetDatabase.ImportAsset(texturePath, ImportAssetOptions.ForceUpdate);
}
// 创建或更新 AnimationClip(若已存在则在原资源上就地更新,避免引用丢失)
public static AnimationClip CreateAnimationClip(
ProcessedAnimationClip animationData,
List<FrameData> frames,
Sprite[] sprites,
string outputPath,
bool isImageAnimation = false)
{
// 先计算目标资源路径
string fullPath = Path.Combine(outputPath, $"{animationData.name}.anim");
string assetPath = fullPath.Replace('\\', '/');
if (!assetPath.StartsWith("Assets/"))
{
// 转换为相对路径
string projectPath = Application.dataPath.Replace("Assets", "");
if (assetPath.StartsWith(projectPath))
{
assetPath = assetPath.Substring(projectPath.Length);
}
}
// 如果已经存在同名 AnimationClip,则复用该资源,在其上就地更新
AnimationClip clip = AssetDatabase.LoadAssetAtPath<AnimationClip>(assetPath);
bool isNewClip = false;
if (clip == null)
{
clip = new AnimationClip();
isNewClip = true;
}
clip.name = animationData.name;
// 设置采样率
AnimationClipSettings settings = AnimationUtility.GetAnimationClipSettings(clip);
clip.frameRate = animationData.sampleRate;
// 创建Sprite关键帧
List<ObjectReferenceKeyframe> keyframes = new List<ObjectReferenceKeyframe>();
float currentTime = 0f;
foreach (int frameIndex in animationData.frameIndices)
{
if (frameIndex < 0 || frameIndex >= sprites.Length)
{
Debug.LogWarning($"帧索引{frameIndex}超出范围,跳过");
continue;
}
Sprite sprite = sprites[frameIndex];
if (sprite == null)
{
Debug.LogWarning($"帧索引{frameIndex}的Sprite为空,跳过");
continue;
}
// 使用帧的duration(如果是Aseprite格式)或动画的frameDuration(手动格式)
float frameDuration = frames[frameIndex].duration > 0
? frames[frameIndex].duration / 1000f // 毫秒转秒
: animationData.frameDuration / 1000f;
keyframes.Add(new ObjectReferenceKeyframe
{
time = currentTime,
value = sprite
});
currentTime += frameDuration;
}
if (keyframes.Count == 0)
{
throw new Exception($"动画片段{animationData.name}没有有效的关键帧");
}
// 设置循环
if (animationData.loop && keyframes.Count > 1)
{
// 添加最后一帧的重复,确保循环
keyframes.Add(new ObjectReferenceKeyframe
{
time = currentTime,
value = keyframes[0].value
});
}
// 创建EditorCurveBinding - 根据动画类型选择不同的组件
EditorCurveBinding curveBinding = new EditorCurveBinding
{
path = "",
type = isImageAnimation ? typeof(UnityEngine.UI.Image) : typeof(SpriteRenderer),
propertyName = "m_Sprite"
};
// 设置曲线
AnimationUtility.SetObjectReferenceCurve(clip, curveBinding, keyframes.ToArray());
// 设置循环
settings.loopTime = animationData.loop;
AnimationUtility.SetAnimationClipSettings(clip, settings);
// 保存 / 更新 AnimationClip 资源
if (isNewClip)
{
// 不存在则创建新资源
AssetDatabase.CreateAsset(clip, assetPath);
}
else
{
// 已存在则标记为已修改,保持原 GUID 与引用
EditorUtility.SetDirty(clip);
}
AssetDatabase.SaveAssets();
return clip;
}
// 主流程:生成AnimationClip
public static void GenerateClips(string texturePath, string jsonPath, string outputPath, bool isImageAnimation = false, Vector2 pivot = default)
{
// 如果没有提供 pivot,使用默认值(中心)
if (pivot == default)
{
pivot = new Vector2(0.5f, 0.5f);
}
// 确保 pivot 值在有效范围内
pivot.x = Mathf.Clamp01(pivot.x);
pivot.y = Mathf.Clamp01(pivot.y);
try
{
EditorUtility.DisplayProgressBar("生成AnimationClip", "检查SpriteMode...", 0f);
// 检查SpriteMode
SpriteImportMode spriteMode = CheckSpriteMode(texturePath);
if (spriteMode == SpriteImportMode.Multiple)
{
Debug.Log("图片的SpriteMode已经是Multiple,将使用现有的Sprite切图");
}
EditorUtility.DisplayProgressBar("生成AnimationClip", "解析JSON...", 0.2f);
// 判断JSON类型并解析
ProcessedAnimationData processedData;
string jsonContent = File.ReadAllText(jsonPath);
if (jsonContent.Contains("\"type\":\"manual\"") || jsonContent.Contains("\"type\": \"manual\""))
{
// 手动格式
processedData = ParseManualJson(jsonPath, texturePath);
}
else
{
// Aseprite格式
processedData = ParseAsepriteJson(jsonPath, texturePath);
}
EditorUtility.DisplayProgressBar("生成AnimationClip", "切图...", 0.4f);
// 如果是Single模式,需要切图
if (spriteMode == SpriteImportMode.Single)
{
SliceSprites(texturePath, processedData.frames, pivot);
// 重新加载以确保sprites可用
AssetDatabase.Refresh();
}
EditorUtility.DisplayProgressBar("生成AnimationClip", "加载Sprites...", 0.6f);
// 加载所有Sprites
Sprite[] allSpritesArray = AssetDatabase.LoadAllAssetsAtPath(texturePath)
.OfType<Sprite>()
.ToArray();
if (allSpritesArray.Length == 0)
{
throw new Exception("无法加载任何Sprite,请检查切图设置");
}
// 创建Sprite字典以便快速查找
Dictionary<string, Sprite> spriteDict = allSpritesArray.ToDictionary(s => s.name, s => s);
// 按照frames列表的顺序创建Sprite数组
Sprite[] allSprites = new Sprite[processedData.frames.Count];
for (int i = 0; i < processedData.frames.Count; i++)
{
string frameName = processedData.frames[i].name;
if (spriteDict.TryGetValue(frameName, out Sprite sprite))
{
allSprites[i] = sprite;
}
else
{
Debug.LogWarning($"找不到名为{frameName}的Sprite");
// 尝试使用索引查找
if (i < allSpritesArray.Length)
{
allSprites[i] = allSpritesArray[i];
}
}
}
// 确保输出目录存在
if (!Directory.Exists(outputPath))
{
Directory.CreateDirectory(outputPath);
}
EditorUtility.DisplayProgressBar("生成AnimationClip", "创建AnimationClip...", 0.8f);
// 为每个动画片段创建AnimationClip
int animationCount = processedData.animations.Count;
for (int i = 0; i < animationCount; i++)
{
var anim = processedData.animations[i];
EditorUtility.DisplayProgressBar("生成AnimationClip",
$"创建动画片段: {anim.name}", 0.8f + (i / (float)animationCount) * 0.2f);
CreateAnimationClip(anim, processedData.frames, allSprites, outputPath, isImageAnimation);
}
EditorUtility.ClearProgressBar();
Debug.Log($"成功生成{animationCount}个AnimationClip到: {outputPath}");
}
catch (Exception e)
{
EditorUtility.ClearProgressBar();
Debug.LogError($"生成AnimationClip失败: {e.Message}");
throw;
}
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c7abb40962ba935419bb10c937b8b2c7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,269 @@
using System;
using System.Collections.Generic;
using System.IO;
using AibisDream.Framework;
using Newtonsoft.Json;
using UnityEditor;
using UnityEditor.Animations;
using UnityEngine;
namespace AibisDream.SystemEditor
{
public class AnimatorBlendTreeParserWindow : EditorWindow
{
private AnimatorController _selectedController;
private List<BlendTreeInfo> _blendTreeInfos;
private Vector2 _scrollPosition;
private string _resultText = "";
private bool _includeNested = false; // 是否包含嵌套混合树,默认不提取
private string _defaultStateName = ""; // 控制器默认 State 名称
[MenuItem("Tools/Animator BlendTree Parser")]
public static void ShowWindow()
{
GetWindow<AnimatorBlendTreeParserWindow>("BlendTree Parser");
}
private void OnGUI()
{
EditorGUILayout.Space(10);
// AnimatorController 选择区域
EditorGUILayout.LabelField("AnimatorController", EditorStyles.boldLabel);
_selectedController = (AnimatorController)EditorGUILayout.ObjectField(
"Controller", _selectedController, typeof(AnimatorController), false);
EditorGUILayout.Space(10);
// 解析选项
EditorGUILayout.LabelField("解析选项", EditorStyles.boldLabel);
_includeNested = EditorGUILayout.Toggle("包含嵌套混合树", _includeNested);
EditorGUILayout.HelpBox(
_includeNested
? "将提取所有层级的混合树(包括嵌套在子混合树中的混合树)"
: "仅提取第一层混合树(不包含嵌套在子混合树中的混合树)",
MessageType.Info);
EditorGUILayout.Space(10);
// 解析按钮
EditorGUI.BeginDisabledGroup(_selectedController == null);
if (GUILayout.Button("解析混合树", GUILayout.Height(30)))
{
ParseBlendTree();
}
EditorGUI.EndDisabledGroup();
EditorGUILayout.Space(10);
// 结果显示区域
if (_blendTreeInfos != null && _blendTreeInfos.Count > 0)
{
EditorGUILayout.LabelField("解析结果", EditorStyles.boldLabel);
// 显示统计信息
EditorGUILayout.HelpBox(
$"共找到 {_blendTreeInfos.Count} 个混合树",
MessageType.Info);
// 可滚动的文本区域
_scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition, GUILayout.ExpandHeight(true));
EditorGUILayout.TextArea(_resultText, GUILayout.ExpandHeight(true));
EditorGUILayout.EndScrollView();
EditorGUILayout.Space(10);
// 保存 JSON 按钮
if (GUILayout.Button("保存为 JSON", GUILayout.Height(30)))
{
SaveToJson();
}
}
else if (_blendTreeInfos != null && _blendTreeInfos.Count == 0)
{
EditorGUILayout.HelpBox(
"未找到混合树",
MessageType.Warning);
}
}
private void ParseBlendTree()
{
if (_selectedController == null)
{
EditorUtility.DisplayDialog("错误", "请先选择 AnimatorController", "确定");
return;
}
try
{
// 解析默认 State 名称(默认使用第 0 层的默认状态)
if (_selectedController.layers != null && _selectedController.layers.Length > 0)
{
var baseLayer = _selectedController.layers[0];
_defaultStateName = baseLayer.stateMachine?.defaultState != null
? baseLayer.stateMachine.defaultState.name
: string.Empty;
}
else
{
_defaultStateName = string.Empty;
}
// 调用解析方法,传入 includeNested 选项
_blendTreeInfos = AnimatorKit.ParseBlendTree(_selectedController, _includeNested);
// 格式化结果显示文本
FormatResultText();
Debug.Log(
$"解析完成: 找到 {_blendTreeInfos.Count} 个混合树 (包含嵌套: {_includeNested}),默认 State: {_defaultStateName}");
}
catch (Exception e)
{
EditorUtility.DisplayDialog("解析失败", e.Message, "确定");
Debug.LogError($"解析失败: {e}");
_blendTreeInfos = null;
_resultText = "";
}
}
private void FormatResultText()
{
if (_blendTreeInfos == null || _blendTreeInfos.Count == 0)
{
_resultText = "未找到混合树";
return;
}
var lines = new List<string>();
lines.Add($"=== 控制器 {_selectedController.name} 的混合树信息 ===");
lines.Add($"默认 State: {_defaultStateName}");
lines.Add($"共找到 {_blendTreeInfos.Count} 个混合树\n");
for (int i = 0; i < _blendTreeInfos.Count; i++)
{
var info = _blendTreeInfos[i];
lines.Add($"[{i + 1}] 混合树名称: {info.name}");
lines.Add($" 类型: {info.type}");
if (info.type == "1D")
{
lines.Add($" 动画片段数量: {info.clipCount}");
lines.Add($" 混合参数: {info.blendParameter}");
lines.Add($" 参数范围: [{info.minThreshold}, {info.maxThreshold}]");
lines.Add($" 动画片段列表 ({info.clips?.Count ?? 0} 个):");
if (info.clips != null)
{
for (int j = 0; j < info.clips.Count; j++)
{
var clip = info.clips[j];
lines.Add($" [{j + 1}] {clip.clipName} (Threshold: {clip.threshold})");
}
}
}
else if (info.type == "2D")
{
lines.Add($" 混合参数 X: {info.blendParameter}");
lines.Add($" 混合参数 Y: {info.blendParameterY}");
lines.Add($" 参数范围: [{info.minThreshold}, {info.maxThreshold}]");
lines.Add($" 动画片段列表 ({info.clips?.Count ?? 0} 个):");
if (info.clips != null)
{
for (int j = 0; j < info.clips.Count; j++)
{
var clip = info.clips[j];
lines.Add($" [{j + 1}] {clip.clipName} (位置: {clip.position})");
}
}
}
else
{
lines.Add($" 动画片段数量: {info.clipCount}");
}
if (i < _blendTreeInfos.Count - 1)
{
lines.Add("");
}
}
_resultText = string.Join("\n", lines);
}
private void SaveToJson()
{
if (_selectedController == null || _blendTreeInfos == null || _blendTreeInfos.Count == 0)
{
EditorUtility.DisplayDialog("错误", "没有可保存的数据", "确定");
return;
}
try
{
// 获取 AnimatorController 的资产路径
string controllerPath = AssetDatabase.GetAssetPath(_selectedController);
if (string.IsNullOrEmpty(controllerPath))
{
EditorUtility.DisplayDialog("错误", "无法获取 AnimatorController 的路径", "确定");
return;
}
// 生成 JSON 文件路径(与 .controller 文件同名同路径,扩展名为 .json)
string directory = Path.GetDirectoryName(controllerPath);
string fileName = Path.GetFileNameWithoutExtension(controllerPath);
string jsonPath = Path.Combine(directory, $"{fileName}.json");
// 转换为 Unity 资源路径格式
jsonPath = jsonPath.Replace("\\", "/");
if (!jsonPath.StartsWith("Assets/"))
{
// 如果不是 Assets 路径,尝试转换
string fullPath = Path.GetFullPath(jsonPath);
string assetsPath = Path.GetFullPath(Application.dataPath);
if (fullPath.StartsWith(assetsPath))
{
jsonPath = "Assets" + fullPath.Substring(assetsPath.Length).Replace("\\", "/");
}
else
{
EditorUtility.DisplayDialog("错误", "JSON 文件路径必须在 Assets 目录下", "确定");
return;
}
}
// 配置序列化设置,忽略循环引用
var settings = new JsonSerializerSettings
{
ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
Formatting = Formatting.Indented
};
// 组装配置对象(包含默认 State 名称和混合树列表)
var config = new BlendTreeConfig
{
defaultStateName = _defaultStateName,
blendTrees = _blendTreeInfos
};
// 序列化为 JSON
string jsonContent = JsonConvert.SerializeObject(config, settings);
// 写入文件(如果已存在则覆盖)
File.WriteAllText(jsonPath, jsonContent, System.Text.Encoding.UTF8);
// 刷新资源数据库
AssetDatabase.Refresh();
EditorUtility.DisplayDialog("保存成功", $"JSON 文件已保存到:\n{jsonPath}", "确定");
Debug.Log($"JSON 文件已保存: {jsonPath}");
}
catch (Exception e)
{
EditorUtility.DisplayDialog("保存失败", e.Message, "确定");
Debug.LogError($"保存 JSON 失败: {e}");
}
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7376797afa65fb549b5347e5d570dc46
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 29e5bfa8c0e3cf74fab38b400eb5946e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: c7fc4cbba4b38a04c8985d4dbce12a73
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
Binary file not shown.
@@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: f242fb3dde1933640859f1c54591c9c8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c0f4601f141d314479c22f4bb3efd5a7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
-21
View File
@@ -1,21 +0,0 @@
fileFormatVersion: 2
guid: 381d5626f43f27b49983e9b2e8bce838
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Chusung
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
-21
View File
@@ -1,21 +0,0 @@
fileFormatVersion: 2
guid: ddb682af113b45541aaa9ca902a14016
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- VonwaonBitmap 16px
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More