Commit Graph
431 Commits
Author SHA1 Message Date
bottlefish 790324fef8 修复合并导致的bug 2024-12-12 20:38:48 +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 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 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
dingyuntian 73087998e0 重构 2024-12-04 22:01:36 +08:00
dingyuntian 369e08296e Update 身体维修界面.psb.meta 2024-12-01 21:52:08 +08:00
dingyuntian 394fd37a34 保存功能 2024-12-01 21:50:27 +08:00
dingyuntian 57ed90a3c3 可配置引擎 2024-11-30 08:36:04 +08:00
dingyuntian 71ec5da49a 可配置模块 2024-11-30 08:04:03 +08:00
dingyuntian d95d117c08 重构 2024-11-29 17:51:19 +08:00
dingyuntian 2a2ab3bf5d 问题修改 2024-11-27 22:48:15 +08:00
dingyuntian 4da5e3b5e2 石头功能修改 2024-11-27 00:49:38 +08:00
dingyuntian e340cbd0d0 齿轮 2024-11-24 22:09:12 +08:00
dingyuntian c09e6ceb94 Merge branch 'feature/stoneTest' of ssh://114.67.212.218:2222/aibis-dream/aibis-dream into feature/stoneTest 2024-11-24 20:09:24 +08:00
dingyuntian 8e88dfa356 配置项修改 2024-11-24 20:08:58 +08:00
jiangzhuoya 150bf0ef41 调整油门参数
现在只有234挡位可以提升,其中2和4大概能提一半速度
2024-11-24 19:20:29 +08:00
dingyuntian a278594e36 问题修改 2024-11-24 18:41:56 +08:00
dingyuntian a7b585a166 Update UnityTool.cs 2024-11-24 17:36:13 +08:00
dingyuntian 9543d707f7 引擎部分修改 2024-11-24 17:20:30 +08:00
dingyuntian 55ceaf239e 改动 2024-11-23 21:20:10 +08:00
dingyuntian c4a0b4a377 Merge branch 'feature/stone' into feature/framework 2024-11-21 16:59:36 +08:00
dingyuntian 4e26966ca1 Framework 2024-11-21 16:53:58 +08:00
chenziqin 41943add67 Merge branch 'yarn小改' into 'develop'
Yarn小改

See merge request aibis-dream/aibis-dream!104
2024-11-17 20:42:19 +00:00
Ovid 20453c14c1 保留一点点拧巴的文案,你才知道为什么舍弃 2024-11-18 04:38:55 +08:00
Ovid 8a91a36f6d 舍弃一些拧巴台本 2024-11-18 04:25:25 +08:00
chenziqin 5e64e07705 Merge branch 'yarn小改' into 'develop'
Yarn小改

See merge request aibis-dream/aibis-dream!102
2024-11-17 19:48:20 +00:00
Ovid 35266075a2 debug 2024-11-18 03:42:22 +08:00
Ovid 6a58843288 Merge branch 'develop' into yarn小改 2024-11-18 03:32:10 +08:00
Ovid 3b5001c75e yarn小小细改 2024-11-18 03:22:37 +08:00
bottlefish c745812b94 Merge branch 'cutline反馈修复' into 'develop'
修复剪错误的线没反馈的问题

See merge request aibis-dream/aibis-dream!99
2024-11-17 18:57:35 +00:00
bottlefish 752b5d6ef7 修复剪错误的线没反馈的问题 2024-11-18 02:57:08 +08:00
bottlefish 88418fea75 Merge branch 'ScrollToNode功能' into 'develop'
提交scrollToNode

See merge request aibis-dream/aibis-dream!98
2024-11-17 18:41:37 +00:00
bottlefish ca9d16e064 提交scrollToNode 2024-11-18 02:40:52 +08:00
bottlefish dd80377430 Merge branch '春晖11.18.1.19' into 'develop'
提交记忆改动

See merge request aibis-dream/aibis-dream!97
2024-11-17 18:14:33 +00:00