Commit Graph
801 Commits
Author SHA1 Message Date
Ovid ea4d116a21 Merge branch 'develop' into yarn_0216 2025-02-15 09:32:50 +08:00
Ovid 6a2e25966e yarn edit 2025-02-15 09:25:31 +08:00
bottlefish ed147bc526 Merge branch '表现优化2.13' into 'develop'
表现优化2.13

See merge request aibis-dream/aibis-dream!232
2025-02-14 16:06:39 +00:00
bottlefish 382687055f clinic到bodymodule才触发timeline,加一些镜头转换设定,修复佩佩场景bug 2025-02-15 00:04:44 +08:00
bottlefish 877ec0627f 冷却器表现添加,进入手术室timeline添加,其他表现优化 2025-02-14 18:16:22 +08:00
bottlefish e07cbb7a64 Merge branch '视觉优化2.8' into 'develop'
视觉优化2.8

See merge request aibis-dream/aibis-dream!231
2025-02-13 10:19:38 +00:00
bottlefish d97bd05bfb Merge branch '剪线操作&蒙太奇' into 'develop'
剪线操作&蒙太奇

See merge request aibis-dream/aibis-dream!230
2025-02-13 10:18:56 +00:00
bottlefish faa18861ee UF模块美术替换 2025-02-13 18:15:45 +08:00
bottlefish 03141e8a26 记忆美术效果添加和素材替换 2025-02-13 17:45:22 +08:00
bottlefish 38be876a74 剪线蒙太奇替换完成 2025-02-13 16:31:09 +08:00
bottlefish f21d2d39a6 timeline调整 2025-02-11 15:47:06 +08:00
bottlefish d52124d2a1 Merge branch 'bugfix2.10' into 'develop'
默认关闭UF特效

See merge request aibis-dream/aibis-dream!229
2025-02-10 05:58:49 +00:00
bottlefish cc84d65e31 默认关闭UF特效 2025-02-10 13:58:06 +08:00
bottlefish 8087121b95 提交 2025-02-10 11:45:40 +08:00
bottlefish 7f4050ab64 提一个版本 2025-02-09 17:46:55 +08:00
bottlefish 5c608a1d15 Merge branch '流程优化_佩佩UF部分' into 'develop'
流程优化 佩佩uf部分

See merge request aibis-dream/aibis-dream!228
2025-02-08 09:43:06 +00:00
bottlefish ddb368c1bc 完成一版本UF想象和UF检查 2025-02-08 17:25:05 +08:00
bottlefish 68eb043ecb UF检查部分改动 2025-02-07 12:12:13 +08:00
bottlefish 51460d405a Merge branch '问题修复' into 'develop'
修复

See merge request aibis-dream/aibis-dream!227
2025-01-26 09:49:39 +00:00
bottlefish 5d9d807e0f 修复 2025-01-26 17:49:00 +08:00
bottlefish 4ca14ee0ce Merge branch '流程bugfix' into 'develop'
流程bugfix

See merge request aibis-dream/aibis-dream!226
2025-01-26 09:44:16 +00:00
bottlefish deac19d51f 增加外出场景占位 2025-01-26 17:42:41 +08:00
bottlefish b400dd1389 bug修复 2025-01-26 17:08:24 +08:00
dingyuntian 564ccf6f81 Merge branch 'bugfix/talk_log' into 'develop'
Update Persistence.unity

See merge request aibis-dream/aibis-dream!225
2025-01-26 08:12:19 +00:00
dingyuntian ae8b4f0b16 对话回顾 2025-01-26 16:10:23 +08:00
dingyuntian bedce4143b Update Persistence.unity 2025-01-26 15:58:34 +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