 dingyuntian
|
244b4ae96d
|
部分修改
|
2025-01-04 21:09:37 +08:00 |
|
|
dingyuntian
|
69a3c9c93c
|
层级改动
|
2025-01-04 20:46:40 +08:00 |
|
|
dingyuntian
|
654e10fdb7
|
Merge branch 'bugfix/问题修改' into 'develop'
Update Persistence.unity
See merge request aibis-dream/aibis-dream!194
|
2025-01-03 09:21:17 +00:00 |
|
|
dingyuntian
|
72a5d103d4
|
Update Persistence.unity
|
2025-01-03 17:20:13 +08:00 |
|
|
dingyuntian
|
472cacaa6f
|
Merge branch 'bugfix/yarn' into 'develop'
问题修改
See merge request aibis-dream/aibis-dream!192
|
2025-01-01 18:16:03 +00:00 |
|
|
dingyuntian
|
61a48de3e7
|
问题修改
|
2025-01-02 02:15:35 +08:00 |
|
|
dingyuntian
|
c0e0ae920e
|
Merge branch 'bugfix/yarn' into 'develop'
Bugfix/yarn
See merge request aibis-dream/aibis-dream!191
|
2025-01-01 17:59:48 +00:00 |
|
|
dingyuntian
|
3bfa6c5d30
|
Update Plug.yarn
|
2025-01-02 01:57:56 +08:00 |
|
|
dingyuntian
|
41a0a071c3
|
从眼睛检查完出来也判断一下是否插完
|
2025-01-01 23:53:51 +08:00 |
|
|
dingyuntian
|
80e2ed05be
|
Merge branch 'bugfix/yarn' into 'develop'
Update 佩佩.prefab
See merge request aibis-dream/aibis-dream!190
|
2025-01-01 15:06:31 +00:00 |
|
|
dingyuntian
|
e0a4d14f9b
|
Update 佩佩.prefab
|
2025-01-01 23:05:37 +08:00 |
|
|
dingyuntian
|
4a0ad477a7
|
Merge branch '表情震屏优化' into 'develop'
人名代号修改-新增
See merge request aibis-dream/aibis-dream!189
|
2025-01-01 11:36:06 +00:00 |
|
|
dingyuntian
|
d10bd27b1a
|
Merge branch 'bugfix/yarn' into 'develop'
Update Re_LTS_Peipeiday2.yarn
See merge request aibis-dream/aibis-dream!188
|
2025-01-01 11:24:07 +00:00 |
|
|
dingyuntian
|
7f39da14f3
|
Update Re_LTS_Peipeiday2.yarn
|
2025-01-01 19:23:32 +08:00 |
|
|
dingyuntian
|
083db6f020
|
Merge branch '台词冲刺day2' into 'develop'
表情和震屏增加
See merge request aibis-dream/aibis-dream!187
|
2025-01-01 11:19:34 +00:00 |
|
|
dingyuntian
|
1c36a07f26
|
Merge branch 'bugfix/配置读取问题' into 'develop'
配置读取问题
See merge request aibis-dream/aibis-dream!186
|
2024-12-31 09:52:19 +00:00 |
|
|
dingyuntian
|
5a9de4d1fc
|
配置读取问题
|
2024-12-31 17:51:47 +08:00 |
|
|
dingyuntian
|
4bbd9edc52
|
Merge branch 'bugfix/打包问题' into 'develop'
Bugfix/打包问题
See merge request aibis-dream/aibis-dream!184
|
2024-12-31 08:44:00 +00:00 |
|
|
dingyuntian
|
3e00dd03be
|
音频更新
|
2024-12-31 16:43:07 +08:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
dingyuntian
|
618e48fa54
|
Merge branch '年底台词冲刺佩佩day2' into 'develop'
day2台词
See merge request aibis-dream/aibis-dream!166
|
2024-12-30 18:51:01 +00:00 |
|
|
dingyuntian
|
b94f89191f
|
Merge branch '年底台词冲刺佩佩day2' into 'develop'
台词
See merge request aibis-dream/aibis-dream!165
|
2024-12-30 17:15:38 +00: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
dingyuntian
|
6c2c0a89d3
|
Merge branch 'feature/年底补锅台词冲刺' into 'develop'
1230修台词
See merge request aibis-dream/aibis-dream!153
|
2024-12-30 02:55:45 +00: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 |
|
|
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 |
|
|
dingyuntian
|
1a4bc91f40
|
Merge branch 'feature/年底补锅台词冲刺' into 'develop'
改台词
See merge request aibis-dream/aibis-dream!144
|
2024-12-29 16:58:40 +00:00 |
|
|
dingyuntian
|
22aff4dada
|
引擎问题
|
2024-12-30 00:43:22 +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 |
|
|
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 |
|
|
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 |
|
|
dingyuntian
|
830f2c9832
|
引擎事件
|
2024-12-27 16:58:36 +08:00 |
|
|
dingyuntian
|
2a14376d80
|
Merge branch 'feature/merge' into 'develop'
Feature/merge
See merge request aibis-dream/aibis-dream!133
|
2024-12-26 20:50:51 +00:00 |
|
|
dingyuntian
|
170ddc84be
|
Merge branch 'feature/stone-day2' into feature/merge
|
2024-12-27 04:49:49 +08:00 |
|
|
dingyuntian
|
23c6a2cf3f
|
小问题修改
|
2024-12-27 04:45:38 +08:00 |
|
|
dingyuntian
|
2eb86db1f7
|
Merge branch 'feature/shitou-day2' into 'develop'
淡出问题
See merge request aibis-dream/aibis-dream!127
|
2024-12-26 13:40:18 +00:00 |
|
|
dingyuntian
|
7b31d609d3
|
淡出问题
|
2024-12-26 21:39:33 +08:00 |
|
|
dingyuntian
|
a749266d47
|
Merge branch 'feature/shitou-day2' into 'develop'
石头小改
See merge request aibis-dream/aibis-dream!126
|
2024-12-26 12:33:52 +00:00 |
|
|
dingyuntian
|
654e7fe84d
|
石头小改
|
2024-12-26 20:33:15 +08:00 |
|
|
dingyuntian
|
068cc8ef16
|
Merge branch 'develop' into feature/yarn_shitou
|
2024-12-26 15:56:17 +08:00 |
|
|
dingyuntian
|
901680e7d9
|
Merge branch '12月版本优化' into 'develop'
调整day2的yarn适应新的改动
See merge request aibis-dream/aibis-dream!124
|
2024-12-26 07:21:02 +00:00 |
|
|
dingyuntian
|
82ae3eb9f0
|
Merge branch 'develop' into 12月版本优化
|
2024-12-26 15:20:40 +08:00 |
|
|
dingyuntian
|
812cdf59cf
|
Merge branch 'feature/merge' into 'develop'
Feature/merge
See merge request aibis-dream/aibis-dream!123
|
2024-12-26 06:58:35 +00:00 |
|
|
dingyuntian
|
59ab59bd07
|
微调
|
2024-12-26 14:57:57 +08:00 |
|
|
dingyuntian
|
5d0a9530fe
|
Merge remote-tracking branch 'origin/12月版本优化' into feature/merge
|
2024-12-26 14:38:34 +08:00 |
|
|
dingyuntian
|
1ea3f9c4e8
|
Update 大脑维修细化导出new.psb
|
2024-12-26 14:27:32 +08:00 |
|
|
dingyuntian
|
2d960371d1
|
Merge branch 'feature/conflict' into 'develop'
Update Persistence.unity
See merge request aibis-dream/aibis-dream!122
|
2024-12-26 05:33:12 +00:00 |
|
|
dingyuntian
|
a99f213007
|
Update Persistence.unity
|
2024-12-26 13:32:46 +08:00 |
|
|
dingyuntian
|
e19b72816a
|
Merge branch 'feature/conflict' into 'develop'
Feature/conflict
See merge request aibis-dream/aibis-dream!121
|
2024-12-26 05:31:45 +00:00 |
|
|
dingyuntian
|
8370b725bc
|
Merge branch 'refs/heads/feature/merge' into feature/conflict
# Conflicts:
# Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb
# Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta
# Assets/Resources/Prefabs/Fix/Bottle.prefab
# Assets/Scenes/ExpressFixScene.unity
# Assets/Scenes/Persistence.unity
# Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs.meta
# Assets/Scripts/FixSystemNew/CoolingMachine/BottleShelf.cs
# Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs
# Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs
# Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs
# Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs
# Assets/Scripts/FixSystemNew/CoolingMachine/TubeController.cs
# Assets/Scripts/FixSystemNew/FixSystemCenter.cs
# Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs
# Assets/Scripts/Framework/OtherKit/MonoCenter.cs
|
2024-12-26 13:30:40 +08:00 |
|
|
dingyuntian
|
e170b69379
|
石头Day1跑通
|
2024-12-26 03:20:56 +08:00 |
|
|
dingyuntian
|
0595ae6156
|
人物修改
|
2024-12-25 22:21:44 +08:00 |
|
|
dingyuntian
|
4c45a3180a
|
Merge branch 'feature/merge' into 'develop'
Feature/merge
See merge request aibis-dream/aibis-dream!118
|
2024-12-24 18:23:42 +00:00 |
|
|
dingyuntian
|
92cf947717
|
Feature/merge
|
2024-12-24 18:23:42 +00:00 |
|
|
dingyuntian
|
da27623d2d
|
yarn合入
|
2024-12-25 02:16:39 +08:00 |
|
|
dingyuntian
|
b49c7a73f1
|
Merge branch 'featrue/stoneTotal' into feature/merge
|
2024-12-25 01:29:33 +08:00 |
|
|
dingyuntian
|
84776e3012
|
新增一些功能
|
2024-12-25 01:24:52 +08:00 |
|