Commit Graph
1688 Commits
Author SHA1 Message Date
bottlefish aedba82e69 Merge branch '打包6.26' into 'develop'
打包6.26

See merge request aibis-dream/aibis-dream!500
2025-06-26 10:16:49 +00:00
bottlefish dead40d875 提交打包信息 2025-06-26 18:16:04 +08:00
bottlefish cbc08105da Merge branch 'develop' into 打包6.26 2025-06-26 18:04:11 +08:00
bottlefish 3df0365d10 提交打包信息和bug修复 2025-06-26 18:03:18 +08:00
chenziqin 7d3e152815 Merge branch 'bugfix/emergencyLevel' into 'develop'
peipei1设置emergencyLevel=0

See merge request aibis-dream/aibis-dream!499
2025-06-26 10:00:20 +00:00
Ovid da2b439b37 peipei1设置emergencyLevel=0 2025-06-26 17:57:41 +08:00
dingyuntian 971904f1f3 Merge branch 'bugfix/clue' into 'develop'
生成器问题

See merge request aibis-dream/aibis-dream!498
2025-06-26 09:24:03 +00:00
Yuntien 6334b9406d 生成器问题 2025-06-26 17:22:18 +08:00
chenziqin fd1df3e812 Merge branch 'feature/text_bugfixes' into 'develop'
bugfixes

See merge request aibis-dream/aibis-dream!497
2025-06-26 09:09:09 +00:00
Ovid 9066a55095 bugfixes 2025-06-26 17:08:16 +08:00
bottlefish e7c5419fde Merge branch '修复音频bug' into 'develop'
修复音频bug

See merge request aibis-dream/aibis-dream!496
2025-06-26 08:44:47 +00:00
bottlefish f9807d06d2 暂时把拉条音频停掉 2025-06-26 16:43:42 +08:00
bottlefish 3ab633a736 Merge branch 'develop' into 修复音频bug 2025-06-26 14:39:53 +08:00
bottlefish 24773dbc56 提交 2025-06-26 14:20:15 +08:00
dingyuntian c85e6a1895 Merge branch 'bugfix/clue' into 'develop'
Bugfix/clue

See merge request aibis-dream/aibis-dream!495
2025-06-26 04:27:41 +00:00
Yuntien 5f1734cbdb 售货机替换 2025-06-26 12:24:49 +08:00
Yuntien ef2d6c29a5 Update Persistence.unity 2025-06-25 23:42:16 +08:00
chenziqin 0344c1c5c4 Merge branch 'feature/佩佩表情替换' into 'develop'
Feature/佩佩表情替换

See merge request aibis-dream/aibis-dream!494
2025-06-25 12:17:55 +00:00
Ovid 89b7ce3807 文本微调 2025-06-25 20:17:10 +08:00
Ovid a28a58f32e 台词br wait等的处理 2025-06-25 20:05:11 +08:00
Ovid af6c1acc0f 佩佩微调文本 2025-06-24 20:12:23 +08:00
dingyuntian 226f56a860 Merge branch 'bugfix/624' into 'develop'
打包

See merge request aibis-dream/aibis-dream!493
2025-06-24 11:01:12 +00:00
dingyuntian f82e2cd105 打包 2025-06-24 19:00:33 +08:00
dingyuntian fadfd5a401 Merge branch 'bugfix/地铁资产替换' into 'develop'
Bugfix/地铁资产替换

See merge request aibis-dream/aibis-dream!492
2025-06-24 07:12:03 +00:00
dingyuntian 17134c1ae4 Update Center.yarn 2025-06-24 14:53:33 +08:00
dingyuntian 05a4f21133 问题修复 2025-06-24 14:28:18 +08:00
Ovid 534a5aa24a 佩佩表情配置 2025-06-23 20:10:04 +08:00
Ovid 71bdd451fb 配置佩佩表情 2025-06-23 19:58:48 +08:00
dingyuntian 33bba18691 美术素材更新 2025-06-23 17:33:25 +08:00
bottlefish 8ca121f9de Merge branch '修复佩佩day2的问题' into 'develop'
修复佩佩day2的问题

See merge request aibis-dream/aibis-dream!491
2025-06-23 07:19:41 +00:00
bottlefish e147e5f1a5 Merge branch 'develop' into 修复佩佩day2的问题 2025-06-23 15:19:20 +08:00
dingyuntian bf04f5ce82 Merge branch 'develop' into feature/佩佩表情替换 2025-06-20 17:21:48 +08:00
dingyuntian 8b058e5d8d 对话框微调 2025-06-20 17:18:21 +08:00
Ovid f4e3a85867 anim test 2025-06-20 16:46:19 +08:00
Ovid 9e42f1b346 Merge branch 'feature/佩佩表情替换' of http://114.67.212.218:8011/aibis-dream/aibis-dream into feature/佩佩表情替换 2025-06-20 15:47:58 +08:00
dingyuntian f6c7700a14 相机注册错误 2025-06-20 15:15:13 +08:00
bottlefish aef498daa9 提交 2025-06-20 14:43:25 +08:00
dingyuntian 0ddf3478cf Merge branch 'bugfix/图太糊' into 'develop'
素材修改

See merge request aibis-dream/aibis-dream!490
2025-06-20 05:52:04 +00:00
dingyuntian af963efc61 素材修改 2025-06-20 13:47:07 +08:00
bottlefish a33dd71f9a 提交 2025-06-20 12:21:44 +08:00
Ovid eb0e43ac2a 上传佩佩表情配置和yarn标记 2025-06-19 21:28:06 +08:00
dingyuntian 1059a92147 佩佩 2025-06-19 15:48:19 +08:00
dingyuntian b6bb76bffe 佩佩动画 2025-06-19 14:34:17 +08:00
bottlefish 8a7c9dc0a5 Merge branch '6.19打包' into 'develop'
提交打包信息

See merge request aibis-dream/aibis-dream!489
2025-06-19 04:44:55 +00:00
bottlefish 57009e439e 提交打包信息 2025-06-19 12:35:07 +08:00
chenziqin 001b4056ee Merge branch 'feature/czq_0617' into 'develop'
prologueEnding上传

See merge request aibis-dream/aibis-dream!488
2025-06-18 17:51:41 +00:00
Ovid a091a4c9bd prologueEnding上传 2025-06-19 01:50:20 +08:00
chenziqin 5abbdf4bf5 Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!487
2025-06-18 14:11:51 +00:00
Ovid 1389266f46 火车进站音效修正 2025-06-18 22:10:53 +08:00
dingyuntian 2f7a68c4b3 Merge branch 'develop' into feature/佩佩表情替换 2025-06-18 22:06:52 +08:00