Merge branch 'master' of http://git.dragonwxl.cn:8080/loudizhiye/loudixvmuniu

Assets/Art/UI/反复弹出Tog.png.meta

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

Assets/Art/UI/反复弹出对号Tog.png.meta

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

Assets/Resources/UIPrefabs/ExplainContainPanel.prefab

@@ -36,6 +36,7 @@ RectTransform:
   - {fileID: 6332384816655404304}
   - {fileID: 6745606675765442323}
   - {fileID: 189938333673924327}
+  - {fileID: 2086888915212075685}
   m_Father: {fileID: 7355316348123831504}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -187,9 +188,10 @@ MonoBehaviour:
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
+    m_HighlightedSprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1,
+      type: 3}
     m_PressedSprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, type: 3}
-    m_SelectedSprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, type: 3}
+    m_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
@@ -202,6 +204,161 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1290555527325003352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6588964901030347884}
+  - component: {fileID: 4403345892364699479}
+  - component: {fileID: 547747191336043664}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6588964901030347884
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1290555527325003352}
+  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: 8859946140086282456}
+  m_Father: {fileID: 2086888915212075685}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 10, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4403345892364699479
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1290555527325003352}
+  m_CullTransparentMesh: 1
+--- !u!114 &547747191336043664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1290555527325003352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 10cb374dd25e08843ae58b57169910e1, 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!1 &1439983187998443897
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 871342592108362003}
+  - component: {fileID: 6752902964104728313}
+  - component: {fileID: 1947919694477530423}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &871342592108362003
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439983187998443897}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2086888915212075685}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 9, y: -0.5}
+  m_SizeDelta: {x: -28, y: -3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6752902964104728313
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439983187998443897}
+  m_CullTransparentMesh: 1
+--- !u!114 &1947919694477530423
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439983187998443897}
+  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: 0.7490196, g: 1, b: 0.96862745, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 6682f39107ec959478d15f6ada28f19a, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E0D\u518D\u5F39\u51FA"
 --- !u!1 &2468768412228411747
 GameObject:
   m_ObjectHideFlags: 0
@@ -751,7 +908,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6BCD\u725B\u7684\u53D1\u60C5\u5468\u671F\uFF0C\u5728\u5375\u5DE2\u4E0A\u8868\u73B0\u4E3A\u5375\u6CE1\u671F\u548C\u9EC4\u4F53\u671F\u4E24\u4E2A\u9636\u6BB5\u3002\u76F8\u5BF9\u9AD8\u7684\u5B55\u6FC0\u7D20\u6C34\u5E73\u53EF\u6291\u5236\u5375\u6CE1\u53D1\u80B2\u548C\u53D1\u60C5\uFF0C\u9EC4\u4F53\u671F\u7684\u7ED3\u675F\u662F\u5375\u6CE1\u671F\u5230\u6765\u7684\u524D\u63D0\u6761\u4EF6\u3002\u56E0\u6B64\uFF0C\u540C\u671F\u53D1\u60C5\u7684\u5173\u952E\u5C31\u662F\u63A7\u5236\u9EC4\u4F53\u5BFF\u547D\uFF0C\u5E76\u540C\u65F6\u7EC8\u6B62\u9EC4\u4F53\u671F\u3002\r\n\u5375\u6CE1\u671F\u662F\u5728\u5468\u671F\u6027\u9EC4\u4F53\u9000\u5316\u7EE7\u800C\u8840\u6DB2\u4E2D\u5B55\u916E\u6C34\u5E73\u663E\u8457\u4E0B\u964D\u540E\uFF0C\u5DE2\u4E2D\u5375\u6CE1\u8FC5\u901F\u751F\u957F\u53D1\u80B2\uFF0C\u6700\u540E\u6210\u719F\u5E76\u5BFC\u81F4\u6392\u5375\u7684\u65F6\u671F\u3002\u5375\u6CE1\u671F\u4E4B\u540E\uFF0C\u5375\u6CE1\u7834\u88C2\u5E76\u53D1\u80B2\u6210\u9EC4\u4F53\uFF0C\u968F\u5373\u8FDB\u5165\u9EC4\u4F53\u671F\uFF0C\u5728\u9EC4\u4F53\u5206\u6CCC\u7684\u5236\uFF0C"
+  m_Text: "\u8BE5\u8F6F\u4EF6\u662F\u4EE5\u725B\u4E3A\u5BF9\u8C61\u7684\u201C\u52A8\u7269\u7E41\u6B96\u201D\u7C7B\u8BFE\u7A0B\u4E13\u4E1A\u5B9E\u8BAD\u3002\u662F\u4EE5\u5178\u578B\u7684\u5DE5\u4F5C\u4EFB\u52A1\u4E3A\u9A71\u52A8\uFF0C\u4EE5\u5DE5\u4F5C\u6D41\u7A0B\u4E3A\u4E3B\u7EBF\u6240\u8FDB\u884C\u7684\u5185\u5BB9\u8BBE\u8BA1\u3002\u5171\u5206\u4E3A\u540C\u671F\u53D1\u60C5\u5904\u7406\u3001\u8D85\u6570\u6392\u5375\u5904\u7406\u3001\u7CBE\u5B50\u6D3B\u7387\u68C0\u67E5\u3001\u4EBA\u5DE5\u6388\u7CBE\u3001\u51B2\u80DA\u3001\u80DA\u80CE\u9009\u62E9\u3001\u80DA\u80CE\u79FB\u690D\u3001\u598A\u5A20\u9274\u5B9A\u4E03\u4E2A\u6A21\u5757\u3002\u53EF\u5E26\u9886\u5B66\u751F\u7531\u6D45\u5165\u6DF1\u4E86\u89E3\u52A8\u7269\u7E41\u6B96\u7684\u5965\u5999\uFF0C\u7531\u6613\u53CA\u96BE\u9010\u6B65\u638C\u63E1\u52A8\u7269\u7E41\u6B96\u6240\u9700\u7684\u77E5\u8BC6\u548C\u6280\u80FD\u3002"
 --- !u!1 &4406781820653346269
 GameObject:
   m_ObjectHideFlags: 0
@@ -1617,6 +1774,92 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u64CD\u4F5C\u8BF4\u660E"
+--- !u!1 &8086155022093170630
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2086888915212075685}
+  - component: {fileID: 1353926411026546173}
+  m_Layer: 5
+  m_Name: LoopPopSet_N
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2086888915212075685
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8086155022093170630}
+  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: 6588964901030347884}
+  - {fileID: 871342592108362003}
+  m_Father: {fileID: 3228359440465635643}
+  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: 107, y: -152}
+  m_SizeDelta: {x: 90, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1353926411026546173
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8086155022093170630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 547747191336043664}
+  toggleTransition: 1
+  graphic: {fileID: 2721685362674604898}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 1
 --- !u!1 &8371301832922793931
 GameObject:
   m_ObjectHideFlags: 0
@@ -1793,3 +2036,78 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
+--- !u!1 &9055544062459517381
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8859946140086282456}
+  - component: {fileID: 3129185475940400901}
+  - component: {fileID: 2721685362674604898}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8859946140086282456
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9055544062459517381}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6588964901030347884}
+  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: 14.6121, y: 9.2986}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3129185475940400901
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9055544062459517381}
+  m_CullTransparentMesh: 1
+--- !u!114 &2721685362674604898
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9055544062459517381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0405a9bd588a38d4a825905c1b1ee03c, 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

Assets/StreamingAssets/ExcelJson/NiuData.txt

@@ -5108,7 +5108,7 @@
     "SoundPath": "N085",
     "VideoPath": "",
     "TimelineLength": 380,
-    "CameraDefaultTR": "0.6985517_-1.943251_-1.70315|8.430001_0.7800003_0",
+    "CameraDefaultTR": "0.9437199_-2.559436_39.45013|20.995_0.1950044_0",
     "CameraNearTR": "",
     "CameraNearTR2": "",
     "QNextNum": 198,
@@ -5134,7 +5134,7 @@
     "SoundPath": "N086",
     "VideoPath": "",
     "TimelineLength": 390,
-    "CameraDefaultTR": "0.6985517_-1.943251_-1.70315|8.430001_0.7800003_0",
+    "CameraDefaultTR": "0.9437199_-2.559436_39.45013|20.995_0.1950044_0",
     "CameraNearTR": "",
     "CameraNearTR2": "",
     "QNextNum": 199,
@@ -5160,7 +5160,7 @@
     "SoundPath": "N087",
     "VideoPath": "",
     "TimelineLength": 390,
-    "CameraDefaultTR": "0.6985517_-1.943251_-1.70315|8.430001_0.7800003_0",
+    "CameraDefaultTR": "0.9437199_-2.559436_39.45013|20.995_0.1950044_0",
     "CameraNearTR": "",
     "CameraNearTR2": "",
     "QNextNum": 200,
@@ -5186,7 +5186,7 @@
     "SoundPath": "N088",
     "VideoPath": "",
     "TimelineLength": 180,
-    "CameraDefaultTR": "0.6985517_-1.943251_-1.70315|8.430001_0.7800003_0",
+    "CameraDefaultTR": "0.9437199_-2.559436_39.45013|20.995_0.1950044_0",
     "CameraNearTR": "",
     "CameraNearTR2": "",
     "QNextNum": 202,

Assets/_Scripts/Application/GameManager.cs

@@ -31,7 +31,7 @@ namespace ZXK.LouDiXvMuNiu
         //輝念app報炎痩樗業
         [System.NonSerialized]
         public float _CurMouseFlexible = 50.0f;
-
+        public bool _loopPopExplain = true;
         public bool _IsFirstFreeCamera = true;
 
         protected override void AwakeSelf()

Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs

@@ -112,6 +112,12 @@ namespace ZXK.LouDiXvMuNiu
             }
             
             GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = _CurSceneStep;
+
+            if (GameManager.Instance._loopPopExplain)
+            {
+                GameObject explainContainGeo = UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip);
+                explainContainGeo.GetComponent<ExplainContainPanel>()._IsFirstEnter = true;
+            }
         }
         private void Update()
         {
@@ -392,6 +398,24 @@ namespace ZXK.LouDiXvMuNiu
                 else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ))
                 {
                     SetTimeLineCtrl(curObj, previousObj, _PTYZTimeLineClip, 0);
+                    if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState"))
+                    {//如果训练模式下，物品展示时显示物品
+                        if (curObj.ThreeTaskName == ConstCtrl.ThreeTaskName_PrepareGeo)
+                        {
+                            GameObject bhyGeoTemp = UtilitiesMng.GetGeoByName(_toolContain, "保护液", true);
+                            bhyGeoTemp.transform.localPosition = new Vector3(-0.0822f, 0.396500051f, 0.00615262985f);
+                            bhyGeoTemp.transform.localRotation = new Quaternion(0,0.707106829f,0.707106829f,0);
+                            GameObject ptygeoTemp = UtilitiesMng.GetGeoByName(_toolContain, "胚胎液", true);
+                            ptygeoTemp.transform.localPosition = new Vector3(-0.0820000023f, 0.396499991f, -0.0887999982f);
+                            ptygeoTemp.transform.localRotation = new Quaternion(0, 0.707106829f, 0.707106829f, 0);
+                            GameObject ksqgeoTemp = UtilitiesMng.GetGeoByName(_toolContain, "凯苏枪", true);
+                            ksqgeoTemp.transform.localPosition = new Vector3(0.25999999f, 0.409000009f, 0.381999999f);
+                            ksqgeoTemp.transform.localRotation = new Quaternion(-0.00385814067f, 0.707096279f, 0.00385814067f, 0.707096279f);
+                            GameObject blxggeoTemp = UtilitiesMng.GetGeoByName(_toolContain, "玻璃细管", true);
+                            blxggeoTemp.transform.localPosition = new Vector3(0.221799999f, 0.400900006f, -0.0782999992f);
+                            blxggeoTemp.transform.localRotation = new Quaternion(0.5f, 0.5f, 0.5f, 0.5f);
+                        }
+                    }
                 }
                 else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD))
                 {

Assets/_Scripts/Application/UI/AppSettingPanel.cs

@@ -94,7 +94,8 @@ namespace ZXK.LouDiXvMuNiu
             _desBtn.onClick.AddListener(() =>
             {
                 PopUpMng._TriAble = false;
-                UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip);
+                GameObject explainContainGeo = UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip);
+                explainContainGeo.GetComponent<ExplainContainPanel>()._IsFirstEnter = false;
             });
             _setBtn.onClick.AddListener(() =>
             {

Assets/_Scripts/Application/UI/ExplainContainPanel.cs

@@ -16,6 +16,10 @@ namespace ZXK.LouDiXvMuNiu
 		private GameObject _trainGeo = null;
 		private GameObject _handlerGeo = null;
 		private Button _closeBtn = null;
+		private Toggle _popLoop = null;
+
+		public bool _IsFirstEnter = false;
+		public int _clickNumber = 0;
 
         protected override void Awake()
         {
@@ -25,26 +29,54 @@ namespace ZXK.LouDiXvMuNiu
 			_trainGeo = GetWedage("TrainExplainBG_N");
 			_handlerGeo = GetWedage("HandlerExplainBG_N");
 			_closeBtn = GetWedage("CloseBtn_N").GetComponent<Button>();
+			_popLoop = GetWedage("LoopPopSet_N").GetComponent<Toggle>();
 			InitUIState();
 			CG.UTility.PopUpMng._TriAble = false;
+			_clickNumber = 0;
+			_popLoop.isOn = GameManager.Instance._loopPopExplain;
 		}
 
 		private void InitUIState()
-        {
+		{
+			_popLoop.onValueChanged.AddListener((isOn) =>
+			{
+				GameManager.Instance._loopPopExplain = isOn;
+			});
 			_trainTog.onValueChanged.AddListener((isOn) =>
 			{
 				_trainGeo.SetActive(isOn);
+				if (isOn)
+					_clickNumber++;
 			});
 			_handlerTog.onValueChanged.AddListener((isOn) =>
 			{
 				_handlerGeo.SetActive(isOn);
+				if (isOn)
+					_clickNumber++;
 			});
-			_closeBtn.onClick.AddListener(() =>
+            _closeBtn.onClick.AddListener(() =>
-			{
+            {
-				UI_Manage.Instance.ClosePanel("ExplainContainPanel");
+                if (_IsFirstEnter)
-				CG.UTility.PopUpMng._TriAble = true;
+                {
-			});
+					if (_clickNumber > 0)
-			_trainTog.isOn = true;
+					{
+						UI_Manage.Instance.ClosePanel("ExplainContainPanel");
+						CG.UTility.PopUpMng._TriAble = true;
+					}
+					else {
+						_trainTog.isOn = false;
+						_handlerTog.isOn = true;
+						_clickNumber++;
+					}
+                }
+                else
+                {
+                    UI_Manage.Instance.ClosePanel("ExplainContainPanel");
+                    CG.UTility.PopUpMng._TriAble = true;
+                }
+
+            });
+            _trainTog.isOn = true;
 			_handlerTog.isOn = false;
 		}
     }

UserSettings/EditorUserSettings.asset

@@ -21,19 +21,10 @@ EditorUserSettings:
       value: 5a070c555353580f0c5a097041200844464f4b7c792c2464797f4f61e1b96c3a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d
-      flags: 0
-    RecentlyUsedSceneGuid-6:
       value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a
       flags: 0
-    UnityEditor.ShaderGraph.Blackboard:
+    RecentlyUsedSceneGuid-6:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba6425d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd8c8a91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc
+      value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d
-      flags: 0
-    UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
-      flags: 0
-    UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 55469
+  controlID: 12393
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -49,9 +49,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 467
+    y: 531
-    width: 898
+    width: 1103
-    height: 524
+    height: 460
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -104,23 +104,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 898
+      width: 1103
-      height: 503
+      height: 439
-    m_Scale: {x: 0.46574074, y: 0.46574074}
+    m_Scale: {x: 0.40648147, y: 0.40648147}
-    m_Translation: {x: 449, y: 251.5}
+    m_Translation: {x: 551.5, y: 219.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -964.05566
+      x: -1356.7654
       y: -540
-      width: 1928.1113
+      width: 2713.5308
       height: 1080
     m_MinimalGUI: 1
-  m_defaultScale: 0.46574074
+  m_defaultScale: 0.40648147
-  m_LastWindowPixelSize: {x: 898, y: 524}
+  m_LastWindowPixelSize: {x: 1103, y: 460}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -145,12 +145,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 899
+    width: 1104
     height: 939
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 55470
+  controlID: 12394
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -168,10 +168,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 899
+    width: 1104
-    height: 394
+    height: 458
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 5}
   m_Panes:
   - {fileID: 5}
@@ -200,8 +200,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 898
+    width: 1103
-    height: 373
+    height: 437
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -633,14 +633,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 960, y: 540, z: 0}
+    m_Target: {x: 1.0385579, y: -2.8006153, z: 40.005222}
     speed: 2
-    m_Value: {x: 960, y: 540, z: 0}
+    m_Value: {x: 1.0385579, y: -2.8006153, z: 40.005222}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -668,17 +668,17 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -686,17 +686,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: 0.33110753, y: -0.011322821, z: 0.003973308, w: 0.9435234}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: 0.33110544, y: -0.011322749, z: 0.003973283, w: 0.94351745}
   m_Size:
-    m_Target: 1101.4536
+    m_Target: 0.47697207
     speed: 2
-    m_Value: 1101.4536
+    m_Value: 0.47697207
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -710,8 +710,8 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LastSceneViewOrtho: 0
+  m_LastSceneViewOrtho: 1
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
@@ -733,11 +733,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 394
+    y: 458
-    width: 899
+    width: 1104
-    height: 545
+    height: 481
-  m_MinSize: {x: 201, y: 221}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 2}
@@ -766,9 +766,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 499
+    y: 531
-    width: 898
+    width: 1103
-    height: 492
+    height: 460
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -803,12 +803,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 899
+    x: 1104
     y: 0
-    width: 331
+    width: 256
     height: 939
-  m_MinSize: {x: 202, y: 221}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 9}
   m_Panes:
   - {fileID: 9}
@@ -835,9 +835,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 899
+    x: 1104
     y: 73
-    width: 329
+    width: 254
     height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -854,7 +854,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: dcdcecff321eedff8a6cedff8097edffe2abedffd632eeff2676eeff4ebeeeff2602efff424aefff7098efff7cddefff80ddefffc8deefff64dfefff7202f0ffdc48f0ff1a52f0ff8ccff0ff74d0f0ff7e7df1ff847df1ffa280f1ff2609f2ff6c0ef2ffdc4ef2ff62ddf4ffba23f5ffec68f5ffe06df5ffdcabf5ffb2acf5ff2ce9f5ff36e9f5ff3ae9f5ff80eef5ff661ef6ff6a1ef6ff1433f6ffd637f6ffde57f6fff257f6fff657f6ff1483f6ffccc6f6fff4cbf6ffd207f7ffd68ef7ff121bf8ff922cf8ff942cf8ff4237f8ffdc55f8ff54b8f8ff58b8f8ff5cb8f8ff86b9f8ff8ab9f8ffe6bef8ffced9f8ffd2d9f8ffd6d9f8ff9a06f9ff900cf9fff289f9fff689f9ff1e8bf9ff228bf9ff8095f9ff02adf9ff06adf9ff46daf9ffb819faff0c1afaff101afaff201bfaff381bfaff3c1bfaff801cfaffa42bfaff6830faff30ccfaff3accfaff3eccfaff9acdfaffaaedfaffaeedfaff12eefaff92effaffe6effaffeaeffaff28f1faff7c39fbffa074fbffa474fbffaa74fbffae74fbff1275fbff1278fbff48c0fbffdcfefbffe0fefbffe6fefbffeafefbff4efffbffa8fffbff0248fcff0688fcff0a88fcff1088fcff1488fcff7888fcff888bfcfff4cefcfffad3fcff180efdff1c0efdff220efdff260efdff8a0efdffb018fdffe064fdff2239feff2639feff2c39feff3039feff9439feffd842feff8079feff8479feff8a79feff8e79fefff279feff0aa0feff02a5feff06a4ffff0aa4ffff12a4ffff16a4ffff7aa4ffff2ea7ffff2efbfffff4ffffff68dc000098dd000080e10000a4e20000965d0100b6620100de630100b4740100d4790100fc7a0100a4ba0100c4bf0100ecc00100a0000200c0050200e806020094460200b44b0200dc4c0200828c0200a2910200ca92020090d70200b8d802001a07030042080300b00c0300961e0300be1f03002c240300d2350300fa360300663b0300683b0300fe640300266603009e6a0300167c03003e7d0300427e03004a7e0300caf20300f8f30300dcf60300dc3904000c3a04003a3b04004a3c0400543c0400be3d040078510400a6520400148104005281040046820400568304006083040086980400b899040002e0040014e40400bce4040028e504000ce704006aeb04000aec0400c4f90400ce0005002c050500cc0505002a00060034070600920b0600320c060094130600521806005c1f0600ba2306005a240600fe470600d24b0600a04c0600ae7c0600d4810600b0b00600ccb5060036b90600d6bc060034c1060028c80600a2c9060044cd0600e6d106006ad206004ed40600acd806000c4407003244070048440700444607006a490700c65b07002e5f0700cc6207002a67070018b70700bcba07005abf0700debf070080d20700a2d70700dcd70700b0010800c6010800e806080022070800622b08007a2b0800
+      m_ExpandedIDs: 320df9ff0cf0faff1ea5fdff28a5fdff2aa8fdff34a8fdff0aaefdff14aefdffe003feffea03feff3045feff604dfeff8ed6feffcc00ffffd600ffff2242ffffee9dffffa2ddffff2efbfffff4ffffff46e100005ee1000076240100522a010074560100265c0100665c0100fe6a02007a6c0200167202000e7402005e750200867802002a790200
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -893,9 +893,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1230
+    x: 1360
     y: 0
-    width: 395
+    width: 245
     height: 939
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -925,9 +925,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1230
+    x: 1360
     y: 73
-    width: 393
+    width: 243
     height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -949,8 +949,7 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders:
+    m_Folders: []
-    - Assets/_Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -966,7 +965,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: be940b00
     m_LastClickedID: 758974
-    m_ExpandedIDs: ffffffff000000004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e750000907500009275000094750000987500009a7500009c7500009e750000a2750000a6750000a8750000aa750000ac750000b0750000b2750000b4750000b6750000b8750000ba750000527800005478000056780000607800008678000088780000e0bd000004a503008aa503009ea50300a0a50300a68e0600325c0800
+    m_ExpandedIDs: ffffffff00000000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009c7500009e750000a0750000a2750000a8750000ae750000b0750000b2750000b4750000cc780000ec780000a0b70000801c0100667f0200
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -991,10 +990,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 300}
+    scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff000000004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e750000907500009275000094750000987500009a7500009c7500009e750000a2750000a6750000a8750000aa750000ac750000b0750000b2750000b4750000b6750000b8750000ba750000527800005478000056780000607800008678000088780000e0bd000004a503008aa503009ea50300a0a50300a68e0600325c0800
+    m_ExpandedIDs: ffffffff00000000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009c7500009e750000a0750000a2750000a8750000ae750000b0750000b2750000b4750000cc780000ec780000a0b70000801c0100667f0200
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1021,7 +1020,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -1065,9 +1064,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1625
+    x: 1605
     y: 0
-    width: 295
+    width: 315
     height: 939
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -1097,9 +1096,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1625
+    x: 1605
     y: 73
-    width: 294
+    width: 314
     height: 918
   m_SerializedDataModeController:
     m_DataMode: 0