Commit Graph
1279 Commits
Author SHA1 Message Date
Ovid 86d3be64fb Merge branch 'develop' into FP_Prologue 2025-05-17 19:27:53 +08:00
Ovid 8e8fa431a6 d0d1串通 2025-05-17 19:26:45 +08:00
dingyuntian 6213a7ab4f Merge branch 'feature/dialog' into 'develop'
Feature/dialog

See merge request aibis-dream/aibis-dream!391
2025-05-16 14:11:05 +00:00
dingyuntian d682e98fee 合并 2025-05-16 22:10:37 +08:00
dingyuntian ce6b3b9803 Merge branch 'develop' into feature/dialog 2025-05-16 21:51:24 +08:00
dingyuntian 851070f3cf 本地化问题修改 2025-05-16 21:47:35 +08:00
bottlefish 13e4b4603b Merge branch '修复佩佩场景问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!390
2025-05-16 13:08:13 +00:00
bottlefish 2e55a45829 提交 2025-05-16 21:06:38 +08:00
Ovid 52ae98018e 本地化问题修复 2025-05-16 19:15:27 +08:00
bottlefish 1a1531f9d9 Merge branch '开头优化5.16' into 'develop'
开头优化5.16

See merge request aibis-dream/aibis-dream!389
2025-05-16 07:42:12 +00:00
bottlefish b1303664ae 提交渲染相关设置 2025-05-16 15:35:42 +08:00
bottlefish e3c5436b37 修复一些合并导致的问题 2025-05-16 15:34:13 +08:00
Ovid 77be2a94c0 提交FICTION_DAY1_BEGIN/MID/END待debug(本地化报错 2025-05-16 15:24:21 +08:00
dingyuntian 6638b42997 Merge branch 'develop' into feature/dialog 2025-05-16 14:16:30 +08:00
dingyuntian 7d4543eeab dialog 2025-05-16 14:11:27 +08:00
chenziqin 0540b3748d Merge branch 'develop' into 'FP_Prologue'
Develop

See merge request aibis-dream/aibis-dream!388
2025-05-16 05:57:14 +00:00
Ovid 39e2c1dae4 Merge branch 'develop' into FP_Prologue 2025-05-16 13:51:47 +08:00
bottlefish dab5c97b11 Merge branch '开头优化' into 'develop'
开头优化

See merge request aibis-dream/aibis-dream!387
2025-05-16 05:30:49 +00:00
bottlefish aca80b35b5 修复 2025-05-16 13:27:45 +08:00
bottlefish 0f3e781a6e 提交 2025-05-16 12:37:26 +08:00
Ovid d3f6094b3e 串通D0D1 2025-05-15 22:12:46 +08:00
dingyuntian 0915763ef6 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!385
2025-05-15 13:32:34 +00:00
dingyuntian 720c6933b0 字体替换 2025-05-15 21:32:07 +08:00
Ovid 42f4216224 Merge branch 'develop' into FP_Prologue 2025-05-15 21:30:07 +08:00
dingyuntian 3a477eec75 字体更新 2025-05-15 21:27:13 +08:00
dingyuntian 89829f1c1a Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!384
2025-05-15 12:59:42 +00:00
dingyuntian 874b2d5ef2 酒吧 2025-05-15 20:51:47 +08:00
bottlefish ad73e96b21 Merge branch '情绪分支测试' into 'develop'
情绪分支测试

See merge request aibis-dream/aibis-dream!383
2025-05-15 09:53:37 +00:00
bottlefish 843bb4f0e9 Merge branch 'develop' into 情绪分支测试 2025-05-15 17:52:54 +08:00
bottlefish 5c13601fcb Merge branch 'develop' into 情绪分支测试 2025-05-15 17:51:09 +08:00
bottlefish 8d8aed74c2 Merge branch 'FP_Prologue' into 'develop'
Fp prologue

See merge request aibis-dream/aibis-dream!382
2025-05-15 09:49:34 +00:00
bottlefish 9ae7520a28 Merge branch 'develop' into FP_Prologue 2025-05-15 17:47:10 +08:00
bottlefish 4c84d6ef28 修复部分问题 2025-05-15 17:45:33 +08:00
dingyuntian 976517d7b9 Merge branch 'bugfix/tasl' into 'develop'
Bugfix/tasl

See merge request aibis-dream/aibis-dream!381
2025-05-15 09:22:54 +00:00
dingyuntian 362b4608bd Update ProjectSettings.asset 2025-05-15 17:20:10 +08:00
dingyuntian d1c1b25f27 task 2025-05-15 16:50:49 +08:00
dingyuntian 9815400bb0 Task 2025-05-15 16:37:10 +08:00
dingyuntian bc5bf8f411 Merge branch 'develop' into feature/open 2025-05-15 16:23:14 +08:00
dingyuntian 8abdd6d1f8 Playable 2025-05-15 16:22:22 +08:00
dingyuntian ff22df0ab3 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!380
2025-05-15 07:39:11 +00:00
dingyuntian 650d1f3edd 临时对话条 2025-05-15 15:37:45 +08:00
dingyuntian 2d726f8c9d link 2025-05-15 13:09:42 +08:00
dingyuntian f0e02a04dd Merge branch 'bugfix/fix' into 'develop'
奇怪问题

See merge request aibis-dream/aibis-dream!379
2025-05-14 14:42:17 +00:00
dingyuntian 6d46818012 奇怪问题 2025-05-14 22:40:24 +08:00
dingyuntian 16c3dfcb04 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!378
2025-05-14 13:28:20 +00:00
dingyuntian 569e29f261 文本问题 2025-05-14 21:27:31 +08:00
dingyuntian 0eb77750fb Merge branch 'develop' into feature/open 2025-05-14 21:21:10 +08:00
dingyuntian b68122f7d4 惊醒 2025-05-14 21:17:26 +08:00
bottlefish 42e106f756 Merge branch '本地化bug修复' into 'develop'
修复本地化问题

See merge request aibis-dream/aibis-dream!377
2025-05-14 13:13:52 +00:00
bottlefish 5f8af70d0a 本地化问题修复 2025-05-14 21:12:49 +08:00