 bottlefish
|
953f2fa852
|
各种提交
|
2025-02-21 17:46:01 +08:00 |
|
|
bottlefish
|
1af4418ac0
|
提交
|
2025-02-21 15:32:00 +08:00 |
|
|
bottlefish
|
88b4863a4f
|
Merge branch '2.20春修改' into 'develop'
2.20春修改
See merge request aibis-dream/aibis-dream!256
|
2025-02-20 17:50:07 +00:00 |
|
|
bottlefish
|
0d9a9eba24
|
Merge branch 'develop' into 2.20春修改
|
2025-02-21 01:49:17 +08:00 |
|
|
bottlefish
|
472be7b042
|
Merge branch '回退timeline' into 'develop'
回退timeline
See merge request aibis-dream/aibis-dream!253
|
2025-02-20 17:14:34 +00:00 |
|
|
bottlefish
|
713fba16ee
|
回退timeline
|
2025-02-21 01:14:05 +08:00 |
|
|
bottlefish
|
5f40a69044
|
Merge branch '补资产' into 'develop'
补资产
See merge request aibis-dream/aibis-dream!252
|
2025-02-20 17:03:15 +00:00 |
|
|
bottlefish
|
cbcdd3b573
|
补资产
|
2025-02-21 01:00:01 +08:00 |
|
|
bottlefish
|
58bf374958
|
Merge branch 'bugfix2.20' into 'develop'
修复
See merge request aibis-dream/aibis-dream!244
|
2025-02-20 08:33:43 +00: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 |
|
|
bottlefish
|
be2fb7d992
|
Merge branch '视觉UF检查RGB值' into 'develop'
增加RGB值
See merge request aibis-dream/aibis-dream!240
|
2025-02-19 13:20:51 +00:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
bottlefish
|
c360b3c869
|
提交
|
2025-01-25 17:45:16 +08:00 |
|
|
bottlefish
|
5703efd59e
|
暂存
|
2025-01-25 13:29:46 +08: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 |
|
|
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 |
|
|
bottlefish
|
ee77732c9a
|
暂存一下
|
2025-01-23 19:30:55 +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 |
|
|
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 |
|
|
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 |
|
|
bottlefish
|
d9a29e9152
|
Merge branch '重构佩佩的脚本来配合存档' into 'develop'
重构佩佩的脚本来配合存档
See merge request aibis-dream/aibis-dream!200
|
2025-01-17 07:16:19 +00:00 |
|
|
bottlefish
|
6b8de5100d
|
Day1和Day2重构基本完成，差Day2的UF视觉部分需要处理一下，Yarn部分开始没问题了
|
2025-01-16 21:56:58 +08:00 |
|
|
bottlefish
|
c2f792186a
|
先恢复之前的视觉移动方案
|
2025-01-16 18:24:14 +08:00 |
|
|
bottlefish
|
e376606660
|
佩佩Day1和day2的yarn重构完成，但是深入部分需要编辑器重构为sprite
|
2025-01-16 18:03:39 +08:00 |
|
|
bottlefish
|
d560a8dc93
|
Merge branch 'bugfix/merge' into 重构佩佩的脚本来配合存档
|
2025-01-15 19:29:06 +08:00 |
|
|
bottlefish
|
04ff856ad1
|
重构视觉的移动
|
2025-01-15 16:17:31 +08:00 |
|
|
bottlefish
|
e6b9c6c6e4
|
提交
|
2025-01-15 12:46:49 +08:00 |
|
|
bottlefish
|
5158e66638
|
重构测试
|
2025-01-14 21:17:39 +08:00 |
|
|
bottlefish
|
a55300df21
|
脚本重构
|
2025-01-14 20:40:54 +08:00 |
|
|
bottlefish
|
96e87cc8d0
|
yarn重构
|
2025-01-14 17:42:30 +08:00 |
|
|
bottlefish
|
05149a6d06
|
上传场景修改
|
2025-01-10 17:45:12 +08:00 |
|
|
bottlefish
|
678ba746cf
|
视觉和打孔带的数据存储和读取
|
2025-01-10 17:24:57 +08:00 |
|
|
bottlefish
|
7709a6d7d8
|
补充佩佩相关state和相机，以及拆卸相关的数据保存
|
2025-01-09 18:18:20 +08:00 |
|
|
bottlefish
|
338cde938d
|
Merge branch '修复眼部bug' into 'develop'
修复眼部bug
See merge request aibis-dream/aibis-dream!195
|
2025-01-05 08:44:31 +00:00 |
|
|
bottlefish
|
759f929b0b
|
修复眼部bug
|
2025-01-05 16:43:05 +08:00 |
|
|
bottlefish
|
3220f9b77f
|
Merge branch '去除clueboard的分支问题' into 'develop'
去除clueboard里两个无需关注的问题
See merge request aibis-dream/aibis-dream!193
|
2025-01-03 05:11:34 +00:00 |
|
|
bottlefish
|
361ca09573
|
去除clueboard里两个无需关注的问题
|
2025-01-03 13:07:37 +08:00 |
|
|
bottlefish
|
967a925abd
|
Merge branch 'debug佩佩流程' into 'develop'
修复一些问题
See merge request aibis-dream/aibis-dream!173
|
2024-12-30 21:03:42 +00:00 |
|
|
bottlefish
|
9ca79850a3
|
修复一些问题
|
2024-12-31 05:02:21 +08:00 |
|
|
bottlefish
|
c438b80ad2
|
Merge branch '佩佩表情调整' into 'develop'
修复错误
See merge request aibis-dream/aibis-dream!171
|
2024-12-30 19:56:41 +00:00 |
|
|
bottlefish
|
e44600fd64
|
修复错误
|
2024-12-31 03:55:52 +08:00 |
|
|
bottlefish
|
cc8ac8bf62
|
Merge branch '最后debug' into 'develop'
补图片，删错误指令
See merge request aibis-dream/aibis-dream!170
|
2024-12-30 19:22:32 +00:00 |
|
|
bottlefish
|
c92b141466
|
补图片，删错误指令
|
2024-12-31 03:21:36 +08:00 |
|
|
bottlefish
|
cc2b226240
|
Merge branch '地铁和佩佩补漏' into 'develop'
地铁调整
See merge request aibis-dream/aibis-dream!168
|
2024-12-30 19:02:31 +00:00 |
|
|
bottlefish
|
e42429500b
|
地铁调整
|
2024-12-31 03:01:34 +08:00 |
|
|
bottlefish
|
726970fe63
|
Merge branch 'bug修复' into 'develop'
修复音频错误
See merge request aibis-dream/aibis-dream!162
|
2024-12-30 15:43:26 +00:00 |
|
|
bottlefish
|
bc05225686
|
修复音频错误
|
2024-12-30 23:42:25 +08:00 |
|
|
bottlefish
|
d8f1a85d96
|
Merge branch '佩佩表情' into 'develop'
佩佩day1表情添加
See merge request aibis-dream/aibis-dream!160
|
2024-12-30 15:16:35 +00:00 |
|
|
bottlefish
|
e0927e2d34
|
佩佩day1表情添加
|
2024-12-30 23:15:50 +08:00 |
|
|
bottlefish
|
c480caf802
|
Merge branch '音频美术优化' into 'develop'
替换资源和音频
See merge request aibis-dream/aibis-dream!159
|
2024-12-30 14:42:13 +00:00 |
|
|
bottlefish
|
60f4f798f7
|
替换资源和音频
|
2024-12-30 22:40:59 +08:00 |
|
|
bottlefish
|
2a83385db9
|
Merge branch '美术优化' into 'develop'
修改clueboard退出表现，和眼睛打开的表现
See merge request aibis-dream/aibis-dream!157
|
2024-12-30 10:49:13 +00:00 |
|
|
bottlefish
|
3fd5f1bd39
|
修改clueboard退出表现，和眼睛打开的表现
|
2024-12-30 18:46:10 +08:00 |
|
|
bottlefish
|
06b879040f
|
Merge branch '增加音频' into 'develop'
增加部分音频
See merge request aibis-dream/aibis-dream!156
|
2024-12-30 09:48:25 +00:00 |
|
|
bottlefish
|
f8958de843
|
增加部分音频
|
2024-12-30 17:45:17 +08:00 |
|
|
bottlefish
|
4dd035e36b
|
Merge branch 'bug修复' into 'develop'
peipeiday1clueboard修复，替换素材
See merge request aibis-dream/aibis-dream!155
|
2024-12-30 08:53:09 +00:00 |
|
|
bottlefish
|
facc31f0f2
|
peipeiday1clueboard修复，替换素材
|
2024-12-30 16:50:39 +08:00 |
|
|
bottlefish
|
0c6c0e0477
|
Merge branch '佩佩优化' into 'develop'
替换素材，增加打孔带溢出表现
See merge request aibis-dream/aibis-dream!154
|
2024-12-30 03:33:12 +00:00 |
|
|
bottlefish
|
cf0db07839
|
替换素材，增加打孔带溢出表现
|
2024-12-30 11:31:02 +08:00 |
|
|
bottlefish
|
6e9980fd26
|
Merge branch '地铁test' into 'develop'
提交地铁测试以及佩佩bug修改，和记忆参数调整
See merge request aibis-dream/aibis-dream!151
|
2024-12-29 19:29:59 +00:00 |
|
|
bottlefish
|
63d6ccbbeb
|
提交地铁测试以及佩佩bug修改，和记忆参数调整
|
2024-12-30 03:28:50 +08:00 |
|
|
bottlefish
|
4590298094
|
Merge branch 'mergedevelop' into 'develop'
Mergedevelop
See merge request aibis-dream/aibis-dream!149
|
2024-12-29 18:43:18 +00:00 |
|
|
bottlefish
|
ddeb30f307
|
Merge branch 'feature/地铁功能' into mergeDevelop
|
2024-12-30 02:41:45 +08:00 |
|