From 68b7d570b67fe80eb0654ee6285ee0490361a201 Mon Sep 17 00:00:00 2001 From: yulong <1838206582@qq.com> Date: Mon, 9 Sep 2024 18:00:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/OutlineEffect/OutlineEffect/Outline.cs | 28 +- .../OutlineEffect/OutlineEffect.cs | 2 +- Assets/Scenes/TobaccoModelTest.unity | 660 +++++++++++++----- Assets/Scripts/YL/Batterychangesystem.cs | 2 +- Assets/Scripts/YL/Checkposition.cs | 50 ++ Assets/Scripts/YL/Checkposition.cs.meta | 11 + Assets/Scripts/YL/Deliveryfromstorage.cs | 12 +- Assets/Scripts/YL/Enteringreservoirarea.cs | 22 +- Assets/Scripts/YL/Movetest.cs | 44 +- Assets/Scripts/YL/Outboundequipment.cs | 4 +- Assets/Scripts/YL/Transportbox.cs | 5 +- 11 files changed, 612 insertions(+), 228 deletions(-) create mode 100644 Assets/Scripts/YL/Checkposition.cs create mode 100644 Assets/Scripts/YL/Checkposition.cs.meta diff --git a/Assets/OutlineEffect/OutlineEffect/Outline.cs b/Assets/OutlineEffect/OutlineEffect/Outline.cs index b919705..868738e 100644 --- a/Assets/OutlineEffect/OutlineEffect/Outline.cs +++ b/Assets/OutlineEffect/OutlineEffect/Outline.cs @@ -71,13 +71,27 @@ namespace cakeslice return _SharedMaterials; } } - private void OnMouseEnter() + //private void OnMouseEnter() + //{ + // OutlineEffect.Instance?.AddOutline(this); + //} + //private void OnMouseExit() + //{ + // OutlineEffect.Instance?.RemoveOutline(this); + //} + private void OnMouseDown() { - OutlineEffect.Instance?.AddOutline(this); - } - private void OnMouseExit() - { - OutlineEffect.Instance?.RemoveOutline(this); - } + if (OutlineEffect.Instance.outlines.Count > 0) + { + + OutlineEffect.Instance.outlines.Clear(); + } + OutlineEffect.Instance?.AddOutline(this); + } + + //private void OnMouseUp() + //{ + // OutlineEffect.Instance?.RemoveOutline(this); + //} } } diff --git a/Assets/OutlineEffect/OutlineEffect/OutlineEffect.cs b/Assets/OutlineEffect/OutlineEffect/OutlineEffect.cs index 670abb3..73a3f7f 100644 --- a/Assets/OutlineEffect/OutlineEffect/OutlineEffect.cs +++ b/Assets/OutlineEffect/OutlineEffect/OutlineEffect.cs @@ -43,7 +43,7 @@ namespace cakeslice public static OutlineEffect Instance { get; private set; } - private readonly LinkedSet outlines = new LinkedSet(); + public readonly LinkedSet outlines = new LinkedSet(); [Range(1.0f, 6.0f)] public float lineThickness = 1.25f; diff --git a/Assets/Scenes/TobaccoModelTest.unity b/Assets/Scenes/TobaccoModelTest.unity index 1ed996c..5610ffb 100644 --- a/Assets/Scenes/TobaccoModelTest.unity +++ b/Assets/Scenes/TobaccoModelTest.unity @@ -11801,6 +11801,73 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 251531528} m_Mesh: {fileID: -9123535487318109513, guid: 20cae80baf420364f85e9076858346c3, type: 3} +--- !u!1 &251902278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 251902279} + - component: {fileID: 251902280} + - component: {fileID: 251902281} + m_Layer: 0 + m_Name: pos1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &251902279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251902278} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 37.25, y: 2, z: 2.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 913131928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &251902280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251902278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7ad08c70a2b42b4896b43145fdb27ca, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 902082534} +--- !u!65 &251902281 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251902278} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &252408428 GameObject: m_ObjectHideFlags: 0 @@ -17526,8 +17593,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 8.043558, y: 2.2405624, z: 2.2630749} - m_Center: {x: 0.06165123, y: 3.1112761, z: 4.709464} + m_Size: {x: 8.043558, y: 4.2833405, z: 2.2630749} + m_Center: {x: 0.06165123, y: 1.9998755, z: 4.709464} --- !u!65 &381357123 BoxCollider: m_ObjectHideFlags: 0 @@ -17543,12 +17610,67 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 m_Size: {x: 1.914458, y: 5.741536, z: 4.35667} m_Center: {x: -0.048522353, y: 2.8707676, z: 1.301336} +--- !u!65 &381357127 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381357114} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.6131563, y: 7.0703773, z: 0.41430092} + m_Center: {x: 2.866181, y: 3.5351882, z: 4.6864243} +--- !u!65 &381357128 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381357114} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.53301096, y: 7.02, z: 0.35001278} + m_Center: {x: -2.8254116, y: 3.5099995, z: 4.5939174} +--- !u!114 &381357129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381357114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e837abc2468fe1b4caa0347ef7395045, type: 3} + m_Name: + m_EditorClassIdentifier: + ID: 1 --- !u!1 &382662699 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9159787642519714698, guid: 266ce14b00e8a694eae7fcaa9f961a0a, type: 3} @@ -18049,6 +18171,10 @@ PrefabInstance: value: "\u52A0\u53BB\u76D6\u673A1" objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 2719329170631387793, guid: 5bc48524ae340164b95e826d47584a04, type: 3} propertyPath: m_TagString value: decap objectReference: {fileID: 0} @@ -18056,27 +18182,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742814} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742813} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742812} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742811} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742810} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742809} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - insertIndex: -1 - addedObject: {fileID: 1485742815} - targetCorrespondingSourceObject: {fileID: 2719329170631387793, guid: 5bc48524ae340164b95e826d47584a04, type: 3} insertIndex: -1 addedObject: {fileID: 381357118} @@ -18086,6 +18191,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2719329170631387793, guid: 5bc48524ae340164b95e826d47584a04, type: 3} insertIndex: -1 addedObject: {fileID: 381357123} + - targetCorrespondingSourceObject: {fileID: 2719329170631387793, guid: 5bc48524ae340164b95e826d47584a04, type: 3} + insertIndex: -1 + addedObject: {fileID: 381357128} + - targetCorrespondingSourceObject: {fileID: 2719329170631387793, guid: 5bc48524ae340164b95e826d47584a04, type: 3} + insertIndex: -1 + addedObject: {fileID: 381357127} + - targetCorrespondingSourceObject: {fileID: 2719329170631387793, guid: 5bc48524ae340164b95e826d47584a04, type: 3} + insertIndex: -1 + addedObject: {fileID: 381357129} m_SourcePrefab: {fileID: 100100000, guid: 5bc48524ae340164b95e826d47584a04, type: 3} --- !u!1 &391427413 GameObject: @@ -21462,6 +21576,73 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &497412968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 497412969} + - component: {fileID: 497412971} + - component: {fileID: 497412970} + m_Layer: 0 + m_Name: pos3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &497412969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497412968} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 40.45, y: 2, z: 2.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 913131928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &497412970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497412968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7ad08c70a2b42b4896b43145fdb27ca, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 1068042533} +--- !u!65 &497412971 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497412968} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &499417481 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9159787642519714698, guid: 266ce14b00e8a694eae7fcaa9f961a0a, type: 3} @@ -33582,6 +33763,73 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759960895} m_Mesh: {fileID: 2754316046856346141, guid: 20cae80baf420364f85e9076858346c3, type: 3} +--- !u!1 &762469918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 762469919} + - component: {fileID: 762469921} + - component: {fileID: 762469920} + m_Layer: 0 + m_Name: pos5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &762469919 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762469918} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 43.61, y: 2, z: 2.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 913131928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &762469920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762469918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7ad08c70a2b42b4896b43145fdb27ca, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 1029273555} +--- !u!65 &762469921 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762469918} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &762824848 GameObject: m_ObjectHideFlags: 0 @@ -40503,6 +40751,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 901355724} m_CullTransparentMesh: 1 +--- !u!1 &902082533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 902082534} + - component: {fileID: 902082536} + - component: {fileID: 902082535} + m_Layer: 0 + m_Name: pos2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &902082534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902082533} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 38.77, y: 2, z: 2.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 913131928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &902082535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902082533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7ad08c70a2b42b4896b43145fdb27ca, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 497412969} +--- !u!65 &902082536 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902082533} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!4 &902355419 stripped Transform: m_CorrespondingSourceObject: {fileID: 960097094823491891, guid: 4466255138e27264da33db90428aa961, type: 3} @@ -42675,6 +42990,7 @@ MonoBehaviour: tongs3: {fileID: 77369143} tongs4: {fileID: 1690047134} box7: {fileID: 408892692} + box8: {fileID: 251902279} --- !u!65 &950008526 BoxCollider: m_ObjectHideFlags: 0 @@ -45842,6 +46158,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027497074} m_CullTransparentMesh: 1 +--- !u!1 &1029273554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1029273555} + - component: {fileID: 1029273557} + - component: {fileID: 1029273556} + m_Layer: 0 + m_Name: pos6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1029273555 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1029273554} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 45.23, y: 2, z: 2.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 913131928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1029273556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1029273554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7ad08c70a2b42b4896b43145fdb27ca, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 408892692} +--- !u!65 &1029273557 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1029273554} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1038921558 GameObject: m_ObjectHideFlags: 0 @@ -47160,6 +47543,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1066537733} m_CullTransparentMesh: 1 +--- !u!1 &1068042532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1068042533} + - component: {fileID: 1068042535} + - component: {fileID: 1068042534} + m_Layer: 0 + m_Name: pos4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1068042533 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068042532} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 42.05, y: 2, z: 2.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 913131928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1068042534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068042532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7ad08c70a2b42b4896b43145fdb27ca, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 762469919} +--- !u!65 &1068042535 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068042532} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1068881594 GameObject: m_ObjectHideFlags: 0 @@ -65022,150 +65472,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483675229} m_CullTransparentMesh: 1 ---- !u!1 &1485742808 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bc48524ae340164b95e826d47584a04, type: 3} - m_PrefabInstance: {fileID: 390893670} - m_PrefabAsset: {fileID: 0} ---- !u!65 &1485742809 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.405364, y: 0.26128578, z: 0.29145807} - m_Center: {x: 4.6308045, y: 1.9261589, z: 0.74456584} ---- !u!65 &1485742810 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.4240446, y: 0.41120684, z: 0.22480392} - m_Center: {x: 4.5849013, y: 1.9198744, z: -0.79045874} ---- !u!65 &1485742811 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.3859692, y: 0.43276882, z: 0.21329641} - m_Center: {x: -4.5279207, y: 1.8840029, z: -0.7294705} ---- !u!65 &1485742812 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.7443533, y: 0.4151764, z: 0.18254662} - m_Center: {x: -4.393128, y: 1.8382239, z: 0.79606724} ---- !u!65 &1485742813 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2.21108, y: 2.4602447, z: 2.048315} - m_Center: {x: -2.9726636, y: 1.0329514, z: -0.0008597374} ---- !u!65 &1485742814 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2.4089203, y: 2.7255607, z: 2.1980386} - m_Center: {x: 2.8099928, y: 1.1971314, z: 0.038839936} ---- !u!114 &1485742815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485742808} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e837abc2468fe1b4caa0347ef7395045, type: 3} - m_Name: - m_EditorClassIdentifier: - ID: 1 --- !u!1 &1488453201 GameObject: m_ObjectHideFlags: 0 @@ -87990,6 +88296,24 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} insertIndex: -1 addedObject: {fileID: 408892692} + - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1029273555} + - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} + insertIndex: -1 + addedObject: {fileID: 762469919} + - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1068042533} + - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} + insertIndex: -1 + addedObject: {fileID: 497412969} + - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} + insertIndex: -1 + addedObject: {fileID: 902082534} + - targetCorrespondingSourceObject: {fileID: 2711589829363529363, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} + insertIndex: -1 + addedObject: {fileID: 251902279} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7519956298880700812, guid: b5e4b1200287e204cab4c1272f9d3afe, type: 3} insertIndex: -1 diff --git a/Assets/Scripts/YL/Batterychangesystem.cs b/Assets/Scripts/YL/Batterychangesystem.cs index 665d8ae..955f103 100644 --- a/Assets/Scripts/YL/Batterychangesystem.cs +++ b/Assets/Scripts/YL/Batterychangesystem.cs @@ -78,7 +78,7 @@ public class Batterychangesystem : MonoBehaviour GameObject bats = Instantiate(batterys, Batspoint); await Movepos(Pointchanger, Point1, speed); await Batteryslot(BatspointList, Pointchanger, bats); - + } } /// diff --git a/Assets/Scripts/YL/Checkposition.cs b/Assets/Scripts/YL/Checkposition.cs new file mode 100644 index 0000000..a3db7e1 --- /dev/null +++ b/Assets/Scripts/YL/Checkposition.cs @@ -0,0 +1,50 @@ +using Cysharp.Threading.Tasks; +using DG.Tweening; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Checkposition : MonoBehaviour +{ + /// + /// 位移的点位 + /// + public Transform point; + /// + /// 位移的速度 + /// + private float speed = 2f; + public async void OnTriggerStay(Collider other) + { + if (other.gameObject.CompareTag("Box")) + { + if (point.childCount == 0) + { + await MoveObjectToPosition(other.gameObject.transform, point.transform.position, speed); + other.gameObject.transform.SetParent(point); + BoxCollider boxCollider = transform.GetComponent(); + if (boxCollider) + { + boxCollider.enabled = false; + } + BoxCollider points = point.GetComponent(); + if (points) + { + points.enabled = true; + } + } + } + } + /// + /// 箱子做对应的动画 + /// + /// + /// + /// + /// + private async UniTask MoveObjectToPosition(Transform target, Vector3 destination, float speed) + { + float duration = Vector3.Distance(target.position, destination) / speed; + await target.DOMove(destination, duration).AsyncWaitForCompletion(); + } +} diff --git a/Assets/Scripts/YL/Checkposition.cs.meta b/Assets/Scripts/YL/Checkposition.cs.meta new file mode 100644 index 0000000..6e0ffb7 --- /dev/null +++ b/Assets/Scripts/YL/Checkposition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7ad08c70a2b42b4896b43145fdb27ca +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/YL/Deliveryfromstorage.cs b/Assets/Scripts/YL/Deliveryfromstorage.cs index 3f627ca..f46fa7f 100644 --- a/Assets/Scripts/YL/Deliveryfromstorage.cs +++ b/Assets/Scripts/YL/Deliveryfromstorage.cs @@ -53,9 +53,15 @@ public class Deliveryfromstorage : MonoBehaviour await transform.DOMove(point4.transform.position, (Vector3.Distance(transform.position, point4.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); await transform.DOMove(point6.transform.position, (Vector3.Distance(transform.position, point6.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); await transform.DOMove(point7.transform.position, (Vector3.Distance(transform.position, point7.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); - - - + await UniTask.Delay(1000); + await transform.DOMove(point6.transform.position, (Vector3.Distance(transform.position, point6.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); + Transform point9 = GameObject.Find("13-35-2").transform; + await transform.DOMove(point9.transform.position, (Vector3.Distance(transform.position, point9.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); + Transform point10 = GameObject.Find("14-35-2").transform; + await transform.DOMove(point10.transform.position, (Vector3.Distance(transform.position, point10.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); + await transform.DOMove(point9.transform.position, (Vector3.Distance(transform.position, point9.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); + await transform.DOMove(point6.transform.position, (Vector3.Distance(transform.position, point6.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); + await transform.DOMove(point7.transform.position, (Vector3.Distance(transform.position, point7.transform.position) / speed)).SetEase(Ease.Linear).AsyncWaitForCompletion(); } private void OnTriggerEnter(Collider other) diff --git a/Assets/Scripts/YL/Enteringreservoirarea.cs b/Assets/Scripts/YL/Enteringreservoirarea.cs index 867d26a..a99f6c6 100644 --- a/Assets/Scripts/YL/Enteringreservoirarea.cs +++ b/Assets/Scripts/YL/Enteringreservoirarea.cs @@ -80,7 +80,10 @@ public class Enteringreservoirarea : MonoBehaviour /// 箱子位移第7个点位 /// public Transform box7; - + /// + /// 第八个点位 + /// + public Transform box8; void Start() { @@ -112,13 +115,13 @@ public class Enteringreservoirarea : MonoBehaviour private async UniTask Makeprogress(GameObject box, GameObject hoister) { await MoveObjectToPosition(hoister.transform, point.transform.position, speed); - box.gameObject.transform.position = new Vector3(box.transform.position.x, box.transform.position.y + 0.8f, box.transform.position.z); - box.transform.SetParent(null); + await Moveup(box.gameObject, hoister); } private async UniTask Moveup(GameObject point, GameObject upmachine) { await MoveObjectToPosition(point.transform, transportbox.position, speed); + point.transform.SetParent(null); point.transform.SetParent(upmachine.transform); await MoveObjectToPosition(upmachine.transform, pos.transform.position, speed); point.transform.SetParent(null); @@ -126,7 +129,7 @@ public class Enteringreservoirarea : MonoBehaviour await MoveObjectToPosition(point.transform, box2.transform.position, speed); GameObject boxchild = point.transform.GetChild(0).gameObject; boxchild.transform.SetParent(null); - // Debug.Log(boxchild.name); + await MoveObjectToPosition(point.transform, box3.transform.position, speed); boxchild.transform.SetParent(Palletizingarm1.transform); await MoveObjectToPosition(Palletizingarm1.transform, tongs2.transform.position, speed); @@ -145,10 +148,15 @@ public class Enteringreservoirarea : MonoBehaviour point.transform.SetParent(null); boxchild.transform.SetParent(point.transform); BoxCollider collider = point.GetComponent(); - collider.center = new Vector3(0,0,0); - await MoveObjectToPosition(point.transform, box7.transform.position, speed); + collider.center = new Vector3(0, 0, 0); await MoveObjectToPosition(Palletizingarm2.transform, tongs3.transform.position, speed); - point.transform.SetParent(box7); + await MoveObjectToPosition(point.transform, box8.transform.position, speed); + BoxCollider checkposition = box8.GetComponent(); + if (checkposition) + { + checkposition.enabled = true; + } + } /// /// 箱子做对应的动画 diff --git a/Assets/Scripts/YL/Movetest.cs b/Assets/Scripts/YL/Movetest.cs index fea5436..081a568 100644 --- a/Assets/Scripts/YL/Movetest.cs +++ b/Assets/Scripts/YL/Movetest.cs @@ -20,13 +20,9 @@ public class Movetest : MonoBehaviour car1 = GameObject.Find("14-37-2"); tarton = car1.GetComponent(); - - //MoveTo(tarton); - //Sequence mySequence = DOTween.Sequence(); - //mySequence.Append(transform.DOMove(car.transform.position, 5).SetEase(Ease.InOutQuad)).Append(transform.DOMove(car1.transform.position, 5)).SetEase(Ease.InOutQuad).Append(transform.DOMove(car.transform.position, 5).OnComplete(() => - //{ - //})); + + _ = Planneddisplacement(); } @@ -56,7 +52,7 @@ public class Movetest : MonoBehaviour await transform.DOMove(point3.transform.position, (Vector3.Distance(transform.position, point3.transform.position) / speed)).SetEase(Ease.InOutQuad).AsyncWaitForCompletion(); Transform point8 = GameObject.Find("14-32-2").transform; await transform.DOMove(point8.transform.position, (Vector3.Distance(transform.position, point8.transform.position) / speed)).SetEase(Ease.InOutQuad).AsyncWaitForCompletion(); - + } private void OnTriggerEnter(Collider other) @@ -69,9 +65,9 @@ public class Movetest : MonoBehaviour if (car && boxinformation) { boxinformation.ID = car.BoxCode; - // Debug.Log(boxinformation.ID); + //Debug.Log(boxinformation.ID); } - // Debug.Log("触发了"); + //Debug.Log("触发了"); float pos = other.transform.position.y + 0.3f; other.transform.DOMoveY(pos, 0.3f).SetEase(Ease.InOutQuad); other.transform.SetParent(transform); @@ -101,36 +97,10 @@ public class Movetest : MonoBehaviour } } } - public void MoveTo(Transform target) - { - targetPosition = target; - isMoving = true; - } + void Update() { - - if (isMoving) - { - MoveToTarget(); - } + } - private void MoveToTarget() - { - if (targetPosition == null) return; - Debug.Log("执行了"); - Vector3 direction = (targetPosition.position - transform.position).normalized; - - - - float step = speed * Time.deltaTime; - transform.position = Vector3.MoveTowards(transform.position, targetPosition.position, step); - - if (Vector3.Distance(transform.position, targetPosition.position) < 0.1f) - { - transform.DOMove(car.transform.position, 2); - isMoving = false; - - } - } } diff --git a/Assets/Scripts/YL/Outboundequipment.cs b/Assets/Scripts/YL/Outboundequipment.cs index 28b5219..df29272 100644 --- a/Assets/Scripts/YL/Outboundequipment.cs +++ b/Assets/Scripts/YL/Outboundequipment.cs @@ -47,9 +47,9 @@ public class Outboundequipment : MonoBehaviour /// private async UniTask Shipment(GameObject box,GameObject frame) { - await MoveObjectToPosition(frame.transform, point1.transform.position,speed); - box.gameObject.transform.position = new Vector3(box.transform.position.x, box.transform.position.y + 0.8f, box.transform.position.z); + await MoveObjectToPosition(frame.transform, point1.transform.position, speed); await MoveObjectToPosition(box.transform, point1.transform.position, speed); + box.transform.SetParent(null); box.transform.SetParent(frame.transform); await MoveObjectToPosition(frame.transform, point2.transform.position, speed); box.transform.SetParent(null); diff --git a/Assets/Scripts/YL/Transportbox.cs b/Assets/Scripts/YL/Transportbox.cs index 9fa288b..a7ed0c3 100644 --- a/Assets/Scripts/YL/Transportbox.cs +++ b/Assets/Scripts/YL/Transportbox.cs @@ -84,8 +84,8 @@ public class Transportbox : MonoBehaviour private async UniTask Makeprogress(GameObject box, GameObject hoister) { await MoveObjectToPosition(hoister.transform, point.transform.position, speed); - box.gameObject.transform.position = new Vector3(box.transform.position.x, box.transform.position.y + 0.8f, box.transform.position.z); - box.gameObject.transform.SetParent(null); + //box.gameObject.transform.position = new Vector3(box.transform.position.x, box.transform.position.y + 0.8f, box.transform.position.z); + //box.gameObject.transform.SetParent(null); await Moveup(box.gameObject, hoister); } /// @@ -97,6 +97,7 @@ public class Transportbox : MonoBehaviour private async UniTask Moveup(GameObject point, GameObject upmachine) { await MoveObjectToPosition(point.transform, transportbox.transform.position, speed); + point.gameObject.transform.SetParent(null); point.transform.SetParent(upmachine.transform); await MoveObjectToPosition(upmachine.transform, pos.transform.position, speed); point.transform.SetParent(null);