Commit Graph
355 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 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 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
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 3e2a606b87 bubble 2025-03-08 19:13:57 +08:00
Ovid c8dc057e2f 表情尝试 2025-03-08 18:09:51 +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 de883c006c FMod 2025-03-07 15:11:58 +08:00
dingyuntian 49e5e038bc fmod 2025-03-05 18:06:59 +08:00
dingyuntian 8953f7af3a 图集编辑功能指令 2025-03-05 15:57:27 +08:00
dingyuntian 8ac2d3213e Merge branch 'feature/sprite-group' into 'develop'
Feature/sprite group

See merge request aibis-dream/aibis-dream!282
2025-03-05 07:11:33 +00:00
dingyuntian 75d8d03275 图集 2025-03-05 15:02:30 +08:00
dingyuntian 49bfc8e3de Sprite群组编辑器 2025-03-05 14:13:33 +08:00
bottlefish e91e8072f4 bug修复 2025-03-01 21:31:24 +08:00
bottlefish 4a7962dcde 提交 2025-03-01 16:05:51 +08:00
bottlefish b7c1885815 修改 2025-03-01 02:36:59 +08:00
bottlefish 30ac2ceb54 修复bug 2025-03-01 01:34:42 +08:00
bottlefish 40a76cffef 修bug 2025-03-01 00:53:47 +08:00
bottlefish 3f3d4b2d36 佩佩的bug应该差不多了 2025-03-01 00:38:25 +08:00
bottlefish c768974c67 提交 2025-02-28 23:41:58 +08:00
bottlefish 5dc98da5ca 修复bug 但还有很多bug没修 2025-02-27 01:10:27 +08:00
bottlefish f364b1b347 修复部分bug 2025-02-26 19:46:21 +08:00
bottlefish d671f5b79f 跳转开始界面 2025-02-24 00:48:34 +08:00
bottlefish 470a930f3c 提交 2025-02-23 23:16:36 +08:00