UI更换

2023-09-03 18:46:51 +08:00 · 2023-09-03 18:46:51 +08:00 · 39bc23706d
parent f0ac0c7fa9
commit 39bc23706d
12 changed files with 14236 additions and 4404 deletions
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/CanvasAll.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/CanvasAll.prefab
@ -32,7 +32,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1939351488}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 1}
  m_AnchorMax: {x: 1, y: 1}
@ -313,7 +313,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1939351488}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 1}
  m_AnchorMax: {x: 1, y: 1}
@ -668,6 +668,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 5035416824398353168}
  - {fileID: 14261792}
  - {fileID: 1220589414}
  m_Father: {fileID: 3536068809516498120}
@ -706,7 +707,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9798dbf4ecb75fe498b4106ca06677a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 162d43ba782f0a4499946fe6f4b181d1, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -859,6 +860,82 @@ MonoBehaviour:
  m_BlockingMask:
    serializedVersion: 2
    m_Bits: 4294967295
+--- !u!1 &4720581175612014417
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5035416824398353168}
+  - component: {fileID: 2153621808762327557}
+  - component: {fileID: 2691126828991551679}
+  m_Layer: 5
+  m_Name: Bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5035416824398353168
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4720581175612014417}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1939351488}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0.00005340576}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2153621808762327557
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4720581175612014417}
+  m_CullTransparentMesh: 1
+--- !u!114 &2691126828991551679
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4720581175612014417}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 9798dbf4ecb75fe498b4106ca06677a6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1001 &376196881785846329
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2320,7 +2397,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 52493960140214286, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.00069284
+      value: -0.000015795002
      objectReference: {fileID: 0}
    - target: {fileID: 52493961020242042, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_AnchorMax.x
@ -2434,9 +2511,13 @@ PrefabInstance:
      propertyPath: m_AnchorMin.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 52493961127997538, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
+      propertyPath: m_Size
+      value: 0.9614727
+      objectReference: {fileID: 0}
    - target: {fileID: 52493961127997538, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_Value
-      value: 1.0000101
+      value: 0.9999968
      objectReference: {fileID: 0}
    - target: {fileID: 52493961236787329, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_HorizontalScrollbar
@ -2448,7 +2529,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 52493961279549372, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.0012289488
+      value: -0.00041322276
      objectReference: {fileID: 0}
    - target: {fileID: 52493961483269043, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_AnchorMax.x
@ -2462,9 +2543,13 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 52493961719744597, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
+      propertyPath: m_Size
+      value: 0.9614727
+      objectReference: {fileID: 0}
    - target: {fileID: 52493961719744597, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_Value
-      value: 1.000008
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 52493961955456164, guid: c2ee4bc77aedb3641b0872c744099798, type: 3}
      propertyPath: m_AnchorMax.x
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/故障词条.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/故障词条.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 886417593}
  - component: {fileID: 886417595}
  - component: {fileID: 886417594}
+  - component: {fileID: 6396514517998405289}
  m_Layer: 5
  m_Name: "\u5220\u9664"
  m_TagString: Untagged
@ -77,6 +78,50 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6396514517998405289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 886417592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 886417594}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1637097119
 GameObject:
  m_ObjectHideFlags: 0
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/用电竞赛切图/组
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/用电竞赛切图/组
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/用电竞赛切图/组
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/用电竞赛切图/组
@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 4dc9d2d661d8cf947838ba382ba1e9fb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 0
+    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: Android
+    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
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Electrical_inspectionCompetitionSystem/Assets/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/配电房_电缆沟盖板.fbx
+++ b/Electrical_inspectionCompetitionSystem/Assets/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/配电房_电缆沟盖板.fbx
--- a/Electrical_inspectionCompetitionSystem/Assets/Fount/SIMHEI
+++ b/Electrical_inspectionCompetitionSystem/Assets/Fount/SIMHEI
@ -146,7 +146,7 @@ Material:
    m_Colors:
    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _FaceColor: {r: 2, g: 2, b: 2, a: 1}
    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Electrical_inspectionCompetitionSystem/Assets/Plugins/HighlightingSystemDemo/Scripts/Advanced/HighlighterInteractionDemo.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Plugins/HighlightingSystemDemo/Scripts/Advanced/HighlighterInteractionDemo.cs
@ -10,8 +10,8 @@ namespace HighlightingSystem.Demo
 		public Color hoverColor = Color.red;

 		// Button names (for Input Manager)
-		static private readonly string buttonFire1 = "Fire1";
-		static private readonly string buttonFire2 = "Fire2";
+		//static private readonly string buttonFire1 = "Fire1";
+		//static private readonly string buttonFire2 = "Fire2";

 		// 
 		void Update()
@ -32,14 +32,14 @@ namespace HighlightingSystem.Demo
 			highlighter.Hover(hoverColor);

 			// Switch tween
-			if (Input.GetButtonDown(buttonFire1))
-			{
-				highlighter.tween = false;
-			}
-			if (Input.GetButtonDown(buttonFire1))
-			{
-				highlighter.constant = false;
-			}
+			//if (Input.GetButtonDown(buttonFire1))
+			//{
+			//	highlighter.tween = false;
+			//}
+			//if (Input.GetButtonDown(buttonFire1))
+			//{
+			//	highlighter.constant = false;
+			//}
 			// Toggle overlay
 			//if (Input.GetButtonUp(buttonFire2))
 			//{
--- a/Electrical_inspectionCompetitionSystem/Assets/Resources/Prefab/条目.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/Prefab/条目.prefab
@ -30,14 +30,15 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 6}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 353472346}
  m_Father: {fileID: 9222175431332791230}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.96383315, y: 0.14535935}
-  m_AnchorMax: {x: 0.99500006, y: 1}
-  m_AnchoredPosition: {x: 0, y: -3}
-  m_SizeDelta: {x: -0.0000009536743, y: -6}
+  m_AnchorMin: {x: 0.9345362, y: 0}
+  m_AnchorMax: {x: 0.99600005, y: 0.8205786}
+  m_AnchoredPosition: {x: -0.8999939, y: -0.9999981}
+  m_SizeDelta: {x: 7.649933, y: 3.4000015}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &174071792
 CanvasRenderer:
@ -60,14 +61,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.5019608}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 211cf00a5c9377443a6c786c754718a4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2377ad4d801e2164f866329bfa82a251, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -133,6 +134,101 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
+--- !u!1 &353472345
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 353472346}
+  - component: {fileID: 353472349}
+  - component: {fileID: 353472348}
+  - component: {fileID: 353472347}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &353472346
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353472345}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 174071789}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &353472349
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353472345}
+  m_CullTransparentMesh: 1
+--- !u!114 &353472348
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353472345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bfddcb2099ad3064d8aac14dbb4b7068, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5220\u9664"
+--- !u!114 &353472347
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353472345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
 --- !u!1 &9222175431289924373
 GameObject:
  m_ObjectHideFlags: 0
@ -168,7 +264,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.15400001, y: 0}
  m_AnchorMax: {x: 0.312, y: 1}
-  m_AnchoredPosition: {x: -159, y: 0}
+  m_AnchoredPosition: {x: -177, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9222175431289924368
@ -227,9 +323,9 @@ MonoBehaviour:
    serializedVersion: 2
    rgba: 4294967295
  m_fontSize: 18
-  m_fontSizeBase: 36
+  m_fontSizeBase: 18
  m_fontWeight: 400
-  m_enableAutoSizing: 1
+  m_enableAutoSizing: 0
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
@ -362,7 +458,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.31300002, y: 0}
  m_AnchorMax: {x: 0.76100004, y: 1}
-  m_AnchoredPosition: {x: -90, y: 0}
+  m_AnchoredPosition: {x: -77.9, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9222175431921572127
@ -420,10 +516,10 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 18
-  m_fontSizeBase: 36
+  m_fontSize: 20
+  m_fontSizeBase: 20
  m_fontWeight: 400
-  m_enableAutoSizing: 1
+  m_enableAutoSizing: 0
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
@ -497,7 +593,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.763, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -73.805, y: 0}
+  m_AnchoredPosition: {x: -118.2, y: 0}
  m_SizeDelta: {x: -149.61, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9222175432659419404
@ -556,9 +652,9 @@ MonoBehaviour:
    serializedVersion: 2
    rgba: 4294967295
  m_fontSize: 18
-  m_fontSizeBase: 36
+  m_fontSizeBase: 18
  m_fontWeight: 400
-  m_enableAutoSizing: 1
+  m_enableAutoSizing: 0
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/主流程_开放.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/主流程_开放.unity
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/主流程_开放UI.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/主流程_开放UI.unity
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/tishi_count.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/tishi_count.cs
@ -0,0 +1,63 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class tishi_count : MonoBehaviour
+{ public Toggle 服务记录仪器;
+    public GameObject 已打开;
+    public GameObject 已关闭;
+    private bool start;
+    public float time =0;
+    // Start is called before the first frame update
+    void Start()
+    {
+        服务记录仪器.onValueChanged.AddListener(starttishi);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+        
+        if (start == true)
+        {
+            time += Time.deltaTime;
+        
+        
+        
+        }
+        if (time > 5) {
+
+            start = false;
+            time = 0;
+            已打开.SetActive(false);
+
+            已关闭.SetActive(false);
+        }
+        
+    }
+    public void starttishi(bool change) {
+
+        start = true;
+        time = 0;
+        if (服务记录仪器.isOn == true)
+        {
+            已打开.SetActive(true);
+            已关闭.SetActive(false);
+            ///服务记录仪器.colors = ColorBlock.defaultColorBlock;
+        }
+
+
+        else
+        {
+
+            已关闭.SetActive(true);
+            已打开.SetActive(false);
+
+        }
+    
+    }
+    
+
+}
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/tishi_count.cs.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/tishi_count.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db4cff5c1fb502b47b992df44c963d63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: