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

1
2023-09-18 09:24:46 +08:00 · 2023-09-18 09:24:36 +08:00 · 2023-09-18 08:56:44 +08:00 · 2023-09-18 08:56:39 +08:00 · 2023-09-18 08:50:30 +08:00 · 2023-09-18 08:50:26 +08:00
5 changed files with 172 additions and 29 deletions
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
@ -37078,7 +37078,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &5155859985116163903
 GameObject:
  m_ObjectHideFlags: 0
@ -37730,7 +37730,7 @@ RectTransform:
  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: -14, y: 367}
+  m_AnchoredPosition: {x: -14, y: 350}
  m_SizeDelta: {x: 1087, y: 122}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6684204543470345897
@ -38180,19 +38180,7 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 7718130227357316763}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        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
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 439778730}
        m_TargetAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI
        m_MethodName: set_isOn
        m_Mode: 6
@ -38503,7 +38491,7 @@ RectTransform:
  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: -186, y: -368.99982}
+  m_AnchoredPosition: {x: -204.75, y: -368.99982}
  m_SizeDelta: {x: 206, y: 52}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9187364478408729666
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
@ -10316,6 +10316,10 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 3739678117119996221}
    m_Modifications:
+    - target: {fileID: 4301222306241434058, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.135
+      objectReference: {fileID: 0}
    - target: {fileID: 4301222306241434058, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: m_LocalPosition.y
      value: 0.3745
@ -10378,7 +10382,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.size
-      value: 25
+      value: 26
      objectReference: {fileID: 0}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[0]
@ -10447,38 +10451,42 @@ PrefabInstance:
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[16]
      value: 
-      objectReference: {fileID: 21300000, guid: 61a79eb053d6a4f4094ee67b4e77a981, type: 3}
+      objectReference: {fileID: 21300000, guid: 51d2ad5223c8a6048a08f53f53d80f3b, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[17]
      value: 
-      objectReference: {fileID: 21300000, guid: c5fa4b65c19c1db499e481f148ceef05, type: 3}
+      objectReference: {fileID: 21300000, guid: 61a79eb053d6a4f4094ee67b4e77a981, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[18]
      value: 
-      objectReference: {fileID: 21300000, guid: 2acc388130074704782d22d537f356c4, type: 3}
+      objectReference: {fileID: 21300000, guid: c5fa4b65c19c1db499e481f148ceef05, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[19]
      value: 
-      objectReference: {fileID: 21300000, guid: 91a7b932aaeda4e40b7d6b463830abf9, type: 3}
+      objectReference: {fileID: 21300000, guid: 2acc388130074704782d22d537f356c4, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[20]
      value: 
-      objectReference: {fileID: 21300000, guid: 7d573be09ed7de444bca9ad37ec54025, type: 3}
+      objectReference: {fileID: 21300000, guid: 91a7b932aaeda4e40b7d6b463830abf9, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[21]
      value: 
-      objectReference: {fileID: 21300000, guid: 639f4b603bfc6874d9f3f23902177584, type: 3}
+      objectReference: {fileID: 21300000, guid: 7d573be09ed7de444bca9ad37ec54025, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[22]
      value: 
-      objectReference: {fileID: 21300000, guid: 58eb0e6b3720e554a93b6f4d8b936921, type: 3}
+      objectReference: {fileID: 21300000, guid: 639f4b603bfc6874d9f3f23902177584, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[23]
      value: 
-      objectReference: {fileID: 21300000, guid: b21e10ac7878ef74b8b292f81e4d58c4, type: 3}
+      objectReference: {fileID: 21300000, guid: 58eb0e6b3720e554a93b6f4d8b936921, type: 3}
    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
      propertyPath: sprites.Array.data[24]
      value: 
+      objectReference: {fileID: 21300000, guid: b21e10ac7878ef74b8b292f81e4d58c4, type: 3}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: sprites.Array.data[25]
+      value: 
      objectReference: {fileID: 21300000, guid: a007627423235514285d396e2b6a0520, type: 3}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/电表屏幕/三相_有互感器_无互感器_有光伏_无光伏/总尖峰平谷17.jpg
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/电表屏幕/三相_有互感器_无互感器_有光伏_无光伏/总尖峰平谷17.jpg
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/电表屏幕/三相_有互感器_无互感器_有光伏_无光伏/总尖峰平谷17.jpg.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/电表屏幕/三相_有互感器_无互感器_有光伏_无光伏/总尖峰平谷17.jpg.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 51d2ad5223c8a6048a08f53f53d80f3b
+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: 1
+    wrapV: 1
+    wrapW: 1
+  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: 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
+  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: 
--- 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	e017acf204	Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition	2023-09-18 09:24:46 +08:00
YangHua	4329de6e01	1	2023-09-18 09:24:36 +08:00
YangHua	f72a96b357	Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition	2023-09-18 08:56:44 +08:00
YangHua	8c9978e99f	添加17	2023-09-18 08:56:39 +08:00
YangHua	25975cac72	Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition	2023-09-18 08:50:30 +08:00
YangHua	5d8a6e6333	添加图片	2023-09-18 08:50:26 +08:00