Commit Graph
100 Commits
Author SHA1 Message Date
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
bottlefish 82c33b995c Merge branch 'develop' into 火山表达模块交互优化 2025-05-13 14:00:56 +08:00
bottlefish d9b17441b2 存档 2025-05-13 13:46:38 +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
bottlefish 552955f3d4 中间版本存档 2025-05-08 16:17:49 +08:00
bottlefish d3d400d75b 过程存档 2025-05-08 12:23:51 +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
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
bottlefish 8f55e4fdd1 火山功能跑通 2025-04-24 18:04:28 +08:00
bottlefish be332cc9a9 Merge branch 'develop' into 火山表达模块开发 2025-04-24 15:18:03 +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
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
bottlefish 5544efddb2 Merge branch '修复K键导致的跳转卡死' into 'develop'
修复k键导致的跳转卡死

See merge request aibis-dream/aibis-dream!347
2025-03-18 13:14:19 +00:00
bottlefish 04578e4491 补充视觉检查hightlight消失 2025-03-18 21:06:23 +08:00
bottlefish dd0aad5a42 修复 2025-03-18 21:00:05 +08:00
bottlefish 5329d5e488 Merge branch '修复视觉模块阻碍bug' into 'develop'
修复视觉模块阻碍bug

See merge request aibis-dream/aibis-dream!339
2025-03-17 11:53:05 +00:00
bottlefish bf292a311d 替换UF中错误的佩佩图片 2025-03-17 19:47:53 +08:00
bottlefish 4cef93e064 提交 2025-03-17 19:24:00 +08:00
bottlefish 76a6501170 Merge branch 'bugfxi' into 'develop'
提交

See merge request aibis-dream/aibis-dream!335
2025-03-12 13:21:15 +00:00
bottlefish 03aa629dfc 提交 2025-03-12 21:19:40 +08:00
bottlefish 01a498c2fd Merge branch '补资源' into 'develop'
修复

See merge request aibis-dream/aibis-dream!331
2025-03-11 16:25:20 +00:00
bottlefish cca5b5a163 修复 2025-03-12 00:24:33 +08:00
bottlefish 49b20a52b9 Merge branch 'bugfixfinal' into 'develop'
修复轮子

See merge request aibis-dream/aibis-dream!329
2025-03-11 16:04:48 +00:00
bottlefish ed0f009f28 修复轮子 2025-03-12 00:03:39 +08:00
bottlefish a55135c27f Merge branch 'bugfix春' into 'develop'
修复

See merge request aibis-dream/aibis-dream!327
2025-03-11 15:50:51 +00:00
bottlefish 15769c7b5d Merge branch 'develop' into bugfix春 2025-03-11 23:48:55 +08:00
bottlefish e9eac8829a 修复 2025-03-11 23:46:58 +08:00
bottlefish 5fdd7a836b Merge branch '主场景动态合入' into 'develop'
提交

See merge request aibis-dream/aibis-dream!319
2025-03-11 13:33:34 +00:00
bottlefish 5826d8b4bd 提交 2025-03-11 21:32:15 +08:00
bottlefish cf0b7e587a Merge branch '修复弹窗美术' into 'develop'
提交

See merge request aibis-dream/aibis-dream!317
2025-03-11 12:42:36 +00:00
bottlefish 95e0d14f94 提交 2025-03-11 19:36:48 +08:00
bottlefish 0586739176 Merge branch '修复后处理问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!315
2025-03-11 11:08:33 +00:00
bottlefish 5ac553d0d9 提交 2025-03-11 19:07:24 +08:00
bottlefish 084a23789a Merge branch '3.11美术合入' into 'develop'
3.11美术合入

See merge request aibis-dream/aibis-dream!313
2025-03-11 10:25:03 +00:00
bottlefish 903f59144c Merge branch 'develop' into 3.11美术合入 2025-03-11 18:23:12 +08:00
bottlefish 7e318b9467 美术合入以及bug修复 2025-03-11 18:19:35 +08:00
bottlefish ebbec8383a 外出动画以及动画系统 2025-03-11 17:08:25 +08:00
bottlefish da25700a95 美术替换 2025-03-11 14:45:43 +08:00
bottlefish 98ef60ae88 Merge branch '美术优化3.10晚上春' into 'develop'
美术优化3.10晚上春

See merge request aibis-dream/aibis-dream!308
2025-03-11 05:26:03 +00:00
bottlefish 533b94fc22 提交 2025-03-11 13:24:28 +08:00
bottlefish 86cab80568 提交,还有bug在修 2025-03-11 12:26:41 +08:00
bottlefish 306fe88bee 美术合入 2025-03-10 23:19:28 +08:00
bottlefish 0e58ab3dcf Merge branch '3.10美术优化' into 'develop'
3.10美术优化

See merge request aibis-dream/aibis-dream!304
2025-03-10 13:52:41 +00:00
bottlefish 94178c1b4d 漏提资源 2025-03-10 21:51:23 +08:00
bottlefish 41b032e131 天桥动态 2025-03-10 21:50:39 +08:00
bottlefish 09e54d3a86 外出美术添加 2025-03-10 20:06:32 +08:00
bottlefish 72eda49ebb Merge branch '修复虚拟相机优先级问题' into 'develop'
修复虚拟相机优先级问题

See merge request aibis-dream/aibis-dream!299
2025-03-10 07:34:35 +00:00
bottlefish bafe8b9f24 修复虚拟相机优先级问题 2025-03-10 15:33:12 +08:00
bottlefish bd21d6b454 Merge branch '3.9美术优化' into 'develop'
修复bug

See merge request aibis-dream/aibis-dream!297
2025-03-09 13:44:14 +00:00
bottlefish 68e9d79653 修复bug 2025-03-09 21:42:08 +08:00
bottlefish c6f90ec711 Merge branch '修复视觉indicator全屏问题' into 'develop'
UI切换为worldcanvas,确保全分辨率可以用

See merge request aibis-dream/aibis-dream!294
2025-03-09 09:53:57 +00:00
bottlefish 942881423e UI切换为worldcanvas,确保全分辨率可以用 2025-03-09 17:44:01 +08:00
bottlefish 41a55307c0 Merge branch 'bugfix2.28' into 'develop'
Bugfix2.28

See merge request aibis-dream/aibis-dream!279
2025-03-01 13:32:21 +00:00
bottlefish e91e8072f4 bug修复 2025-03-01 21:31:24 +08:00
bottlefish 4a7962dcde 提交 2025-03-01 16:05:51 +08:00
bottlefish b7c1885815 修改 2025-03-01 02:36:59 +08:00
bottlefish 30ac2ceb54 修复bug 2025-03-01 01:34:42 +08:00
bottlefish 40a76cffef 修bug 2025-03-01 00:53:47 +08:00
bottlefish 3f3d4b2d36 佩佩的bug应该差不多了 2025-03-01 00:38:25 +08:00
bottlefish c768974c67 提交 2025-02-28 23:41:58 +08:00
bottlefish c640f79c09 Merge branch 'bugfix2.26' into 'develop'
Bugfix2.26

See merge request aibis-dream/aibis-dream!278
2025-02-26 17:11:10 +00:00
bottlefish 5dc98da5ca 修复bug 但还有很多bug没修 2025-02-27 01:10:27 +08:00
bottlefish f364b1b347 修复部分bug 2025-02-26 19:46:21 +08:00
bottlefish f2176441b9 Merge branch 'bugfix2.23' into 'develop'
Bugfix2.23

See merge request aibis-dream/aibis-dream!277
2025-02-23 16:49:28 +00:00
bottlefish d671f5b79f 跳转开始界面 2025-02-24 00:48:34 +08:00
bottlefish 470a930f3c 提交 2025-02-23 23:16:36 +08:00
bottlefish ccc54eace9 修复bug 增加选关 2025-02-23 20:31:30 +08:00
bottlefish 480c5c33d1 修复 2025-02-23 17:16:27 +08:00
bottlefish 8d1fd34c46 Merge branch 'debug2.22.16' into 'develop'
提交

See merge request aibis-dream/aibis-dream!274
2025-02-22 08:41:34 +00:00
bottlefish 9233c0e428 提交 2025-02-22 16:38:33 +08:00
bottlefish 1f2e2eccb0 Merge branch 'debug2.22' into 'develop'
Debug2.22

See merge request aibis-dream/aibis-dream!273
2025-02-21 19:23:49 +00:00
bottlefish b12be15e9b 提交 2025-02-22 03:21:06 +08:00
bottlefish 76d2b3775a 修复 2025-02-22 03:19:24 +08:00
bottlefish c0c03608a6 Merge branch '2.21.21.54优化' into 'develop'
2.21.21.54优化

See merge request aibis-dream/aibis-dream!267
2025-02-21 14:47:26 +00:00
bottlefish d09994888c 提交 2025-02-21 22:46:45 +08:00
bottlefish a2f996ce28 提交 2025-02-21 22:39:52 +08:00
bottlefish 34367f433f Merge branch '2.21.17.51优化' into 'develop'
各种修改

See merge request aibis-dream/aibis-dream!266
2025-02-21 11:43:05 +00:00
bottlefish 473902b2d9 Merge branch 'develop' into '2.21.17.51优化'
# Conflicts:
#   Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn
2025-02-21 11:42:59 +00:00
bottlefish 881cb0d929 各种修改 2025-02-21 19:42:02 +08:00
bottlefish 2ebcf6ee49 Merge branch '2.21优化' into 'develop'
2.21优化

See merge request aibis-dream/aibis-dream!263
2025-02-21 09:47:15 +00:00