 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 |
|
 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 |
|
|
bottlefish
|
5875d8aa02
|
修复merge造成的bug
|
2024-12-22 11:59:08 +08:00 |
|
|
bottlefish
|
093d2bd849
|
Merge branch 'featrue/stoneTotal' into 佩佩代码重构
|
2024-12-20 10:39:51 +08:00 |
|
|
bottlefish
|
83d6902363
|
重构中，提交一下
|
2024-12-20 10:31:01 +08:00 |
|
|
dingyuntian
|
a57ef888a4
|
Merge branch 'featrue/stoneTotal' of ssh://114.67.212.218:2222/aibis-dream/aibis-dream into featrue/stoneTotal
|
2024-12-18 23:07:12 +08:00 |
|
|
dingyuntian
|
6b619c8ede
|
Update EngineSystem.cs
|
2024-12-18 23:06:48 +08:00 |
|
|
dingyuntian
|
def17e005e
|
小改动
|
2024-12-18 23:05:58 +08:00 |
|
|
bottlefish
|
6ad760a499
|
Fix LFS tracking for .psb file
|
2024-12-18 17:59:11 +08:00 |
|
|
bottlefish
|
988a2f33f4
|
Revert "Stop tracking .psb.meta files"
This reverts commit c3b7df45c9.
|
2024-12-18 17:48:11 +08:00 |
|
|
bottlefish
|
c3b7df45c9
|
Stop tracking .psb.meta files
|
2024-12-18 17:30:07 +08:00 |
|
|
dingyuntian
|
6ef406d44c
|
石头串联
|
2024-12-16 22:09:56 +08:00 |
|
|
bottlefish
|
319b1545c7
|
接入热力图和降温
|
2024-12-14 19:47:23 +08:00 |
|
|
bottlefish
|
c33f8425ec
|
按照新系统组装peipei
|
2024-12-14 17:47:15 +08:00 |
|
|
bottlefish
|
8f28951f7a
|
Merge branch '佩佩代码重构' into 'develop'
删除了一些废弃代码
See merge request aibis-dream/aibis-dream!115
|
2024-12-13 08:08:08 +00:00 |
|
|
bottlefish
|
43b18c0373
|
删除了一些废弃代码
|
2024-12-13 16:06:47 +08:00 |
|
|
dingyuntian
|
7edaac2201
|
Merge branch 'develop' into featrue/stoneTotal
|
2024-12-12 22:40:54 +08:00 |
|
 chenziqin
|
f2ebe7d344
|
Merge branch 'feature/yarn_shitou' into 'develop'
Merge branch 'develop' into 'feature/yarn_shitou'
See merge request aibis-dream/aibis-dream!114
|
2024-12-12 14:26:43 +00:00 |
|