Commit Graph
2464 Commits
Author SHA1 Message Date
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 1a5e3dbc59 Merge branch 'feature/全流程拉通合入' into 'develop'
Feature/全流程拉通合入

See merge request aibis-dream/aibis-dream!656
2026-03-28 02:23:43 +00: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 ea25756202 Merge branch 'bugfix/资源重新组织' into 'develop'
chore(addressable): 更新资源组配置

See merge request aibis-dream/aibis-dream!655
2026-03-27 14:45:35 +00:00
dingyuntian efcef3dde9 fix: 修复索引丢失的问题 2026-03-27 22:44:43 +08:00
dingyuntian 1d15f5daff fix: 合并后编译错误 2026-03-27 22:43:38 +08:00
dingyuntian 0ec85e0cda chore: 资源组织规范 2026-03-27 22:25:15 +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
chenziqin 259ea6eaff Merge branch 'feature/全流程拉通' into 'develop'
Feature/全流程拉通

See merge request aibis-dream/aibis-dream!653
2026-03-27 08:57:23 +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
bottlefish 618a9fc0df Merge branch 'develop' into 3.24火山BUG修复和查漏补缺 2026-03-27 11:36:39 +08:00
bottlefish 1d88a9dadf 修复高亮指令错误 2026-03-27 11:26:10 +08:00
dingyuntian e4d0a94962 Merge branch 'bugfix/佩佩流程问题' into 'develop'
fix(peipei): 佩佩流程问题修复

See merge request aibis-dream/aibis-dream!652
2026-03-26 12:56:49 +00:00
dingyuntian bebee804d9 fix(peipei): 佩佩流程问题修复
1. 打孔带托盘不显示
2. 记忆特效消失
2026-03-26 20:55:23 +08:00
dingyuntian 5fc2ff9324 fix: 失效command(task相关)清理 2026-03-26 20:54:17 +08:00
chenziqin 353acfc4a1 Merge branch 'feature/pp.aseprite合成一个' into 'develop'
OK这是啥几把东西啊discard不掉overwrite不掉stash不了只能提交提交了会不会额外出问题啊我不知道但是除了提交我还能做什么不知道总之似乎不会...

See merge request aibis-dream/aibis-dream!651
2026-03-26 10:19:53 +00:00
Ovid 76ef3e14f1 Merge branch 'develop' into feature/pp.aseprite合成一个 2026-03-26 18:17:58 +08:00
Ovid 2189033369 OK这是啥几把东西啊discard不掉overwrite不掉stash不了只能提交提交了会不会额外出问题啊我不知道但是除了提交我还能做什么不知道总之似乎不会造成实质的变更而且反正总有办法撤销的对吧那我就先这么提交了 2026-03-26 18:17:25 +08:00
dingyuntian 8c0d53c2a1 scene: 调整持久化场景相机与初始对话配置
Made-with: Cursor
2026-03-26 16:09:08 +08:00
dingyuntian 6a7f420ea1 scene(peipei): 调整佩佩修复场景界面锚点与对象参数
Made-with: Cursor
2026-03-26 16:08:53 +08:00
dingyuntian 0ebbc9c341 fix(resource-kit): 修复场景资源加载器生命周期与初始化时序
Made-with: Cursor
2026-03-26 16:08:41 +08:00
dingyuntian 7291dfb031 docs: 更新资源加载与提交规范文档说明
Made-with: Cursor
2026-03-26 14:12:41 +08:00
dingyuntian 45c36a514d chore: 调整DOTween配置资源位置并同步编辑器资源
Made-with: Cursor
2026-03-26 14:12:35 +08:00
dingyuntian 29fed0d3c4 art: 更新诊所外相关原始美术资源
Made-with: Cursor
2026-03-26 14:12:27 +08:00