Commit Graph
1074 Commits
Author SHA1 Message Date
dingyuntian b87606a018 Merge branch 'version' into 'develop'
Update ProjectSettings.asset

See merge request aibis-dream/aibis-dream!342
2025-03-17 12:26:01 +00:00
dingyuntian e6b3185f18 Update ProjectSettings.asset 2025-03-17 20:25:01 +08:00
dingyuntian e56804f5ce Merge branch 'bugfix/QATools' into 'develop'
Bugfix/qa tools

See merge request aibis-dream/aibis-dream!340
2025-03-17 11:55:40 +00:00
dingyuntian fd7d842070 Merge branch 'develop' into bugfix/QATools 2025-03-17 19:53:24 +08:00
bottlefish 5329d5e488 Merge branch '修复视觉模块阻碍bug' into 'develop'
修复视觉模块阻碍bug

See merge request aibis-dream/aibis-dream!339
2025-03-17 11:53:05 +00:00
dingyuntian 778641edd7 Update ProjectSettings.asset 2025-03-17 19:51:30 +08:00
dingyuntian 1d1c99bdd1 版本号调整 2025-03-17 19:50:38 +08:00
bottlefish bf292a311d 替换UF中错误的佩佩图片 2025-03-17 19:47:53 +08:00
bottlefish 4cef93e064 提交 2025-03-17 19:24:00 +08:00
chenziqin 2023969370 Merge branch 'simc' into 'develop'
Simc

See merge request aibis-dream/aibis-dream!338
2025-03-17 10:16:12 +00:00
Ovid 27abd91495 Merge branch 'develop' into simc 2025-03-17 18:15:45 +08:00
Ovid cfae76bb66 0317bugfix 2025-03-17 18:14:37 +08:00
dingyuntian f7c396c7af 版本号 2025-03-17 17:26:31 +08:00
dingyuntian 08a55a4d04 存档功能 2025-03-17 16:04:13 +08:00
dingyuntian d60dfb527c Merge branch 'feature/退出游戏' into 'develop'
存档修复

See merge request aibis-dream/aibis-dream!336
Release2023031201
2025-03-12 13:22:14 +00:00
bottlefish 76a6501170 Merge branch 'bugfxi' into 'develop'
提交

See merge request aibis-dream/aibis-dream!335
2025-03-12 13:21:15 +00:00
bottlefish 03aa629dfc 提交 2025-03-12 21:19:40 +08:00
dingyuntian 395d159f01 存档修复 2025-03-12 21:07:15 +08:00
chenziqin 86beb773c3 Merge branch 'simc' into 'develop'
delete x

See merge request aibis-dream/aibis-dream!334
2025-03-12 09:07:51 +00:00
Ovid e7ad4e8f8f delete x 2025-03-12 17:07:18 +08:00
chenziqin f8ed695cbf Merge branch 'simc' into 'develop'
typo fix

See merge request aibis-dream/aibis-dream!333
2025-03-12 09:04:14 +00:00
Ovid 98326e57b7 typo fix 2025-03-12 17:03:36 +08:00
dingyuntian 419b120b9a Merge branch 'feature/退出游戏' into 'develop'
退出游戏

See merge request aibis-dream/aibis-dream!332
2025-03-11 17:10:05 +00:00
dingyuntian 9e27272d03 退出游戏 2025-03-12 01:09:22 +08:00
bottlefish 01a498c2fd Merge branch '补资源' into 'develop'
修复

See merge request aibis-dream/aibis-dream!331
2025-03-11 16:25:20 +00:00
bottlefish cca5b5a163 修复 2025-03-12 00:24:33 +08:00
chenziqin 939e1595b5 Merge branch 'simc' into 'develop'
mem_insert change to punchtape's asset

See merge request aibis-dream/aibis-dream!330
2025-03-11 16:23:44 +00:00
Ovid 8a9500e4c7 mem_insert change to punchtape's asset 2025-03-12 00:23:11 +08:00
bottlefish 49b20a52b9 Merge branch 'bugfixfinal' into 'develop'
修复轮子

See merge request aibis-dream/aibis-dream!329
2025-03-11 16:04:48 +00:00
bottlefish ed0f009f28 修复轮子 2025-03-12 00:03:39 +08:00
bottlefish a55135c27f Merge branch 'bugfix春' into 'develop'
修复

See merge request aibis-dream/aibis-dream!327
2025-03-11 15:50:51 +00:00
chenziqin 717f92ba84 Merge branch 'simc' into 'develop'
final fix

See merge request aibis-dream/aibis-dream!328
2025-03-11 15:49:08 +00:00
bottlefish 15769c7b5d Merge branch 'develop' into bugfix春 2025-03-11 23:48:55 +08:00
Ovid 13e662322a final fix 2025-03-11 23:48:21 +08:00
bottlefish e9eac8829a 修复 2025-03-11 23:46:58 +08:00
dingyuntian cb190e7ddd Merge branch 'feature/test' into 'develop'
存档修改

See merge request aibis-dream/aibis-dream!326
2025-03-11 15:39:45 +00:00
dingyuntian 7cf396e1a7 存档修改 2025-03-11 23:31:52 +08:00
dingyuntian 3b97cf8050 Merge branch 'bugfix/clinic' into 'develop'
Bugfix/clinic

See merge request aibis-dream/aibis-dream!325
2025-03-11 15:13:32 +00:00
chenziqin 3c35666aeb Merge branch 'ui' into 'develop'
reupload sfx & music param fix

See merge request aibis-dream/aibis-dream!324
2025-03-11 15:11:03 +00:00
Ovid b74caba55f reupload sfx & music param fix 2025-03-11 23:09:22 +08:00
dingyuntian af4d48121c 添加测试存档 2025-03-11 23:09:12 +08:00
dingyuntian c9306ad883 fix 2025-03-11 22:42:20 +08:00
chenziqin 34519c76ef Merge branch 'feature/yarn_0310' into 'develop'
peipei2beendtalk凑合

See merge request aibis-dream/aibis-dream!323
2025-03-11 13:55:17 +00:00
Ovid 3d3a503767 peipei2beendtalk凑合 2025-03-11 21:54:48 +08:00
dingyuntian 69ba70d4c9 Merge branch 'feature/clinic' into 'develop'
文件相关

See merge request aibis-dream/aibis-dream!322
2025-03-11 13:51:48 +00:00
dingyuntian 193f8122e0 Merge branch 'bugfix/art' into 'develop'
场景替换

See merge request aibis-dream/aibis-dream!321
2025-03-11 13:49:58 +00:00
chenziqin 4dc0ad683f Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!320
2025-03-11 13:48:04 +00:00
Ovid 00071e84ac Merge branch 'develop' into feature/yarn_0310 2025-03-11 21:47:42 +08:00
dingyuntian 99bbcdf7bb 场景替换 2025-03-11 21:47:39 +08:00
Ovid 2c52002986 start & end modify 2025-03-11 21:44:58 +08:00