Commit Graph
306 Commits
Author SHA1 Message Date
bottlefish 470a930f3c 提交 2025-02-23 23:16:36 +08:00
bottlefish ccc54eace9 修复bug 增加选关 2025-02-23 20:31:30 +08:00
dingyuntian 898d6946ab dialog问题修改 2025-02-23 03:06:14 +08: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
dingyuntian 8cdf40a9ad 合并 2025-02-22 02:42:57 +08:00
dingyuntian a991b83d90 Merge branch 'develop' into feature/bubble 2025-02-22 01:39:22 +08:00
dingyuntian 30ca85748d 气泡 2025-02-22 01:37:30 +08:00
bottlefish a2f996ce28 提交 2025-02-21 22:39:52 +08: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
bottlefish 953f2fa852 各种提交 2025-02-21 17:46:01 +08:00
bottlefish 1af4418ac0 提交 2025-02-21 15:32:00 +08:00
dingyuntian 6cf743afc7 Merge branch 'feature/spritegroup' into 'develop'
Feature/spritegroup

See merge request aibis-dream/aibis-dream!258
2025-02-21 02:50:11 +00:00
dingyuntian eae34b7d6e 合并 2025-02-21 02:01:39 +08:00
bottlefish 0d9a9eba24 Merge branch 'develop' into 2.20春修改 2025-02-21 01:49:17 +08:00
dingyuntian 65c5c6d32d 全屏展示图片 2025-02-21 00:23:55 +08:00
dingyuntian 6cedae4d07 scene 2025-02-21 00:14:59 +08:00
dingyuntian a70b05737c Merge branch 'bugfix/timeline' into 'develop'
修改

See merge request aibis-dream/aibis-dream!246
2025-02-20 11:54:59 +00:00
dingyuntian 9b04f250e4 修改 2025-02-20 19:52:00 +08:00
bottlefish 7b7933e9b2 修复 2025-02-20 16:12:23 +08:00
bottlefish 12c80a44d4 Merge branch 'develop' into '2.20春修改'
# Conflicts:
#   Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
#   Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn
#   Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn
2025-02-20 07:21:34 +00:00
bottlefish de1ac68f99 各种问题修复 2025-02-20 13:02:35 +08:00
dingyuntian 9b4c0ddfeb 美术替换 2025-02-20 01:40:04 +08:00
dingyuntian 7c27fbc7b4 Merge branch 'develop' into bugfix/timeline 2025-02-20 00:55:56 +08:00
dingyuntian 543ecf49b1 美术资源替换 2025-02-20 00:55:14 +08:00
bottlefish 20893f337c 增加RGB值 2025-02-19 17:48:17 +08:00
bottlefish 430ab63f5c 插头修改提交 2025-02-19 17:25:37 +08: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
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 5166b15b96 对话框 2025-02-15 14:15:33 +08: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 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 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 ddb368c1bc 完成一版本UF想象和UF检查 2025-02-08 17:25:05 +08:00
bottlefish 68eb043ecb UF检查部分改动 2025-02-07 12:12:13 +08:00
bottlefish 5d9d807e0f 修复 2025-01-26 17:49:00 +08:00