 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 |
|
 bottlefish
|
49ce328415
|
Merge branch '佩佩merge分支' into 'develop'
佩佩merge分支
See merge request aibis-dream/aibis-dream!130
|
2024-12-26 19:31:59 +00:00 |
|
|
bottlefish
|
fcbc01d871
|
调整clueboard和yarn配合最新的改动
|
2024-12-27 03:31:07 +08:00 |
|
|
bottlefish
|
3533b099a6
|
Merge branch '12月版本佩佩优化12.26' into 佩佩merge分支
|
2024-12-27 01:50:12 +08:00 |
|
|
bottlefish
|
0b962cbbe4
|
提交
|
2024-12-27 01:45:35 +08:00 |
|
|
bottlefish
|
d6a359a29d
|
修复bug
|
2024-12-27 00:27:28 +08:00 |
|
|
bottlefish
|
24cf10121c
|
流程merge完成
|
2024-12-27 00:03:41 +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
|
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 |
|
|
bottlefish
|
83e4ad3aee
|
调整day2的yarn适应新的改动
|
2024-12-26 14:17:15 +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 |
|
|
bottlefish
|
2c761af133
|
记忆部分debug完成，还剩一个小bug不过不影响
|
2024-12-26 13:09:48 +08:00 |
|
|
bottlefish
|
b024c3c1a4
|
记忆插槽逻辑修改，还有bug
|
2024-12-26 04:00:17 +08:00 |
|
|
dingyuntian
|
e170b69379
|
石头Day1跑通
|
2024-12-26 03:20:56 +08:00 |
|
|
dingyuntian
|
0595ae6156
|
人物修改
|
2024-12-25 22:21:44 +08:00 |
|
|
bottlefish
|
1eae4e42d4
|
打孔带打印，存储替换完成
|
2024-12-25 19:46:56 +08:00 |
|
|
bottlefish
|
cc4d3a5a05
|
重构插线和深入的逻辑，加入剪线的timeline
|
2024-12-25 03:48:06 +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 |
|
|
dingyuntian
|
b06ea0156b
|
调整
|
2024-12-24 23:42:45 +08:00 |
|
|
dingyuntian
|
e70ef14143
|
冷却液完整版
|
2024-12-24 21:43:10 +08:00 |
|
|
bottlefish
|
c3876895d6
|
场景替换素材
|
2024-12-24 18:03:50 +08:00 |
|
|
bottlefish
|
d944baf685
|
资产替换
|
2024-12-24 17:57:41 +08:00 |
|
|
bottlefish
|
6e0b0b79fb
|
修改过渡，新增highlight
|
2024-12-24 16:37:58 +08:00 |
|
|
dingyuntian
|
be6ac8b694
|
新冷却液
|
2024-12-24 13:52:41 +08:00 |
|
|
bottlefish
|
c03a525610
|
新增模块hightlight
|
2024-12-24 13:15:04 +08:00 |
|
|
bottlefish
|
9b965d2cb6
|
Merge branch '佩佩代码重构' into 'develop'
Revert "Stop tracking .psb.meta files"
See merge request aibis-dream/aibis-dream!116
|
2024-12-23 18:39:32 +00:00 |
|
|
bottlefish
|
1620049846
|
新增一些拆卸相关处理，socket屏蔽，跑通流程
|
2024-12-24 02:37:20 +08:00 |
|
|
bottlefish
|
6341fbe46f
|
Day1Day2重构基本完成
|
2024-12-23 23:47:26 +08:00 |
|
|
bottlefish
|
4e08fda3e6
|
重构暂存
|
2024-12-23 15:32:54 +08:00 |
|
|
bottlefish
|
58714dcb2d
|
重构暂存
|
2024-12-22 18:09:55 +08:00 |
|
|
bottlefish
|
2d4bba2878
|
Merge branch 'featrue/stoneTotal' into 佩佩代码重构
|
2024-12-22 18:07:42 +08:00 |
|
|
dingyuntian
|
41032c033f
|
Update OscilloscopeSystem.cs
|
2024-12-22 18:06:40 +08:00 |
|
|
bottlefish
|
659c8df323
|
重构暂存
|
2024-12-22 17:17:27 +08:00 |
|