diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/NameplateController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/NameplateController.cs index edbe4c15..a242f9e9 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/NameplateController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/NameplateController.cs @@ -19,7 +19,7 @@ public class NameplateController : MonoSingleton private void Start() { - AddNameplateClick(); + Invoke("AddNameplateClick",5.0f); } public void AddNameplateClick() diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs index a04781e1..d7507528 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs @@ -31,7 +31,7 @@ public class ShowNameplate : MonoBehaviour case "低压互感器铭牌": multiple = 1.0f; break; - case "光伏并网逆变器_铭牌": + case "2号逆变器_铭牌_正确": multiple = 3.0f; break; case "光伏板_铭牌": @@ -41,14 +41,10 @@ public class ShowNameplate : MonoBehaviour Vector2 bg = NameplateController.Instance.NameplateImage.rectTransform.sizeDelta; - float x = bg.x / multiple; - float y = bg.y / multiple; - bg = new Vector2(x,y); - NameplateController.Instance.backTransform.sizeDelta = bg + new Vector2(40, 40); - NameplateController.Instance.NameplateImage.rectTransform.sizeDelta = bg; + NameplateController.Instance.backTransform.sizeDelta = bg / multiple + new Vector2(40, 40); + NameplateController.Instance.NameplateImage.rectTransform.sizeDelta = bg / multiple; - Vector2 mt = NameplateController.Instance.mtTransform.sizeDelta; - NameplateController.Instance.mtTransform.sizeDelta = new Vector2(NameplateController.Instance.backTransform.sizeDelta.x, mt.y); + //NameplateController.Instance.mtTransform.sizeDelta = new Vector2(NameplateController.Instance.backTransform.sizeDelta.x, mt.y); NameplateController.Instance.DictextMeshPro[myName].text = "300"; NameplateController.Instance.DictextMeshPro[myName].gameObject.SetActive(true); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/鍐滃涔.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/鍐滃涔.unity index 3fd0b05c..9cdf1b65 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/鍐滃涔.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/鍐滃涔.unity @@ -46390,7 +46390,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5475814894836966473, guid: 74bae246c73626f4d80059eda580593f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74bae246c73626f4d80059eda580593f, type: 3}