Commit Graph
1289 Commits
Author SHA1 Message Date
dingyuntian 376c7acdf4 Merge branch 'develop' into feature/dialogUI 2025-05-20 13:23:05 +08:00
dingyuntian 4a60159e60 Merge branch 'develop' into feature/dialogUI 2025-05-19 22:49:39 +08:00
dingyuntian 0f3ace7e6d Merge branch 'bugfix/local' into 'develop'
Bugfix/local

See merge request aibis-dream/aibis-dream!397
2025-05-19 14:47:45 +00:00
dingyuntian ed70f945e5 快进按钮 2025-05-19 22:45:58 +08:00
dingyuntian 0645adf5b8 本地化 2025-05-19 22:20:03 +08:00
dingyuntian edef6fa96a Merge branch 'bugfix/local' into 'develop'
本地化

See merge request aibis-dream/aibis-dream!396
2025-05-19 13:26:35 +00:00
dingyuntian 68f3e327f1 本地化 2025-05-19 21:13:41 +08:00
dingyuntian 9ec4d60034 替换 2025-05-19 21:13:01 +08:00
dingyuntian b050870ca0 Merge branch 'feature/dialogUI' into 'develop'
打包

See merge request aibis-dream/aibis-dream!395
2025-05-19 12:19:51 +00:00
dingyuntian 1993e0bf47 Merge branch 'develop' into feature/dialogUI 2025-05-19 20:19:38 +08:00
dingyuntian 3b754c8a5d 打包 2025-05-19 20:17:28 +08:00
dingyuntian 1e3f976c86 Merge branch 'feature/dialog' into 'develop'
打包

See merge request aibis-dream/aibis-dream!394
2025-05-19 11:18:51 +00:00
dingyuntian f5c0d3afdd Merge branch 'feature/dialog' into 'develop'
Feature/dialog

See merge request aibis-dream/aibis-dream!393
2025-05-19 11:17:58 +00:00
dingyuntian df4b259e2a 打包 2025-05-19 19:16:54 +08:00
dingyuntian ea2e3f1559 Merge branch 'develop' into feature/dialog 2025-05-19 19:02:13 +08:00
dingyuntian f2fa277a56 本地化 2025-05-19 19:00:23 +08:00
bottlefish 10037bb66b Merge branch '渲染bug修复' into 'develop'
提交render修改

See merge request aibis-dream/aibis-dream!392
2025-05-19 08:45:10 +00:00
bottlefish 59d97a3f14 提交render修改 2025-05-19 16:41:50 +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
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
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
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
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
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