 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
|
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 |
|
|
bottlefish
|
1e1c1538e1
|
Merge branch 'feature/地铁功能' into mergedevelop
|
2024-12-30 02:39:34 +08:00 |
|
|
bottlefish
|
7d54a77272
|
Merge branch '视觉部分bug修复' into 'develop'
让currenttartget重复也能触发
See merge request aibis-dream/aibis-dream!146
|
2024-12-29 18:05:22 +00:00 |
|
|
bottlefish
|
db9d5c8c01
|
让currenttartget重复也能触发
|
2024-12-30 02:04:33 +08:00 |
|
|
bottlefish
|
c44da6f0d9
|
Merge branch 'bugfix记忆卡带滞留' into 'develop'
记忆bug修复
See merge request aibis-dream/aibis-dream!145
|
2024-12-29 16:59:02 +00:00 |
|
|
bottlefish
|
f84b3ce85c
|
记忆bug修复
|
2024-12-30 00:58:28 +08:00 |
|
|
bottlefish
|
c47ff13a69
|
Merge branch '12月peipeiDebug' into 'develop'
修复配置问题
See merge request aibis-dream/aibis-dream!143
|
2024-12-29 16:26:12 +00:00 |
|
|
bottlefish
|
9aa500f5e1
|
修复配置问题
|
2024-12-30 00:24:49 +08:00 |
|
|
bottlefish
|
49ce328415
|
Merge branch '佩佩merge分支' into 'develop'
佩佩merge分支
See merge request aibis-dream/aibis-dream!130
|
2024-12-26 19:31:59 +00:00 |
|
|
bottlefish
|
fcbc01d871
|
调整clueboard和yarn配合最新的改动
|
2024-12-27 03:31:07 +08:00 |
|
|
bottlefish
|
3533b099a6
|
Merge branch '12月版本佩佩优化12.26' into 佩佩merge分支
|
2024-12-27 01:50:12 +08:00 |
|
|
bottlefish
|
0b962cbbe4
|
提交
|
2024-12-27 01:45:35 +08:00 |
|
|
bottlefish
|
d6a359a29d
|
修复bug
|
2024-12-27 00:27:28 +08:00 |
|
|
bottlefish
|
24cf10121c
|
流程merge完成
|
2024-12-27 00:03:41 +08:00 |
|
|
bottlefish
|
83e4ad3aee
|
调整day2的yarn适应新的改动
|
2024-12-26 14:17:15 +08:00 |
|
|
bottlefish
|
2c761af133
|
记忆部分debug完成，还剩一个小bug不过不影响
|
2024-12-26 13:09:48 +08:00 |
|
|
bottlefish
|
b024c3c1a4
|
记忆插槽逻辑修改，还有bug
|
2024-12-26 04:00:17 +08:00 |
|
|
bottlefish
|
1eae4e42d4
|
打孔带打印，存储替换完成
|
2024-12-25 19:46:56 +08:00 |
|
|
bottlefish
|
cc4d3a5a05
|
重构插线和深入的逻辑，加入剪线的timeline
|
2024-12-25 03:48:06 +08:00 |
|
|
bottlefish
|
c3876895d6
|
场景替换素材
|
2024-12-24 18:03:50 +08:00 |
|
|
bottlefish
|
d944baf685
|
资产替换
|
2024-12-24 17:57:41 +08:00 |
|
|
bottlefish
|
6e0b0b79fb
|
修改过渡，新增highlight
|
2024-12-24 16:37:58 +08:00 |
|
|
bottlefish
|
c03a525610
|
新增模块hightlight
|
2024-12-24 13:15:04 +08:00 |
|
|
bottlefish
|
9b965d2cb6
|
Merge branch '佩佩代码重构' into 'develop'
Revert "Stop tracking .psb.meta files"
See merge request aibis-dream/aibis-dream!116
|
2024-12-23 18:39:32 +00:00 |
|
|
bottlefish
|
1620049846
|
新增一些拆卸相关处理，socket屏蔽，跑通流程
|
2024-12-24 02:37:20 +08:00 |
|
|
bottlefish
|
6341fbe46f
|
Day1Day2重构基本完成
|
2024-12-23 23:47:26 +08:00 |
|
|
bottlefish
|
4e08fda3e6
|
重构暂存
|
2024-12-23 15:32:54 +08:00 |
|
|
bottlefish
|
58714dcb2d
|
重构暂存
|
2024-12-22 18:09:55 +08:00 |
|
|
bottlefish
|
2d4bba2878
|
Merge branch 'featrue/stoneTotal' into 佩佩代码重构
|
2024-12-22 18:07:42 +08:00 |
|
|
bottlefish
|
659c8df323
|
重构暂存
|
2024-12-22 17:17:27 +08:00 |
|
|
bottlefish
|
5875d8aa02
|
修复merge造成的bug
|
2024-12-22 11:59:08 +08:00 |
|
|
bottlefish
|
093d2bd849
|
Merge branch 'featrue/stoneTotal' into 佩佩代码重构
|
2024-12-20 10:39:51 +08:00 |
|
|
bottlefish
|
83d6902363
|
重构中，提交一下
|
2024-12-20 10:31:01 +08:00 |
|
|
bottlefish
|
6ad760a499
|
Fix LFS tracking for .psb file
|
2024-12-18 17:59:11 +08:00 |
|
|
bottlefish
|
988a2f33f4
|
Revert "Stop tracking .psb.meta files"
This reverts commit c3b7df45c9.
|
2024-12-18 17:48:11 +08:00 |
|