 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 |
|
|
dingyuntian
|
e795fb4917
|
Merge branch 'bugfix/跑包' into 'develop'
Bugfix/跑包
See merge request aibis-dream/aibis-dream!161
|
2024-12-30 15:33:11 +00:00 |
|
|
dingyuntian
|
fe45f1104f
|
Merge branch 'develop' into bugfix/跑包
|
2024-12-30 23:32:21 +08:00 |
|
|
dingyuntian
|
37c4934ad3
|
音频接入
|
2024-12-30 23:31:37 +08:00 |
|
|
bottlefish
|
d8f1a85d96
|
Merge branch '佩佩表情' into 'develop'
佩佩day1表情添加
See merge request aibis-dream/aibis-dream!160
|
2024-12-30 15:16:35 +00:00 |
|
|
bottlefish
|
e0927e2d34
|
佩佩day1表情添加
|
2024-12-30 23:15:50 +08:00 |
|
|
bottlefish
|
c480caf802
|
Merge branch '音频美术优化' into 'develop'
替换资源和音频
See merge request aibis-dream/aibis-dream!159
|
2024-12-30 14:42:13 +00:00 |
|
|
bottlefish
|
60f4f798f7
|
替换资源和音频
|
2024-12-30 22:40:59 +08:00 |
|
|
dingyuntian
|
61892bafbd
|
齿轮固定
|
2024-12-30 21:59:24 +08:00 |
|
|
dingyuntian
|
6ce0a20f18
|
Merge branch 'bugfix/跑包' into 'develop'
Bugfix/跑包
See merge request aibis-dream/aibis-dream!158
|
2024-12-30 10:56:52 +00:00 |
|
|
dingyuntian
|
3b3e906fc5
|
Merge branch 'develop' into bugfix/跑包
|
2024-12-30 18:56:11 +08:00 |
|
|
dingyuntian
|
b2012457ec
|
4天跑通版本
|
2024-12-30 18:51:32 +08:00 |
|
|
bottlefish
|
2a83385db9
|
Merge branch '美术优化' into 'develop'
修改clueboard退出表现，和眼睛打开的表现
See merge request aibis-dream/aibis-dream!157
|
2024-12-30 10:49:13 +00:00 |
|
|
bottlefish
|
3fd5f1bd39
|
修改clueboard退出表现，和眼睛打开的表现
|
2024-12-30 18:46:10 +08:00 |
|
|
bottlefish
|
06b879040f
|
Merge branch '增加音频' into 'develop'
增加部分音频
See merge request aibis-dream/aibis-dream!156
|
2024-12-30 09:48:25 +00:00 |
|
|
bottlefish
|
f8958de843
|
增加部分音频
|
2024-12-30 17:45:17 +08:00 |
|
|
dingyuntian
|
58a8361466
|
Merge branch 'develop' into bugfix/跑包
|
2024-12-30 17:14:20 +08:00 |
|
|
dingyuntian
|
0917b7e9a6
|
流程修改
|
2024-12-30 17:11:40 +08:00 |
|
|
bottlefish
|
4dd035e36b
|
Merge branch 'bug修复' into 'develop'
peipeiday1clueboard修复，替换素材
See merge request aibis-dream/aibis-dream!155
|
2024-12-30 08:53:09 +00:00 |
|
|
bottlefish
|
facc31f0f2
|
peipeiday1clueboard修复，替换素材
|
2024-12-30 16:50:39 +08:00 |
|
|
bottlefish
|
0c6c0e0477
|
Merge branch '佩佩优化' into 'develop'
替换素材，增加打孔带溢出表现
See merge request aibis-dream/aibis-dream!154
|
2024-12-30 03:33:12 +00:00 |
|
|
bottlefish
|
cf0db07839
|
替换素材，增加打孔带溢出表现
|
2024-12-30 11:31:02 +08:00 |
|
|
dingyuntian
|
6c2c0a89d3
|
Merge branch 'feature/年底补锅台词冲刺' into 'develop'
1230修台词
See merge request aibis-dream/aibis-dream!153
|
2024-12-30 02:55:45 +00:00 |
|
|
伍振彤
|
2c27552c20
|
Merge branch 'develop' into 'feature/年底补锅台词冲刺'
# Conflicts:
# Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn
|
2024-12-30 02:53:48 +00:00 |
|
|
NeologismWu
|
e54599bee4
|
1230修台词
|
2024-12-30 10:48:55 +08:00 |
|
|
chenziqin
|
588571f9dc
|
Merge branch 'feature/yarn_shitou' into 'develop'
Feature/yarn shitou
See merge request aibis-dream/aibis-dream!152
|
2024-12-29 20:33:43 +00:00 |
|
|
Ovid
|
3fb25bb62a
|
shitou整体调整
|
2024-12-30 04:30:46 +08:00 |
|
|
bottlefish
|
6e9980fd26
|
Merge branch '地铁test' into 'develop'
提交地铁测试以及佩佩bug修改，和记忆参数调整
See merge request aibis-dream/aibis-dream!151
|
2024-12-29 19:29:59 +00:00 |
|
|
bottlefish
|
63d6ccbbeb
|
提交地铁测试以及佩佩bug修改，和记忆参数调整
|
2024-12-30 03:28:50 +08:00 |
|
|
dingyuntian
|
7a37a59e4c
|
Merge branch 'feature/流程串通' into 'develop'
流程串通
See merge request aibis-dream/aibis-dream!150
|
2024-12-29 19:00:08 +00:00 |
|
|
dingyuntian
|
39f2fc63ac
|
流程串通
|
2024-12-30 02:58:07 +08:00 |
|
|
bottlefish
|
4590298094
|
Merge branch 'mergedevelop' into 'develop'
Mergedevelop
See merge request aibis-dream/aibis-dream!149
|
2024-12-29 18:43:18 +00:00 |
|
|
bottlefish
|
ddeb30f307
|
Merge branch 'feature/地铁功能' into mergeDevelop
|
2024-12-30 02:41:45 +08:00 |
|
|
bottlefish
|
1e1c1538e1
|
Merge branch 'feature/地铁功能' into mergedevelop
|
2024-12-30 02:39:34 +08:00 |
|
|
dingyuntian
|
e0987bc64b
|
Merge branch 'bugfix/shone' into 'develop'
小问题修改
See merge request aibis-dream/aibis-dream!147
|
2024-12-29 18:12:13 +00:00 |
|
|
dingyuntian
|
25cf318114
|
Update BodyModuleTransition.cs
|
2024-12-30 02:11:25 +08:00 |
|