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

Electrical_inspectionCompetitionSystem/Assets/02_ui/农家乐.jpg.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 0128dc9a1e444534ea6027038c8425ec
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -5906,6 +5906,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -8116758301364444328, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: -7104531441027181592, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: -6135323959174509748, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
     - target: {fileID: -5260060894338397145, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -0.00006103506
@@ -5918,6 +5930,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0.00016784667
       objectReference: {fileID: 0}
+    - target: {fileID: -3094519758374681016, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
     - target: {fileID: -3013769497943921491, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalScale.x
       value: 0.5318197
@@ -5938,6 +5954,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1437794174185993398, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
     - target: {fileID: 1934297243589407246, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalPosition.y
       value: 1.2
@@ -5970,6 +5990,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2097911494752482903, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337052985069988118, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 3306945913174669214, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 3587840515185738510, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4100218984641909529, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
     - target: {fileID: 5213865969853075656, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_DirtyAABB
       value: 0
@@ -6002,6 +6042,14 @@ PrefabInstance:
       propertyPath: m_BlendShapeWeights.Array.size
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6464544102738605386, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
     - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_TagString
       value: YanDian

Electrical_inspectionCompetitionSystem/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs

@@ -136,7 +136,7 @@ public class FirstPersonController : MonoBehaviour
 
     #endregion
 
-    float fieldView;
+    
 
     private void Awake()
     {
@@ -369,11 +369,7 @@ public class FirstPersonController : MonoBehaviour
         #endregion
 
         CheckGround();
-        fieldView = playerCamera.fieldOfView;
+       
-        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
-        fieldView = Mathf.Clamp(fieldView, 20, 60);
-        playerCamera.fieldOfView = fieldView;
-
 
 
         if (enableHeadBob)

Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/工作证.prefab

@@ -135,7 +135,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6219929193322986586}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 10.199997, y: 0.25000054, z: 8}

Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity

@@ -3277,7 +3277,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   stopValveImage: {fileID: 1948143378}
   timeCount: 0
-  limitTime: 0.15
+  limitTime: 0.1
   linearMeasure: 0
   index: 0
   currentPos: {x: 0, y: 0}
@@ -9081,18 +9081,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 273619910}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: -1, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1850967338}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 628.0852, y: 416.18}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 1257.478, y: 634.334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &273619912
 MonoBehaviour:
@@ -9114,7 +9114,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c8fcf47c17936f7458d3aa720704205e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0128dc9a1e444534ea6027038c8425ec, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12980,7 +12980,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 30
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &388288287
 GameObject:
@@ -18637,7 +18637,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   stopValveImage: {fileID: 1752228207}
   timeCount: 0
-  limitTime: 0.2
+  limitTime: 0.1
   linearMeasure: 0
   index: 0
   currentPos: {x: 0, y: 0}
@@ -26671,7 +26671,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -26961,7 +26961,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_RootOrder
-      value: 23
+      value: 24
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_LocalPosition.x
@@ -32528,7 +32528,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_RootOrder
-      value: 20
+      value: 21
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_LocalPosition.x
@@ -32590,6 +32590,10 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2249601072385645600, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2249601072385645600, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_StaticEditorFlags
       value: 0
@@ -32612,6 +32616,29 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: e3c135b4872f7f149af512e1721355da, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
+--- !u!1 &854357933 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3451149981163930307, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
+  m_PrefabInstance: {fileID: 854357932}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &854357934
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 854357933}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 12.643806, y: 39.59106, z: 4.8362184}
+  m_Center: {x: 11.109867, y: -3.9301128, z: 2.4181106}
+--- !u!4 &854357935 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -5076147426688453975, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
+  m_PrefabInstance: {fileID: 854357932}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &855158950
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -34621,7 +34648,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &905697366
 MonoBehaviour:
@@ -37754,6 +37781,51 @@ Transform:
   m_Father: {fileID: 1745594328}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &960870798
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 960870800}
+  - component: {fileID: 960870799}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &960870799
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960870798}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!4 &960870800
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960870798}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 98.2331, y: 2.0826, z: 298.2952}
+  m_LocalScale: {x: 25.657972, y: 5.1652, z: 12.9896}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 20
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &963586247
 GameObject:
   m_ObjectHideFlags: 0
@@ -38335,7 +38407,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 31
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &977773623
 PrefabInstance:
@@ -49253,6 +49325,51 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1268342221}
   m_Mesh: {fileID: 3564021358373180619, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
+--- !u!1 &1268459357
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1268459358}
+  - component: {fileID: 1268459359}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1268459358
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1268459357}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 8.532, y: -15.469, z: 0.3551}
+  m_LocalScale: {x: 39.387344, y: 0.1235377, z: 1.7102}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 854357935}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1268459359
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1268459357}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &1269524962
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -50599,7 +50716,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3}
       propertyPath: m_RootOrder
-      value: 26
+      value: 27
       objectReference: {fileID: 0}
     - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3}
       propertyPath: m_LocalScale.x
@@ -54345,8 +54462,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1425909734}
-  m_LocalRotation: {x: 0.26166272, y: 0.68143034, z: -0.28754756, w: 0.62008214}
+  m_LocalRotation: {x: 0.036638454, y: 0.94280463, z: -0.31224412, w: 0.110818714}
-  m_LocalPosition: {x: 81.89592, y: 21.541733, z: 317.80313}
+  m_LocalPosition: {x: 92.73303, y: 18.33218, z: 339.1505}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -64246,6 +64363,39 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3}
   m_PrefabInstance: {fileID: 1679712370}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1679712372 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3}
+  m_PrefabInstance: {fileID: 1679712370}
+  m_PrefabAsset: {fileID: 0}
+--- !u!136 &1679712373
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1679712372}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.4
+  m_Height: 1.8
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.9, z: 0}
+--- !u!114 &1679712374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1679712372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d4a7a090670be304ebe50e87679d3257, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isWorkingPersonnel: 0
+  game: {fileID: 8536413114597608434}
 --- !u!1 &1680200294
 GameObject:
   m_ObjectHideFlags: 0
@@ -67969,7 +68119,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
       propertyPath: m_RootOrder
-      value: 25
+      value: 26
       objectReference: {fileID: 0}
     - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
       propertyPath: m_LocalPosition.x
@@ -70328,7 +70478,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 2401820166666229530}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -76037,7 +76187,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:
@@ -92852,7 +93002,7 @@ Transform:
   - {fileID: 4240377296742345613}
   - {fileID: 50144230157523243}
   m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!4 &2397982214548926677
 Transform:
@@ -93118,6 +93268,7 @@ GameObject:
   - component: {fileID: 2401820165377604996}
   - component: {fileID: 2067264123610548656}
   - component: {fileID: 2401820165377604997}
+  - component: {fileID: 2401820165377605007}
   m_Layer: 0
   m_Name: Player
   m_TagString: Player
@@ -93125,6 +93276,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &2401820165377605007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2401820165377605006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03962d1a310647749949f007b0d3edb7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  playerCamera: {fileID: 2401820166666229530}
 --- !u!4 &2401820166598484376
 Transform:
   m_ObjectHideFlags: 0
@@ -100583,7 +100747,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4250994750885528243}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 72.8, z: 0}
+  m_LocalPosition: {x: 0, y: 57.3, z: 0}
   m_LocalScale: {x: 2.2007926, y: -0.015401587, z: 2.2007926}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -141505,7 +141669,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3}
       propertyPath: m_RootOrder
-      value: 24
+      value: 25
       objectReference: {fileID: 0}
     - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3}
       propertyPath: m_LocalPosition.x

Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs

@@ -21,7 +21,7 @@ public class AmpereMeter : MonoBehaviour
         if (Input.GetMouseButton(0))
         {
             //1.参数ray 为射线碰撞检测的光线(返回一个从相机到屏幕鼠标位置的光线)
-            Ray ray = cam.ScreenPointToRay(Input.mousePosition);
+            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
             RaycastHit hit;
             if (Physics.Raycast(ray, out hit, 50) && !EventSystem.current.IsPointerOverGameObject()) //如果碰撞检测到物体
             {

Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs

@@ -4,148 +4,33 @@ using UnityEngine;
 
 public class CameraControl : MonoBehaviour
 {
-    public static CameraControl Instance { private set; get; }
+    float fieldView;
-    public float minDis = 0.5f;
+    public Camera playerCamera;
-    public float maxDis = 1.5f;
-    public float rSmoothTime = 0.3f, sSmoothTime = 0.3f, mSmoothTime = 0.3f;
-    public float mouseRotSpeed = 8, mouseMoveSpeed = 1, mouseZoomSpeed = 15;
-    public float minVerticalAngle = -30, maxVerticalAngle = 60;
-    public float minHorizontalAngle = -60, maxHorizontalAngle = 60;
-    [Header("初始化数据"), SerializeField] float orginDis = 0;
-    Vector3 currentPosition, movVelocity, targetPosition;
-    float targetDis, currentDis, disVelocity;
-    Vector3 currentRotation, targetRotation, rotVelocity;
-    [SerializeField] Transform target;
-    Vector3 pos;
-    bool isok = false;
-    public bool ZhoLI = false;//是否是重力模式
-    float speed = 20;
-    private void Awake()
-    {
-        Instance = this;
-        SetCameraTrans();
-        //Debug.Log("CameraControl");
-    }
-    [ContextMenu("设置相机位置")]
-    private void SetCameraTrans()
-    {
-        currentDis = targetDis = orginDis;
-        currentPosition = targetPosition = transform.position;
-        currentRotation = targetRotation = transform.localEulerAngles;
-    }
-    public void SetOrginDis(Vector3 orginPos, Vector3 orginRO)
-    {
-        target = null;
-        targetPosition = orginPos;
-        targetRotation = orginRO;
-        targetDis = 0;
-    }
-    public void SetPos(Vector3 pos,Vector3 ro)
-    {
-        targetPosition = pos;
-        targetRotation = ro;
-    }
     private void Update()
     {
-        if (Input.touchCount == 0 && Input.GetMouseButton(1))
+        fieldView = playerCamera.fieldOfView;
+        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
+        fieldView = Mathf.Clamp(fieldView, 30, 60);
+        playerCamera.fieldOfView = fieldView;
+        switch (fieldView/10)
         {
-            targetRotation.y += Input.GetAxis("Mouse X") * mouseRotSpeed;
+            case 3:
-            targetRotation.x -= Input.GetAxis("Mouse Y") * mouseRotSpeed;
-        }
-        targetDis = targetDis - Input.GetAxis("Mouse ScrollWheel") * mouseZoomSpeed;
-        targetRotation.x = Mathf.Clamp(targetRotation.x, minVerticalAngle, maxVerticalAngle);
-        //targetRotation.y = Mathf.Clamp(targetRotation.y, minHorizontalAngle, maxHorizontalAngle);
-        targetDis = Mathf.Clamp(targetDis, minDis, maxDis);
-        currentDis = Mathf.SmoothDamp(currentDis, targetDis, ref disVelocity, rSmoothTime);
-        currentRotation = Vector3.SmoothDamp(currentRotation, targetRotation, ref rotVelocity, rSmoothTime);
-        var tmpRotation = Quaternion.Euler(currentRotation);
-        var offset = tmpRotation * Vector3.forward * -currentDis;
-        if (target != null)
-        {
-            targetPosition = target.position;
-        }
-        currentPosition = Vector3.SmoothDamp(currentPosition, targetPosition, ref movVelocity, mSmoothTime);
-        var tmpPosition = currentPosition + offset;
-        if (transform.rotation != tmpRotation)
-        {
-            transform.rotation=tmpRotation;
-        }
-        if (ZhoLI)
-        {
-            if (transform.position.y > 3f)
-            {
-                transform.position = new Vector3(transform.position.x, 2.1f, transform.position.z);
-            }
-        }
-        else
-        {
-            if (transform.position.y > 20f)
-            {
-                transform.position = new Vector3(transform.position.x, 20f, transform.position.z);
-            }
-        }
-        if (transform.position.y < 2f)
-        {
-            transform.position = new Vector3(transform.position.x, 2.1f, transform.position.z);
-        }
-        if (Input.GetKey(KeyCode.LeftShift))
-        {
-            speed = 25f;
-        }
-        else
-        {
-            speed = 12f;
-        }
 
-        
+                break;
-        float x= Mathf.Clamp(transform.position.x, -137f, 102f);
+            case 4:
-        //float y = Mathf.Clamp(transform.position.y, 2.1f, 20f);
+
-        float z= Mathf.Clamp(transform.position.z, -125f, 119f);
+                break;
-        transform.position = new Vector3(x,transform.position.y,z);
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            default:
+                break;
+        }
     }
-    private void FixedUpdate()
+
-    {
-        float x = Input.GetAxis("Horizontal");
-        float y = Input.GetAxis("Vertical");
-        float z = Input.GetAxis("Updown");
-        if (x != 0 || y != 0 || z != 0)
-        {
-            Debug.Log("Horizontal " + x + " Ver" + y);
-            if (!ZhoLI)
-            {
-                z = (z * Time.deltaTime * speed);
-                Debug.Log(z);
-            }
-            pos = new Vector3(x * Time.deltaTime * speed, z, y * Time.deltaTime * speed);
-            isok = true;
-            
-        }
-        else
-        {
-            isok = false;
-        }
-        if (isok)
-        {
-            if (transform.position != pos || x != 0 || y != 0||z !=0)
-            {
-                transform.Translate(pos);
-                
-            }
-        }
-        
-    }
-    //public void Fly()
-    //{
-    //    ZhoLI = false;
-    //    transform.GetComponent<Rigidbody>().useGravity = false;
-    //    transform.position = new Vector3(transform.position.x, 20f, transform.position.z);
-    //}
-    //public void NotFly()
-    //{
-    //    ZhoLI = true;
-    //    transform.GetComponent<Rigidbody>().useGravity = true;
-    //    transform.position = new Vector3(transform.position.x,2.1f,transform.position.z);
-    //}
 }
 ////声明部分public float horizontalinput;
 /////水平参数public float Verticalinput;

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -91,29 +91,29 @@ public class GameManager : MonoBehaviour
 
     private void Update()
     {
-        switch (interactiveEnum)
+        //switch (interactiveEnum)
-        {
+        //{
-            case Interactive.none:
+        //    case Interactive.none:
-                for (int i = 0; i < interactive.Count; i++)
+        //        for (int i = 0; i < interactive.Count; i++)
-                {
+        //        {
-                    interactive[i].transform.GetComponent<door_control>().启用交互 = true;
+        //            interactive[i].transform.GetComponent<door_control>().启用交互 = true;
-                }
+        //        }
-                break;
+        //        break;
-            case Interactive.YanDian:
+        //    case Interactive.YanDian:
-                for (int i = 0; i < interactive.Count; i++)
+        //        for (int i = 0; i < interactive.Count; i++)
-                {
+        //        {
-                    interactive[i].transform.GetComponent<door_control>().启用交互 = false;
+        //            interactive[i].transform.GetComponent<door_control>().启用交互 = false;
-                }
+        //        }
-                break;
+        //        break;
-            case Interactive.QianXing:
+        //    case Interactive.QianXing:
-                for (int i = 0; i < interactive.Count; i++)
+        //        for (int i = 0; i < interactive.Count; i++)
-                {
+        //        {
-                    interactive[i].transform.GetComponent<door_control>().启用交互 = true;
+        //            interactive[i].transform.GetComponent<door_control>().启用交互 = true;
-                }
+        //        }
-                break;
+        //        break;
-            default:
+        //    default:
-                break;
+        //        break;
-        }
+        //}
         if (Input.GetKeyDown(KeyCode.K))
         {
             ToolsShow(QianXing);

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs

@@ -16,7 +16,21 @@ public class BoxDools : MonoBehaviour
         {
             for (int i = 0; i < GameManager.ins.interactive.Count; i++)
             {
-                GameManager.ins.interactive[i].GetComponent<door_control>().enabled = true;
+                GameManager.ins.interactive[i].GetComponent<door_control>().启用交互 = true;
+            }
+        }
+    }
+    private void OnTriggerExit(Collider other)
+    {
+        if (other != null)
+        {
+            for (int i = 0; i < GameManager.ins.interactive.Count; i++)
+            {
+                GameManager.ins.interactive[i].GetComponent<door_control>().启用交互 = false;
+                if (GameManager.ins.interactive[i].GetComponent<door_control>().是否开门)
+                {
+                    GameManager.ins.interactive[i].GetComponent<door_control>().animator.Play(GameManager.ins.interactive[i].GetComponent<door_control>().关门动画);
+                }
             }
         }
     }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxPengZhuang.cs

@@ -11,7 +11,7 @@ public class BoxPengZhuang : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        
+
     }
 
     private void OnTriggerEnter(Collider other)
@@ -24,6 +24,7 @@ public class BoxPengZhuang : MonoBehaviour
             {
                 fraction.CompletedorNot = true;
             }
+            PlayerPrefs.SetString("isWorkingPersonnel", "1");
             GetComponent<Fraction>().CompletedorNot = true;
         }
     }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs

@@ -32,7 +32,7 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
 
     public void OnBeginDrag(PointerEventData eventData)
     {
-        currentPos = eventData.position;
+        currentPos = transform.position;
     }
 
     /// <summary>

Electrical_inspectionCompetitionSystem/Assets/Script/WorkingPersonnel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5ce293192264ba143b0b7754dc6a46a7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Script/WorkingPersonnel/WorkingPersonnel.cs

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WorkingPersonnel : MonoBehaviour
+{
+    public static WorkingPersonnel instance;
+    [SerializeField] string isWorkingPersonnel;
+    [SerializeField] GameObject game;
+    private void Awake()
+    {
+        if (instance != null)
+        {
+            Destroy(gameObject);
+            return;
+        }
+        instance = this;
+        DontDestroyOnLoad(gameObject);
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (string.IsNullOrEmpty(PlayerPrefs.GetString("isWorkingPersonnel")))
+        {
+            PlayerPrefs.GetString("isWorkingPersonnel", "0");
+        }
+        else
+        {
+            isWorkingPersonnel = PlayerPrefs.GetString("isWorkingPersonnel");
+            if (isWorkingPersonnel.Equals("1"))
+            {
+                game.SetActive(false);
+            }
+        }
+    }
+    private void OnDestroy()
+    {
+        PlayerPrefs.SetString("isWorkingPersonnel","0");
+    }
+}

Electrical_inspectionCompetitionSystem/Assets/Script/WorkingPersonnel/WorkingPersonnel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d4a7a090670be304ebe50e87679d3257
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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: 7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: 7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefeffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1

Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset

@@ -24,7 +24,7 @@ TagManager:
   - UI
   - QianXing
   - Player
-  - 
+  - Men
   - 
   - 
   -