From e340cbd0d06d30fb13b3e45f9c78e5dbebbeb981 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sun, 24 Nov 2024 22:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BD=BF=E8=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Art/Fix/Stone/身体维修界面.psb | Bin 26901010 -> 26909139 bytes .../Art/Fix/Stone/身体维修界面.psb.meta | 165 +++++-- .../Resources/Prefabs/Gear System/Gear.prefab | 7 +- .../Prefabs/Gear System/Shaft.prefab | 17 +- Assets/Scenes/ExpressFixScene.unity | 401 +++++++++++++++--- Assets/Scripts/Framework/Core/UnityTool.cs | 6 - Assets/Scripts/MiniGame/Gear/Gear.cs | 23 +- .../Scripts/MiniGame/Gear/GearController.cs | 13 +- Assets/Scripts/MiniGame/Gear/Shaft.cs | 34 +- Assets/Scripts/MiniGame/Gear/ShaftGraph.cs | 14 +- 10 files changed, 551 insertions(+), 129 deletions(-) diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb index a1985cdf04b0be041f8dcecb3e028dcf00596756..3f0f9181f8b95da0905a80d899400f00d3f63e32 100644 GIT binary patch delta 13647 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 delta 6617 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 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(); circleCollider = GetComponent(); spriteRenderer = GetComponent(); + } + private void Start() + { + gearController = transform.parent.parent.GetComponent(); // 给齿轮赋值 InitGearModel(); } @@ -28,12 +32,13 @@ namespace AibisDream /// /// 设置齿轮信息 /// - /// 齿轮信息 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); } + + /// + /// 判断齿轮能不能放进轴内 + /// + /// 当前轴 + /// 齿轮半径 + /// 是否可用 + public bool CheckGearSuitable(Shaft sourceShaft, float gearRadius) + { + return _shaftGraph.CheckGearSuitable(sourceShaft, gearRadius); + } /// /// 生成齿轮 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().sprite = initSprite; + var staticGearRenderer = staticGear.GetComponent(); + 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().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; } + /// + /// 判断齿轮能不能放进轴内 + /// + /// 当前轴 + /// 齿轮半径 + /// 是否可用 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