Commit Graph
1767 Commits
Author SHA1 Message Date
chenziqin 20ec008568 Merge branch 'feature/yingli1fic' into 'develop'
Feature/yingli1fic

See merge request aibis-dream/aibis-dream!528
2025-08-04 11:31:22 +00:00
Ovid ce5ac26174 81包全串通 2025-08-04 19:30:23 +08:00
dingyuntian 3923cb0e9a Merge branch 'bugfix/shitou' into 'develop'
Update ExpressFixScene.unity

See merge request aibis-dream/aibis-dream!522
2025-08-04 06:27:14 +00:00
dingyuntian 14ca1bf8d8 Update ExpressFixScene.unity 2025-08-04 14:23:36 +08:00
Ovid e5969a5151 上传DAY1-4 2025-08-02 21:20:16 +08:00
Ovid 8b789da446 Merge branch 'develop' into feature/yingli1fic 2025-08-02 18:02:30 +08:00
dingyuntian 4a881b2a53 Update CameraKit.cs 2025-08-01 17:33:06 +08:00
Ovid f84159aa8e bug 2025-08-01 17:09:26 +08:00
dingyuntian 01c5b1fda3 Merge branch 'feature/yingli' into 'develop'
英理打地鼠功能

See merge request aibis-dream/aibis-dream!521
2025-08-01 07:26:53 +00:00
dingyuntian 11ab2d04bd Merge branch 'develop' into feature/yingli 2025-08-01 15:26:16 +08:00
dingyuntian 171bae4663 打地鼠重置 2025-08-01 15:18:12 +08:00
Ovid 2013dd41e0 yingli1 2025-07-25 19:28:47 +08:00
Ovid 06770f567c Merge branch 'develop' into feature/yingli1fic 2025-07-25 15:46:25 +08:00
Ovid fcd9292164 stage2对话补完 2025-07-24 18:30:22 +08:00
dingyuntian 3c2128f709 Merge branch 'bugfix/merge' into 'develop'
Bugfix/merge

See merge request aibis-dream/aibis-dream!518
2025-07-24 09:15:54 +00:00
dingyuntian e13988d4c9 合并 2025-07-24 17:13:35 +08:00
dingyuntian fe63f99d02 Merge remote-tracking branch 'origin/保底全流程包' into develop 2025-07-24 17:12:36 +08:00
dingyuntian f883c502f7 随机触发 2025-07-24 17:10:39 +08:00
Ovid 9bd67dfa86 Merge branch 'develop' into feature/yingli1fic 2025-07-24 16:34:14 +08:00
Ovid 93eef68beb 暂存 2025-07-24 16:33:03 +08:00
Ovid d8eb9770a2 没做完不知道改了啥 2025-07-23 19:45:40 +08:00
dingyuntian 7eda71e153 Merge branch 'feature/yingli' into 'develop'
结果

See merge request aibis-dream/aibis-dream!517
2025-07-23 11:44:14 +00:00
dingyuntian 085366f836 结果 2025-07-23 19:43:45 +08:00
dingyuntian eb73b38110 Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!516
2025-07-23 11:40:06 +00:00
dingyuntian ec7c7a8356 英理功能增加 2025-07-23 19:37:24 +08:00
dingyuntian 37d6dbf254 英理测试 2025-07-23 15:37:07 +08:00
bottlefish 34fe52fc2f 提交 2025-07-21 15:55:16 +08:00
chenziqin f85c73c57f Merge branch 'feature/huoshan1fic' into 'develop'
debugdebugdebugdebug

See merge request aibis-dream/aibis-dream!515
2025-07-18 14:56:20 +00:00
Ovid d5258c8315 debugdebugdebugdebug 2025-07-18 22:53:21 +08:00
chenziqin b4ac76355e Merge branch 'feature/huoshan1fic' into 'develop'
+localization

See merge request aibis-dream/aibis-dream!514
2025-07-18 13:55:24 +00:00
Ovid 79eee45019 +localization 2025-07-18 21:54:15 +08:00
chenziqin 343ffe8283 Merge branch 'feature/huoshan1fic' into 'develop'
debug

See merge request aibis-dream/aibis-dream!513
2025-07-18 13:41:31 +00:00
Ovid ef38d5aaa9 debug 2025-07-18 21:39:53 +08:00
chenziqin 6675fff982 Merge branch 'feature/huoshan1fic' into 'develop'
Feature/huoshan1fic

See merge request aibis-dream/aibis-dream!512
2025-07-18 13:27:23 +00:00
Ovid eec76cb0b1 +表情,debug 2025-07-18 21:26:21 +08:00
chenziqin 88572dd62d Merge branch 'develop' into 'feature/huoshan1fic'
Develop

See merge request aibis-dream/aibis-dream!511
2025-07-18 11:34:55 +00:00
dingyuntian d2c644fa6e Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!510
2025-07-18 11:33:48 +00:00
dingyuntian 23e2a5c741 火山临时 2025-07-18 19:32:27 +08:00
Ovid 8463d9caa8 huoshan1fic 2025-07-18 19:32:14 +08:00
dingyuntian 27eec345f6 添加火山PSB版 2025-07-18 19:23:53 +08:00
dingyuntian 6ecde1fa8a Merge branch 'develop' into feature/yingli 2025-07-18 19:18:51 +08:00
Ovid 65d79d8b8e 提交火山fic 2025-07-18 18:44:53 +08:00
Ovid 9324f928ba debugshitou2 2025-07-15 21:13:45 +08:00
Ovid 3d1c072687 Merge branch '保底全流程包' of http://114.67.212.218:8011/aibis-dream/aibis-dream into 保底全流程包 2025-07-15 21:11:21 +08:00
Ovid e218dbc547 配置shitou2peipei3表情、shitoupeipei的ta全改它、去掉小机体的说法改为小小的机体 2025-07-15 21:10:40 +08:00
bottlefish 7aebe851af 提交石头修改 2025-07-15 17:42:33 +08:00
bottlefish 77470d42ce 修改结尾 2025-07-15 16:20:59 +08:00
bottlefish 18f52c317e 跑通!并且可以八倍速跑通! 2025-07-15 16:05:13 +08:00
bottlefish 2a18f7dc8b 提交 2025-07-15 11:02:32 +08:00
bottlefish c27bb3258f 回退下 2025-07-14 22:55:38 +08:00