Commit Graph
822 Commits
Author SHA1 Message Date
bottlefish 20893f337c 增加RGB值 2025-02-19 17:48:17 +08:00
bottlefish 33c28c7469 Merge branch 'feature/插线相关调整' into 'develop'
Feature/插线相关调整

See merge request aibis-dream/aibis-dream!238
2025-02-19 09:27:41 +00:00
bottlefish 430ab63f5c 插头修改提交 2025-02-19 17:25:37 +08:00
bottlefish 722a3013ab Merge branch 'develop' into feature/插线相关调整 2025-02-19 14:30:43 +08:00
bottlefish 10455608af 提交 2025-02-19 14:30:13 +08:00
dingyuntian e8cfa0fce4 Merge branch 'bugfix/timeline' into 'develop'
Bugfix/timeline

See merge request aibis-dream/aibis-dream!237
2025-02-17 03:35:47 +00:00
dingyuntian 9874a8b41f timeline 2025-02-17 11:34:51 +08:00
dingyuntian e5a6610637 Merge branch 'bugfix/old' into bugfix/timeline 2025-02-17 11:28:28 +08:00
dingyuntian 12baf16e53 timeline 2025-02-17 11:27:55 +08:00
bottlefish 57a6b4ba9d Merge branch 'bugfix2.17' into 'develop'
暂时修复阻碍bug

See merge request aibis-dream/aibis-dream!236
2025-02-17 02:07:09 +00:00
bottlefish 3e59ccc71e 暂时修复阻碍bug 2025-02-17 10:06:06 +08:00
dingyuntian c0e354856c Merge branch 'feature/screen' into 'develop'
Feature/screen

See merge request aibis-dream/aibis-dream!235
2025-02-15 08:00:18 +00:00
dingyuntian e0e103287e 新屏幕 2025-02-15 15:49:42 +08:00
dingyuntian 56c4d81539 Merge branch 'develop' into feature/screen 2025-02-15 15:29:43 +08:00
dingyuntian fbea809af3 Update Box.prefab 2025-02-15 15:25:43 +08:00
dingyuntian 5166b15b96 对话框 2025-02-15 14:15:33 +08:00
chenziqin 2741dfa45e Merge branch 'yarn_0216' into 'develop'
Yarn 0216

See merge request aibis-dream/aibis-dream!234
2025-02-15 01:35:11 +00:00
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
dingyuntian 496f538b9f 屏幕问题 2025-02-13 20:53:28 +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
dingyuntian 94e01a9baa screen 2025-02-12 15:12:00 +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