From 1fcb646f4a82a97550c180f637d02b4be271bf48 Mon Sep 17 00:00:00 2001 From: yulong <1838206582@qq.com> Date: Tue, 12 Nov 2024 14:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefebs/Materials/Material__110.mat | 2 +- .../Prefebs/Materials/Material__111.mat | 2 +- .../Prefebs/Materials/Material__159.mat | 2 +- .../Prefebs/Materials/Material__2.mat | 2 +- .../Prefebs/Materials/Material__25.mat | 2 +- .../Prefebs/Materials/Material__27.mat | 2 +- .../Prefebs/Materials/Material__29.mat | 2 +- .../Prefebs/Materials/Material__30.mat | 2 +- .../Prefebs/Materials/Material__44.mat | 2 +- .../Prefebs/Materials/Material__47.mat | 2 +- .../Prefebs/Materials/Material__48.mat | 2 +- .../Prefebs/Materials/Material__52.mat | 2 +- .../Prefebs/Materials/Material__69.mat | 2 +- .../Prefebs/Materials/Material__71.mat | 2 +- .../Prefebs/Materials/Material__78.mat | 2 +- .../Prefebs/Materials/Material__79.mat | 2 +- .../Prefebs/Materials/Material__84.mat | 2 +- .../Prefebs/Materials/Material__85.mat | 2 +- .../Prefebs/Materials/Material__86.mat | 2 +- .../Prefebs/Materials/wire_027177027.mat | 2 +- .../Prefebs/Materials/wire_057008136.mat | 2 +- .../Prefebs/Materials/wire_063082100.mat | 2 +- .../Prefebs/Materials/wire_063255173.mat | 2 +- .../Prefebs/Materials/wire_088144225.mat | 2 +- .../Prefebs/Materials/wire_177148027.mat | 2 +- .../Prefebs/Materials/wire_192192192.mat | 2 +- .../Prefebs/Materials/wire_196088225.mat | 2 +- .../Prefebs/Materials/wire_198225087.mat | 2 +- .../Prefebs/Materials/wire_202209238.mat | 2 +- .../Prefebs/Materials/wire_204006005.mat | 2 +- .../Prefebs/Materials/wire_214229166.mat | 2 +- .../Prefebs/Roboticarm/Roboticarm.controller | 52 +++---- Assets/Resources/Prefrom/快换电池1 (1).prefab | 88 +++++++++++ Assets/Resources/Prefrom/穿梭车1.prefab | 64 ++++++++ Assets/Scenes/New Scene.unity | 37 ++--- Assets/Scenes/TobaccoModelTest.unity | 138 ++++++++++++++---- Assets/Scripts/ExplodeOnClick.cs | 36 +++-- Assets/Scripts/YL/Conveyordata.cs | 4 +- Assets/Scripts/YL/Palletizertent.cs | 7 +- Assets/Scripts/YL/Warehousingdata.cs | 40 +++-- 40 files changed, 389 insertions(+), 139 deletions(-) diff --git a/Assets/GameAssets/Prefebs/Materials/Material__110.mat b/Assets/GameAssets/Prefebs/Materials/Material__110.mat index 0d4285f..5aa521b 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__110.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__110.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0, g: 0.5849056, b: 0.07173374, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__111.mat b/Assets/GameAssets/Prefebs/Materials/Material__111.mat index 7d399ef..d4119d9 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__111.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__111.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 0.5, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__159.mat b/Assets/GameAssets/Prefebs/Materials/Material__159.mat index b13a626..9358a62 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__159.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__159.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.42352942, g: 0.42352942, b: 0.42352942, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__2.mat b/Assets/GameAssets/Prefebs/Materials/Material__2.mat index 0a0f035..456bed9 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__2.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__2.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__25.mat b/Assets/GameAssets/Prefebs/Materials/Material__25.mat index 02d4187..d1b7c9b 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__25.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__25.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__27.mat b/Assets/GameAssets/Prefebs/Materials/Material__27.mat index 56911b6..248685f 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__27.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__27.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__29.mat b/Assets/GameAssets/Prefebs/Materials/Material__29.mat index 63431a9..d3e9118 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__29.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__29.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0, g: 0.5572357, b: 0.7924528, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__30.mat b/Assets/GameAssets/Prefebs/Materials/Material__30.mat index 1966207..2e2fd8b 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__30.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__30.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__44.mat b/Assets/GameAssets/Prefebs/Materials/Material__44.mat index b56c161..efe601c 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__44.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__44.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0, g: 0.0036712592, b: 0.735849, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__47.mat b/Assets/GameAssets/Prefebs/Materials/Material__47.mat index 627ddaa..46ae720 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__47.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__47.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.8301887, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__48.mat b/Assets/GameAssets/Prefebs/Materials/Material__48.mat index 6f0bb00..fa8079a 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__48.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__48.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.019983208, g: 0.3490566, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__52.mat b/Assets/GameAssets/Prefebs/Materials/Material__52.mat index 45d5eea..2809163 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__52.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__52.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__69.mat b/Assets/GameAssets/Prefebs/Materials/Material__69.mat index ed2fc09..f81693d 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__69.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__69.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.9433962, g: 0.12014952, b: 0.12014952, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__71.mat b/Assets/GameAssets/Prefebs/Materials/Material__71.mat index 0d6c170..44ab641 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__71.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__71.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.42352942, g: 0.42352942, b: 0.42352942, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__78.mat b/Assets/GameAssets/Prefebs/Materials/Material__78.mat index 62a2a6c..b1726f3 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__78.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__78.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__79.mat b/Assets/GameAssets/Prefebs/Materials/Material__79.mat index d24cd86..82a7f50 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__79.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__79.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0, g: 0.040860754, b: 0.6792453, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__84.mat b/Assets/GameAssets/Prefebs/Materials/Material__84.mat index 336b61f..49de68d 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__84.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__84.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0, g: 0.58431375, b: 0.07058824, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__85.mat b/Assets/GameAssets/Prefebs/Materials/Material__85.mat index b9c499a..bb754c9 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__85.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__85.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 0.5019608, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/Material__86.mat b/Assets/GameAssets/Prefebs/Materials/Material__86.mat index a94a99a..c9e9611 100644 --- a/Assets/GameAssets/Prefebs/Materials/Material__86.mat +++ b/Assets/GameAssets/Prefebs/Materials/Material__86.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.13207549, g: 0.13207549, b: 0.13207549, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_027177027.mat b/Assets/GameAssets/Prefebs/Materials/wire_027177027.mat index 3b1b260..ce4a359 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_027177027.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_027177027.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.2627451, g: 0.84705883, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_057008136.mat b/Assets/GameAssets/Prefebs/Materials/wire_057008136.mat index a255632..a9d5871 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_057008136.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_057008136.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.2627451, g: 0.84705883, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_063082100.mat b/Assets/GameAssets/Prefebs/Materials/wire_063082100.mat index 6c166d9..2d096d9 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_063082100.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_063082100.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_063255173.mat b/Assets/GameAssets/Prefebs/Materials/wire_063255173.mat index d28cf5c..cbfb983 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_063255173.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_063255173.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.1273585, g: 1, b: 0.89686394, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_088144225.mat b/Assets/GameAssets/Prefebs/Materials/wire_088144225.mat index 703fe5c..5dfbc9a 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_088144225.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_088144225.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.25943398, g: 0.84536004, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_177148027.mat b/Assets/GameAssets/Prefebs/Materials/wire_177148027.mat index 273dd3f..d5b662f 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_177148027.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_177148027.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.2627451, g: 0.84705883, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_192192192.mat b/Assets/GameAssets/Prefebs/Materials/wire_192192192.mat index a1ec5e8..bc2c4f6 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_192192192.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_192192192.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_196088225.mat b/Assets/GameAssets/Prefebs/Materials/wire_196088225.mat index 6172bb3..edbe4be 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_196088225.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_196088225.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.42417708, g: 0.022427902, b: 0.5283019, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_198225087.mat b/Assets/GameAssets/Prefebs/Materials/wire_198225087.mat index 782ef98..6ad0ca4 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_198225087.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_198225087.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.7667309, g: 0.8679245, b: 0.08597365, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_202209238.mat b/Assets/GameAssets/Prefebs/Materials/wire_202209238.mat index e0c13bc..72fecb2 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_202209238.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_202209238.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.67058825, g: 0.67058825, b: 0.67058825, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_204006005.mat b/Assets/GameAssets/Prefebs/Materials/wire_204006005.mat index c59dc8e..77370a3 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_204006005.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_204006005.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.8207547, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Materials/wire_214229166.mat b/Assets/GameAssets/Prefebs/Materials/wire_214229166.mat index 2c0b260..c85e738 100644 --- a/Assets/GameAssets/Prefebs/Materials/wire_214229166.mat +++ b/Assets/GameAssets/Prefebs/Materials/wire_214229166.mat @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.2627451, g: 0.84705883, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Prefebs/Roboticarm/Roboticarm.controller b/Assets/GameAssets/Prefebs/Roboticarm/Roboticarm.controller index 0c17e2b..e606876 100644 --- a/Assets/GameAssets/Prefebs/Roboticarm/Roboticarm.controller +++ b/Assets/GameAssets/Prefebs/Roboticarm/Roboticarm.controller @@ -1,35 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-4376526991649564865 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -2150884167522021065} - m_Position: {x: 380, y: 150, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -2150884167522021065} ---- !u!1102 &-2150884167522021065 +--- !u!1102 &-6842296932978832182 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Take 001 + m_Name: take m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -42,12 +20,34 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 0} + m_Motion: {fileID: 1827226128182048838, guid: 44819ad5da7c5294688a019bf76aa394, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &-4376526991649564865 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6842296932978832182} + m_Position: {x: 250.32788, y: 265.07376, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6842296932978832182} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -62,7 +62,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Resources/Prefrom/快换电池1 (1).prefab b/Assets/Resources/Prefrom/快换电池1 (1).prefab index b42884e..58440bc 100644 --- a/Assets/Resources/Prefrom/快换电池1 (1).prefab +++ b/Assets/Resources/Prefrom/快换电池1 (1).prefab @@ -48,6 +48,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7020243909276424642, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -6912125841577810863, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5550877698612165509, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4846640163156487560, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4577066470407061277, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -3242721653465546553, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1227272688328652009, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} propertyPath: m_Name value: "\u5FEB\u6362\u7535\u6C601 (1)" @@ -56,6 +84,66 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 968809591604650378, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1176169133155807510, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1279157875431536361, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2096326532518169760, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2165219617248841629, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2181007510529323777, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5151128109418922724, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5578482074691624247, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6368506141013777181, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6466313282857327592, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6482846487265673055, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6576590086304079609, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7485070046491715890, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8726129076437877856, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8830628356290519509, guid: fb7298f30cfa5ae4eaf512f471e507b5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Resources/Prefrom/穿梭车1.prefab b/Assets/Resources/Prefrom/穿梭车1.prefab index 38eb02a..6a8dbe2 100644 --- a/Assets/Resources/Prefrom/穿梭车1.prefab +++ b/Assets/Resources/Prefrom/穿梭车1.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -9024466071053626620, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -48,6 +52,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8213724012791355186, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7695029075881589242, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -6291533499364328468, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5540226258310830843, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5188615651225229061, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2816613197184405924, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2573022609567451529, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1962138991208347735, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1924820336873919549, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} propertyPath: m_Name value: "\u7A7F\u68AD\u8F661" @@ -56,6 +96,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1390919688232478818, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1925554442106616337, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5174202348710880239, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5996496879452222381, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7758586770552001015, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8808739652463023248, guid: deb727cb1e735a14ab71cc03daf993e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/New Scene.unity b/Assets/Scenes/New Scene.unity index 62abb30..1ac405a 100644 --- a/Assets/Scenes/New Scene.unity +++ b/Assets/Scenes/New Scene.unity @@ -141,7 +141,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &63227001 RectTransform: m_ObjectHideFlags: 0 @@ -208,7 +208,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 546314794} m_TargetAssemblyTypeName: ExplodeOnClick, Assembly-CSharp - m_MethodName: Battery + m_MethodName: Shuttlebus m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -710,7 +710,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &404317953 RectTransform: m_ObjectHideFlags: 0 @@ -777,7 +777,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 546314794} m_TargetAssemblyTypeName: ExplodeOnClick, Assembly-CSharp - m_MethodName: Hoister + m_MethodName: Hoister2 m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -842,7 +842,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &422372811 RectTransform: m_ObjectHideFlags: 0 @@ -1040,7 +1040,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aaf1662ad16ab44bb0d4ef3fac49a1a, type: 3} m_Name: m_EditorClassIdentifier: - equipment: 0 + equipment: 1 parentObject: {fileID: 0} batteryobj: {fileID: 5243875753411277459, guid: f8d78cc4b99fe7745a88879444d5206e, type: 3} carobj: {fileID: 6719742576894611499, guid: a2d59d7c53d15174cb41528bf6024707, type: 3} @@ -1055,6 +1055,7 @@ MonoBehaviour: points: [] Replacebattery: [] colidpoints: [] + Blowups: 0 --- !u!4 &546314796 Transform: m_ObjectHideFlags: 0 @@ -1182,7 +1183,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &967173163 RectTransform: m_ObjectHideFlags: 0 @@ -1315,7 +1316,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &985286624 RectTransform: m_ObjectHideFlags: 0 @@ -2085,9 +2086,9 @@ MonoBehaviour: showCamRay: 0 middleSpeed: 30 minMaxSlider: {x: -90, y: 90} - MouseWheelSensitivity: 1 - MouseZoomMin: 5 - MouseZoomMax: 500 + MouseWheelSensitivity: 10 + MouseZoomMin: 1 + MouseZoomMax: 30 xSpeed: 250 ySpeed: 120 Distance: 20 @@ -2126,7 +2127,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1487972215 RectTransform: m_ObjectHideFlags: 0 @@ -2193,7 +2194,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 546314794} m_TargetAssemblyTypeName: ExplodeOnClick, Assembly-CSharp - m_MethodName: Hoister2 + m_MethodName: Battery m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2501,7 +2502,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1717100710 RectTransform: m_ObjectHideFlags: 0 @@ -2568,7 +2569,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 546314794} m_TargetAssemblyTypeName: ExplodeOnClick, Assembly-CSharp - m_MethodName: Shuttlebus + m_MethodName: Hoister m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2750,7 +2751,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2051874904} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4ed3db161c5fa7546ac4bb1059504cd2, type: 3} m_Name: @@ -2791,7 +2792,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2128518413 RectTransform: m_ObjectHideFlags: 0 @@ -2924,7 +2925,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2143791156 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TobaccoModelTest.unity b/Assets/Scenes/TobaccoModelTest.unity index c8fb42a..65978b9 100644 --- a/Assets/Scenes/TobaccoModelTest.unity +++ b/Assets/Scenes/TobaccoModelTest.unity @@ -163,7 +163,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 951469} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1541,7 +1541,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 31165535} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -4661,7 +4661,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 88638526} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -13146,7 +13146,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 245416278} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -15888,7 +15888,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294627195} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -21741,7 +21741,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424112035} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -26028,7 +26028,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527019335} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -46224,7 +46224,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 892079066} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -50690,7 +50690,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 973846180} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -50932,7 +50932,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977596574} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -51638,7 +51638,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983669044} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -52837,6 +52837,27 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &1014118239 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + m_PrefabInstance: {fileID: 2020122910} + m_PrefabAsset: {fileID: 0} +--- !u!111 &1014118240 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014118239} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 1827226128182048838, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + m_Animations: + - {fileID: 1827226128182048838, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 --- !u!1 &1017917012 GameObject: m_ObjectHideFlags: 0 @@ -57093,7 +57114,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117928922} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -62138,7 +62159,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1212721099} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -63864,7 +63885,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1244481050} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -63947,7 +63968,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245992029} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -67791,7 +67812,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313088320} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -71778,7 +71799,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1392390178} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -74558,7 +74579,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1475249485} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -75649,7 +75670,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496820333} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -77537,7 +77558,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1538643593} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -78567,7 +78588,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1358535570} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 65b0b058f5fa57e4784d7c3b3fb7d001, type: 3} m_Name: @@ -78581,7 +78602,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1358535570} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 40898eb910012ec4680ea6ae9e5a61bb, type: 2} m_CullingMode: 0 @@ -80358,7 +80379,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1605586455} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -86092,7 +86113,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1717373314} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -94824,7 +94845,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1879363762} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -95357,7 +95378,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885350324} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -102159,6 +102180,66 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2018735035} m_CullTransparentMesh: 1 +--- !u!1001 &2020122910 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalPosition.x + value: -6.762866 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalPosition.y + value: 0.24769303 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalPosition.z + value: 18.547043 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000006657903 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + propertyPath: m_Name + value: "3\u673A\u68B0\u81C2_\u53BB\u76D6" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1014118240} + m_SourcePrefab: {fileID: 100100000, guid: 3c6bbdd1e82e1714f9ad478e26a69bdb, type: 3} --- !u!114 &2022501496 MonoBehaviour: m_ObjectHideFlags: 0 @@ -106923,7 +107004,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2090505128} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -108718,7 +108799,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4157a389ab7cb7e499f5d5d290ea3e40, type: 3} propertyPath: m_LocalPosition.x - value: 21.72 + value: 10.09 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4157a389ab7cb7e499f5d5d290ea3e40, type: 3} propertyPath: m_LocalPosition.y @@ -165579,3 +165660,4 @@ SceneRoots: - {fileID: 108631931} - {fileID: 1291014530} - {fileID: 796359296} + - {fileID: 2020122910} diff --git a/Assets/Scripts/ExplodeOnClick.cs b/Assets/Scripts/ExplodeOnClick.cs index 973984d..c815526 100644 --- a/Assets/Scripts/ExplodeOnClick.cs +++ b/Assets/Scripts/ExplodeOnClick.cs @@ -38,9 +38,10 @@ public class ExplodeOnClick : MonoBehaviour private bool isp = false; private GameObject Opjgame; public List colidpoints; + public bool Blowups = false; private void Awake() { - parentObject = Instantiate(batteryobj, point); + parentObject = Instantiate(carobj, point); for (int i = 0; i < parentObject.transform.childCount; i++) { points.Add(parentObject.transform.GetChild(i).localPosition); @@ -110,7 +111,7 @@ public class ExplodeOnClick : MonoBehaviour Replacebattery.Add(parentObject.transform.GetChild(i).gameObject); } equipment = Equipment.Battery; - // Showshebi(parentObject.name+ "(Clone)"); + // Showshebi(parentObject.name+ "(Clone)"); } } else @@ -166,7 +167,7 @@ public class ExplodeOnClick : MonoBehaviour Replacebattery.Add(parentObject.transform.GetChild(i).gameObject); } equipment = Equipment.Hoister; - // Showshebi(parentObject.name + "(Clone)"); + // Showshebi(parentObject.name + "(Clone)"); } } else @@ -184,10 +185,10 @@ public class ExplodeOnClick : MonoBehaviour { if (parentObject) { - Destroy (parentObject); + Destroy(parentObject); isExploded = false; isp = false; - parentObject = Instantiate(hoister2,point); + parentObject = Instantiate(hoister2, point); Deletes(Replacebattery, points); for (int i = 0; i < parentObject.transform.childCount; i++) { @@ -195,7 +196,7 @@ public class ExplodeOnClick : MonoBehaviour Replacebattery.Add(parentObject.transform.GetChild(i).gameObject); } equipment = Equipment.Hoister2; - // Showshebi(parentObject.name + "(Clone)"); + // Showshebi(parentObject.name + "(Clone)"); } } @@ -219,23 +220,18 @@ public class ExplodeOnClick : MonoBehaviour Debug.Log(hit.collider.gameObject.transform.parent.name); Showdata(hit.collider.gameObject.transform.parent.name); Opjgame = hit.collider.gameObject.transform.parent.gameObject; + Blowups = true; + Debug.Log("小图爆炸" + Blowups); + Application.ExternalCall("modelStatus", Judgment()); } - // 检查点击的物体是否有 ModelChilderComponent - //ModelChilderComponent childComponent = hit.transform.GetComponent(); - //if (childComponent != null) - //{ - // parentObject = hit.transform.parent; // 保存父对象 - // originalPositions = new Vector3[parentObject.childCount]; // 初始化原始位置数组 - - // // 保存原始位置 - // for (int i = 0; i < parentObject.childCount; i++) - // { - // originalPositions[i] = parentObject.GetChild(i).localPosition; - // } - //} } } } + + public bool Judgment() + { + return Blowups; + } /// /// 激活所有父物体 /// @@ -283,6 +279,8 @@ public class ExplodeOnClick : MonoBehaviour } isp = false; StartCoroutine(Bulkreduction()); + Blowups = false; + Debug.Log("小车还原" + Blowups); } } public void Explode() diff --git a/Assets/Scripts/YL/Conveyordata.cs b/Assets/Scripts/YL/Conveyordata.cs index c7e5240..b509402 100644 --- a/Assets/Scripts/YL/Conveyordata.cs +++ b/Assets/Scripts/YL/Conveyordata.cs @@ -128,7 +128,7 @@ public class Conveyordata : MonoBehaviour boxtasknumber.ID = initdata.result[0].transferId; switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); @@ -221,7 +221,7 @@ public class Conveyordata : MonoBehaviour boxtasknumber.ID = initdata.result[0].transferId; switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); diff --git a/Assets/Scripts/YL/Palletizertent.cs b/Assets/Scripts/YL/Palletizertent.cs index 6de1345..4452bc4 100644 --- a/Assets/Scripts/YL/Palletizertent.cs +++ b/Assets/Scripts/YL/Palletizertent.cs @@ -50,7 +50,7 @@ public class Palletizertent : MonoBehaviour public Transform Points; public void Stacking(Dpmequipment cmequipment) { - if (cmequipment.TaskNumber != null) + if (cmequipment.TaskNumber.Length > 0) { if (cmequipment.TaskNumber.Length > 0 && !ispcon && cmequipment.boxesNumber == "1") { @@ -92,7 +92,7 @@ public class Palletizertent : MonoBehaviour boxtasknumber.ID = initdata.result[0].transferId; switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); @@ -181,8 +181,10 @@ public class Palletizertent : MonoBehaviour /// private void Centreposition() { + Debug.Log("еλǷ"); if (Armobj.transform.childCount > 0 && Haveabox.childCount > 0) { + Debug.Log("ִеλ"); GameObject box = Armobj.transform.GetChild(0).gameObject; GameObject box2 = Haveabox.transform.GetChild(0).gameObject; if (box2 != null) @@ -211,6 +213,7 @@ public class Palletizertent : MonoBehaviour //Debug.Log("ײ"); box.transform.SetParent(Haveabox.transform); Armobj.transform.DOMoveY(Armobj.transform.position.y - 0.23f, 0.2f).SetEase(Ease.InOutQuad); + Debug.Log("ִеλ"); } } } diff --git a/Assets/Scripts/YL/Warehousingdata.cs b/Assets/Scripts/YL/Warehousingdata.cs index 11d4fa1..686867a 100644 --- a/Assets/Scripts/YL/Warehousingdata.cs +++ b/Assets/Scripts/YL/Warehousingdata.cs @@ -133,7 +133,7 @@ public class Warehousingdata : MonoBehaviour { switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); @@ -211,7 +211,7 @@ public class Warehousingdata : MonoBehaviour { switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); @@ -287,12 +287,13 @@ public class Warehousingdata : MonoBehaviour Initdata initdata = JsonUtility.FromJson(data); if (initdata != null && Boxgame2) { + Debug.Log("ʼ"); GameObject box = Instantiate(Boxgame2, transform); Boxtasknumber boxtasknumber = box.GetComponent(); boxtasknumber.ID = initdata.result[0].transferId; switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); @@ -380,7 +381,7 @@ public class Warehousingdata : MonoBehaviour boxtasknumber.ID = initdata.result[0].transferId; switch (initdata.result[0].palletType) { - case "Qbox": + case "QBox": if (initdata.result[0].itemType == "EmptyBox") { Renderer renderer = box.GetComponent(); @@ -478,25 +479,33 @@ public class Warehousingdata : MonoBehaviour /// public void Tothereversal() { - if (Antipoint1.childCount > 0) + if (Antipoint1) { - GameObject box = Antipoint1.transform.GetChild(0).gameObject; - if (box != null) + if (Antipoint1.childCount > 0) { - box.transform.SetParent(null); - box.transform.DOMove(Antipoint2.position, (Vector3.Distance(box.transform.position, Antipoint2.transform.position) / Speed)).SetEase(Ease.InOutQuad).OnComplete(() => + Debug.Log("Էת"); + GameObject box = Antipoint1.transform.GetChild(0).gameObject; + if (box != null) { - box.transform.SetParent(Antipoint2); - }); + Debug.Log("ȡת"); + box.transform.SetParent(null); + box.transform.DOMove(Antipoint2.position, (Vector3.Distance(box.transform.position, Antipoint2.transform.position) / Speed)).SetEase(Ease.InOutQuad).OnComplete(() => + { + Debug.Log("ת"); + box.transform.SetParent(Antipoint2); + }); + } } } - else if (GetComponent()) + else if (transform.GetComponent() != null) { - Hoistmovement hoistmovement = GetComponent(); + Debug.Log("ת"); + Hoistmovement hoistmovement = transform.GetComponent(); if (hoistmovement) { if (hoistmovement.Downpoint.transform.childCount > 0 && Reversing) { + Debug.Log("תһ"); GameObject box = hoistmovement.Downpoint.transform.GetChild(0).gameObject; if (box) { @@ -509,6 +518,7 @@ public class Warehousingdata : MonoBehaviour } else if (hoistmovement.UPpoint.transform.childCount > 0 && Reversing2) { + Debug.Log("תڶ"); GameObject box = hoistmovement.UPpoint.transform.GetChild(0).gameObject; if (box) { @@ -521,5 +531,9 @@ public class Warehousingdata : MonoBehaviour } } } + else + { + Debug.Log("ûзת"); + } } }