diff --git a/Assets/Scenes/04_ToolMaterialScene.unity b/Assets/Scenes/04_ToolMaterialScene.unity
index 8274d39..bddd12e 100644
--- a/Assets/Scenes/04_ToolMaterialScene.unity
+++ b/Assets/Scenes/04_ToolMaterialScene.unity
@@ -142,13 +142,21 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
+ - target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.009999999
+ objectReference: {fileID: 0}
+ - target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.009999999
+ objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalPosition.x
value: 0.315
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.746
+ value: 0.20700002
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalPosition.z
@@ -290,13 +298,21 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.10000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.10000005
+ objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalPosition.x
value: 0.281
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.3943
+ value: 1.5587001
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalPosition.z
@@ -368,13 +384,21 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 19
objectReference: {fileID: 0}
+ - target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.10000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.10000005
+ objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalPosition.x
value: 0.281
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.3943
+ value: 1.5587001
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalPosition.z
@@ -842,7 +866,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.344
+ value: 1.6090001
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalPosition.z
@@ -854,15 +878,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -908,7 +932,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8190001
+ value: 1.134
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_LocalPosition.z
@@ -978,13 +1002,21 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
+ - target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.009999999
+ objectReference: {fileID: 0}
+ - target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.009999999
+ objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalPosition.x
value: 0.315
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.746
+ value: 0.20700002
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalPosition.z
@@ -1082,7 +1114,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 983777792}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 1.9530001, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -1203,7 +1235,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8190001
+ value: 1.134
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_LocalPosition.z
@@ -1269,7 +1301,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.283
+ value: 0.6700001
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_LocalPosition.z
@@ -1455,7 +1487,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.7356
+ value: 0.21740007
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalPosition.z
@@ -1467,15 +1499,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1517,7 +1549,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2846526067851582604, guid: 831da7c4cf2a33848b3e7020b4ed2483, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8463001
+ value: 1.1067
objectReference: {fileID: 0}
- target: {fileID: 2846526067851582604, guid: 831da7c4cf2a33848b3e7020b4ed2483, type: 3}
propertyPath: m_LocalPosition.z
@@ -1595,7 +1627,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8363
+ value: 1.1167
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_LocalPosition.z
@@ -1661,7 +1693,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8290001
+ value: 1.124
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_LocalPosition.z
@@ -1862,7 +1894,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.39700007
+ value: 1.556
objectReference: {fileID: 0}
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_LocalPosition.z
@@ -2037,7 +2069,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.81720006
+ value: 1.1358
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalPosition.z
@@ -2049,15 +2081,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2268,7 +2300,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.2996001
+ value: 0.65339994
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalPosition.z
@@ -2280,15 +2312,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2350,7 +2382,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.81720006
+ value: 1.1358
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalPosition.z
@@ -2362,15 +2394,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2651,7 +2683,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.82500005
+ value: 1.128
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_LocalPosition.z
@@ -2877,7 +2909,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.7356
+ value: 0.21740007
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalPosition.z
@@ -2889,15 +2921,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2990,7 +3022,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2846526067851582604, guid: 831da7c4cf2a33848b3e7020b4ed2483, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8463001
+ value: 1.1067
objectReference: {fileID: 0}
- target: {fileID: 2846526067851582604, guid: 831da7c4cf2a33848b3e7020b4ed2483, type: 3}
propertyPath: m_LocalPosition.z
@@ -3194,7 +3226,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.283
+ value: 0.6700001
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_LocalPosition.z
@@ -3667,7 +3699,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.39700007
+ value: 1.556
objectReference: {fileID: 0}
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_LocalPosition.z
@@ -3814,7 +3846,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.2996001
+ value: 0.65339994
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalPosition.z
@@ -3826,15 +3858,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4624,7 +4656,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.8240001
+ value: 1.129
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_LocalPosition.z
@@ -4935,7 +4967,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.344
+ value: 1.6090001
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalPosition.z
@@ -4947,15 +4979,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
index 58ebf22..8ce4c5b 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
@@ -52,7 +52,40 @@ public class Device_3Phase4WireMeter : Device_Base
///
public void Init(bool isIntsalledState)
{
- if(!isIntsalledState)
+ if(isIntsalledState)
+ {
+ Debug.Log("ܱΪʼ״̬");
+ //Ӹ
+ cover.isOpen = false;
+ cover.transform.localPosition = new Vector3(0.0001220703f, 0.01112366f, -0.09854126f);
+ //˿š
+ cover.cover_screw_Left.isInstall = true;
+ cover.cover_screw_Left.transform.localPosition = new Vector3(cover.cover_screw_Left.transform.localPosition.x, cover.cover_screw_Left.initPostionY, cover.cover_screw_Left.transform.localPosition.z);
+ //˿š
+ cover.cover_screw_Right.isInstall = true;
+ cover.cover_screw_Right.transform.localPosition = new Vector3(cover.cover_screw_Right.transform.localPosition.x, cover.cover_screw_Right.initPostionY, cover.cover_screw_Right.transform.localPosition.z);
+ //ӡװ
+ cover.cover_seal_Left.isCut = false;
+ cover.cover_seal_Left.gameObject.SetActive(true);
+ //ҷӡװ
+ cover.cover_seal_Right.isCut = false;
+ cover.cover_seal_Right.gameObject.SetActive(true);
+ //̶˿š
+ fix_screw_left.isInstall = true;
+ fix_screw_left.transform.localPosition = new Vector3(fix_screw_left.transform.localPosition.x, fix_screw_left.initPostionY , fix_screw_left.transform.localPosition.z);
+ //ҹ̶˿š
+ fix_screw_right.isInstall = true;
+ fix_screw_right.transform.localPosition = new Vector3(fix_screw_right.transform.localPosition.x, fix_screw_right.initPostionY , fix_screw_right.transform.localPosition.z);
+ //˿ȫš
+ jieXian_screws.ForEach(a =>
+ {
+ a.isInstall = true;
+ a.transform.localPosition = new Vector3(a.transform.localPosition.x, a.initPostionY, a.transform.localPosition.z);
+ });
+ //
+ namePlate.isChecked = false;
+ }
+ else
{
Debug.Log("ܱΪ״̬");
//Ӳ
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
index ec2d5f4..197ca03 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
@@ -1,3 +1,4 @@
+using Sirenix.Utilities;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -58,6 +59,34 @@ public class Device_MeasuringCabinet : Device_Base
}
+ ///
+ /// ԭ״̬
+ ///
+ public void Init()
+ {
+ //ԭߵܱ
+ meteringDevice.Init(true);
+ //ԭ
+ cabinetDoor.isOpen = false;
+ cabinetDoor.transform.localEulerAngles = Vector3.zero;
+ cabinetDoor.transform.Find("2/3").localEulerAngles = Vector3.zero;
+ //ԭ
+
+ //ԭ߿
+ inSwitch.isOpen = true;
+ inSwitch.transform.localEulerAngles = new Vector3(0, 0, 0);
+ //ԭܱ
+ jieXian_screws.ForEach(screw =>
+ {
+ screw.isConnected = true;
+ screw.transform.localPosition = new Vector3(screw.transform.localPosition.x, screw.InstallPosY, screw.transform.localPosition.z);
+ });
+ //ԭ
+ sundries.gameObject.SetActive(false);
+
+ //ˢ״̬
+ CheckHasElectricity();
+ }
///
/// սߵ˿
diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
index 0ed4947..97e8105 100644
--- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
+++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
@@ -61,34 +61,55 @@ public class StepState_1002 : StepState
{
//
//ȷװ
- PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial();
+
+ //ձ
+ PacksackBagMgr.Instance.ClearAllData();
+ //ԭ
+
}
else if (num == 3006)
{
//ѡȡ
//װõ
- Tool_SelectComponent item1=ToolAndmaterialMgr.Instance.GetItemInfoByName("ȫñ");
- Tool_SelectComponent item2 = ToolAndmaterialMgr.Instance.GetItemInfoByName("");
- Tool_SelectComponent item3 = ToolAndmaterialMgr.Instance.GetItemInfoByName("Ե");
- Tool_SelectComponent item4 = ToolAndmaterialMgr.Instance.GetItemInfoByName("Եѥ");
- PacksackBagMgr.Instance.AddOneToolOrMater(item1.itemInfo);
- PacksackBagMgr.Instance.AddOneToolOrMater(item2.itemInfo);
- PacksackBagMgr.Instance.AddOneToolOrMater(item3.itemInfo);
- PacksackBagMgr.Instance.AddOneToolOrMater(item4.itemInfo);
- Destroy(item1.gameObject);
- Destroy(item2.gameObject);
- Destroy(item3.gameObject);
- Destroy(item4.gameObject);
- //
- PacksackBagMgr.Instance.WearItemState(item1.itemInfo, true);
- PacksackBagMgr.Instance.WearItemState(item2.itemInfo, true);
- PacksackBagMgr.Instance.WearItemState(item3.itemInfo, true);
- PacksackBagMgr.Instance.WearItemState(item4.itemInfo, true);
+ List items=ToolAndmaterialMgr.Instance.GetItemInfoByName(new List { "ȫñ", "", "Ե", "Եѥ" });
+ items.ForEach(item =>
+ {
+ PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo);
+ Destroy(item.gameObject);
+ //
+ PacksackBagMgr.Instance.WearItemState(item.itemInfo, true);
+ });
}
else if (num == 3007)
{
+ //
//ͻͨ
+
+ #region òȷװ
+
+ //ձ
+ PacksackBagMgr.Instance.ClearAllData();
+ //ɷװ
+ List items=ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ȫñ", "", "Ե", "Եѥ" });
+ //뱳
+ items.ForEach(item =>
+ {
+ PacksackBagMgr.Instance.AddOneToolOrMater(item);
+ //
+ PacksackBagMgr.Instance.WearItemState(item, true);
+ });
+ //ɹ
+ List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ǯ", "Ե˿", "", "֤", "װӡ", "Ե", "ߵܱ" });
+ items2.ForEach(item =>
+ {
+ PacksackBagMgr.Instance.AddOneToolOrMater(item);
+ });
+
+ #endregion
+
+ //ԭ
+ SiteManager.instance.measuringCabinet.Init();
}
else if (num == 3008)
{
diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
index 3e94c15..35d4907 100644
--- a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
+++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
@@ -99,6 +99,15 @@ public class PacksackBagMgr : BaseManager
}
}
+ ///
+ /// 清除背包数据
+ ///
+ public void ClearAllData()
+ {
+ wearDic.Clear();
+ toolAndMaterialDic.Clear();
+ }
+
///
/// 拿出背包所有东西
///
@@ -117,8 +126,8 @@ public class PacksackBagMgr : BaseManager
obj.GetComponent().GetInfo();
}
}
- wearDic.Clear();
- toolAndMaterialDic.Clear();
+
+ ClearAllData();
}
///
diff --git a/Assets/Scripts/Project/Manager/TooRoomMannger.cs b/Assets/Scripts/Project/Manager/TooRoomMannger.cs
index df8a050..63e27d8 100644
--- a/Assets/Scripts/Project/Manager/TooRoomMannger.cs
+++ b/Assets/Scripts/Project/Manager/TooRoomMannger.cs
@@ -14,14 +14,17 @@ public class TooRoomMannger : SingletonMono
public Transform shoesSlot;
private List _cancel; //δ
private List _wear; //
- // Start is called before the first frame update
+
void Start()
{
allTMDs = toolParent.GetComponentsInChildren(true);
+
+
_cancel = new List();
_wear = new List();
_cancel = Resources.LoadAll("Materials/CharacterEquip/Cancel").ToList();
_wear = Resources.LoadAll("Materials/CharacterEquip/Wear").ToList();
+
foreach (var tmd in allTMDs)
{
tmd.GetInfo();
@@ -61,3 +64,18 @@ public class TooRoomMannger : SingletonMono
}
}
+
+///
+/// ܹ
+///
+//public class ToolRoomSettingData
+//{
+// public string objname;
+// public Vector3 initPostion;
+
+// public ToolRoomSettingData(string objname, Vector3 initPostion)
+// {
+// this.e_ToolOrDeviceOrMaterials = e_toolOrDeviceOrMaterials;
+// this.initPostion = initPostion;
+// }
+//}
diff --git a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
index 8bcf969..d47afe8 100644
--- a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
+++ b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
@@ -37,13 +37,46 @@ public class ToolAndmaterialMgr : BaseManager
}
///
- /// 获取ItemInfo
+ /// 获取场景中ItemInfo (仅在在工具间场景调用)
///
///
///
- public Tool_SelectComponent GetItemInfoByName(string objName)
+ public List GetItemInfoByName(List objNamelist)
{
- Tool_SelectComponent tmp= GameObject.FindObjectsOfType().ToList().Find(a => a.gameObject.name == objName);
- return tmp;
+ List tmps= new List();
+ objNamelist.ForEach(objName =>
+ {
+ Tool_SelectComponent tmp = GameObject.FindObjectsOfType().ToList().Find(a => a.gameObject.name == objName);
+ tmps.Add(tmp);
+ });
+
+ return tmps;
+ }
+
+ ///
+ /// 生成iteminfo (在其他场景调用)
+ ///
+ ///
+ ///
+ public List CreateItemInfoByName(List objNamelist)
+ {
+ List infos = new List();
+ objNamelist.ForEach(objName =>
+ {
+ D_ToolAndMaterialData dTMD = GetToolOrMaterialOrDeviceInfoByObjName(objName);
+ ItemInfo itemInfo = new ItemInfo();
+ if (dTMD != null)
+ {
+ itemInfo.toolId = dTMD.id;
+ itemInfo.triggerID = dTMD.id;
+ itemInfo.toolName = dTMD.objName;
+ itemInfo.toolOrDeviceOrMaterial = (E_ToolOrDeviceOrMaterials)dTMD.type;
+ itemInfo.objPrefab = Resources.Load("Prefabs/Objects/Tools/" + objName);
+ //itemInfo.selfPosInToolRoom = transform.position;
+ infos.Add(itemInfo);
+ }
+ });
+
+ return infos;
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
index c65b9c3..f004ff0 100644
--- a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
+++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
@@ -56,6 +56,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
itemInfo.toolOrDeviceOrMaterial = (E_ToolOrDeviceOrMaterials)dTMD.type;
gameObject.SetActive(true);
itemInfo.objPrefab = Resources.Load("Prefabs/Objects/Tools/" + gameObject.name);
+ Debug.Log("生成");
itemInfo.selfPosInToolRoom = transform.position;
}
else