Commit Graph
1020 Commits
Author SHA1 Message Date
dingyuntian 99bbcdf7bb 场景替换 2025-03-11 21:47:39 +08:00
bottlefish 5fdd7a836b Merge branch '主场景动态合入' into 'develop'
提交

See merge request aibis-dream/aibis-dream!319
2025-03-11 13:33:34 +00:00
bottlefish 5826d8b4bd 提交 2025-03-11 21:32:15 +08:00
dingyuntian df162c5ac1 Merge branch 'feature/clinic' into 'develop'
Feature/clinic

See merge request aibis-dream/aibis-dream!318
2025-03-11 12:46:47 +00:00
bottlefish cf0b7e587a Merge branch '修复弹窗美术' into 'develop'
提交

See merge request aibis-dream/aibis-dream!317
2025-03-11 12:42:36 +00:00
bottlefish 95e0d14f94 提交 2025-03-11 19:36:48 +08:00
dingyuntian 96a472b3d8 FadeIn问题 2025-03-11 19:19:45 +08:00
dingyuntian 85cf41c359 Update Stage11_手术.yarn 2025-03-11 19:17:51 +08:00
dingyuntian a540b16d4f Clinic前景更新 2025-03-11 19:13:31 +08:00
bottlefish 0586739176 Merge branch '修复后处理问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!315
2025-03-11 11:08:33 +00:00
dingyuntian 5c6ebfe5bd Merge branch 'bugfix/load' into 'develop'
Update GameLoopManager.cs

See merge request aibis-dream/aibis-dream!314
2025-03-11 11:07:55 +00:00
bottlefish 5ac553d0d9 提交 2025-03-11 19:07:24 +08:00
bottlefish 084a23789a Merge branch '3.11美术合入' into 'develop'
3.11美术合入

See merge request aibis-dream/aibis-dream!313
2025-03-11 10:25:03 +00:00
bottlefish 903f59144c Merge branch 'develop' into 3.11美术合入 2025-03-11 18:23:12 +08:00
bottlefish 7e318b9467 美术合入以及bug修复 2025-03-11 18:19:35 +08:00
dingyuntian e7f629a399 Update GameLoopManager.cs 2025-03-11 17:27:57 +08:00
bottlefish ebbec8383a 外出动画以及动画系统 2025-03-11 17:08:25 +08:00
dingyuntian 1f527c112b Merge branch 'bugfix/test' into 'develop'
fadein

See merge request aibis-dream/aibis-dream!312
2025-03-11 08:16:11 +00:00
dingyuntian 0c019524a7 fadein 2025-03-11 16:14:40 +08:00
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