Commit Graph
1351 Commits
Author SHA1 Message Date
bottlefish da77bb6023 石头引擎合入,添加了抖动,进度条,速度显示 2025-01-23 23:07:18 +08:00
dingyuntian f0a7b63f32 Merge branch 'feature/dialogbox' into 'develop'
Feature/dialogbox

See merge request aibis-dream/aibis-dream!213
2025-01-23 11:36:25 +00:00
bottlefish ee77732c9a 暂存一下 2025-01-23 19:30:55 +08:00
dingyuntian 083c39544e 问题修改 2025-01-23 19:22:03 +08:00
dingyuntian 2825fbef47 引擎修改 2025-01-23 18:32:25 +08:00
chenziqin a5287fa41c Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!212
2025-01-22 18:39:46 +00:00
chenziqin d6142cd1b9 Merge branch 'fearure/Yarn_FP' into 'develop'
shitou1修改

See merge request aibis-dream/aibis-dream!211
2025-01-22 18:39:22 +00:00
Ovid d2815008c8 shitou1修改 2025-01-23 02:38:35 +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
chenziqin c60602424a Merge branch 'fearure/Yarn_FP' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!209
2025-01-21 18:09:58 +00:00
Ovid 7762494195 bugfix 2025-01-22 02:06:33 +08:00
chenziqin 1793ee3fb3 Merge branch 'fearure/Yarn_FP' into 'develop'
shitou调整

See merge request aibis-dream/aibis-dream!207
2025-01-21 17:49:50 +00:00
Ovid 58a6ddbba9 shitou调整 2025-01-22 01:48:08 +08:00
chenziqin efa7408f3c Merge branch 'fearure/Yarn_FP' into 'develop'
Fearure/yarn fp

See merge request aibis-dream/aibis-dream!206
2025-01-20 16:54:35 +00:00
Ovid 65d6052fa5 resolve_conflict 2025-01-21 00:53:31 +08:00
Ovid f688ae0afd Merge branch 'develop' into fearure/Yarn_FP 2025-01-21 00:50:04 +08:00
Ovid 7e19265811 SHITOU1、2上传,全流程FP拉通 2025-01-21 00:47:00 +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
chenziqin fd2fbfd79f Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!203
2025-01-18 11:42:40 +00: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
dingyuntian 17605e51ed Merge branch 'feature/cursor' into 'develop'
Feature/cursor

See merge request aibis-dream/aibis-dream!202
2025-01-17 13:22:32 +00:00
dingyuntian 247363a112 Merge branch 'develop' into feature/cursor 2025-01-17 21:21:58 +08:00
dingyuntian 27aaac02e0 提交 2025-01-17 21:21:37 +08:00
dingyuntian cdffaab7c9 Update FixSystemCenter.cs 2025-01-17 21:18:38 +08:00
dingyuntian 59dd5d67dc 引擎相关玩法 2025-01-17 21:17:52 +08:00
dingyuntian a1fd6fca67 引擎简单更新 2025-01-17 21:05:06 +08:00
chenziqin 1c135969aa Merge branch 'develop' into 'fearure/Yarn_FP'
Develop

See merge request aibis-dream/aibis-dream!201
2025-01-17 08:30:55 +00:00
bottlefish d9a29e9152 Merge branch '重构佩佩的脚本来配合存档' into 'develop'
重构佩佩的脚本来配合存档

See merge request aibis-dream/aibis-dream!200
2025-01-17 07:16:19 +00:00
dingyuntian 74025f3d5b 指针功能完成,齿轮未接入 2025-01-16 22:20:04 +08:00
bottlefish 6b8de5100d Day1和Day2重构基本完成,差Day2的UF视觉部分需要处理一下,Yarn部分开始没问题了 2025-01-16 21:56:58 +08:00
dingyuntian b80d78ad23 Merge branch '重构佩佩的脚本来配合存档' into feature/cursor 2025-01-16 19:36:12 +08:00
dingyuntian 3592187b11 改回Overlay 2025-01-16 19:27:27 +08:00
dingyuntian 879f74b7bf EventSystem扩展 2025-01-16 19:21:33 +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
dingyuntian be558878ce 相机状态和维修状态解绑 2025-01-16 11:45:37 +08:00
dingyuntian cb3eff896d 事件系统扩展 2025-01-16 11:37:14 +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
dingyuntian 13bf57e84a 合并 2025-01-15 14:17:35 +08:00
dingyuntian b1167c81b1 Merge branch '重构佩佩的脚本来配合存档' into bugfix/merge 2025-01-15 14:01:07 +08:00
dingyuntian b891a2218d Camera修改 2025-01-15 13:06:40 +08:00
dingyuntian b2ff37ef2f 将Canvas添加到UICamera 2025-01-15 13:04:02 +08:00
bottlefish e6b9c6c6e4 提交 2025-01-15 12:46:49 +08:00
dingyuntian e3f063866f 添加Camera 2025-01-15 12:39:08 +08:00
dingyuntian 045d6273f2 误删部分 2025-01-15 11:40:13 +08:00