Commit Graph
1351 Commits
Author SHA1 Message Date
chenziqin 04e210a8e3 Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!311
2025-03-11 07:27:48 +00:00
Ovid 40edf7d1fb event:Amb/amb_tram 2025-03-11 15:27:13 +08:00
bottlefish da25700a95 美术替换 2025-03-11 14:45:43 +08:00
chenziqin 7b78f01882 Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!310
2025-03-11 06:21:41 +00:00
dingyuntian 67ae5fee18 Merge branch 'bugfix/art' into 'develop'
部分问题修改

See merge request aibis-dream/aibis-dream!309
2025-03-11 05:31:02 +00:00
dingyuntian 85cc345e26 部分问题修改 2025-03-11 13:29:57 +08:00
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 055f32ba60 Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!307
2025-03-10 17:03:51 +00: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 8fe8d7e280 Merge branch 'bugfix/art-replace' into 'develop'
合并

See merge request aibis-dream/aibis-dream!303
2025-03-10 10:33:01 +00:00
dingyuntian 85036ce05c 合并 2025-03-10 18:30:40 +08:00
dingyuntian 25f55d3901 Merge branch 'bugfix/art-replace' into 'develop'
石头美术替换

See merge request aibis-dream/aibis-dream!302
2025-03-10 09:23:31 +00: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
chenziqin b7356fa64b Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!301
2025-03-10 07:59:01 +00:00
Ovid 975699e0eb 误传.history 2025-03-10 15:56:55 +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 72eda49ebb Merge branch '修复虚拟相机优先级问题' into 'develop'
修复虚拟相机优先级问题

See merge request aibis-dream/aibis-dream!299
2025-03-10 07:34:35 +00: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 8d4816ae9c Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!296
2025-03-09 11:49:30 +00: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 c6f90ec711 Merge branch '修复视觉indicator全屏问题' into 'develop'
UI切换为worldcanvas,确保全分辨率可以用

See merge request aibis-dream/aibis-dream!294
2025-03-09 09:53:57 +00:00
bottlefish 942881423e UI切换为worldcanvas,确保全分辨率可以用 2025-03-09 17:44:01 +08:00
dingyuntian 44ecc59606 Merge branch 'feature/asp_anime' into 'develop'
开发者工具

See merge request aibis-dream/aibis-dream!293
2025-03-08 14:59:00 +00:00
dingyuntian 9cd1a832c3 开发者工具 2025-03-08 22:57:59 +08:00
dingyuntian f19a6018bc Merge branch 'feature/bubble' into 'develop'
Feature/bubble

See merge request aibis-dream/aibis-dream!292
2025-03-08 13:48:32 +00: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 92fd486d69 Merge branch 'feature/bubble' into 'develop'
Feature/bubble

See merge request aibis-dream/aibis-dream!290
2025-03-08 12:56:12 +00:00
dingyuntian 77130baab3 表情 2025-03-08 20:54:44 +08:00