优化场景，改了非常多bug，加了非常多canvas解决动态ui卡顿问题

Assets/Art/UI/3D/Beng.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 5e68cfd1c6602934bb238a5c941d9a6a
+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: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    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: 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: 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: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/3D/Farm.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 7c6feb5e1ee862d499276d1dffea0ea0
+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: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    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: 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: 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: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/3D/WaterIcon.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 5c8accac4b971ad4391394c13fdd2971
+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: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    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: 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: 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: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/3D/monitor.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 8bf2406dfeaab2b4b86e076f2e50a709
+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: 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: 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: 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: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModelCameraCtrl.cs

@@ -80,7 +80,7 @@ public class ModelCameraCtrl : MonoBehaviour
 
         scrollSensitivity = Mathf.Clamp(scrollSensitivity, 10, 4000);
 
-        if (Input.GetMouseButton(0)&& onUI)
+        if (Input.GetMouseButton(2)&& onUI)
         {
             rotateXAngle -= Input.GetAxis("Mouse Y") * rotateSpeed;
             rotateYAngle += Input.GetAxis("Mouse X") * rotateSpeed;

Assets/Prefabs/UI/3D/GCZL.prefab

@@ -277,8 +277,8 @@ 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: 65.32855, y: 27.5}
-  m_SizeDelta: {x: 92.1359, y: 22.1154}
+  m_AnchoredPosition: {x: 109.63, y: 27.5}
+  m_SizeDelta: {x: 180.74, y: 22.1154}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1864410167887464708
 CanvasRenderer:
@@ -1874,6 +1874,8 @@ GameObject:
   - component: {fileID: 4452380874144021549}
   - component: {fileID: 4452380874144021547}
   - component: {fileID: 4452380874144021548}
+  - component: {fileID: 367937608}
+  - component: {fileID: 367937609}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -1941,6 +1943,44 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!223 &367937608
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4452380874144021550}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &367937609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4452380874144021550}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &4452380874246937173
 GameObject:
   m_ObjectHideFlags: 0
@@ -2573,6 +2613,12 @@ MonoBehaviour:
   - /Uploads/projectImages/pdf/TK_2.pdf
   - /Uploads/projectImages/pdf/TK_3.pdf
   - /Uploads/projectImages/pdf/TK_4.pdf
+  mTexs:
+  - {fileID: 2800000, guid: 5c8accac4b971ad4391394c13fdd2971, type: 3}
+  - {fileID: 2800000, guid: 5e68cfd1c6602934bb238a5c941d9a6a, type: 3}
+  - {fileID: 2800000, guid: 7c6feb5e1ee862d499276d1dffea0ea0, type: 3}
+  - {fileID: 2800000, guid: 8bf2406dfeaab2b4b86e076f2e50a709, type: 3}
+  currentObj: {fileID: 0}
 --- !u!1 &4452380874908355294
 GameObject:
   m_ObjectHideFlags: 0
@@ -2667,10 +2713,10 @@ MonoBehaviour:
   m_Content: {fileID: 4452380874144021549}
   m_Horizontal: 0
   m_Vertical: 1
-  m_MovementType: 1
+  m_MovementType: 2
   m_Elasticity: 0.1
   m_Inertia: 1
-  m_DecelerationRate: 0.135
+  m_DecelerationRate: 0.1
   m_ScrollSensitivity: 1
   m_Viewport: {fileID: 4452380873706791396}
   m_HorizontalScrollbar: {fileID: 0}

Assets/Prefabs/UI/Information.prefab

@@ -195,7 +195,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 0}
+  m_Texture: {fileID: 2800000, guid: 5c8accac4b971ad4391394c13fdd2971, type: 3}
   m_UVRect:
     serializedVersion: 2
     x: 0

Assets/Prefabs/UI/ObsPlayerPanel.prefab

@@ -68,7 +68,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 16
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -1827,7 +1827,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 16
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -2348,7 +2348,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 16
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -2810,7 +2810,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 93, y: -15.5}
-  m_SizeDelta: {x: 112, y: 19}
+  m_SizeDelta: {x: 112, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6377451847635805101
 CanvasRenderer:
@@ -2842,8 +2842,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
-    m_FontStyle: 1
+    m_FontSize: 16
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -2922,7 +2922,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -3413,6 +3413,7 @@ MonoBehaviour:
   fullScreenButton: {fileID: 0}
   fullScreenButton2: {fileID: 0}
   isFullScreen: 0
+  openSuccess: 0
 --- !u!114 &4832472719989189542
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3667,6 +3668,10 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 0.6047526
       objectReference: {fileID: 0}
+    - target: {fileID: 3663913339689935745, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Prefabs/UI/SWFZ/SPJK.prefab

@@ -1174,7 +1174,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2026,7 +2026,6 @@ MonoBehaviour:
   currentObsDataList: []
   countText: {fileID: 5147317439065066957}
   _obsSearchInputField: {fileID: 6744885183358372171}
-  obsPlayerPanel: {fileID: 0}
   byBtn: {fileID: 4925615604355872925}
   tkBtn: {fileID: 6238181476664041905}
   _obsIconContent: {fileID: 434352196474264963}
@@ -2164,6 +2163,8 @@ GameObject:
   - component: {fileID: 390971722641760305}
   - component: {fileID: 3906120057051253037}
   - component: {fileID: 9188567412576843721}
+  - component: {fileID: 4696838642648696802}
+  - component: {fileID: 851902247527828439}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -2229,6 +2230,44 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!223 &4696838642648696802
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4802023922447027288}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &851902247527828439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4802023922447027288}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &5169321731880624058
 GameObject:
   m_ObjectHideFlags: 0
@@ -2467,9 +2506,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -3, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2904706457155480049
 CanvasRenderer:
@@ -3652,6 +3691,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 434352196474264963}
+  - component: {fileID: 120444377}
+  - component: {fileID: 120444376}
   m_Layer: 5
   m_Name: ObsIconContent
   m_TagString: Untagged
@@ -3679,3 +3720,41 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &120444377
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9023829895859056529}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &120444376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9023829895859056529}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295

Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -12795,7 +12795,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4461453780397662635
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13217,6 +13217,8 @@ GameObject:
   - component: {fileID: 390971722641760305}
   - component: {fileID: 3906120057051253037}
   - component: {fileID: 9188567412576843721}
+  - component: {fileID: 5817890103729860778}
+  - component: {fileID: 2775653530573460778}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -13282,6 +13284,44 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!223 &5817890103729860778
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4802023922447027288}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &2775653530573460778
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4802023922447027288}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &4826935227246746768
 GameObject:
   m_ObjectHideFlags: 0
@@ -21327,6 +21367,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3218409779109884448}
+  - component: {fileID: 826901048}
+  - component: {fileID: 826901047}
   m_Layer: 5
   m_Name: ZhaMenContent
   m_TagString: Untagged
@@ -21354,6 +21396,44 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &826901048
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7762756203306636676}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &826901047
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7762756203306636676}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &7774106130615778819
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -34,7 +34,7 @@ RectTransform:
   - {fileID: 2120617297}
   - {fileID: 1478845648}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 13
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3664,7 +3664,7 @@ RectTransform:
   - {fileID: 5097783785475022968}
   - {fileID: 715179445626271726}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 12
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -4220,7 +4220,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2332442566715947249}
+  m_Father: {fileID: 7742320628942826334}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5169,6 +5169,89 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5168\u90E8"
+--- !u!1 &1077574348291470837
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7742320628942826334}
+  - component: {fileID: 4411440208077946862}
+  - component: {fileID: 457954634830348765}
+  m_Layer: 5
+  m_Name: LittleItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7742320628942826334
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1077574348291470837}
+  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:
+  - {fileID: 8757336094675718186}
+  - {fileID: 4513584130216526266}
+  - {fileID: 4182890165485450081}
+  - {fileID: 8715375028596148447}
+  - {fileID: 1362758536565080360}
+  - {fileID: 4819968365055139308}
+  - {fileID: 9005838094908035467}
+  m_Father: {fileID: 2332442566715947249}
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &4411440208077946862
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1077574348291470837}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &457954634830348765
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1077574348291470837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &1083031629515528438
 GameObject:
   m_ObjectHideFlags: 0
@@ -10124,7 +10207,7 @@ RectTransform:
   - {fileID: 8356210405529773629}
   - {fileID: 4939582991026324373}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 11
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -12270,7 +12353,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2332442566715947249}
+  m_Father: {fileID: 7742320628942826334}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -17984,7 +18067,7 @@ RectTransform:
   - {fileID: 2445653730657967958}
   - {fileID: 1940776636}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 7
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -20162,6 +20245,8 @@ GameObject:
   - component: {fileID: 487020491366741147}
   - component: {fileID: 1537381047032949388}
   - component: {fileID: 3418308354268678351}
+  - component: {fileID: 153100797}
+  - component: {fileID: 153100796}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -20227,6 +20312,44 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!223 &153100797
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3948291450610736770}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &153100796
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3948291450610736770}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &3949803204784773471
 GameObject:
   m_ObjectHideFlags: 0
@@ -20569,13 +20692,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8757336094675718186}
-  - {fileID: 4513584130216526266}
-  - {fileID: 4182890165485450081}
-  - {fileID: 8715375028596148447}
-  - {fileID: 1362758536565080360}
-  - {fileID: 4819968365055139308}
-  - {fileID: 9005838094908035467}
+  - {fileID: 7742320628942826334}
   - {fileID: 4783289687366494045}
   - {fileID: 8764418338679404718}
   - {fileID: 4918900963093814639}
@@ -22650,7 +22767,7 @@ RectTransform:
   m_Children:
   - {fileID: 8807809732347603726}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 8
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -23900,7 +24017,7 @@ RectTransform:
   - {fileID: 766006179146297008}
   - {fileID: 4843864906037961469}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 9
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -24710,7 +24827,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2332442566715947249}
+  m_Father: {fileID: 7742320628942826334}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -26326,7 +26443,7 @@ RectTransform:
   - {fileID: 8285858550147934584}
   - {fileID: 5363127773030823900}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 10
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -29448,7 +29565,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2332442566715947249}
+  m_Father: {fileID: 7742320628942826334}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -32605,7 +32722,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2332442566715947249}
+  m_Father: {fileID: 7742320628942826334}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -46324,7 +46441,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 2332442566715947249}
+    m_TransformParent: {fileID: 7742320628942826334}
     m_Modifications:
     - target: {fileID: 1295938256603995126, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
       propertyPath: m_Name
@@ -46760,7 +46877,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 2332442566715947249}
+    m_TransformParent: {fileID: 7742320628942826334}
     m_Modifications:
     - target: {fileID: 1295938256603995126, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
       propertyPath: m_Name

Assets/Scripts/HttpHelper.cs

@@ -604,20 +604,10 @@ public class HttpHelper : MonoBehaviour
                             obsData.targetName = value;
                         }
 
-                        // if (i > 0)
-                        // {
-                        //     obsData.url =
-                        //         "http://www.chatgpt918.top:9080/rtp/34020000001180000001_34020000001310000001/hls.m3u8";
-                        // }
-                        // else
-                        // {
-                        //obsData.url = await GetObsUrl(serverObsDatas.list[i].deviceId,serverObsDatas.list[i].channelId);
-                        //Debug.Log("!!!:"+obsData.url);
-                        //obsData.url = ServerAddress.ObsSeverM3U8Address + string.Format("/rtp/{0}_{1}/hls.m3u8", serverObsDatas.list[i].deviceId, serverObsDatas.list[i].channelId);
-                        //}
                         obsData.type = obsType.BuYuanObs;
                         obsData.deviceId = serverObsDatas.list[i].deviceId;
                         obsData.channelId = serverObsDatas.list[i].channelId;
+                        GlobalData.obsDeviceIDLib.Add(obsData.name, obsData.channelId);
                         obsData.status = serverObsDatas.list[i].status;
                         GlobalData.obsDatas_by.Add(obsData);
                     }
@@ -699,8 +689,10 @@ public class HttpHelper : MonoBehaviour
                         //ServerAddress.ObsSeverM3U8Address + string.Format("/rtp/{0}_{1}/hls.m3u8", serverObsDatas.list[i].deviceId, serverObsDatas.list[i].channelId);
                         //}
                         obsData.type = obsType.TaoKouObs;
+                        
                         obsData.deviceId = serverObsDatas.list[i].deviceId;
                         obsData.channelId = serverObsDatas.list[i].channelId;
+                        GlobalData.obsDeviceIDLib.Add(obsData.name, obsData.channelId);
                         obsData.status = serverObsDatas.list[i].status;
                         GlobalData.obsDatas_tk.Add(obsData);
                     }

Assets/Scripts/UI/Data/GlobalData.cs

@@ -44,6 +44,11 @@ public class GlobalData
     /// </summary>
     public static Dictionary<string, string> obsCameraLib = new Dictionary<string, string>();
 
+    /// <summary>
+    /// 监控通道字典
+    /// </summary>
+    public static Dictionary<string, string> obsDeviceIDLib = new Dictionary<string, string>();
+
     /// <summary>
     /// 一张图第二页数据
     /// </summary>

Assets/Scripts/UI/Item/ObsItem.cs

@@ -73,6 +73,9 @@ public class ObsItem : MonoBehaviour
             if (!OBSTexLibrary.ContainsKey(ServerAddress.Server_TextureSavePath + hashName + ".jpg"))
                 OBSTexLibrary.Add(ServerAddress.Server_TextureSavePath + hashName + ".jpg", fmImg.texture);
         }
+        else {
+            havePic = true;
+        }
         www.disposeDownloadHandlerOnDispose = true;
         www.Dispose();
     }

Assets/Scripts/UI/UIView/3D/GCZLLayer.cs

@@ -67,14 +67,18 @@ public class GCZLLayer : MonoBehaviour
     public string[] TK_PdfDownloadUrl;
     private Button downloadPdfButton;
     private int showTypeIndex = 0;
-    
+
+    public Texture[] mTexs;
+
+    public GameObject currentObj;
+
     [DllImport("__Internal")]
     private static extern void OpenNewWebsite(string str);
 
 
     private void Awake()
     {
-        
+
         InfoPanel = this.transform.Find("InfoPanel").gameObject;
         InfoTitleText = InfoPanel.transform.Find("Title").GetComponent<Text>();
         InfoClassText = InfoPanel.transform.Find("Class").GetComponent<Text>();
@@ -226,14 +230,18 @@ public class GCZLLayer : MonoBehaviour
         }
     }
 
-    void InitInformation(int index)
+    async void InitInformation(int index)
     {
+
         if (currentClass == index) return;
         for (int i = informations.Count - 1; i >= 0; i--)
         {
             Destroy(informations[i]);
         }
-
+        await new WaitUntil(() =>
+        {
+            return GlobalData.obsDatas_by.Count > 0 && GlobalData.obsDatas_tk.Count > 0;
+        });
         informations.Clear();
         currentClass = index;
         if (currentClass == 0)
@@ -259,10 +267,11 @@ public class GCZLLayer : MonoBehaviour
                     obj.transform.localScale = Vector3.one;
                     informations.Add(obj);
                     int dataIndex = i;
-
+                    
                     obj.GetComponent<Button>().onClick.AddListener(() =>
                     {
                         currentData = GlobalData.layerUnitDatas[dataIndex];
+                        currentObj = obj;
                         StaticLod.instance.OnFoucusStatic(priName);
                         if (objType == LayerUnitType.ZZ || objType == LayerUnitType.BZ)
                         {
@@ -293,15 +302,34 @@ public class GCZLLayer : MonoBehaviour
                     obj.transform.Find("Name").GetComponentInChildren<Text>().text = realName;
                     obj.transform.Find("Class").GetComponentInChildren<Text>().text = className;
                     //todo
-                    obj.transform.Find("No").GetComponentInChildren<Text>().text = "未知";
+                    if (currentClass == 4)
+                    {
+                        string noName;
+                        if (GlobalData.obsDeviceIDLib.TryGetValue(realName, out noName)) 
+                        {
+                            obj.transform.Find("No").GetComponentInChildren<Text>().text = noName;
+                        }
+                        else
+                        {
+                            obj.transform.Find("No").GetComponentInChildren<Text>().text = "未知";
+                        }
+                    }
+                    else {
+                        obj.transform.Find("No").GetComponentInChildren<Text>().text = "未知";
+                    }
                     obj.transform.Find("Day").GetComponentInChildren<Text>().text = "近期";
-                    obj.transform.Find("fm").GetComponent<RawImage>().texture =
-                        TextureLoadHelp._Instance.GetTempTexture(priName);
+                    obj.transform.Find("fm").GetComponent<RawImage>().texture = mTexs[currentClass - 1];
+                    Texture tex = TextureLoadHelp._Instance.GetTempTexture(priName);
+                    if (tex != null)
+                        obj.transform.Find("fm").GetComponent<RawImage>().texture = tex;
+
+
                     obj.transform.localScale = Vector3.one;
                     informations.Add(obj);
                     int dataIndex = i;
                     obj.GetComponent<Button>().onClick.AddListener(() =>
                     {
+                        currentObj = obj;
                         currentData = GlobalData.layerUnitDatas[dataIndex];
                         StaticLod.instance.OnFoucusStatic(priName);
                         if (objType == LayerUnitType.ZZ || objType == LayerUnitType.BZ)
@@ -348,9 +376,10 @@ public class GCZLLayer : MonoBehaviour
     {
         InfoTitleText.text = currentData.name;
         InfoClassText.text = currentData.GetTypeName();
-        InfoFM.texture = TextureLoadHelp._Instance.GetTempTexture(currentData.namePri);
+        //InfoFM.texture = TextureLoadHelp._Instance.GetTempTexture(currentData.namePri);
+        InfoFM.texture = currentObj.transform.Find("fm").GetComponent<RawImage>().texture;
         //todo
-        InfoNoText.text = "未知";
+        InfoNoText.text = currentObj.transform.Find("No").GetComponentInChildren<Text>().text;
         InfoDayText.text = "近期";
         InfoPanel.SetActive(true);
     }

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -526,7 +526,7 @@ public class GCJKLayer : YZTRootLayer
         obsPanel.gameObject.SetActive(false);
         obsItemContent = this.transform.Find("ShiPinJianKong/ScrollView/Viewport/Content").transform;
 
-        _obsIconContent = this.transform.Find("Main/ObsIconContent").transform;
+        _obsIconContent = this.transform.Find("Main/LittleItem/ObsIconContent").transform;
 
         _obsSearchInputField = this.transform.Find("ShiPinJianKong/InputField").GetComponent<InputField>();
         _obsSearchInputField.onValueChanged.AddListener(SearchObsItem);
@@ -534,14 +534,14 @@ public class GCJKLayer : YZTRootLayer
         CreatObsItem();
 
         //水位
-        _shuiWeiIconContent = this.transform.Find("Main/ShuiWeiIconContent").transform;
+        _shuiWeiIconContent = this.transform.Find("Main/LittleItem/ShuiWeiIconContent").transform;
 
-        _shuiYaIconContent = this.transform.Find("Main/ShuiYaIconContent").transform;
+        _shuiYaIconContent = this.transform.Find("Main/LittleItem/ShuiYaIconContent").transform;
 
-        _weiYiIconContent = this.transform.Find("Main/WeiYiIconContent").transform;
+        _weiYiIconContent = this.transform.Find("Main/LittleItem/WeiYiIconContent").transform;
 
 
-        deviceIconContent = this.transform.Find("Main/DeviceIconContent").transform;
+        deviceIconContent = this.transform.Find("Main/LittleItem/DeviceIconContent").transform;
 
         ObsToggle = this.transform.Find("Main/IconToggles/ObsToggle").GetComponent<Toggle>();
         shuiWeiToggle = this.transform.Find("Main/IconToggles/shuiWeiToggle").GetComponent<Toggle>();