Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab

@@ -5908,15 +5908,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8116758301364444328, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -7104531441027181592, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -6135323959174509748, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -5260060894338397145, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -5932,7 +5932,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -3094519758374681016, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -3013769497943921491, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalScale.x
@@ -5956,7 +5956,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1437794174185993398, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1934297243589407246, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalPosition.y
@@ -5992,23 +5992,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2097911494752482903, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2337052985069988118, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3306945913174669214, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3587840515185738510, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4100218984641909529, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5213865969853075656, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_DirtyAABB
@@ -6044,11 +6044,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6464544102738605386, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_TagString

Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs

@@ -12,19 +12,21 @@ public class CameraControl : MonoBehaviour
         fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
         fieldView = Mathf.Clamp(fieldView, 30, 60);
         playerCamera.fieldOfView = fieldView;
+        if (GameManager.ins.temp&& !GameManager.ins.temp.name.Equals("ǯÐεçÁ÷±í(Clone)"))
+        {
             switch (fieldView / 10)
             {
                 case 3:
-
+                    GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.53f, 1.10f);
                     break;
                 case 4:
-
+                    GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.63f, 0.82f);
                     break;
                 case 5:
-
+                    GameManager.ins.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
                     break;
                 case 6:
-
+                    GameManager.ins.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
                     break;
                 default:
                     break;
@@ -32,6 +34,8 @@ public class CameraControl : MonoBehaviour
         }
         
     }
+
+}
 ////声明部分public float horizontalinput;
 /////水平参数public float Verticalinput;
 /////垂直参数float speed=10.0f;

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -63,7 +63,7 @@ public class GameManager : MonoBehaviour
             interactiveEnum = Interactive.none;
             FirstPersonController.enabled = true;
         });
-        string sceneInfo = "三相_无互感器_无光伏";
+        string sceneInfo = GlobalFlag.SceneInfo();
         var tempStr = sceneInfo.Split('_');
         int pvwCount = (GlobalFlag.pvw * 1000) / 295;
         if (tempStr[tempStr.Length-1].Equals("Óйâ·ü"))

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.15",
+        "com.unity.ide.rider": "3.0.16",
         "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.0.1"
+        "com.unity.testtools.codecoverage": "1.2.2"
       }
     },
     "com.unity.ide.rider": {
@@ -92,7 +92,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.services.core": {
-      "version": "1.4.2",
+      "version": "1.6.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -121,7 +121,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.0.1",
+      "version": "1.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {

Electrical_inspectionCompetitionSystem/ProjectSettings/DynamicsManager.asset

@@ -18,7 +18,7 @@ PhysicsManager:
   m_ClothInterCollisionDistance: 0
   m_ClothInterCollisionStiffness: 0
   m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: 7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefeffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: 7ffefffffffffffffffffffffffffffffffffffffffffffffffffffffefeffff7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1