整合

2 years ago · b3c2e4d37d
parent c4fb41a5ba
commit b3c2e4d37d
32 changed files with 8837 additions and 1330 deletions
--- a/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta
+++ b/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta
@ -1,90 +1,61 @@
 fileFormatVersion: 2
 guid: 6a3c684705042f345975d924f6983e36
+timeCreated: 1466788352
+licenseType: Store
 PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
+  serializedVersion: 1
  iconMap: {}
  executionOrder: {}
-  defineConstraints: []
  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
  platformData:
-  - first:
-      : Linux
-    second:
+    Android:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+    Linux:
      enabled: 0
      settings:
        CPU: x86
-  - first:
-      : OSXIntel
-    second:
+    Linux64:
+      enabled: 0
+      settings:
+        CPU: x86_64
+    OSXIntel:
      enabled: 0
      settings:
        CPU: AnyCPU
-  - first:
-      : OSXIntel64
-    second:
+    OSXIntel64:
      enabled: 0
      settings:
        CPU: AnyCPU
-  - first:
-      : SamsungTV
-    second:
+    SamsungTV:
      enabled: 1
      settings:
        STV_MODEL: STANDARD_13
-  - first:
-      : Tizen
-    second:
+    Tizen:
      enabled: 1
      settings: {}
-  - first:
-      Android: Android
-    second:
+    WebGL:
      enabled: 1
-      settings:
-        CPU: AnyCPU
-  - first:
-      Any: 
-    second:
-      enabled: 0
      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      Standalone: Win
-    second:
+    Win:
      enabled: 0
      settings:
        CPU: AnyCPU
-  - first:
-      Standalone: Win64
-    second:
+    Win64:
      enabled: 0
      settings:
        CPU: AnyCPU
-  - first:
-      WebGL: WebGL
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
+    WindowsStoreApps:
      enabled: 1
      settings:
        CPU: AnyCPU
@ -92,16 +63,12 @@ PluginImporter:
        PlaceholderPath: Assets/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll
        SDK: AnySDK
        ScriptingBackend: Il2Cpp
-  - first:
-      iPhone: iOS
-    second:
+    iOS:
      enabled: 1
      settings:
        CompileFlags: 
        FrameworkDependencies: 
-  - first:
-      tvOS: tvOS
-    second:
+    tvOS:
      enabled: 1
      settings: {}
  userData: 
--- a/Assets/Resources/Prefab/kuang.prefab
+++ b/Assets/Resources/Prefab/kuang.prefab
@ -65,7 +65,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 557c94bc98aa7bf4486b38d82bac73b5, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e38f5e2cf9080af4d939cdb1f83ecb57, type: 3}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -91,3 +91,4 @@ MonoBehaviour:
  target: {fileID: 0}
  offset: {x: 0, y: 0, z: 0}
  isScreen: 1
+  isCameraDistance: 0
--- a/Assets/Resources/img/方框按钮.png.meta
+++ b/Assets/Resources/img/方框按钮.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 557c94bc98aa7bf4486b38d82bac73b5
+guid: 7af3f6dd3882b924ca39e0a30b955082
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/Resources/img/方框按钮1.png
+++ b/Assets/Resources/img/方框按钮1.png
--- a/Assets/Resources/img/方框按钮1.png.meta
+++ b/Assets/Resources/img/方框按钮1.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: e38f5e2cf9080af4d939cdb1f83ecb57
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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: 8, y: 8, z: 8, w: 8}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 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: 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: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/img/方框按钮2.png
+++ b/Assets/Resources/img/方框按钮2.png
--- a/Assets/Resources/img/方框按钮2.png.meta
+++ b/Assets/Resources/img/方框按钮2.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 557c94bc98aa7bf4486b38d82bac73b5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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: 8, y: 8, z: 8, w: 8}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 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: 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: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/img/标题.png
+++ b/Assets/Resources/img/标题.png
--- a/Assets/Resources/img/标题.png.meta
+++ b/Assets/Resources/img/标题.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bf0004e03ea2f9644b91f5e91c011947
+guid: 9ba0b0eb8b34eab49b7d671ac4a04ec6
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/Resources/img/标题1.png
+++ b/Assets/Resources/img/标题1.png
--- a/Assets/Resources/img/标题1.png.meta
+++ b/Assets/Resources/img/标题1.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 0bf3ebb6cad98ac45b22c3ce834dc791
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 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: 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: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/img/标题2.png
+++ b/Assets/Resources/img/标题2.png
--- a/Assets/Resources/img/标题2.png.meta
+++ b/Assets/Resources/img/标题2.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: bf0004e03ea2f9644b91f5e91c011947
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 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: 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: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/GaoSuXunJian/345NEW.asset
+++ b/Assets/Scenes/GaoSuXunJian/345NEW.asset
@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: 345NEW
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::BuildProfile
+  BuildTasks:
+  - ProductName: Level3New
+    BuildTarget: 20
+    BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u9AD8\u901F\u5DE1\u68C0"
+    SceneAssets:
+    - {fileID: 102900000, guid: 7c680cd46ad496d43ac24bd0d77ab1b6, type: 3}
+  - ProductName: Level4New
+    BuildTarget: 20
+    BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u9AD8\u901F\u5DE1\u68C0/"
+    SceneAssets:
+    - {fileID: 102900000, guid: f221a0e2809b9e541b6668d40e4bfa4f, type: 3}
+  - ProductName: Level5New
+    BuildTarget: 20
+    BuildPath: "D:/\u6253\u5305\u6D4B\u8BD5/\u9AD8\u901F\u5DE1\u68C0/"
+    SceneAssets:
+    - {fileID: 102900000, guid: adee36548eb732541991ae61c8d573a9, type: 3}
--- a/Assets/Scenes/GaoSuXunJian/345NEW.asset.meta
+++ b/Assets/Scenes/GaoSuXunJian/345NEW.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f4c38f3f08e27fe478010f78c3566473
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/GaoSuXunJian/Level2.unity
+++ b/Assets/Scenes/GaoSuXunJian/Level2.unity
--- a/Assets/Scenes/GaoSuXunJian/Level3.unity
+++ b/Assets/Scenes/GaoSuXunJian/Level3.unity
@ -133,6 +133,7 @@ GameObject:
  - component: {fileID: 1142921}
  - component: {fileID: 1142923}
  - component: {fileID: 1142922}
+  - component: {fileID: 1142924}
  m_Layer: 5
  m_Name: Text
  m_TagString: Untagged
@ -200,6 +201,21 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1142920}
  m_CullTransparentMesh: 0
+--- !u!114 &1142924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1142920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1001 &7998844
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -582,6 +598,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 745064106}
+  - {fileID: 662265069}
  m_Father: {fileID: 261848736}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1115,8 +1132,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 557c94bc98aa7bf4486b38d82bac73b5, type: 3}
-  m_Type: 2
+  m_Sprite: {fileID: 21300000, guid: e38f5e2cf9080af4d939cdb1f83ecb57, type: 3}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -2916,6 +2933,80 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 661335708}
  m_CullTransparentMesh: 0
+--- !u!1 &662265068
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 662265069}
+  - component: {fileID: 662265071}
+  - component: {fileID: 662265070}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &662265069
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 662265068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.61577, y: 0.61577, z: 0.61577}
+  m_Children: []
+  m_Father: {fileID: 78877963}
+  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}
+  m_AnchoredPosition: {x: 0, y: -64}
+  m_SizeDelta: {x: 131, y: 179}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &662265070
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 662265068}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: caf0aa1484d0ede41ad8de63cd5bf731, 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!222 &662265071
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 662265068}
+  m_CullTransparentMesh: 0
 --- !u!1 &668880848
 GameObject:
  m_ObjectHideFlags: 0
@ -3523,7 +3614,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -3667,13 +3758,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.5529412}
+  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.9137255}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -4120,6 +4211,84 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1210266416}
  m_CullTransparentMesh: 0
+--- !u!1 &1215588667
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1215588668}
+  - component: {fileID: 1215588670}
+  - component: {fileID: 1215588669}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1215588668
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1215588667}
+  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_Children: []
+  m_Father: {fileID: 2006303178}
+  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}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1215588669
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1215588667}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 44
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5C71\u4F53\u6ED1\u5761\u68C0\u6D4B"
+--- !u!222 &1215588670
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1215588667}
+  m_CullTransparentMesh: 0
 --- !u!1 &1221048502
 GameObject:
  m_ObjectHideFlags: 0
@ -4408,7 +4577,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -5238,7 +5407,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: 
 --- !u!222 &1635895476
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -5565,7 +5734,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -5584,7 +5753,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u67E5\u770B\u533A\u57DF"
+  m_Text: "\u5DE5\u4F5C\u533A\u57DF"
 --- !u!222 &1723216635
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -6302,13 +6471,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.5529412}
+  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.84313726}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -6467,7 +6636,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2006303178
 RectTransform:
  m_ObjectHideFlags: 0
@ -6478,7 +6647,8 @@ RectTransform:
  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_Children: []
+  m_Children:
+  - {fileID: 1215588668}
  m_Father: {fileID: 261848736}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6506,7 +6676,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -6732,7 +6902,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -12171,10 +12341,10 @@ RectTransform:
  m_Father: {fileID: 261848736}
  m_RootOrder: 13
  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: 681.7, y: 542.9}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -298.83002, y: 159.57}
+  m_SizeDelta: {x: 597.65137, y: 319.14148}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5490534806959884269
 GameObject:
@ -12221,7 +12391,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -12354,7 +12524,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0bf3ebb6cad98ac45b22c3ce834dc791, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -12572,17 +12742,6 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 239164508}
-        m_MethodName: SendPassResult
-        m_Mode: 1
-        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
 --- !u!224 &5490534808067179259
 RectTransform:
  m_ObjectHideFlags: 0
@ -12600,7 +12759,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: 0, y: -204.4}
+  m_AnchoredPosition: {x: 0, y: -105}
  m_SizeDelta: {x: 160, y: 49.125885}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &5490534808437424196
@ -12619,8 +12778,8 @@ RectTransform:
  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: 11.6}
-  m_SizeDelta: {x: 0, y: -215.78775}
+  m_AnchoredPosition: {x: -7.700012, y: 11.600006}
+  m_SizeDelta: {x: -76.18823, y: -215.78775}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5490534808437424197
 GameObject:
--- a/Assets/Scenes/GaoSuXunJian/Level4.unity
+++ b/Assets/Scenes/GaoSuXunJian/Level4.unity
@ -133,6 +133,7 @@ GameObject:
  - component: {fileID: 1142921}
  - component: {fileID: 1142923}
  - component: {fileID: 1142922}
+  - component: {fileID: 1142924}
  m_Layer: 5
  m_Name: Text
  m_TagString: Untagged
@ -180,7 +181,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3}
-    m_FontSize: 28
+    m_FontSize: 33
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 10
@ -200,6 +201,21 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1142920}
  m_CullTransparentMesh: 0
+--- !u!114 &1142924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1142920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1001 &7998844
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -582,6 +598,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 745064106}
+  - {fileID: 473224342}
  m_Father: {fileID: 261848736}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1093,7 +1110,7 @@ RectTransform:
  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: -43.078003}
+  m_AnchoredPosition: {x: 0, y: -43.07788}
  m_SizeDelta: {x: 0, y: -86.156006}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &171034087
@ -1115,8 +1132,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 557c94bc98aa7bf4486b38d82bac73b5, type: 3}
-  m_Type: 2
+  m_Sprite: {fileID: 21300000, guid: e38f5e2cf9080af4d939cdb1f83ecb57, type: 3}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -1941,10 +1958,10 @@ RectTransform:
  m_Father: {fileID: 2086695569}
  m_RootOrder: 1
  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: 11.6}
-  m_SizeDelta: {x: 0, y: -215.78775}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 14}
+  m_SizeDelta: {x: 549.08, y: 102.21225}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &343405882
 MonoBehaviour:
@ -2665,6 +2682,80 @@ MonoBehaviour:
  seed: 4
  Range: 9.9
  ScaleRange: 3.1
+--- !u!1 &473224341
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 473224342}
+  - component: {fileID: 473224344}
+  - component: {fileID: 473224343}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &473224342
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473224341}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.82, y: 0.82, z: 0.82}
+  m_Children: []
+  m_Father: {fileID: 78877963}
+  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}
+  m_AnchoredPosition: {x: 0, y: -81.5}
+  m_SizeDelta: {x: 131, y: 179}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &473224343
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473224341}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: caf0aa1484d0ede41ad8de63cd5bf731, 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!222 &473224344
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473224341}
+  m_CullTransparentMesh: 0
 --- !u!1 &522666126
 GameObject:
  m_ObjectHideFlags: 0
@ -3410,8 +3501,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: 0, y: 20.4}
-  m_SizeDelta: {x: 1219.61, y: 809.7556}
+  m_AnchoredPosition: {x: -57, y: -28}
+  m_SizeDelta: {x: 707.37805, y: 469.661}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &795680594
 MonoBehaviour:
@ -3706,7 +3797,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 114.3, y: -174}
+  m_AnchoredPosition: {x: 114.299805, y: -174}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &884719730
@ -3881,7 +3972,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -3935,7 +4026,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: 0, y: -204.4}
+  m_AnchoredPosition: {x: 0, y: -95}
  m_SizeDelta: {x: 160, y: 49.125885}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &979400583
@ -3981,9 +4072,9 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 2086695568}
-        m_MethodName: SetActive
-        m_Mode: 6
+      - m_Target: {fileID: 239164508}
+        m_MethodName: SendPassResult
+        m_Mode: 1
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@ -3992,9 +4083,9 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 239164508}
-        m_MethodName: SendPassResult
-        m_Mode: 1
+      - m_Target: {fileID: 2086695568}
+        m_MethodName: SetActive
+        m_Mode: 6
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@ -4056,7 +4147,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &998050746
 Transform:
  m_ObjectHideFlags: 0
@ -4114,6 +4205,80 @@ Camera:
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
+--- !u!1 &1003862810
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1003862811}
+  - component: {fileID: 1003862813}
+  - component: {fileID: 1003862812}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1003862811
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1003862810}
+  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_Children: []
+  m_Father: {fileID: 1966735705}
+  m_RootOrder: 9
+  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: 212, y: 86}
+  m_SizeDelta: {x: 131, y: 179}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1003862812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1003862810}
+  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: 0.88133717, g: 1, b: 0.023584902, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: caf0aa1484d0ede41ad8de63cd5bf731, 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!222 &1003862813
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1003862810}
+  m_CullTransparentMesh: 0
 --- !u!1 &1026972712
 GameObject:
  m_ObjectHideFlags: 0
@ -4166,13 +4331,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.5529412}
+  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.84313726}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -4206,7 +4371,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!20 &1077391536
 Camera:
  m_ObjectHideFlags: 0
@ -4498,7 +4663,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: 0, y: -347}
+  m_AnchoredPosition: {x: 0, y: 11}
  m_SizeDelta: {x: 694.4, y: 103.1}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1160174774
@ -4599,7 +4764,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -5053,7 +5218,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.13207549, g: 0.13207549, b: 0.13207549, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -5138,7 +5303,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -6049,7 +6214,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: 
 --- !u!222 &1635895476
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -6075,7 +6240,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1660090803
 RectTransform:
  m_ObjectHideFlags: 0
@ -6376,7 +6541,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -6395,7 +6560,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u67E5\u770B\u533A\u57DF"
+  m_Text: "\u5DE5\u4F5C\u533A\u57DF"
 --- !u!222 &1723216635
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -7092,6 +7257,7 @@ RectTransform:
  - {fileID: 285588950}
  - {fileID: 835698374}
  - {fileID: 1761680744}
+  - {fileID: 1003862811}
  m_Father: {fileID: 261848736}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7113,13 +7279,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.5529412}
+  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.84313726}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -7543,7 +7709,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -7831,10 +7997,10 @@ RectTransform:
  m_Father: {fileID: 261848736}
  m_RootOrder: 13
  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: 681.7, y: 542.9}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -297, y: 158.9}
+  m_SizeDelta: {x: 594.00903, y: 317.75623}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2086695570
 MonoBehaviour:
@ -7855,7 +8021,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -7929,7 +8095,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 557c94bc98aa7bf4486b38d82bac73b5, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e38f5e2cf9080af4d939cdb1f83ecb57, type: 3}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -10038,7 +10204,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1209894160818423968
 Transform:
  m_ObjectHideFlags: 0
@ -13374,7 +13540,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &8094290152699551512
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/GaoSuXunJian/Level5.unity
+++ b/Assets/Scenes/GaoSuXunJian/Level5.unity
@ -133,6 +133,7 @@ GameObject:
  - component: {fileID: 1142921}
  - component: {fileID: 1142923}
  - component: {fileID: 1142922}
+  - component: {fileID: 1142924}
  m_Layer: 5
  m_Name: Text
  m_TagString: Untagged
@ -180,7 +181,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3}
-    m_FontSize: 28
+    m_FontSize: 34
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 10
@ -200,6 +201,21 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1142920}
  m_CullTransparentMesh: 0
+--- !u!114 &1142924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1142920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1001 &7998844
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -582,6 +598,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 745064106}
+  - {fileID: 1856861651}
  m_Father: {fileID: 261848736}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1093,7 +1110,7 @@ RectTransform:
  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: -43.078003}
+  m_AnchoredPosition: {x: 0, y: -43.078125}
  m_SizeDelta: {x: 0, y: -86.156006}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &171034087
@ -1115,8 +1132,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 557c94bc98aa7bf4486b38d82bac73b5, type: 3}
-  m_Type: 2
+  m_Sprite: {fileID: 21300000, guid: e38f5e2cf9080af4d939cdb1f83ecb57, type: 3}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -1911,10 +1928,10 @@ RectTransform:
  m_Father: {fileID: 2086695569}
  m_RootOrder: 1
  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: 11.6}
-  m_SizeDelta: {x: 0, y: -215.78775}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0.8}
+  m_SizeDelta: {x: 515, y: 135.81493}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &343405882
 MonoBehaviour:
@ -2678,10 +2695,10 @@ RectTransform:
  m_Father: {fileID: 261848736}
  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &565429439
 PrefabInstance:
@ -3348,15 +3365,14 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 1660090803}
  - {fileID: 1160174773}
  m_Father: {fileID: 181483805}
  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: 20.4}
-  m_SizeDelta: {x: 1219.61, y: 809.7556}
+  m_AnchoredPosition: {x: -47, y: -159}
+  m_SizeDelta: {x: 778.63684, y: 260.989}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &795680594
 MonoBehaviour:
@ -3371,14 +3387,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.49411765, g: 1, b: 0.9843137, a: 0.7647059}
+  m_Color: {r: 0.49411765, g: 1, b: 0.9843137, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 62b845639c3d1f34e850d2d871cf112d, type: 3}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -3582,7 +3598,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 114.3, y: -174}
+  m_AnchoredPosition: {x: 114.299805, y: -174}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &884719730
@ -3897,7 +3913,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -3951,7 +3967,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: 0, y: -204.4}
+  m_AnchoredPosition: {x: 0, y: -108}
  m_SizeDelta: {x: 160, y: 49.125885}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &979400583
@ -4008,7 +4024,7 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 239164508}
        m_MethodName: SendPassResult
        m_Mode: 1
        m_Arguments:
@ -4072,7 +4088,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &998050746
 Transform:
  m_ObjectHideFlags: 0
@ -4182,13 +4198,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.5529412}
+  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.8156863}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -4786,11 +4802,11 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 795680593}
-  m_RootOrder: 1
+  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: -347}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 694.4, y: 103.1}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1160174774
@ -4806,7 +4822,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -4984,7 +5000,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -5523,7 +5539,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bf0004e03ea2f9644b91f5e91c011947, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6a3c99b65d14e3a4db158d78d8458c4a, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -6463,7 +6479,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: 
 --- !u!222 &1635895476
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -6472,77 +6488,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1635895473}
  m_CullTransparentMesh: 0
--- !u!1 &1660090802
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1660090803}
-  - component: {fileID: 1660090805}
-  - component: {fileID: 1660090804}
-  m_Layer: 5
-  m_Name: RawImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1660090803
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660090802}
-  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_Children: []
-  m_Father: {fileID: 795680593}
-  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: 997, y: 585.6}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1660090804
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660090802}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: b925a35b8bc22064e863f4b915e8a640, type: 2}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &1660090805
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660090802}
-  m_CullTransparentMesh: 0
 --- !u!1 &1666125719
 GameObject:
  m_ObjectHideFlags: 0
@ -6790,7 +6735,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -6809,7 +6754,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u67E5\u770B\u533A\u57DF"
+  m_Text: "\u5DE5\u4F5C\u533A\u57DF"
 --- !u!222 &1723216635
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -7093,6 +7038,80 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1836696323}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1856861650
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1856861651}
+  - component: {fileID: 1856861653}
+  - component: {fileID: 1856861652}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1856861651
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856861650}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.77627, y: 0.77627, z: 0.77627}
+  m_Children: []
+  m_Father: {fileID: 78877963}
+  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}
+  m_AnchoredPosition: {x: 0, y: -75}
+  m_SizeDelta: {x: 131, y: 179}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1856861652
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856861650}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: caf0aa1484d0ede41ad8de63cd5bf731, 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!222 &1856861653
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856861650}
+  m_CullTransparentMesh: 0
 --- !u!1 &1866155404
 GameObject:
  m_ObjectHideFlags: 0
@ -7717,13 +7736,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.5529412}
+  m_Color: {r: 0.495283, g: 1, b: 0.9843738, a: 0.8352941}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -8147,7 +8166,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -8366,10 +8385,10 @@ RectTransform:
  m_Father: {fileID: 261848736}
  m_RootOrder: 13
  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: 681.7, y: 542.9}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -297, y: 164.6}
+  m_SizeDelta: {x: 594.00903, y: 329.27393}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2086695570
 MonoBehaviour:
@ -8390,7 +8409,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -10653,6 +10672,8 @@ MonoBehaviour:
  ZoneCanvans: {fileID: 0}
  craetTime: 1
  OverSpeedMaxValue: 120
+  height: 0.25
+  safeDistance: 20
 --- !u!1 &1209894160802048765
 GameObject:
  m_ObjectHideFlags: 0
@ -10670,7 +10691,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1209894160818423968
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/AddScripts/shantihuapo/LevelSTHPTask.cs
+++ b/Assets/Scripts/AddScripts/shantihuapo/LevelSTHPTask.cs
@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
-using static UnityEditor.PlayerSettings;
+

 public class LevelSTHPTask : TaskBase
 {
--- a/Assets/Scripts/GameRoot.cs
+++ b/Assets/Scripts/GameRoot.cs
@ -39,6 +39,8 @@ public class GameRoot : MonoSingleton<GameRoot>
    private string GameStateParameters = "currentStateID";
    public Text GameStateTxt;

+    public GameObject OverTip;
+
    protected override void Awake()
    {
        base.Awake();
@ -114,4 +116,12 @@ public class GameRoot : MonoSingleton<GameRoot>
        StateAnimator.SetInteger(GameStateParameters, StateId);
    }

+    public void SetCameraPos(Transform trans)
+    {
+        Camera.main.transform.position = new Vector3(trans.position.x, Camera.main.transform.position.y,trans.position.z);
+    }
+
+
+
+
 }
--- a/Assets/Scripts/Manager/CameraManager.cs
+++ b/Assets/Scripts/Manager/CameraManager.cs
@ -7,7 +7,7 @@ public class CameraManager : MonoBehaviour
    public static CameraManager Instance = null;

    public Camera MainCamera;
-    public float MainCameraSpeed = 20;
+    public float MainCameraSpeed = 35;
    private float MainCameraMaxUp=255;
    private float MainCameraMaxDown=-325;
    private float MainCameraMaxLeft = -186;
--- a/Assets/Scripts/Manager/Level1Manager.cs
+++ b/Assets/Scripts/Manager/Level1Manager.cs
@ -100,7 +100,6 @@ public class Level1Manager : MonoSingleton<Level1Manager>
        for (int i = 0; i < UACGroup.Length; i++)
        {
            StartCoroutine(TransMove(UACGroup[i], WayPointGroup[i],i+1));
-            UACGroup[i].GetComponentInChildren<WRJMinpMap>().Draw();//绘制路线和图标
        }

    }
--- a/Assets/Scripts/Manager/Level3Manager.cs
+++ b/Assets/Scripts/Manager/Level3Manager.cs
@ -76,7 +76,7 @@ public class Level3Manager : MonoSingleton<Level3Manager>
    }
    private void Update()
    {
-        if (isAnaly&&(EducoderText.text.Contains("Y")|| EducoderText.text.Contains("True")))
+        if (isAnaly&&(EducoderText.text.Contains("Y")|| EducoderText.text.Contains("T")))
        {
            //RandomStone();
            AnalyPanel.SetActive(false);
@ -95,6 +95,8 @@ public class Level3Manager : MonoSingleton<Level3Manager>
            ReturnMainViewBtn.image.raycastTarget = false;
            ReturnMainViewBtn.GetComponentInChildren<Text>().enabled = false;

+
+            SendPassResult();
            isAnaly = false;

        }
--- a/Assets/Scripts/Manager/Level4lManager.cs
+++ b/Assets/Scripts/Manager/Level4lManager.cs
@ -71,14 +71,13 @@ public class Level4lManager : MonoSingleton<Level4lManager>
    }
    private void Update()
    {
-        if (isAnaly && (EducoderText.text.Contains("Y")|| EducoderText.text.Contains("True")) || EducoderText.text.Contains("t"))
+        if (isAnaly && (EducoderText.text.Contains("Y")|| EducoderText.text.Contains("True") || EducoderText.text.Contains("t")))
        {
            //RandomStone();
            tafang.SetActive(true);
            AnalyPanel.SetActive(false);
            showKuang = true;
            kuangParent.gameObject.SetActive(true);
-            isAnaly = false;
            for (int j = 0; j < cameraGroup.Length; j++)
            {
                cameraGroup[j].depth = 0;
@ -90,6 +89,9 @@ public class Level4lManager : MonoSingleton<Level4lManager>
            ReturnMainViewBtn.image.enabled = false;
            ReturnMainViewBtn.image.raycastTarget = false;
            ReturnMainViewBtn.GetComponentInChildren<Text>().enabled = false;
+
+            isAnaly = false;
+
        }
    }

@ -160,6 +162,7 @@ public class Level4lManager : MonoSingleton<Level4lManager>
    public void SendPassResult()
    {
        EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
+        overTip.gameObject.SetActive(false);
    }

 }
--- a/Assets/Scripts/Manager/Level5Manager.cs
+++ b/Assets/Scripts/Manager/Level5Manager.cs
@ -72,7 +72,7 @@ public class Level5Manager : MonoSingleton<Level4lManager>
    }
    private void Update()
    {
-        if (isAnaly && (EducoderText.text.Contains("Y")|| EducoderText.text.Contains("True")))
+        if (isAnaly && (EducoderText.text.Contains("Y")|| EducoderText.text.Contains("T")))
        {
            //RandomStone();
            tafang.SetActive(true);
--- a/Assets/Scripts/Tool/Car.cs
+++ b/Assets/Scripts/Tool/Car.cs
@ -132,6 +132,7 @@ public class Car : MonoBehaviour
        moveOffset = Vector3.zero;
        wall = null;
        driveStatu = CarDriveStatu.正常;
+
       // SetOverSpeed();
    }
    private void Update()
--- a/Assets/Scripts/Tool/DataSetPanel.cs
+++ b/Assets/Scripts/Tool/DataSetPanel.cs
@ -30,11 +30,11 @@ public class DataSetPanel : MonoBehaviour
        DragCheck[] dragChecks = GameObject.FindObjectsOfType<DragCheck>();
        for (int i = 0; i < dragChecks.Length; i++)
        {
-            //if (dragChecks[i].isPlace)
-            //{
-            //    int index = dragChecks[i].id-1;
-            //    aears[index].gameObject.SetActive(true);
-            //}
+            if (dragChecks[i].isPlace)
+            {
+                int index = dragChecks[i].id-1;
+                aears[index].gameObject.SetActive(true);
+            }
        }
        GameRoot.Instance.menuWindow.FangZhiAear.SetActive(false);
    }
@ -75,7 +75,7 @@ public class DataSetPanel : MonoBehaviour
            //关闭设置面板，显示数据面板
            DataInfoPanel.SetActive(true);
            this.gameObject.SetActive(false);
-            //GameRoot.Instance.OverTip.gameObject.SetActive(true);
+            GameRoot.Instance.OverTip.gameObject.SetActive(true);
            EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);

        }
--- a/Assets/Scripts/Tool/DragCheck.cs
+++ b/Assets/Scripts/Tool/DragCheck.cs
@ -5,13 +5,15 @@ using UnityEngine;
 public class DragCheck : MonoBehaviour
 {
    public string AearID = "";
-
+    public int id;
    [HideInInspector]
    public GameObject shexiang, leida, longmenjia, chuanGanQi, ludeng;
    private List<string> activeList = new List<string>();

    Transform activeParent;

+    public bool isPlace = false;
+
    private void Start()
    {
        shexiang = transform.Find("SheXiang").gameObject;
@ -71,6 +73,9 @@ public class DragCheck : MonoBehaviour
                   ludeng.transform.SetParent(activeParent);
                    activeList.Add(ItemType.ZHLuDeng.ToString());
                    GameRoot.Instance.infoWindow.AddAearInfo(this.AearID, AearInfoType.PM2_5);
+                    GameRoot.Instance.infoWindow.AddAearInfo(this.AearID, AearInfoType.噪音);
+                    GameRoot.Instance.infoWindow.AddAearInfo(this.AearID, AearInfoType.摄像);
+                    GameRoot.Instance.infoWindow.AddAearInfo(this.AearID, AearInfoType.湿度和可见度);
                    //安装提示
                    GameRoot.Instance.AddTipQueue("已成功部署" + this.AearID + "智能路灯");
                }
@ -118,9 +123,10 @@ public class DragCheck : MonoBehaviour
                break;

        }
-        if (activeList.Count >= 4)
+        if (activeList.Count >= 1)
        {
            Hide();
+            isPlace = true;
        }
                      
    }
--- a/Assets/Scripts/Window/InfoWindow.cs
+++ b/Assets/Scripts/Window/InfoWindow.cs
@ -17,6 +17,8 @@ public class InfoWindow : WindowBase
    public Text emptytipTxt;

    public GameObject miniMap;
+
+    public Text passTxt;
    public override void Init()
    {
        base.Init();
@ -141,5 +143,11 @@ public class InfoWindow : WindowBase
        }
    }

+    public void SetPassTipTxt(string str)
+    {
+        passTxt.text = str;
+    }
+
+
    #endregion
 }
--- a/Assets/Scripts/Window/MenuWindow.cs
+++ b/Assets/Scripts/Window/MenuWindow.cs
@ -57,7 +57,7 @@ public class MenuWindow : WindowBase
            {
                BuShuOkBtn.gameObject.SetActive(false);
                ToolAear.SetActive(false);
-                FangZhiAear.SetActive(false);
+               // FangZhiAear.SetActive(false);
                //SceneSlectedBtn.gameObject.SetActive(true);
                //第一关写图像分析代码做模型训练在这接着写 
                ModelTrainBtn.gameObject.SetActive(true);
@ -67,7 +67,7 @@ public class MenuWindow : WindowBase
        });

        ModelTrainBtn.onClick.AddListener(() => {
-            ModelTrainPanel.SetActive(true);
+           // ModelTrainPanel.SetActive(true);
            CheckResult = true;
        });

--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -8,7 +8,7 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/Scenes/GaoSuXunJian/Level1.unity
    guid: 88c59328d65b09442aa5853babe30c8e
-  - enabled: 1
+  - enabled: 0
    path: Assets/Scenes/GaoSuXunJian/Level2.unity
    guid: eb1a8fab61180d14da89d8c3edd485b3
  - enabled: 0
@ -20,4 +20,7 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/Scenes/GaoSuXunJian/Level5.unity
    guid: 27c65cb84fc468e4ab943e20551f0b72
+  - enabled: 1
+    path: Assets/Scenes/GaoSuXunJian/shantihuapo.unity
+    guid: 7c680cd46ad496d43ac24bd0d77ab1b6
  m_configObjects: {}