diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/绝缘胶带绑线p1.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/绝缘胶带绑线p1.mat index 2fa1692f..50c8efb9 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/绝缘胶带绑线p1.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/绝缘胶带绑线p1.mat @@ -114,12 +114,12 @@ Material: - _UVSec: 0 - _ZWrite: 1 - __dirty: 0 - - _step_p1: 1 - - _step_p2: 1 - - _step_p3: 1 - - _step_p4: 1 - - _step_p5: 1 - - _step_p6: 1 + - _step_p1: 0 + - _step_p2: 0 + - _step_p3: 0 + - _step_p4: 0 + - _step_p5: 0 + - _step_p6: 0 m_Colors: - _BaseCol: {r: 0.23429155, g: 0.28497556, b: 0.3679245, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity b/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity index e66243cd..defe87d0 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity @@ -9424,8 +9424,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432} - m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854} + m_Size: {x: 0.005161286, y: 0.0053709717, z: 0.005163432} + m_Center: {x: 0.0000019068073, y: 0.0026854845, z: -0.00000011960203} --- !u!1 &392085716 GameObject: m_ObjectHideFlags: 0 @@ -22524,20 +22524,10 @@ MonoBehaviour: returnButton: {fileID: 635778594} originalPosition: {x: 0, y: 0, z: 0} originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 274807175} - returnButton: {fileID: 108426143} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - toolObject: {fileID: 1498050634} returnButton: {fileID: 478745220} originalPosition: {x: 0, y: 0, z: 0} originalRotation: {x: 0, y: 0, z: 0, w: 0} - onladderTools: - - {fileID: 945637454} - - {fileID: 724345513} - - {fileID: 798421952} - - {fileID: 274807175} - - {fileID: 1498050634} PlayercameraTrans: {fileID: 1035373398} Fieldobservation: {fileID: 616989521} --- !u!4 &1039753534 @@ -23204,8 +23194,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432} - m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854} + m_Size: {x: 0.005161286, y: 0.005798218, z: 0.005163432} + m_Center: {x: 0.0000019067827, y: 0.0028991075, z: -0.00000011961477} --- !u!1 &1074012515 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity index 4f46d288..8766767c 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity @@ -3739,8 +3739,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432} - m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854} + m_Size: {x: 0.005161286, y: 0.0092161875, z: 0.005163432} + m_Center: {x: 0.0000019065862, y: 0.004608092, z: -0.00000011971663} --- !u!4 &177045583 stripped Transform: m_CorrespondingSourceObject: {fileID: 8378556726591945539, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} @@ -5387,8 +5387,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432} - m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854} + m_Size: {x: 0.005161286, y: 0.009460328, z: 0.005163432} + m_Center: {x: 0.0000019065723, y: 0.004730162, z: -0.00000011972391} --- !u!1 &286447742 GameObject: m_ObjectHideFlags: 0 @@ -27843,20 +27843,10 @@ MonoBehaviour: returnButton: {fileID: 1869768458} originalPosition: {x: 0, y: 0, z: 0} originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 1485260145} - returnButton: {fileID: 156402808} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - toolObject: {fileID: 2018635915} returnButton: {fileID: 587729411} originalPosition: {x: 0, y: 0, z: 0} originalRotation: {x: 0, y: 0, z: 0, w: 0} - onladderTools: - - {fileID: 4441233656616589336} - - {fileID: 1112936940} - - {fileID: 588400109} - - {fileID: 1485260145} - - {fileID: 2018635915} PlayercameraTrans: {fileID: 6121626523118833240} Fieldobservation: {fileID: 6121626523908351180} --- !u!1 &1511629609 diff --git a/SXElectricityInformationAcquisition/Assets/ToolManager.cs b/SXElectricityInformationAcquisition/Assets/ToolManager.cs index dfa44034..5119dca8 100644 --- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs +++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs @@ -116,54 +116,54 @@ public class ToolManager : MonoBehaviour } } } - public void HandleStringEvent(string message) - { - if (generateAreaScript.IsPlayerInArea()) - { - if (message == "") - { - Tool[0].gameObject.SetActive(true); - Ladder.instance.Init(); - } - if (message == "֤") - { - Tool[1].gameObject.SetActive(true); - } - if (message == "ǯ") - { - Tool[2].gameObject.SetActive(true); - RetractBtn[0].gameObject.SetActive(true); - } - if (message == "") - { - Tool[3].gameObject.SetActive(true); - RetractBtn[1].gameObject.SetActive(true); - } - if (message == "˿") - { - Tool[4].gameObject.SetActive(true); - RetractBtn[2].gameObject.SetActive(true); - } - if (message == "Ե") - { - Tool[5].gameObject.SetActive(true); - RetractBtn[3].gameObject.SetActive(true); - } + //public void HandleStringEvent(string message) + //{ + // if (generateAreaScript.IsPlayerInArea()) + // { + // if (message == "") + // { + // Tool[0].gameObject.SetActive(true); + // Ladder.instance.Init(); + // } + // if (message == "֤") + // { + // Tool[1].gameObject.SetActive(true); + // } + // if (message == "ǯ") + // { + // Tool[2].gameObject.SetActive(true); + // RetractBtn[0].gameObject.SetActive(true); + // } + // if (message == "") + // { + // Tool[3].gameObject.SetActive(true); + // RetractBtn[1].gameObject.SetActive(true); + // } + // if (message == "˿") + // { + // Tool[4].gameObject.SetActive(true); + // RetractBtn[2].gameObject.SetActive(true); + // } + // if (message == "Ե") + // { + // Tool[5].gameObject.SetActive(true); + // RetractBtn[3].gameObject.SetActive(true); + // } - if (message == "lͼ") - { - Tool[6].gameObject.SetActive(true); - RetractBtn[4].gameObject.SetActive(true); - } - if (message == "װӡ") - { - Tool[7].gameObject.SetActive(true); - RetractBtn[5].gameObject.SetActive(true); - } + // if (message == "lͼ") + // { + // Tool[6].gameObject.SetActive(true); + // RetractBtn[4].gameObject.SetActive(true); + // } + // if (message == "װӡ") + // { + // Tool[7].gameObject.SetActive(true); + // RetractBtn[5].gameObject.SetActive(true); + // } - Debug.Log("Received message: " + message); - } - } + // Debug.Log("Received message: " + message); + // } + //} public void HandleStringEvents(string message) { if (generateAreaScript.IsPlayerInArea()) diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs index 6247136d..b7a63381 100644 --- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs +++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs @@ -28,7 +28,7 @@ public class TooslManager : MonoBehaviour /// /// ʹõĹ /// - public GameObject[] onladderTools; + // public GameObject[] onladderTools; public Transform PlayercameraTrans; @@ -96,11 +96,11 @@ public class TooslManager : MonoBehaviour // tool.SetActive(true); // } //} - void ToggleTools(bool activate) - { - foreach (GameObject tool in onladderTools) - { - tool.SetActive(activate); - } - } + //void ToggleTools(bool activate) + //{ + // foreach (GameObject tool in onladderTools) + // { + // tool.SetActive(activate); + // } + //} }