 wuzhentong
|
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 |
|
|
dingyuntian
|
0d73a2ce54
|
小问题修改
1. 缺字
2. 切换State关闭其他场景
3. 引擎抽风
|
2024-12-30 02:09:24 +08:00 |
|
|
bottlefish
|
7d54a77272
|
Merge branch '视觉部分bug修复' into 'develop'
让currenttartget重复也能触发
See merge request aibis-dream/aibis-dream!146
|
2024-12-29 18:05:22 +00:00 |
|
|
bottlefish
|
db9d5c8c01
|
让currenttartget重复也能触发
|
2024-12-30 02:04:33 +08:00 |
|
|
Ovid
|
14db10d97e
|
Merge branch 'develop' into feature/yarn_shitou
|
2024-12-30 01:08:23 +08:00 |
|
|
Ovid
|
641f424e18
|
石头1fix没完成（引擎和冷却液）
|
2024-12-30 01:04:09 +08:00 |
|
|
bottlefish
|
c44da6f0d9
|
Merge branch 'bugfix记忆卡带滞留' into 'develop'
记忆bug修复
See merge request aibis-dream/aibis-dream!145
|
2024-12-29 16:59:02 +00:00 |
|
|
dingyuntian
|
1a4bc91f40
|
Merge branch 'feature/年底补锅台词冲刺' into 'develop'
改台词
See merge request aibis-dream/aibis-dream!144
|
2024-12-29 16:58:40 +00:00 |
|
|
bottlefish
|
f84b3ce85c
|
记忆bug修复
|
2024-12-30 00:58:28 +08:00 |
|
|
NeologismWu
|
49419bed39
|
改台词
111
|
2024-12-30 00:48:47 +08:00 |
|
|
dingyuntian
|
22aff4dada
|
引擎问题
|
2024-12-30 00:43:22 +08:00 |
|
|
bottlefish
|
c47ff13a69
|
Merge branch '12月peipeiDebug' into 'develop'
修复配置问题
See merge request aibis-dream/aibis-dream!143
|
2024-12-29 16:26:12 +00:00 |
|
|
bottlefish
|
9aa500f5e1
|
修复配置问题
|
2024-12-30 00:24:49 +08:00 |
|
|
chenziqin
|
88a0702bf5
|
Merge branch 'feature/yarn_shitou' into 'develop'
小debug
See merge request aibis-dream/aibis-dream!141
|
2024-12-29 15:27:47 +00:00 |
|
|
Ovid
|
36a434bf44
|
小debug
|
2024-12-29 23:26:26 +08:00 |
|
|
dingyuntian
|
cff19378ed
|
Merge branch 'feature/年底补锅台词冲刺' into 'develop'
99889
See merge request aibis-dream/aibis-dream!140
|
2024-12-29 15:20:26 +00:00 |
|
|
dingyuntian
|
c70426ce2c
|
Merge branch 'develop' into feature/年底补锅台词冲刺
|
2024-12-29 23:19:34 +08:00 |
|
|
NeologismWu
|
ce41fc973a
|
99889
台词校对
|
2024-12-29 23:09:39 +08:00 |
|
|
chenziqin
|
a54ce443fb
|
Merge branch 'feature/yarn_shitou' into 'develop'
Feature/yarn shitou
See merge request aibis-dream/aibis-dream!139
|
2024-12-29 14:52:17 +00:00 |
|
|
Ovid
|
df6281e32f
|
取消open gear panel前的trans camera
|
2024-12-29 21:32:15 +08:00 |
|
|
Ovid
|
85b31500d9
|
石头+震屏效果+新打开效果
|
2024-12-29 21:27:53 +08:00 |
|
|
Ovid
|
e9553762c3
|
Merge branch 'develop' into feature/yarn_shitou
|
2024-12-29 20:58:19 +08:00 |
|
|
Ovid
|
9f9a800807
|
shitou2文本修正
|
2024-12-29 20:49:36 +08:00 |
|
|
dingyuntian
|
55dd32109c
|
Merge branch 'bugfix/转场拆分' into 'develop'
Bugfix/转场拆分
See merge request aibis-dream/aibis-dream!138
|
2024-12-29 11:32:54 +00:00 |
|
|
dingyuntian
|
175ffa4763
|
Update ExpressFixScene.unity
|
2024-12-29 19:16:29 +08:00 |
|
|
dingyuntian
|
d55c517286
|
Update CameraKit.cs
|
2024-12-29 19:11:41 +08:00 |
|
|
dingyuntian
|
28983e043c
|
转场拆分
|
2024-12-29 18:52:28 +08:00 |
|
|
NeologismWu
|
dd6cf06884
|
Update Persistence.unity
|
2024-12-29 17:38:35 +08:00 |
|
|
NeologismWu
|
0537f0ce5d
|
Update Persistence.unity
|
2024-12-29 17:35:53 +08:00 |
|
|
Ovid
|
6f46655486
|
Merge branch 'develop' into feature/yarn_shitou
|
2024-12-29 14:05:48 +08:00 |
|
|
dingyuntian
|
46e7828898
|
Merge branch 'feature/stone-day2' into 'develop'
Feature/stone day2
See merge request aibis-dream/aibis-dream!137
|
2024-12-28 19:26:14 +00:00 |
|
|
dingyuntian
|
a6c602c06b
|
Merge branch 'develop' into feature/stone-day2
|
2024-12-29 03:25:49 +08:00 |
|
|
dingyuntian
|
915044d55c
|
石头Day2
|
2024-12-29 03:19:06 +08:00 |
|
|
dingyuntian
|
381a691c84
|
问题齿轮
|
2024-12-27 22:40:33 +08:00 |
|
|
dingyuntian
|
e41a2c275c
|
调整
|
2024-12-27 18:02:51 +08:00 |
|
|
dingyuntian
|
0e03502011
|
Merge branch 'feature/stone-day2' into 'develop'
Update PlugOptions.yarn
See merge request aibis-dream/aibis-dream!135
|
2024-12-27 09:09:04 +00:00 |
|
|
dingyuntian
|
f4266aa236
|
Update PlugOptions.yarn
|
2024-12-27 17:07:10 +08:00 |
|
|
dingyuntian
|
a2f5e4ec1a
|
Merge branch 'feature/stone-day2' into 'develop'
引擎事件
See merge request aibis-dream/aibis-dream!134
|
2024-12-27 08:59:37 +00:00 |
|