From 517e50cac54262517fa8b4950aaf85a6df248f0e Mon Sep 17 00:00:00 2001
From: huangjiayu <2453663605@qq.com>
Date: Sun, 17 Sep 2023 16:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Adam/Scripts/ShowNameplate.cs      |  2 +-
 .../Assets/Scenes/农家乐.unity                | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs
index d7507528..0e399bc6 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs
@@ -44,7 +44,7 @@ public class ShowNameplate : MonoBehaviour
         NameplateController.Instance.backTransform.sizeDelta = bg / multiple + new Vector2(40, 40);
         NameplateController.Instance.NameplateImage.rectTransform.sizeDelta = bg / multiple;
 
-        //NameplateController.Instance.mtTransform.sizeDelta = new Vector2(NameplateController.Instance.backTransform.sizeDelta.x, mt.y);
+        NameplateController.Instance.mtTransform.sizeDelta = new Vector2(NameplateController.Instance.backTransform.sizeDelta.x, 100f);
 
         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 b32b551c..b7c877ed 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
@@ -26691,7 +26691,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_RootOrder
-      value: 23
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_LocalPosition.x
@@ -32256,7 +32256,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_RootOrder
-      value: 20
+      value: 19
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_LocalPosition.x
@@ -41908,7 +41908,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1064186729
 MonoBehaviour:
@@ -54455,7 +54455,7 @@ Transform:
   m_Children:
   - {fileID: 772200475}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1437685154
 PrefabInstance:
@@ -67573,7 +67573,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 3
   m_TargetDisplay: 0
 --- !u!224 &1797272991
 RectTransform:
@@ -71883,7 +71883,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
       propertyPath: m_LocalPosition.x
@@ -75291,7 +75291,7 @@ Transform:
   - {fileID: 1446289608}
   - {fileID: 696764694}
   m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1987230714
 GameObject:
@@ -82447,7 +82447,7 @@ Transform:
   - {fileID: 8278156440674586169}
   - {fileID: 1472106633}
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &554189251323931874
 MonoBehaviour:
@@ -92170,7 +92170,7 @@ Transform:
   - {fileID: 4250994751310936222}
   - {fileID: 2401820166598484376}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 83.982, z: 0}
 --- !u!33 &2401820165377604995
 MeshFilter:
@@ -94661,7 +94661,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
       propertyPath: m_LocalPosition.x
@@ -128688,7 +128688,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5537173360887175222, guid: 15526cc793435654cad09098a46a9caf, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5537173360887175222, guid: 15526cc793435654cad09098a46a9caf, type: 3}
       propertyPath: m_LocalPosition.x