 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 |
|
|
bottlefish
|
8edf6279d3
|
Merge branch '佩佩视觉模块优化' into 'develop'
佩佩视觉模块优化
See merge request aibis-dream/aibis-dream!113
|
2024-12-12 14:04:30 +00:00 |
|
|
bottlefish
|
87be93195b
|
去除歧义命令
|
2024-12-12 21:48:51 +08:00 |
|
|
bottlefish
|
c7ff350c32
|
修复clueboard的移动问题
|
2024-12-12 21:34:06 +08:00 |
|
|
bottlefish
|
39c9279a25
|
取消进入视觉自动指定一个视觉目标
|
2024-12-12 21:03:51 +08:00 |
|
|
bottlefish
|
4f06ee7907
|
Merge branch '修复merge后的bug' into 'develop'
修复合并导致的bug
See merge request aibis-dream/aibis-dream!112
|
2024-12-12 12:43:19 +00:00 |
|
|
bottlefish
|
790324fef8
|
修复合并导致的bug
|
2024-12-12 20:38:48 +08:00 |
|
|
chenziqin
|
b667cc1d0c
|
Merge branch 'develop' into 'feature/yarn_shitou'
Develop
See merge request aibis-dream/aibis-dream!111
|
2024-12-12 12:31:07 +00:00 |
|
|
chenziqin
|
cc0079c012
|
Merge branch 'feature/yarn_shitou' into 'develop'
Feature/yarn shitou
See merge request aibis-dream/aibis-dream!110
|
2024-12-12 12:25:42 +00:00 |
|
 Ovid
|
7a541ae619
|
shitoutalk全部上传
|
2024-12-12 20:22:19 +08:00 |
|
|
bottlefish
|
27b003a758
|
Merge branch '12月新版本佩佩流程' into 'develop'
12月新版本佩佩流程
See merge request aibis-dream/aibis-dream!109
|
2024-12-12 09:07:39 +00:00 |
|
|
bottlefish
|
bcbbaa639d
|
Merge branch 'develop' into '12月新版本佩佩流程'
# Conflicts:
# Assets/Scripts/FixSystem/Cable/Socket.cs
# Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs
# Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs
|
2024-12-12 09:07:02 +00:00 |
|
|
bottlefish
|
caf2d50e5e
|
修复bug，重构yarn
|
2024-12-12 16:58:45 +08:00 |
|
|
chenziqin
|
e7cd5d9b8d
|
Merge branch 'develop' into 'feature/yarn_shitou'
Merge branch 'feature/yarn_shitou' into 'develop'
See merge request aibis-dream/aibis-dream!108
|
2024-12-12 08:56:21 +00:00 |
|
|
dingyuntian
|
3fcff0598a
|
石头
|
2024-12-12 01:07:26 +08:00 |
|
|
chenziqin
|
eb82ae381c
|
Merge branch 'feature/yarn_shitou' into 'develop'
shitou1
See merge request aibis-dream/aibis-dream!107
|
2024-12-11 16:45:47 +00:00 |
|
|
Ovid
|
fcf3de7fc0
|
shitou1
|
2024-12-12 00:42:16 +08:00 |
|
|
bottlefish
|
aee673a041
|
修复小bug
|
2024-12-11 18:52:54 +08:00 |
|
|
bottlefish
|
97645fece3
|
day2加上clueboard以及流程调整跑通
|
2024-12-11 17:28:11 +08:00 |
|
|
bottlefish
|
6babd10819
|
小调整
|
2024-12-08 05:32:20 +08:00 |
|
|
bottlefish
|
0861bb6c80
|
day1和day2破产内部功能版完成，保个底吧
|
2024-12-08 05:27:34 +08:00 |
|
|
bottlefish
|
58fde11c9a
|
收尾day1，开始day2
|
2024-12-07 11:28:43 +08:00 |
|
|
bottlefish
|
7f6b76d367
|
各种修改
|
2024-12-06 23:44:09 +08:00 |
|
|
bottlefish
|
0400a63fa8
|
day1基本走通，接下来优化clueboard
|
2024-12-06 00:13:04 +08:00 |
|
|
bottlefish
|
65607f9678
|
流程和功能迭代
|
2024-12-05 22:57:31 +08:00 |
|
|
bottlefish
|
d883a9c296
|
佩佩Day1重构跑通
|
2024-12-05 15:46:20 +08:00 |
|
|
dingyuntian
|
2667419d98
|
Update BodyModule.cs
|
2024-12-05 12:10:11 +08:00 |
|
|
dingyuntian
|
b5dadcc95d
|
Merge branch 'featrue/stoneTotal' into 'develop'
插线系统重构
See merge request aibis-dream/aibis-dream!106
|
2024-12-05 04:06:50 +00:00 |
|
|
dingyuntian
|
034116aa55
|
降温系统
|
2024-12-05 12:05:13 +08:00 |
|
|
dingyuntian
|
c5b7d61bdf
|
Update 身体维修界面.psb
|
2024-12-04 22:16:18 +08:00 |
|
|
dingyuntian
|
937451fafa
|
Merge branch 'feature/yarn-storage' into 'develop'
变量操作
See merge request aibis-dream/aibis-dream!105
|
2024-12-04 14:11:23 +00:00 |
|
|
dingyuntian
|
1b016084c7
|
变量操作
|
2024-12-04 22:10:52 +08:00 |
|