Commit Graph
736 Commits
Author SHA1 Message Date
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
dingyuntian 5edb93bd35 Update SceneLoader.cs 2025-02-23 23:41:06 +08:00
bottlefish 470a930f3c 提交 2025-02-23 23:16:36 +08:00
bottlefish ccc54eace9 修复bug 增加选关 2025-02-23 20:31:30 +08:00
bottlefish 480c5c33d1 修复 2025-02-23 17:16:27 +08:00
dingyuntian 898d6946ab dialog问题修改 2025-02-23 03:06:14 +08:00
bottlefish 9233c0e428 提交 2025-02-22 16:38:33 +08:00
bottlefish 1f2e2eccb0 Merge branch 'debug2.22' into 'develop'
Debug2.22

See merge request aibis-dream/aibis-dream!273
2025-02-21 19:23:49 +00:00
bottlefish b12be15e9b 提交 2025-02-22 03:21:06 +08:00
bottlefish 76d2b3775a 修复 2025-02-22 03:19:24 +08:00
dingyuntian f47e7d6b99 Merge branch 'feature/bubble' into 'develop'
合并

See merge request aibis-dream/aibis-dream!272
2025-02-21 18:43:32 +00:00
dingyuntian 8cdf40a9ad 合并 2025-02-22 02:42:57 +08:00
Ovid 8ffac0c1a2 Merge branch 'develop' into feature/Yarn_0219 2025-02-22 02:26:06 +08:00
Ovid 3fb2622009 day2end、day3end 2025-02-22 02:21:03 +08:00
dingyuntian 1a38ae4572 meta 2025-02-22 01:39:33 +08:00
dingyuntian a991b83d90 Merge branch 'develop' into feature/bubble 2025-02-22 01:39:22 +08:00
dingyuntian 30ca85748d 气泡 2025-02-22 01:37:30 +08:00
bottlefish d09994888c 提交 2025-02-21 22:46:45 +08:00
bottlefish a2f996ce28 提交 2025-02-21 22:39:52 +08:00
bottlefish 473902b2d9 Merge branch 'develop' into '2.21.17.51优化'
# Conflicts:
#   Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn
2025-02-21 11:42:59 +00:00
bottlefish 881cb0d929 各种修改 2025-02-21 19:42:02 +08:00
Ovid 99f8aca174 最后小改,课间和peipei2开头对话 2025-02-21 18:42:51 +08:00
bottlefish 2ebcf6ee49 Merge branch '2.21优化' into 'develop'
2.21优化

See merge request aibis-dream/aibis-dream!263
2025-02-21 09:47:15 +00:00
bottlefish 953f2fa852 各种提交 2025-02-21 17:46:01 +08:00
bottlefish 1af4418ac0 提交 2025-02-21 15:32:00 +08:00
dingyuntian cc16f23a93 timeline指令 2025-02-21 14:23:42 +08:00
dingyuntian bfe7db351c Merge branch 'bugfix/fadein' into 'develop'
Bugfix/fadein

See merge request aibis-dream/aibis-dream!259
2025-02-21 03:15:03 +00:00
dingyuntian 91263a98bc 唱针 2025-02-21 11:14:17 +08:00
dingyuntian 9ecc5191b1 问题修改 2025-02-21 11:12:02 +08:00
dingyuntian 6cf743afc7 Merge branch 'feature/spritegroup' into 'develop'
Feature/spritegroup

See merge request aibis-dream/aibis-dream!258
2025-02-21 02:50:11 +00:00
Ovid ba88ee5c1a 丢失更改恢复 2025-02-21 04:22:10 +08:00
Ovid 459e72f5e5 +emotion 2025-02-21 03:58:22 +08:00
dingyuntian eae34b7d6e 合并 2025-02-21 02:01:39 +08:00
bottlefish 0d9a9eba24 Merge branch 'develop' into 2.20春修改 2025-02-21 01:49:17 +08:00
bottlefish 713fba16ee 回退timeline 2025-02-21 01:14:05 +08:00
bottlefish 5f40a69044 Merge branch '补资产' into 'develop'
补资产

See merge request aibis-dream/aibis-dream!252
2025-02-20 17:03:15 +00:00
bottlefish cbcdd3b573 补资产 2025-02-21 01:00:01 +08:00
dingyuntian 934c1d96df Merge branch 'develop' into feature/spritegroup 2025-02-21 00:37:05 +08:00
dingyuntian 76d2332c2c 自动生成 2025-02-21 00:37:00 +08:00
Ovid 7c1df6cda9 Merge branch 'develop' into feature/Yarn_0219 2025-02-21 00:35:15 +08:00
Ovid 990c53389f shitou2_eyetext_fix 2025-02-21 00:33:10 +08:00
dingyuntian 13e0db49fd Merge branch 'develop' into feature/spritegroup 2025-02-21 00:31:29 +08:00
Ovid adeea6cfda music fix 2025-02-21 00:31:05 +08:00
dingyuntian 65c5c6d32d 全屏展示图片 2025-02-21 00:23:55 +08:00
dingyuntian 6cedae4d07 scene 2025-02-21 00:14:59 +08:00