12121

Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition
同步
2023-09-18 06:17:22 +08:00 · 2023-09-18 06:14:19 +08:00 · 2023-09-18 06:14:14 +08:00
4 changed files with 329 additions and 20 deletions
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/ThreeTransformerPhotovoltaicData.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/ThreeTransformerPhotovoltaicData.cs
@ -22,6 +22,8 @@ namespace ttpData
    [Serializable]
    public class Data
    {
+        public string zhbl;
+        public string yxrl;
        public string[] rdj;
        public string qxA;
        public string qxB;
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs
@ -35,21 +35,22 @@ namespace Adam
            SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]);
            GlobalFlag.sceneData = sceneInfoData;
            GlobalFlag.pvw = ExamusersController.Instance.GetPVWByUseNo(userID.text);
-            switch (tt[3])
-            {
-                case "自建房场景":
-                    SceneLoad.Instance.SceneChange("居民自建");
-                    break;
-                case "农家乐场景":
-                    SceneLoad.Instance.SceneChange("农家乐");
-                    break;
-                case "小商户场景":
-                    SceneLoad.Instance.SceneChange("小商户");
-                    break;
-                case "农贸市场场景":
-                    SceneLoad.Instance.SceneChange("农贸市场");
-                    break;
-            }
+            SceneLoad.Instance.SceneChange(tt[3]);
+            //switch (tt[3])
+            //{
+            //    case "自建房场景":
+            //        SceneLoad.Instance.SceneChange("居民自建");
+            //        break;
+            //    case "农家乐场景":
+            //        SceneLoad.Instance.SceneChange("农家乐");
+            //        break;
+            //    case "小商户场景":
+            //        SceneLoad.Instance.SceneChange("小商户");
+            //        break;
+            //    case "农贸市场场景":
+            //        SceneLoad.Instance.SceneChange("农贸市场");
+            //        break;
+            //}
            SwitchPanel();
            UIManager.Instance.backToToolBtn.gameObject.SetActive(true);
        }
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
@ -370,6 +370,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 828261942}
  name: "\u7528\u7535_AA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &802787404017427454
 MeshCollider:
  m_ObjectHideFlags: 0
@ -561,6 +564,8 @@ GameObject:
  - component: {fileID: 1278288147205125454}
  - component: {fileID: 8320404840817262237}
  - component: {fileID: 2933440632977776610}
+  - component: {fileID: 1430584271966503639}
+  - component: {fileID: 4282438891055449266}
  m_Layer: 0
  m_Name: "\u8BA1\u91CF\u8868_\u6309\u94AE_\u4E0A002"
  m_TagString: Untagged
@ -633,6 +638,46 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &1430584271966503639
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 364215905846846160}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.00881958, y: 0.016798094, z: 0.010143056}
+  m_Center: {x: -0.000000059604645, y: -0.0000066785133, z: 0.00000034458935}
+--- !u!114 &4282438891055449266
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 364215905846846160}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c7884dee69b6a34d9fb51800efe59f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onMouseDwon:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8383901371750192783}
+        m_TargetAssemblyTypeName: Views.ThreeTransformerPhotovoltaicView, Assembly-CSharp
+        m_MethodName: OnUp
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &367645293117803107
 GameObject:
  m_ObjectHideFlags: 0
@ -644,6 +689,8 @@ GameObject:
  - component: {fileID: 6410156867785914120}
  - component: {fileID: 7854859249840885272}
  - component: {fileID: 6253669163026534955}
+  - component: {fileID: 3932038801141271538}
+  - component: {fileID: 8664020790121978656}
  m_Layer: 0
  m_Name: "\u8BA1\u91CF\u8868_\u6309\u94AE_\u4E0B002"
  m_TagString: Untagged
@ -716,6 +763,46 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &3932038801141271538
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 367645293117803107}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.00881958, y: 0.01679809, z: 0.010143056}
+  m_Center: {x: -0.000000059604645, y: -0.0000066766506, z: 0.00000030733645}
+--- !u!114 &8664020790121978656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 367645293117803107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c7884dee69b6a34d9fb51800efe59f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onMouseDwon:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8383901371750192783}
+        m_TargetAssemblyTypeName: Views.ThreeTransformerPhotovoltaicView, Assembly-CSharp
+        m_MethodName: OnDown
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &414747018099015702
 GameObject:
  m_ObjectHideFlags: 0
@ -997,6 +1084,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 5510298771229176834}
  name: "\u7528\u7535_CA3"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!1 &882740240257928397
 GameObject:
  m_ObjectHideFlags: 0
@ -1627,6 +1717,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 978512685}
  name: "\u7528\u7535_BA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &3779270377983782145
 MeshCollider:
  m_ObjectHideFlags: 0
@ -1825,6 +1918,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 474222391}
  name: "\u7528\u7535_CA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &9124662342473540606
 MeshCollider:
  m_ObjectHideFlags: 0
@ -2366,6 +2462,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 5510298771229176834}
  name: "\u7528\u7535_BA3"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &203956982629035202
 MeshCollider:
  m_ObjectHideFlags: 0
@ -2512,6 +2611,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 114521831}
  name: "\u7528\u7535_AA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &8330858888387296803
 MeshCollider:
  m_ObjectHideFlags: 0
@ -3020,6 +3122,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 7958380611471871807}
  name: "\u7528\u7535_AA3"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &7137907560168321248
 MeshCollider:
  m_ObjectHideFlags: 0
@ -3550,6 +3655,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 877527174}
  name: "\u7528\u7535_CA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &1191074510302990370
 MeshCollider:
  m_ObjectHideFlags: 0
@ -4763,6 +4871,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 5510298771229176834}
  name: "\u7528\u7535_AA3"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &1483003281333461482
 MeshCollider:
  m_ObjectHideFlags: 0
@ -5127,6 +5238,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 5510298771229176834}
  name: "\u7528\u7535_BA3"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &3459726206515330861
 MeshCollider:
  m_ObjectHideFlags: 0
@ -6269,6 +6383,7 @@ Transform:
  - {fileID: 5612271452311232281}
  - {fileID: 1454913978642549817}
  - {fileID: 7006305552974435347}
+  - {fileID: 8383901371750192782}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9011,6 +9126,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 1632693535}
  name: "\u7528\u7535_BA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &7267157407081037942
 MeshCollider:
  m_ObjectHideFlags: 0
@ -9126,6 +9244,9 @@ MonoBehaviour:
  isInteractive: 0
  g1: {fileID: 5510298771229176834}
  name: "\u7528\u7535_CA3"
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
 --- !u!64 &2307476709251360141
 MeshCollider:
  m_ObjectHideFlags: 0
@ -9599,7 +9720,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
@ -9746,3 +9867,188 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 8695571647825121107, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3}
  m_PrefabInstance: {fileID: 4318846428091722587}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5758022577365625768
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3739678117119996221}
+    m_Modifications:
+    - target: {fileID: 4301222306241434058, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.3745
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222306241434058, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.2414
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538273, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_Name
+      value: "\u7528\u7535"
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.size
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[0]
+      value: 
+      objectReference: {fileID: 21300000, guid: 2cc1158dacf4188439f871079ec30ef1, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[1]
+      value: 
+      objectReference: {fileID: 21300000, guid: ffa5fef008e78f6469e9a103886d9abc, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[2]
+      value: 
+      objectReference: {fileID: 21300000, guid: e47a14287d4f78f42892cf161092e3da, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[3]
+      value: 
+      objectReference: {fileID: 21300000, guid: 70151b92e4bdf44458d9c2962781bac3, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[4]
+      value: 
+      objectReference: {fileID: 21300000, guid: 4bb2e45c9feb39946904d631a44d35c9, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[5]
+      value: 
+      objectReference: {fileID: 21300000, guid: 4607df0c6d0eb4f4fa983ec0995e0cd1, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[6]
+      value: 
+      objectReference: {fileID: 21300000, guid: 598012a979056a742bd5d9dc03576390, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[7]
+      value: 
+      objectReference: {fileID: 21300000, guid: 3b9bcd25989cd884e81fe09f4928e324, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[8]
+      value: 
+      objectReference: {fileID: 21300000, guid: d80f734b730657b40a0e06c333496a95, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[9]
+      value: 
+      objectReference: {fileID: 21300000, guid: 16961d3b6dd95c2449dbb235fec3c663, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[10]
+      value: 
+      objectReference: {fileID: 21300000, guid: 9f2a43a8273750646983e3fc3282f76d, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[11]
+      value: 
+      objectReference: {fileID: 21300000, guid: b1a2cc1b032c55d43b8f5181ec45bb4f, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[12]
+      value: 
+      objectReference: {fileID: 21300000, guid: 1ea169a73f0255a45a7ab3fbf0040e4a, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[13]
+      value: 
+      objectReference: {fileID: 21300000, guid: bcf30d516ae939e4a867731028976cce, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[14]
+      value: 
+      objectReference: {fileID: 21300000, guid: abeff76727423e14c9c196dd0cca9850, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[15]
+      value: 
+      objectReference: {fileID: 21300000, guid: 1aa5bf59efd74134ca95d18ee9339eb8, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[16]
+      value: 
+      objectReference: {fileID: 21300000, guid: 61a79eb053d6a4f4094ee67b4e77a981, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[17]
+      value: 
+      objectReference: {fileID: 21300000, guid: c5fa4b65c19c1db499e481f148ceef05, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[18]
+      value: 
+      objectReference: {fileID: 21300000, guid: 2acc388130074704782d22d537f356c4, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[19]
+      value: 
+      objectReference: {fileID: 21300000, guid: 91a7b932aaeda4e40b7d6b463830abf9, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[20]
+      value: 
+      objectReference: {fileID: 21300000, guid: 7d573be09ed7de444bca9ad37ec54025, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[21]
+      value: 
+      objectReference: {fileID: 21300000, guid: 639f4b603bfc6874d9f3f23902177584, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[22]
+      value: 
+      objectReference: {fileID: 21300000, guid: 58eb0e6b3720e554a93b6f4d8b936921, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[23]
+      value: 
+      objectReference: {fileID: 21300000, guid: b21e10ac7878ef74b8b292f81e4d58c4, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[24]
+      value: 
+      objectReference: {fileID: 21300000, guid: a007627423235514285d396e2b6a0520, type: 3}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+--- !u!4 &8383901371750192782 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+  m_PrefabInstance: {fileID: 5758022577365625768}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8383901371750192783 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+  m_PrefabInstance: {fileID: 5758022577365625768}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a74b3d6930f8a554d8a7f3470d698b8d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
+++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
@ -35,12 +35,12 @@
      "source": "builtin",
      "dependencies": {
        "com.unity.ide.visualstudio": "2.0.16",
-        "com.unity.ide.rider": "3.0.16",
+        "com.unity.ide.rider": "3.0.15",
        "com.unity.ide.vscode": "1.2.5",
        "com.unity.editorcoroutines": "1.0.0",
        "com.unity.performance.profile-analyzer": "1.1.1",
        "com.unity.test-framework": "1.1.31",
-        "com.unity.testtools.codecoverage": "1.2.2"
+        "com.unity.testtools.codecoverage": "1.0.1"
      }
    },
    "com.unity.ide.rider": {
@ -92,7 +92,7 @@
      "url": "https://packages.unity.cn"
    },
    "com.unity.services.core": {
-      "version": "1.6.0",
+      "version": "1.4.2",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@ -121,7 +121,7 @@
      "url": "https://packages.unity.cn"
    },
    "com.unity.testtools.codecoverage": {
-      "version": "1.2.2",
+      "version": "1.0.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
Author	SHA1	Message	Date
YangHua	28dfae8927	12121	2023-09-18 06:17:22 +08:00
YangHua	6e777986de	Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition	2023-09-18 06:14:19 +08:00
YangHua	8c9dd59fb1	同步	2023-09-18 06:14:14 +08:00