Commit Graph
642 Commits
Author SHA1 Message Date
dingyuntian 22c0d4f742 打包过程出现的问题 2024-12-31 16:40:03 +08:00
dingyuntian 389a1bdde9 Merge branch 'bugfix/小问题' into 'develop'
Bugfix/小问题

See merge request aibis-dream/aibis-dream!182
2024-12-31 08:18:17 +00:00
dingyuntian ce553e32f3 Update Re_LTS_Peipeiday2.yarn 2024-12-31 16:17:55 +08:00
dingyuntian 7c16f59ac0 Merge branch 'develop' into bugfix/小问题 2024-12-31 15:38:26 +08:00
dingyuntian bd6dbd5448 佩佩Day2改动 2024-12-31 15:37:54 +08:00
chenziqin 4614a8920a Merge branch 'feature/yarn_subway' into 'develop'
Feature/yarn subway

See merge request aibis-dream/aibis-dream!181
2024-12-31 07:20:03 +00:00
Ovid 45c5c63cee 音频wrap多了一截无声,处理 2024-12-31 15:18:32 +08:00
Ovid 7ae885e142 石头加表情 2024-12-31 14:48:54 +08:00
dingyuntian aad158b05b 佩佩修改 2024-12-31 14:47:46 +08:00
dingyuntian e5bdfdc838 Merge branch '台词冲刺day2' into bugfix/小问题 2024-12-31 14:34:08 +08:00
dingyuntian 3e7dccea69 Merge branch 'bugfix/小问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!179
2024-12-31 06:31:53 +00:00
dingyuntian 3a91e50ea0 提交 2024-12-31 14:29:59 +08:00
dingyuntian d7977cc8b6 Merge branch 'bugfix/通流程' into 'develop'
全通

See merge request aibis-dream/aibis-dream!177
2024-12-31 05:32:23 +00:00
dingyuntian 02d5b573d1 全通 2024-12-31 13:31:45 +08:00
Ovid ee4e0ddbe4 Merge branch 'develop' into feature/yarn_subway 2024-12-31 12:18:57 +08:00
dingyuntian 15c0bb593f Merge branch 'bugfix/layer' into 'develop'
图层调整

See merge request aibis-dream/aibis-dream!176
2024-12-31 04:02:21 +00:00
dingyuntian df6c01e446 图层调整 2024-12-31 12:00:55 +08:00
NeologismWu 2b426c0131 Update Re_LTS_Peipeiday2.yarn 2024-12-31 11:57:24 +08:00
chenziqin 4f6caac8f3 Merge branch 'feature/yarn_subway' into 'develop'
Feature/yarn subway

See merge request aibis-dream/aibis-dream!174
2024-12-30 22:14:30 +00:00
Ovid 31b9ae7fb2 统一佩佩和石头的插线检查逻辑 2024-12-31 06:13:00 +08:00
Ovid 91e1215e61 串通调整-尽管调整得非常迷你 2024-12-31 05:39:06 +08:00
bottlefish 967a925abd Merge branch 'debug佩佩流程' into 'develop'
修复一些问题

See merge request aibis-dream/aibis-dream!173
2024-12-30 21:03:42 +00:00
bottlefish 9ca79850a3 修复一些问题 2024-12-31 05:02:21 +08:00
dingyuntian d1efc8c2d0 Merge branch 'feature/gear_sound' into 'develop'
Feature/gear sound

See merge request aibis-dream/aibis-dream!172
2024-12-30 20:48:30 +00:00
dingyuntian d9897366af 音频更新 2024-12-31 04:47:40 +08:00
dingyuntian 7b3b6369f2 Update CharacterViewer.cs 2024-12-31 04:44:15 +08:00
dingyuntian 2fcbea4056 齿轮音效 2024-12-31 04:38:47 +08:00
Ovid b42b31b196 Merge branch 'develop' into feature/yarn_subway 2024-12-31 04:11:33 +08:00
Ovid 0f71fce8f7 石头上传一点点1的修改,以拉更新避免冲突 2024-12-31 04:10:32 +08:00
bottlefish c438b80ad2 Merge branch '佩佩表情调整' into 'develop'
修复错误

See merge request aibis-dream/aibis-dream!171
2024-12-30 19:56:41 +00:00
bottlefish e44600fd64 修复错误 2024-12-31 03:55:52 +08:00
bottlefish cc8ac8bf62 Merge branch '最后debug' into 'develop'
补图片,删错误指令

See merge request aibis-dream/aibis-dream!170
2024-12-30 19:22:32 +00:00
bottlefish c92b141466 补图片,删错误指令 2024-12-31 03:21:36 +08:00
bottlefish cc2b226240 Merge branch '地铁和佩佩补漏' into 'develop'
地铁调整

See merge request aibis-dream/aibis-dream!168
2024-12-30 19:02:31 +00:00
bottlefish e42429500b 地铁调整 2024-12-31 03:01:34 +08:00
dingyuntian 618e48fa54 Merge branch '年底台词冲刺佩佩day2' into 'develop'
day2台词

See merge request aibis-dream/aibis-dream!166
2024-12-30 18:51:01 +00:00
NeologismWu c4de490f65 day2台词 2024-12-31 02:49:10 +08:00
chenziqin da8d1af583 Merge branch 'feature/yarn_subway' into 'develop'
第一天结束+地铁

See merge request aibis-dream/aibis-dream!167
2024-12-30 18:07:00 +00:00
Ovid 522f345c64 第一天结束+地铁 2024-12-31 02:04:39 +08:00
NeologismWu 8511d95871 day2台词 2024-12-31 02:02:58 +08:00
dingyuntian b94f89191f Merge branch '年底台词冲刺佩佩day2' into 'develop'
台词

See merge request aibis-dream/aibis-dream!165
2024-12-30 17:15:38 +00:00
NeologismWu 1e0e6bac69 台词 2024-12-31 01:11:18 +08:00
dingyuntian f77238d01a Merge branch 'feature/年底补锅台词冲刺' into 'develop'
day1台词完整版

See merge request aibis-dream/aibis-dream!164
2024-12-30 16:44:36 +00:00
dingyuntian a0a40b72ba Update Memory.yarn 2024-12-31 00:44:05 +08:00
dingyuntian f9a4747c0a Merge branch 'develop' into feature/年底补锅台词冲刺 2024-12-31 00:41:37 +08:00
NeologismWu c3eb5ff3ab day1台词完整版 2024-12-31 00:25:38 +08:00
dingyuntian 238ad8d823 Merge branch 'bugfix/跑包' into 'develop'
Update ExpressFixScene.unity

See merge request aibis-dream/aibis-dream!163
2024-12-30 15:56:43 +00:00
dingyuntian 3a395d148f Update ExpressFixScene.unity 2024-12-30 23:56:19 +08:00
bottlefish 726970fe63 Merge branch 'bug修复' into 'develop'
修复音频错误

See merge request aibis-dream/aibis-dream!162
2024-12-30 15:43:26 +00:00
bottlefish bc05225686 修复音频错误 2024-12-30 23:42:25 +08:00