diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb
index a1985cdf0..3f0f9181f 100644
Binary files a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb and b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb differ
diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta
index cfcb1a74f..d4c6a72c8 100644
--- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta
+++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta
@@ -136,6 +136,48 @@ ScriptedImporter:
     tessellationDetail: 0
     uvTransform: {x: 3154, y: 7105}
     spritePosition: {x: 1745, y: 1386}
+  - name: "\u692D\u5706 2"
+    originalName: 
+    pivot: {x: 0.5, y: 0.5}
+    alignment: 0
+    border: {x: 0, y: 0, z: 0, w: 0}
+    rect:
+      serializedVersion: 2
+      x: 4005
+      y: 5962
+      width: 25
+      height: 25
+    spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2
+    spriteBone: []
+    spriteOutline: []
+    vertices: []
+    spritePhysicsOutline: []
+    indices: 
+    edges: []
+    tessellationDetail: 0
+    uvTransform: {x: 4004, y: 5961}
+    spritePosition: {x: 1374, y: 1055}
+  - name: "\u692D\u5706 1"
+    originalName: 
+    pivot: {x: 0.5, y: 0.5}
+    alignment: 0
+    border: {x: 0, y: 0, z: 0, w: 0}
+    rect:
+      serializedVersion: 2
+      x: 3906
+      y: 6520
+      width: 26
+      height: 26
+    spriteID: 289d20330e2397a45ad29088f4f1a6e0
+    spriteBone: []
+    spriteOutline: []
+    vertices: []
+    spritePhysicsOutline: []
+    indices: 
+    edges: []
+    tessellationDetail: 0
+    uvTransform: {x: 3904, y: 6519}
+    spritePosition: {x: 1349, y: 1048}
   - name: "\u6307\u9488"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -147,7 +189,7 @@ ScriptedImporter:
       y: 6469
       width: 20
       height: 43
-    spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3
+    spriteID: c7aa11cecdaa86640854984d4b51a89f
     spriteBone: []
     spriteOutline: []
     vertices: []
@@ -156,6 +198,27 @@ ScriptedImporter:
     edges: []
     tessellationDetail: 0
     uvTransform: {x: 3906, y: 6469}
+    spritePosition: {x: 1910, y: 1059}
+  - name: "\u6307\u9488"
+    originalName: 
+    pivot: {x: 0.5, y: 0.5}
+    alignment: 0
+    border: {x: 0, y: 0, z: 0, w: 0}
+    rect:
+      serializedVersion: 2
+      x: 3920
+      y: 6139
+      width: 20
+      height: 43
+    spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3
+    spriteBone: []
+    spriteOutline: []
+    vertices: []
+    spritePhysicsOutline: []
+    indices: 
+    edges: []
+    tessellationDetail: 0
+    uvTransform: {x: 3920, y: 6139}
     spritePosition: {x: 1294, y: 1305}
   - name: "\u8F6C\u901F\u8868"
     originalName: 
@@ -250,8 +313,8 @@ ScriptedImporter:
       serializedVersion: 2
       x: 2220
       y: 5499
-      width: 0
-      height: 0
+      width: 330
+      height: 330
     spriteID: 725469d4c92a63f459926985c2726704
     spriteBone: []
     spriteOutline: []
@@ -270,7 +333,7 @@ ScriptedImporter:
     rect:
       serializedVersion: 2
       x: 3512
-      y: 7461
+      y: 7460
       width: 154
       height: 154
     spriteID: c562151c266172245900603e7959a8da
@@ -353,8 +416,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 3926
-      y: 6563
+      x: 3906
+      y: 6554
       width: 0
       height: 0
     spriteID: 7e7562128bf69d7418af6bd34587198a
@@ -365,7 +428,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 3764, y: 6403}
+    uvTransform: {x: 3744, y: 6394}
     spritePosition: {x: 1782, y: 1048}
   - name: "\u53D8\u901F\u7BB1"
     originalName: 
@@ -542,8 +605,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 3926
-      y: 6571
+      x: 3914
+      y: 6554
       width: 0
       height: 0
     spriteID: 446346ef83ab15c43a3d115b695a489a
@@ -554,7 +617,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 3740, y: 6385}
+    uvTransform: {x: 3728, y: 6368}
     spritePosition: {x: 1459, y: 1570}
   - name: "\u5FC3\u810F\u9F7F\u8F6EB"
     originalName: 
@@ -563,8 +626,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 3926
-      y: 6579
+      x: 3922
+      y: 6554
       width: 0
       height: 0
     spriteID: b20eafea4b8b8c94c89d9e5d54ae683f
@@ -575,7 +638,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 3720, y: 6372}
+    uvTransform: {x: 3716, y: 6347}
     spritePosition: {x: 1344, y: 1445}
   - name: "\u5FC3\u810F\u9F7F\u8F6EC"
     originalName: 
@@ -584,8 +647,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 3926
-      y: 6587
+      x: 3930
+      y: 6554
       width: 0
       height: 0
     spriteID: 4937081512344314a989a0d438fd73d3
@@ -596,7 +659,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 3766, y: 6428}
+    uvTransform: {x: 3770, y: 6395}
     spritePosition: {x: 1295, y: 1611}
   - name: "\u5FC3\u810F\u9F7F\u8F6ED"
     originalName: 
@@ -626,7 +689,7 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 3934
+      x: 3926
       y: 6563
       width: 0
       height: 0
@@ -638,7 +701,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 3804, y: 6433}
+    uvTransform: {x: 3796, y: 6433}
     spritePosition: {x: 1541, y: 1536}
   - name: "\u5FC3\u810F"
     originalName: 
@@ -953,13 +1016,43 @@ ScriptedImporter:
     flatten: 0
     isImported: 0
     isVisible: 1
+  - name: "\u692D\u5706 2"
+    spriteName: "\u692D\u5706 2"
+    isGroup: 0
+    parentIndex: 2
+    spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2
+    layerID: 459
+    mosaicPosition: {x: 4005, y: 5962}
+    flatten: 0
+    isImported: 1
+    isVisible: 1
+  - name: "\u692D\u5706 1"
+    spriteName: "\u692D\u5706 1"
+    isGroup: 0
+    parentIndex: 2
+    spriteID: 289d20330e2397a45ad29088f4f1a6e0
+    layerID: 458
+    mosaicPosition: {x: 3906, y: 6520}
+    flatten: 0
+    isImported: 1
+    isVisible: 1
+  - name: "\u6307\u9488"
+    spriteName: "\u6307\u9488"
+    isGroup: 0
+    parentIndex: 2
+    spriteID: c7aa11cecdaa86640854984d4b51a89f
+    layerID: 457
+    mosaicPosition: {x: 3906, y: 6469}
+    flatten: 0
+    isImported: 1
+    isVisible: 1
   - name: "\u6307\u9488"
     spriteName: "\u6307\u9488"
     isGroup: 0
     parentIndex: 2
     spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3
     layerID: 229
-    mosaicPosition: {x: 3906, y: 6469}
+    mosaicPosition: {x: 3920, y: 6139}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -1059,7 +1152,7 @@ ScriptedImporter:
     parentIndex: 2
     spriteID: 7e7562128bf69d7418af6bd34587198a
     layerID: 281
-    mosaicPosition: {x: 3926, y: 6563}
+    mosaicPosition: {x: 3906, y: 6554}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -1096,7 +1189,7 @@ ScriptedImporter:
   - name: "\u5FC3\u810F\u63D2\u5B54"
     spriteName: "\u5FC3\u810F\u63D2\u5B54"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 393fed26529755c43b3adf65c5215b60
     layerID: 307
     mosaicPosition: {x: 3812, y: 6469}
@@ -1106,7 +1199,7 @@ ScriptedImporter:
   - name: "\u5FC3\u810F\u76D6\u5B50"
     spriteName: "\u5FC3\u810F\u76D6\u5B50"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 783637c73e28afc46a70e12184fba9a3
     layerID: 264
     mosaicPosition: {x: 1424, y: 7105}
@@ -1116,7 +1209,7 @@ ScriptedImporter:
   - name: "\u55B7\u6CB9\u5EA6\u91CF"
     spriteName: "\u55B7\u6CB9\u5EA6\u91CF"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 955abee622701d34c92da4721f082368
     layerID: 421
     mosaicPosition: {x: 3998, y: 7349}
@@ -1126,7 +1219,7 @@ ScriptedImporter:
   - name: "\u8FDB\u6C14\u5EA6\u91CF"
     spriteName: "\u8FDB\u6C14\u5EA6\u91CF"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 0c11f41444c477f4fac3222cb5b79a98
     layerID: 420
     mosaicPosition: {x: 4022, y: 7349}
@@ -1136,7 +1229,7 @@ ScriptedImporter:
   - name: "\u6C14\u95E8\u62C9\u6746"
     spriteName: "\u6C14\u95E8\u62C9\u6746"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: ed1ecfe628602a44285fa18ebac88553
     layerID: 295
     mosaicPosition: {x: 3812, y: 6563}
@@ -1146,7 +1239,7 @@ ScriptedImporter:
   - name: "\u62C9\u6746\u6C60"
     spriteName: "\u62C9\u6746\u6C60"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 6b94d32d5c28acf489338ccdcdbff11b
     layerID: 298
     mosaicPosition: {x: 2066, y: 7105}
@@ -1156,37 +1249,37 @@ ScriptedImporter:
   - name: "\u5FC3\u810F\u9F7F\u8F6EA"
     spriteName: "\u5FC3\u810F\u9F7F\u8F6EA"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 446346ef83ab15c43a3d115b695a489a
     layerID: 446
-    mosaicPosition: {x: 3926, y: 6571}
+    mosaicPosition: {x: 3914, y: 6554}
     flatten: 0
     isImported: 1
     isVisible: 1
   - name: "\u5FC3\u810F\u9F7F\u8F6EB"
     spriteName: "\u5FC3\u810F\u9F7F\u8F6EB"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: b20eafea4b8b8c94c89d9e5d54ae683f
     layerID: 445
-    mosaicPosition: {x: 3926, y: 6579}
+    mosaicPosition: {x: 3922, y: 6554}
     flatten: 0
     isImported: 1
     isVisible: 1
   - name: "\u5FC3\u810F\u9F7F\u8F6EC"
     spriteName: "\u5FC3\u810F\u9F7F\u8F6EC"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 4937081512344314a989a0d438fd73d3
     layerID: 444
-    mosaicPosition: {x: 3926, y: 6587}
+    mosaicPosition: {x: 3930, y: 6554}
     flatten: 0
     isImported: 1
     isVisible: 1
   - name: "\u5FC3\u810F\u9F7F\u8F6ED"
     spriteName: "\u5FC3\u810F\u9F7F\u8F6ED"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: 14aab779c58f90a40a99c1b0e02cc11c
     layerID: 443
     mosaicPosition: {x: 3844, y: 7105}
@@ -1196,17 +1289,17 @@ ScriptedImporter:
   - name: "\u5FC3\u810F\u9F7F\u8F6EE"
     spriteName: "\u5FC3\u810F\u9F7F\u8F6EE"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: a4d40b2ba111122448c31f2ea4fd4d4d
     layerID: 439
-    mosaicPosition: {x: 3934, y: 6563}
+    mosaicPosition: {x: 3926, y: 6563}
     flatten: 0
     isImported: 1
     isVisible: 1
   - name: "\u5FC3\u810F"
     spriteName: "\u5FC3\u810F"
     isGroup: 0
-    parentIndex: 16
+    parentIndex: 19
     spriteID: fe0cd590855195341917906fb8d73748
     layerID: 311
     mosaicPosition: {x: 2220, y: 4340}
diff --git a/Assets/Resources/Prefabs/Gear System/Gear.prefab b/Assets/Resources/Prefabs/Gear System/Gear.prefab
index 0872ad920..17c56b0e6 100644
--- a/Assets/Resources/Prefabs/Gear System/Gear.prefab	
+++ b/Assets/Resources/Prefabs/Gear System/Gear.prefab	
@@ -74,12 +74,12 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 2
+  m_SortingOrder: 4
   m_Sprite: {fileID: 21300000, guid: eccbf2467d281894bafba3ef467f0875, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
-  m_DrawMode: 0
+  m_DrawMode: 1
   m_Size: {x: 4.8, y: 4.8}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
@@ -133,5 +133,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c6cc6c2a67bfbc540b276c3c4a144275, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: {fileID: 0}
+  radius: 0
+  gearSprite: {fileID: 0}
   targetShaft: {fileID: 0}
diff --git a/Assets/Resources/Prefabs/Gear System/Shaft.prefab b/Assets/Resources/Prefabs/Gear System/Shaft.prefab
index 1a43ba987..bc87ddb3f 100644
--- a/Assets/Resources/Prefabs/Gear System/Shaft.prefab	
+++ b/Assets/Resources/Prefabs/Gear System/Shaft.prefab	
@@ -73,12 +73,12 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 2
+  m_SortingOrder: 5
   m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
-  m_DrawMode: 0
+  m_DrawMode: 1
   m_Size: {x: 1, y: 1}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
@@ -194,13 +194,13 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 2
-  m_Sprite: {fileID: -1923825764, guid: 4007956251f7161409b80ba58fa68f1f, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_SortingOrder: 4
+  m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 0.55, y: 0.55}
+  m_Size: {x: 1, y: 0.55}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
@@ -220,7 +220,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   id: 0
   shaftType: 0
+  initRadius: 0
+  initSprite: {fileID: 0}
+  hasGear: 0
+  childGear: {fileID: 0}
   initialSpeed: 0
-  gearModel: {fileID: 0}
   targetSpeed: 0
   speed: 0
diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity
index 481121860..592ce1cbb 100644
--- a/Assets/Scenes/ExpressFixScene.unity
+++ b/Assets/Scenes/ExpressFixScene.unity
@@ -559,11 +559,15 @@ Transform:
   m_GameObject: {fileID: 199118572}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.97, y: -1.5, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1747384944}
   - {fileID: 1860845981}
+  - {fileID: 1888547583}
+  - {fileID: 1078086547}
+  - {fileID: 404437037}
   m_Father: {fileID: 657112469}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &223820135
@@ -982,6 +986,11 @@ Transform:
   m_Children: []
   m_Father: {fileID: 657112469}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &404437037 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+  m_PrefabInstance: {fileID: 1443501785}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &463110380
 GameObject:
   m_ObjectHideFlags: 0
@@ -1129,6 +1138,83 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1301816245}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &514341497
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 199118573}
+    m_Modifications:
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: hasGear
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: shaftType
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initRadius
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initSprite
+      value: 
+      objectReference: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: targetSpeed
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_Name
+      value: Target Shaft
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 6.629
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.684
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
 --- !u!1 &551825976
 GameObject:
   m_ObjectHideFlags: 0
@@ -1572,6 +1658,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5489eacced0c49c4ab26308cd50fb917, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _gearPrefab: {fileID: 0}
   runType: 0
 --- !u!1 &693951178
 GameObject:
@@ -2470,6 +2557,84 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 4294967295
   m_MaxRayIntersections: 0
+--- !u!1001 &1078086546
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 199118573}
+    m_Modifications:
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: hasGear
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: shaftType
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initRadius
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initSprite
+      value: 
+      objectReference: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+    - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_Name
+      value: Pluggable Shaft
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.516
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.867
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+--- !u!4 &1078086547 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+  m_PrefabInstance: {fileID: 1078086546}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1081346457
 GameObject:
   m_ObjectHideFlags: 0
@@ -2955,6 +3120,79 @@ Transform:
   - {fileID: 2061960537}
   m_Father: {fileID: 1104267851}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1443501785
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 199118573}
+    m_Modifications:
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: hasGear
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: shaftType
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initRadius
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initSprite
+      value: 
+      objectReference: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+    - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_Name
+      value: Shaft
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 6.56
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.334
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
 --- !u!1 &1492467213
 GameObject:
   m_ObjectHideFlags: 0
@@ -3511,6 +3749,11 @@ LineRenderer:
   m_UseWorldSpace: 0
   m_Loop: 0
   m_ApplyActiveColorSpace: 1
+--- !u!4 &1747384944 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+  m_PrefabInstance: {fileID: 514341497}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1814664090
 GameObject:
   m_ObjectHideFlags: 0
@@ -3637,89 +3880,37 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 199118573}
     m_Modifications:
-    - target: {fileID: 3043662884828134004, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 4b40fc0f65c85f14fbc9c7c5f40ca686, type: 3}
-    - target: {fileID: 3043662884828134004, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_Color.a
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: hasGear
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 3043662884828134004, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_DrawMode
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3043662884828134004, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_SortingOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4413377968706854998, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5891805930162401337, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: eccbf2467d281894bafba3ef467f0875, type: 3}
-    - target: {fileID: 5891805930162401337, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_SortingLayer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5891805930162401337, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_SortingOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5891805930162401337, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_SortingLayerID
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: gearModel
-      value: 
-      objectReference: {fileID: 11400000, guid: 0b31f7a5b65969146ace2f70ffebf57e, type: 2}
-    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: shaftType
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: targetSpeed
+      propertyPath: initRadius
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initSprite
+      value: 
+      objectReference: {fileID: -997898850808940670, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
     - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
       propertyPath: initialSpeed
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: gearModel.radius
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: gearModel.spriteName
-      value: 
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
       propertyPath: m_Name
-      value: Shaft
-      objectReference: {fileID: 0}
-    - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_IsActive
-      value: 1
+      value: Driver Shaft
       objectReference: {fileID: 0}
     - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.53
+      value: 4.48
       objectReference: {fileID: 0}
     - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.87
+      value: 3.28
       objectReference: {fileID: 0}
     - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
       propertyPath: m_LocalPosition.z
@@ -3934,6 +4125,88 @@ Transform:
   - {fileID: 574939132}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1888547582
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 199118573}
+    m_Modifications:
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: hasGear
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: shaftType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initRadius
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6084533904510143880, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: initSprite
+      value: 
+      objectReference: {fileID: 4685789066096419141, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+    - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_Name
+      value: Constant Shaft
+      objectReference: {fileID: 0}
+    - target: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.973
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.457
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+--- !u!4 &1888547583 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+  m_PrefabInstance: {fileID: 1888547582}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1895751249
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Framework/Core/UnityTool.cs b/Assets/Scripts/Framework/Core/UnityTool.cs
index 2947e7431..68b87553b 100644
--- a/Assets/Scripts/Framework/Core/UnityTool.cs
+++ b/Assets/Scripts/Framework/Core/UnityTool.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using AibisDream;
 using UnityEngine;
 
 namespace Framework.Core
@@ -100,11 +99,6 @@ namespace Framework.Core
             {
                 foreach (var component in components)
                 {
-                    if (attribute.goName == "Min Pointer")
-                    {
-                        Debug.Log(component.name);
-                    }
-                    
                     if (component.name != attribute.goName) continue;
                     field.SetValue(mono, component);
                     break;
diff --git a/Assets/Scripts/MiniGame/Gear/Gear.cs b/Assets/Scripts/MiniGame/Gear/Gear.cs
index e73a82d7a..f7bbfd0cf 100644
--- a/Assets/Scripts/MiniGame/Gear/Gear.cs
+++ b/Assets/Scripts/MiniGame/Gear/Gear.cs
@@ -1,3 +1,4 @@
+using System;
 using AibisDream.Framework;
 using DG.Tweening;
 using UnityEngine;
@@ -17,10 +18,13 @@ namespace AibisDream
 
         private void Awake()
         {
-            gearController = transform.parent.parent.GetComponent<GearController>();
             circleCollider = GetComponent<CircleCollider2D>();
             spriteRenderer = GetComponent<SpriteRenderer>();
+        }
 
+        private void Start()
+        {
+            gearController = transform.parent.parent.GetComponent<GearController>();
             // 给齿轮赋值
             InitGearModel();
         }
@@ -28,12 +32,13 @@ namespace AibisDream
         /// <summary>
         /// 设置齿轮信息
         /// </summary>
-        /// <param name="gearModel">齿轮信息</param>
         public void InitGearModel()
         {
             // 给齿轮赋值
             spriteRenderer.sprite = gearSprite;
             circleCollider.radius = radius;
+
+            spriteRenderer.size = new Vector2(radius * 2, radius * 2);
         }
 
         public void StartMove()
@@ -54,7 +59,19 @@ namespace AibisDream
         public void Move(Vector2 targetPos)
         {
             transform.position = targetPos;
-            targetShaft = CheckTargetShaft();
+            var tempShaft = gearController.CheckClosestShaft(transform.position, radius);
+            if (!tempShaft) return;
+            
+            targetShaft = tempShaft;
+            
+            if (gearController.CheckGearSuitable(tempShaft, radius))
+            {
+                targetShaft = tempShaft;
+            }
+            else
+            {
+                return;
+            }
         }
 
         private Shaft CheckTargetShaft()
diff --git a/Assets/Scripts/MiniGame/Gear/GearController.cs b/Assets/Scripts/MiniGame/Gear/GearController.cs
index 57c3e72f7..acde17dfa 100644
--- a/Assets/Scripts/MiniGame/Gear/GearController.cs
+++ b/Assets/Scripts/MiniGame/Gear/GearController.cs
@@ -9,7 +9,7 @@ namespace AibisDream
     {
         #region 索引
 
-        private GameObject _gearPrefab;
+        [SerializeField] private GameObject _gearPrefab;
         private Shaft[] _shafts;
 
         #endregion
@@ -76,6 +76,17 @@ namespace AibisDream
         {
             return _shaftGraph.QuerySnapShaft(pos, gearRadius);
         }
+
+        /// <summary>
+        /// 判断齿轮能不能放进轴内
+        /// </summary>
+        /// <param name="sourceShaft">当前轴</param>
+        /// <param name="gearRadius">齿轮半径</param>
+        /// <returns>是否可用</returns>
+        public bool CheckGearSuitable(Shaft sourceShaft, float gearRadius)
+        {
+            return _shaftGraph.CheckGearSuitable(sourceShaft, gearRadius);
+        }
         
         /// <summary>
         /// 生成齿轮
diff --git a/Assets/Scripts/MiniGame/Gear/Shaft.cs b/Assets/Scripts/MiniGame/Gear/Shaft.cs
index 14bed740b..b4fb6a283 100644
--- a/Assets/Scripts/MiniGame/Gear/Shaft.cs
+++ b/Assets/Scripts/MiniGame/Gear/Shaft.cs
@@ -9,18 +9,20 @@ namespace AibisDream
         [SerializeField] private int id;
 
         [SerializeField] public ShaftType shaftType;
-        
+
         // 初始齿轮
         [SerializeField] private float initRadius;
         [SerializeField] private Sprite initSprite;
         [SerializeField] private bool hasGear;
 
-        private GameObject childGear;
-        
+        [SerializeField] private GameObject childGear;
+
         // 初始角速度
         [SerializeField] private float initialSpeed;
+
         // 目标角速度
         [SerializeField] private float targetSpeed;
+
         // 当前角速度
         public float speed;
 
@@ -73,10 +75,14 @@ namespace AibisDream
         private GameObject InitStaticGear()
         {
             GameObject staticGear = transform.GetChild(0).gameObject;
+            
 
             // 添加齿轮图片
             staticGear.SetActive(true);
-            staticGear.GetComponent<SpriteRenderer>().sprite = initSprite;
+            var staticGearRenderer = staticGear.GetComponent<SpriteRenderer>();
+            staticGearRenderer.sprite = initSprite;
+            staticGearRenderer.size = new Vector2(initRadius * 2, initRadius * 2);
+            
             // 如果有初速，就要开始转动了
             if (!CommonUtil.IsZero(initialSpeed))
             {
@@ -89,17 +95,21 @@ namespace AibisDream
 
         private GameObject InitPluggableGear()
         {
-            return gearController.InitGear(transform.position, initRadius, initSprite, initialSpeed);
+            var gear = gearController.InitGear(transform.position, initRadius, initSprite, initialSpeed);
+            gear.GetComponent<Gear>().targetShaft = this;
+            return gear;
         }
 
         public void PlugInGear(Gear gear)
         {
             childGear = gear.gameObject;
+            gearController.ChangeGraphVertex(GetInstanceID());
         }
 
         public void PlugOutGear()
         {
             childGear = null;
+            gearController.ChangeGraphVertex(GetInstanceID());
         }
 
         public void UpdateSpeed()
@@ -127,15 +137,23 @@ namespace AibisDream
 
             // 更新动画
             childGear.transform.DOKill();
-            childGear.transform.DORotate(new Vector3(0, 0, 360), 1 / speed, RotateMode.LocalAxisAdd)
-                .SetEase(Ease.Linear).SetLoops(-1, LoopType.Incremental);
+            if (speed > 0)
+            {
+                childGear.transform.DORotate(new Vector3(0, 0, 360), 1 / speed, RotateMode.LocalAxisAdd)
+                    .SetEase(Ease.Linear).SetLoops(-1, LoopType.Incremental);
+            }
+            else
+            {
+                childGear.transform.DORotate(new Vector3(0, 0, -360), 1 / -speed, RotateMode.LocalAxisAdd)
+                    .SetEase(Ease.Linear).SetLoops(-1, LoopType.Incremental);
+            }
         }
 
         private void CheckGameState()
         {
             if (shaftType == ShaftType.Target)
             {
-                if (targetSpeed <= speed)
+                if (targetSpeed <= Mathf.Abs(speed))
                 {
                     gearController.Succeed();
                 }
diff --git a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
index 4ff9b2105..1298df453 100644
--- a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
+++ b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
@@ -207,19 +207,31 @@ namespace AibisDream
             return minDistance < gearRadius ? closestShaft : null;
         }
 
+        /// <summary>
+        /// 判断齿轮能不能放进轴内
+        /// </summary>
+        /// <param name="sourceShaft">当前轴</param>
+        /// <param name="gearRadius">齿轮半径</param>
+        /// <returns>是否可用</returns>
         public bool CheckGearSuitable(Shaft sourceShaft, float gearRadius)
         {
             // 获取目标idx
             int idx = TranInstanceIDToIdx(sourceShaft.GetInstanceID());
             
+            bool isShaftAvailable = true;
             // 寻找所有临接轴
             for (int i = 0; i < _vertexSize; i++)
             {
                 if (i != idx) continue; // 不需要计算和自身的关系
                 float availableDis = Shaft.CalcShaftAvailableDis(sourceShaft.transform.position, _vertexArray[i]);
+                if (availableDis < gearRadius - 0.15f)
+                {
+                    isShaftAvailable = false;
+                    break;
+                }
             }
 
-            return false;
+            return isShaftAvailable;
         }
     }
 }
\ No newline at end of file