Commit Graph
798 Commits
Author SHA1 Message Date
bottlefish 98ef60ae88 Merge branch '美术优化3.10晚上春' into 'develop'
美术优化3.10晚上春

See merge request aibis-dream/aibis-dream!308
2025-03-11 05:26:03 +00:00
bottlefish 533b94fc22 提交 2025-03-11 13:24:28 +08:00
bottlefish 86cab80568 提交,还有bug在修 2025-03-11 12:26:41 +08:00
chenziqin 7ac4ec0e87 Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!306
2025-03-10 17:02:51 +00:00
Ovid f5a32a41f0 +shitou emo 2025-03-11 01:01:43 +08:00
Ovid 0d0571a6b1 peipeiemo+,还差day2BE 2025-03-10 23:54:40 +08:00
bottlefish 306fe88bee 美术合入 2025-03-10 23:19:28 +08:00
dingyuntian 7130bd099d Merge branch 'bugfix/art-replace' into 'develop'
Bugfix/art replace

See merge request aibis-dream/aibis-dream!305
2025-03-10 14:22:23 +00:00
dingyuntian 8d0763c01a 屏幕显示线框图 2025-03-10 22:21:21 +08:00
dingyuntian 7c5295d450 石头维修资源替换 2025-03-10 21:55:18 +08:00
bottlefish 0e58ab3dcf Merge branch '3.10美术优化' into 'develop'
3.10美术优化

See merge request aibis-dream/aibis-dream!304
2025-03-10 13:52:41 +00:00
bottlefish 94178c1b4d 漏提资源 2025-03-10 21:51:23 +08:00
bottlefish 41b032e131 天桥动态 2025-03-10 21:50:39 +08:00
bottlefish 09e54d3a86 外出美术添加 2025-03-10 20:06:32 +08:00
Ovid d4da373aeb Peipei2EmoFix 2025-03-10 18:46:56 +08:00
dingyuntian 85036ce05c 合并 2025-03-10 18:30:40 +08:00
dingyuntian e5db096e09 石头美术替换 2025-03-10 17:21:58 +08:00
Ovid 33de094abc Merge branch 'feature/yarn_0310' of http://114.67.212.218:8011/aibis-dream/aibis-dream into feature/yarn_0310 2025-03-10 16:02:07 +08:00
Ovid 3257bf9d89 石头emo注册、资源上传、佩佩资源更新 2025-03-10 15:56:31 +08:00
dingyuntian 306d0976cd Merge branch 'bugfix/art-replace' into 'develop'
对话修复

See merge request aibis-dream/aibis-dream!300
2025-03-10 07:50:28 +00:00
dingyuntian d93f8463b4 对话修复 2025-03-10 15:49:52 +08:00
bottlefish bafe8b9f24 修复虚拟相机优先级问题 2025-03-10 15:33:12 +08:00
bottlefish bd21d6b454 Merge branch '3.9美术优化' into 'develop'
修复bug

See merge request aibis-dream/aibis-dream!297
2025-03-09 13:44:14 +00:00
bottlefish 68e9d79653 修复bug 2025-03-09 21:42:08 +08:00
chenziqin ea4225cc9a Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!295
2025-03-09 11:49:07 +00:00
Ovid e1197536d4 +emo +peipeimusic 2025-03-09 19:48:17 +08:00
bottlefish 942881423e UI切换为worldcanvas,确保全分辨率可以用 2025-03-09 17:44:01 +08:00
dingyuntian 9cd1a832c3 开发者工具 2025-03-08 22:57:59 +08:00
dingyuntian 0d7ef2fe4e 气泡配置 2025-03-08 21:48:09 +08:00
dingyuntian 7ac013554d Update Persistence.unity 2025-03-08 21:34:08 +08:00
dingyuntian edc8f5525f Update YarnUtil.cs 2025-03-08 21:33:29 +08:00
chenziqin 65b54fcb5b Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!291
2025-03-08 13:00:44 +00:00
dingyuntian 77130baab3 表情 2025-03-08 20:54:44 +08:00
dingyuntian 3e2a606b87 bubble 2025-03-08 19:13:57 +08:00
Ovid c8dc057e2f 表情尝试 2025-03-08 18:09:51 +08:00
dingyuntian 6b615454df fmod微调 2025-03-08 15:43:37 +08:00
Ovid 5b1d31af7e Merge branch 'develop' into feature/FMOD_integration_0310 2025-03-08 12:28:32 +08:00
Ovid 89d92b2c3b amb 3d改2d 2025-03-08 12:27:13 +08:00
dingyuntian 0dc74815ce FMOD调通 2025-03-08 12:07:35 +08:00
dingyuntian dad6c087fd FMOD功能迁移 2025-03-07 22:28:12 +08:00
dingyuntian 99a2e78466 Merge branch 'develop' into feature/fmod 2025-03-07 15:39:56 +08:00
dingyuntian de883c006c FMod 2025-03-07 15:11:58 +08:00
chenziqin 56125cbc47 Merge branch 'feature/FMOD_integration_0310' into 'develop'
Feature/fmod integration 0310

See merge request aibis-dream/aibis-dream!285
2025-03-06 11:18:18 +00:00
Ovid 9716c2de52 fmod integration finished 2025-03-06 19:13:47 +08:00
Ovid 7533eabc0a fmod integration 2025-03-06 18:36:47 +08:00
dingyuntian 49f07c79d7 Merge branch 'develop' into feature/fmod 2025-03-05 18:07:26 +08:00
dingyuntian d2bc229031 Update FMODStudioSettings.asset 2025-03-05 18:07:09 +08:00
dingyuntian 49e5e038bc fmod 2025-03-05 18:06:59 +08:00
chenziqin 87e73fd1c7 Merge branch 'feature/FMOD_integration_0310' into 'develop'
change fmod version to 2.02.25

See merge request aibis-dream/aibis-dream!284
2025-03-05 10:05:55 +00:00
Ovid 731da2f979 change fmod version to 2.02.25 2025-03-05 18:05:13 +08:00