Commit Graph
777 Commits
Author SHA1 Message Date
bottlefish deac19d51f 增加外出场景占位 2025-01-26 17:42:41 +08:00
bottlefish b400dd1389 bug修复 2025-01-26 17:08:24 +08:00
chenziqin 5dc9177ecd Merge branch 'fearure/Yarn_FP' into 'develop'
Fearure/yarn fp

See merge request aibis-dream/aibis-dream!224
2025-01-25 23:01:10 +00:00
Ovid de0815f8db persistence改成正常的开始 2025-01-26 06:57:34 +08:00
Ovid 378d2e8155 peipei拉通 2025-01-26 06:56:24 +08:00
chenziqin fb23cfb0a6 Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!223
2025-01-25 18:51:32 +00:00
Ovid d41c41185f Merge branch 'fearure/Yarn_FP' of http://114.67.212.218:8011/aibis-dream/aibis-dream into fearure/Yarn_FP 2025-01-26 02:48:32 +08:00
Ovid ad6e1b7707 peipei2,peipei3ongoing 2025-01-26 02:46:02 +08:00
dingyuntian a8fa7621ac Merge branch 'feature/stone-change' into 'develop'
Feature/stone change

See merge request aibis-dream/aibis-dream!222
2025-01-25 15:09:16 +00:00
dingyuntian 4b57236e0c 问题修复 2025-01-25 23:08:14 +08:00
dingyuntian ea689da0dd 变速箱修改 2025-01-25 19:08:00 +08:00
chenziqin 95f4864e66 Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!221
2025-01-25 05:49:47 +00:00
dingyuntian 0f6d95466e Merge branch 'bugfix/develop' into 'develop'
Bugfix/develop

See merge request aibis-dream/aibis-dream!220
2025-01-25 03:26:32 +00:00
Yuntien c3bdb13556 Merge branch 'bugfix/merge' into bugfix/develop 2025-01-25 11:01:31 +08:00
dingyuntian 6fd85e6bca 石头串通 2025-01-24 23:21:54 +08:00
chenziqin 6fa98f9bab Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!218
2025-01-24 08:30:03 +00:00
bottlefish b47b29f996 Merge branch '记忆重构' into 'develop'
记忆重构

See merge request aibis-dream/aibis-dream!217
2025-01-24 07:57:11 +00:00
bottlefish 905df5d3d3 记忆部分迭代完成 2025-01-24 15:42:42 +08:00
bottlefish 2941236fa7 暂存 2025-01-24 13:54:27 +08:00
bottlefish ca2c9277eb Merge branch 'develop' into 记忆重构 2025-01-24 13:45:44 +08:00
dingyuntian 499c85beea Merge branch 'bugfix/dialog' into 'develop'
Update CursorManager.cs

See merge request aibis-dream/aibis-dream!216
2025-01-24 03:06:55 +00:00
Yuntien 8640e9b905 Update CursorManager.cs 2025-01-24 11:05:51 +08:00
chenziqin 561730ed12 Merge branch 'fearure/Yarn_FP' into 'develop'
Fearure/yarn fp

See merge request aibis-dream/aibis-dream!215
2025-01-23 22:19:31 +00:00
Ovid dfeea7cb6d Merge branch 'develop' into fearure/Yarn_FP 2025-01-24 06:18:13 +08:00
Ovid 305f247754 shitou2修改 2025-01-24 06:10:22 +08:00
bottlefish fb56e83d0f Merge branch '石头修改' into 'develop'
石头引擎合入,添加了抖动,进度条,速度显示

See merge request aibis-dream/aibis-dream!214
2025-01-23 15:09:41 +00:00
bottlefish da77bb6023 石头引擎合入,添加了抖动,进度条,速度显示 2025-01-23 23:07:18 +08:00
dingyuntian f0a7b63f32 Merge branch 'feature/dialogbox' into 'develop'
Feature/dialogbox

See merge request aibis-dream/aibis-dream!213
2025-01-23 11:36:25 +00:00
bottlefish ee77732c9a 暂存一下 2025-01-23 19:30:55 +08:00
dingyuntian 083c39544e 问题修改 2025-01-23 19:22:03 +08:00
dingyuntian 2825fbef47 引擎修改 2025-01-23 18:32:25 +08:00
chenziqin a5287fa41c Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!212
2025-01-22 18:39:46 +00:00
chenziqin d6142cd1b9 Merge branch 'fearure/Yarn_FP' into 'develop'
shitou1修改

See merge request aibis-dream/aibis-dream!211
2025-01-22 18:39:22 +00:00
Ovid d2815008c8 shitou1修改 2025-01-23 02:38:35 +08:00
bottlefish e3dd810a9d Merge branch 'peipeiday3' into 'develop'
佩佩day3以及其他调整

See merge request aibis-dream/aibis-dream!210
2025-01-22 16:11:20 +00:00
bottlefish be23a512c1 佩佩day3以及其他调整 2025-01-23 00:09:45 +08:00
chenziqin c60602424a Merge branch 'fearure/Yarn_FP' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!209
2025-01-21 18:09:58 +00:00
Ovid 7762494195 bugfix 2025-01-22 02:06:33 +08:00
chenziqin 1793ee3fb3 Merge branch 'fearure/Yarn_FP' into 'develop'
shitou调整

See merge request aibis-dream/aibis-dream!207
2025-01-21 17:49:50 +00:00
Ovid 58a6ddbba9 shitou调整 2025-01-22 01:48:08 +08:00
chenziqin efa7408f3c Merge branch 'fearure/Yarn_FP' into 'develop'
Fearure/yarn fp

See merge request aibis-dream/aibis-dream!206
2025-01-20 16:54:35 +00:00
Ovid 65d6052fa5 resolve_conflict 2025-01-21 00:53:31 +08:00
Ovid f688ae0afd Merge branch 'develop' into fearure/Yarn_FP 2025-01-21 00:50:04 +08:00
Ovid 7e19265811 SHITOU1、2上传,全流程FP拉通 2025-01-21 00:47:00 +08:00
bottlefish cfe166aba6 Merge branch 'feature/佩佩UF' into 'develop'
Feature/佩佩uf

See merge request aibis-dream/aibis-dream!204
2025-01-19 11:25:36 +00:00
bottlefish 19b0debe92 UF检查和停止想象接入完成 2025-01-19 19:24:32 +08:00
chenziqin fd2fbfd79f Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!203
2025-01-18 11:42:40 +00:00
bottlefish 264ae8f1a0 效果在佩佩场景基本配置完成,需要给eyesystem加个状态配合 2025-01-18 17:43:55 +08:00
bottlefish 878538fa36 完成UF效果测试 2025-01-18 17:05:45 +08:00
bottlefish 78a6c627ba 后处理插件提交 2025-01-18 11:38:58 +08:00