diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
index c70bf1b7..91f3bfb0 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
@@ -3627,8 +3627,6 @@ GameObject:
- component: {fileID: 5628285356639401483}
- component: {fileID: 1466767362190688725}
- component: {fileID: 6395429860798199179}
- - component: {fileID: 6724356607303599370}
- - component: {fileID: 3192312147718851319}
m_Layer: 0
m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u538B_A\u76F8_\u6B63\u786E"
m_TagString: Untagged
@@ -3647,8 +3645,7 @@ Transform:
m_LocalPosition: {x: 2.3920794, y: 0.67994374, z: -0.31451344}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1736251263084467383}
+ m_Children: []
m_Father: {fileID: 1454913978642549817}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3702,39 +3699,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &6724356607303599370
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2834405563394974423}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 4314733556764735260, guid: 3c10a05dd7008c34d837451c78491571, type: 3}
---- !u!114 &3192312147718851319
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2834405563394974423}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isInteractive: 0
- g1: {fileID: 5325271450725069806}
- name:
- linearMeasure: 0
- floats: []
- Fuan: 2
- unit: A
--- !u!1 &2850252329512971376
GameObject:
m_ObjectHideFlags: 0
@@ -6275,37 +6239,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &5325271450725069806
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1736251263084467383}
- m_Layer: 0
- m_Name: Cube
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1736251263084467383
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5325271450725069806}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.00727, y: -0.15304, z: 0}
- m_LocalScale: {x: 0.005, y: 0.005, z: 0.005}
- m_ConstrainProportionsScale: 1
- m_Children: []
- m_Father: {fileID: 5628285356639401483}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5478729078447363518
GameObject:
m_ObjectHideFlags: 0
@@ -10146,7 +10079,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -7959428157999269440, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
propertyPath: m_LocalPosition.z
- value: 321.201
+ value: 321.206
objectReference: {fileID: 0}
- target: {fileID: -7959428157999269440, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
propertyPath: m_LocalRotation.w
@@ -10249,8 +10182,8 @@ GameObject:
m_CorrespondingSourceObject: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
m_PrefabInstance: {fileID: 2384626891547736126}
m_PrefabAsset: {fileID: 0}
---- !u!64 &591350019840623951
-MeshCollider:
+--- !u!65 &7543020873635088253
+BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -10259,10 +10192,9 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
- serializedVersion: 4
- m_Convex: 1
- m_CookingOptions: 30
- m_Mesh: {fileID: -688124394491253374, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
+ serializedVersion: 2
+ m_Size: {x: 0.017715812, y: 0.7307945, z: 0.95005375}
+ m_Center: {x: 0.027794212, y: -0.3566327, z: 0.0007122159}
--- !u!114 &4094150410768700923
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
index 52ecb94c..950b542f 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
@@ -84,7 +84,7 @@ public class GameManager : MonoBehaviour
GameObject obj = Instantiate(Inverter[i]);
obj.transform.localPosition = biaojiPos.localPosition;
obj.transform.localEulerAngles = biaojiPos.localEulerAngles;
- interactive.Add(obj.GetComponentInChildren<door_control>().gameObject) ;
+ interactive.Add(obj.GetComponentInChildren<door_control>().gameObject);
}
}
}
@@ -114,10 +114,10 @@ public class GameManager : MonoBehaviour
default:
break;
}
- if (Input.GetKeyDown(KeyCode.K))
- {
- ToolsShow(QianXing);
- }
+ //if (Input.GetKeyDown(KeyCode.K))
+ //{
+ // ToolsShow(QianXing);
+ //}
}
/// <summary>
/// �������ɷ���
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/TestPenInteractive.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/TestPenInteractive.cs
index aaaa06ab..1011c492 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/TestPenInteractive.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/TestPenInteractive.cs
@@ -24,7 +24,7 @@ public class TestPenInteractive : MonoBehaviour
//1.����ray Ϊ������ײ���Ĺ���(����һ�����������Ļ���λ�õĹ���)
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit;
- if (Physics.Raycast(ray, out hit, 50)) //�����ײ������
+ if (Physics.Raycast(ray, out hit, 100)) //�����ײ������
{
if (hit.collider.transform.tag.Equals("YanDian"))
{
@@ -47,7 +47,7 @@ public class TestPenInteractive : MonoBehaviour
g1.SetActive(false);
}
}
-
+
}
}
}
@@ -56,7 +56,7 @@ public class TestPenInteractive : MonoBehaviour
g1.SetActive(false);
transform.parent = GameManager.ins.Player.transform;
transform.localPosition = new Vector3(0.307f, 0.504f, 0.654f);
- transform.localEulerAngles = new Vector3(-180,-180,180);
+ transform.localEulerAngles = new Vector3(-180, -180, 180);
}
}
private void OnDisable()