Commit Graph
1960 Commits
Author SHA1 Message Date
dingyuntian 11c6bd5232 Merge branch 'develop' into bugfix/打孔带重构 2026-03-30 19:16:39 +08:00
bottlefish 7cf804b4ca 修复佩佩视觉索引丢失 2026-03-30 19:15:37 +08:00
dingyuntian f851016a28 fix: 开头托盘索引丢失 2026-03-30 19:10:27 +08:00
dingyuntian a2590be82f scene(fix-system): 同步打孔带重构后的维修场景配置
更新 PeipeiFixScene 与 Persistence 的对象引用与组件配置,使场景资源与新打孔带流程保持一致。

Made-with: Cursor
2026-03-30 16:34:02 +08:00
dingyuntian f0bf5e47a9 fix(fix-system): 修复屏幕面板启动状态未置位
在启动屏幕面板流程中补充 isSystemOn 置 true,避免系统状态与 UI 激活状态不一致。

Made-with: Cursor
2026-03-30 16:33:56 +08:00
dingyuntian 57a9f9b6cb Merge branch 'develop' into bugfix/打孔带重构 2026-03-30 16:27:38 +08:00
dingyuntian f8e813f12a chore(fix-system): 补齐打孔带元数据
Made-with: Cursor
2026-03-30 15:59:22 +08:00
dingyuntian a442eefc3b yarn(dialog): 更新打孔带命令调用并同步本地化资源映射
Made-with: Cursor
2026-03-30 15:59:00 +08:00
dingyuntian c4d1a25b08 refactor(clue): 移除废弃线索板 prefab 元数据
Made-with: Cursor
2026-03-30 15:58:33 +08:00
dingyuntian 21111aa1d9 refactor(clue): 移除废弃线索板与旧打孔带实现
Made-with: Cursor
2026-03-30 15:58:09 +08:00
dingyuntian f3f9ecb57f scene(fix-system): 同步维修场景与预制体的打孔带系统配置
Made-with: Cursor
2026-03-30 15:57:38 +08:00
dingyuntian 6ee319ab4f feat(fix-system): 重构打孔带流程并接入新收藏与插槽系统
Made-with: Cursor
2026-03-30 15:56:55 +08:00
bottlefish 9535894eac 修复一些初始化勾选 2026-03-30 15:53:26 +08:00
bottlefish e15c7c5c19 Merge branch 'develop' into 3.28全流程拉通 2026-03-30 14:28:45 +08:00
dingyuntian fbfda00150 fix: 维修面板初始灯光状态可配置 2026-03-28 21:45:00 +08:00
bottlefish e1562b749f 修复错误 2026-03-28 21:33:11 +08:00
bottlefish 2db9679a9e scene: 更新 Bridge、Persistence、梦境场景与 Day3 中段 SceneSO
Made-with: Cursor
2026-03-28 19:38:49 +08:00
bottlefish 3d18fa48d4 art: 梦境图片 D2S meta 更新与新增剧情立绘资源
Made-with: Cursor
2026-03-28 19:38:35 +08:00
bottlefish 2df0eee31e art: 调整高亮材质参数
Made-with: Cursor
2026-03-28 19:38:24 +08:00
bottlefish 248f622e12 loc: 同步对话字符串表与 Addressable 分组(含梦境场景组)
Made-with: Cursor
2026-03-28 19:38:16 +08:00
bottlefish 38f92d9a36 content(yarn): 更新 Day2 睡眠、Day3 中段与佩佩2 开场对话脚本
Made-with: Cursor
2026-03-28 19:38:05 +08:00
bottlefish fc03cfdd4a feat: 梦境门、热力图、身体模块与终端 UI 全流程逻辑
Made-with: Cursor
2026-03-28 19:37:52 +08:00
bottlefish 215725d2a0 Merge remote-tracking branch 'origin/feature/FP_D2S' into 3.28全流程拉通 2026-03-28 15:58:35 +08:00
bottlefish 188397cd40 拉通 2026-03-28 15:57:34 +08:00
Ovid 12ff6b1fd4 创建 FP_D2S 2026-03-28 15:54:18 +08:00
dingyuntian 3a8bba261e Merge branch 'feature/全流程拉通' into feature/全流程拉通合入 2026-03-28 10:22:28 +08:00
bottlefish 26d0c03efa 拉通 2026-03-28 10:17:18 +08:00
dingyuntian efcef3dde9 fix: 修复索引丢失的问题 2026-03-27 22:44:43 +08:00
dingyuntian 1d15f5daff fix: 合并后编译错误 2026-03-27 22:43:38 +08:00
dingyuntian 209a795141 Merge branch 'develop' into bugfix/内存问题 2026-03-27 18:55:12 +08:00
bottlefish dcd47d26eb Merge branch '3.24火山BUG修复和查漏补缺' into 'develop'
fix(huoshan): 修复多轮表达重叠并支持非目标粒子数配置

See merge request aibis-dream/aibis-dream!654
2026-03-27 09:01:14 +00:00
bottlefish 84b3874036 尝试下新的highlight 2026-03-27 16:56:54 +08:00
Ovid 7440dd3ed2 D1B本地化问题 2026-03-27 16:56:39 +08:00
dingyuntian bf3120fc1c Merge branch 'develop' into bugfix/内存问题 2026-03-27 16:32:27 +08:00
Ovid e17ec6d799 Merge branch 'develop' into feature/全流程拉通 2026-03-27 16:00:14 +08:00
Ovid 28e03c409d PP2解决actor代码失效问题(暂时注释掉) 2026-03-27 16:00:05 +08:00
dingyuntian 8b42afd0a2 scene: 调整 Persistence 场景对象与层级
Made-with: Cursor
2026-03-27 15:43:05 +08:00
dingyuntian ebe8901813 scene(peipei): 调整佩佩维修场景精灵与布局
Made-with: Cursor
2026-03-27 15:43:00 +08:00
dingyuntian 4c5b166bfb feat(huoshan): 新增分析关卡配置并注册 Addressables
Made-with: Cursor
2026-03-27 15:42:56 +08:00
dingyuntian 9a9645dfec feat: 使用 ResourceSystem 异步加载精灵与关卡配置
Made-with: Cursor
2026-03-27 15:42:46 +08:00
dingyuntian 28418edd44 refactor: 零碎资源迁移 2026-03-27 15:38:27 +08:00
dingyuntian 8a105d8b8b refactor: show_obj相关资源迁移并清理失效资源 2026-03-27 15:36:08 +08:00
dingyuntian 7a5649efde refactor: 部分维修零碎图片迁移 2026-03-27 15:29:34 +08:00
dingyuntian dfcaa4f362 refactor: 记忆相关资产迁移 2026-03-27 15:25:57 +08:00
dingyuntian fa328b4730 refactor(dream): 梦境相关资产重定位 2026-03-27 15:23:47 +08:00
dingyuntian a579ff48ad refactor(VFX): 粒子效果迁移 2026-03-27 15:19:34 +08:00
dingyuntian 24d0536634 refactor: 性能分析工具,暂时无用 2026-03-27 15:18:06 +08:00
bottlefish 3a1f475713 scene(huoshan): 更新 HuoShanFixScene 场景配置
Made-with: Cursor
2026-03-27 14:28:59 +08:00
bottlefish 32c3635268 yarn(dialog): 更新 Test_Huoshan 剧本与表达指令参数
Made-with: Cursor
2026-03-27 14:28:53 +08:00
bottlefish f67641407d fix(huoshan): 修复多轮表达重叠并支持非目标粒子数配置
Made-with: Cursor
2026-03-27 14:26:42 +08:00