1 实现进度保存，单张

2 填色区域和组进度关联 组进度变化 波浪效果
3 加载进度条

Assets/Resources/perfabs/areaGroupId.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -81, y: 878}
-  m_SizeDelta: {x: 36, y: 36}
+  m_SizeDelta: {x: 200, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &810986338845534415
 CanvasRenderer:
@@ -93,15 +93,15 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 32.2
+  m_fontSize: 36
   m_fontSizeBase: 36
   m_fontWeight: 400
-  m_enableAutoSizing: 1
+  m_enableAutoSizing: 0
   m_fontSizeMin: 10
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0

Assets/Resources/perfabs/gameAreaGroupItem.prefab

@@ -35,8 +35,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: 61}
-  m_SizeDelta: {x: 148, y: 32}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 110, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &637148015308226340
 CanvasRenderer:
@@ -66,7 +66,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e1c879e803b7bf341850c0ace38a515f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: f2380fc434093c241a6cab57cffb82f8, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -76,82 +76,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &5882378146322591837
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 73259668606617614}
-  - component: {fileID: 369255888022981877}
-  - component: {fileID: 3058710508561533708}
-  m_Layer: 5
-  m_Name: minBar
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &73259668606617614
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5882378146322591837}
-  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: 1616143210361961396}
-  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: 0}
-  m_SizeDelta: {x: 90, y: 90}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &369255888022981877
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5882378146322591837}
-  m_CullTransparentMesh: 1
---- !u!114 &3058710508561533708
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5882378146322591837}
-  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: 0.60754716, b: 0.60754716, 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: e1eb2cb8ea58bd54681a7950ef2cf00c, type: 3}
-  m_Type: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 0
-  m_FillOrigin: 2
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6004577723284806528
 GameObject:
   m_ObjectHideFlags: 0
@@ -242,9 +166,10 @@ GameObject:
   m_Component:
   - component: {fileID: 8453382958569157211}
   - component: {fileID: 1147814174343809736}
+  - component: {fileID: 1787754176526650320}
   - component: {fileID: 7976428067039409740}
   m_Layer: 5
-  m_Name: lowBar
+  m_Name: circle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -259,7 +184,7 @@ RectTransform:
   m_GameObject: {fileID: 7289411106616376695}
   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_LocalScale: {x: 0.6, y: 0.6, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1616143210361961396}
@@ -278,7 +203,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7289411106616376695}
   m_CullTransparentMesh: 1
---- !u!114 &7976428067039409740
+--- !u!114 &1787754176526650320
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -287,94 +212,36 @@ MonoBehaviour:
   m_GameObject: {fileID: 7289411106616376695}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: d6a140759d40b744e891af608357385b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.41037738, g: 1, b: 0.41851088, 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: c4a8d1f39b589d747ba0b9ecc99f8f5d, 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 &7706314437183634079
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7341643178725361735}
-  - component: {fileID: 7553108749846778778}
-  - component: {fileID: 2547549287289153947}
-  m_Layer: 5
-  m_Name: finish
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7341643178725361735
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7706314437183634079}
-  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: 1616143210361961396}
-  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: 0}
-  m_SizeDelta: {x: 51, y: 38}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7553108749846778778
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7706314437183634079}
-  m_CullTransparentMesh: 1
---- !u!114 &2547549287289153947
+  color1: {r: 1, g: 1, b: 0, a: 1}
+  color2: {r: 1, g: 0, b: 1, a: 1}
+  height: 0.1
+  langValue: 0.08
+  radius: 80
+  speed: 5
+--- !u!114 &7976428067039409740
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7706314437183634079}
+  m_GameObject: {fileID: 7289411106616376695}
   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: 0.627451, b: 0.627451, a: 1}
+  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: 9f03d019d8287bb40a8a15877586fa3c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -416,15 +283,13 @@ RectTransform:
   m_Children:
   - {fileID: 8307886021508962735}
   - {fileID: 8453382958569157211}
-  - {fileID: 73259668606617614}
   - {fileID: 6241380524619156769}
-  - {fileID: 7341643178725361735}
   m_Father: {fileID: 0}
   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: -228.9, y: -378}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3851703331259501924
@@ -499,3 +364,5 @@ MonoBehaviour:
   nowProgress: 0.35
   idName: 12
   useColor: {r: 0.9612525, g: 0.9811321, b: 0, a: 1}
+  index: 0
+  selectLang: 0.25

Assets/Resources/scenes/game/areaListLow.png.meta

-fileFormatVersion: 2
-guid: ec9da1a89b6f08d449647e8be52ef1f9
-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: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
-  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: 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/rand__temp__text_localFile.png.meta → Assets/Resources/scenes/game/gameSelectGroupHuan.png.meta

 fileFormatVersion: 2
-guid: 54ac8b67ea1f6f14892bd14ea1caab62
+guid: f2380fc434093c241a6cab57cffb82f8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -48,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
+  spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1

Assets/Resources/selectLow.png.meta

-fileFormatVersion: 2
-guid: e1c879e803b7bf341850c0ace38a515f
-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: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
-  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: 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/Scenes/gameScene.unity

@@ -159,10 +159,10 @@ RectTransform:
   m_Father: {fileID: 1474894691}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: -1}
-  m_SizeDelta: {x: 0, y: 293.47827}
+  m_SizeDelta: {x: 1920, y: 293.47827}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &133508487
 MonoBehaviour:
@@ -246,6 +246,82 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   perfabPath: perfabs/gameAreaGroupItem
   perfabPaths: []
+--- !u!1 &231065441
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 231065442}
+  - component: {fileID: 231065444}
+  - component: {fileID: 231065443}
+  m_Layer: 0
+  m_Name: loadImg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &231065442
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231065441}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1344696295}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 365}
+  m_SizeDelta: {x: 1150, y: 1700}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &231065443
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231065441}
+  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: 3fca7c3284062644a86193d485e5f5f8, 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 &231065444
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231065441}
+  m_CullTransparentMesh: 1
 --- !u!1 &297775245
 GameObject:
   m_ObjectHideFlags: 0
@@ -680,6 +756,43 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 416857211}
   m_CullTransparentMesh: 1
+--- !u!1 &419919573
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 419919574}
+  m_Layer: 0
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &419919574
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 419919573}
+  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: 1507463051}
+  m_Father: {fileID: 1935633728}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &456163396
 GameObject:
   m_ObjectHideFlags: 0
@@ -943,6 +1056,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 706874198}
   m_CullTransparentMesh: 1
+--- !u!1 &725276716
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 725276717}
+  - component: {fileID: 725276719}
+  - component: {fileID: 725276718}
+  m_Layer: 0
+  m_Name: Handle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &725276717
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 725276716}
+  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: 1329274449}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &725276718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 725276716}
+  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: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  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 &725276719
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 725276716}
+  m_CullTransparentMesh: 1
 --- !u!1 &859724157
 GameObject:
   m_ObjectHideFlags: 0
@@ -1162,7 +1351,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1013381886
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1183,7 +1372,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -630, y: 0}
+  m_SizeDelta: {x: -630, y: 129}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1013381887
 MonoBehaviour:
@@ -1410,6 +1599,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1187012649}
   m_CullTransparentMesh: 1
+--- !u!1 &1329274448
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1329274449}
+  m_Layer: 0
+  m_Name: Handle Slide Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1329274449
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1329274448}
+  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: 725276717}
+  m_Father: {fileID: 1935633728}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1344696294
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1344696295}
+  m_Layer: 0
+  m_Name: ingameLoad
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1344696295
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1344696294}
+  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: 231065442}
+  - {fileID: 1935633728}
+  m_Father: {fileID: 1474894691}
+  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: 0}
+  m_SizeDelta: {x: -1820, y: -3740}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1474894690
 GameObject:
   m_ObjectHideFlags: 0
@@ -1446,6 +1710,7 @@ RectTransform:
   - {fileID: 1656126341}
   - {fileID: 1013381886}
   - {fileID: 133508485}
+  - {fileID: 1344696295}
   m_Father: {fileID: 297775248}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1533,6 +1798,82 @@ MonoBehaviour:
   areaGroupList: {fileID: 133508484}
   progress: 0
   showAreaId: 1
+--- !u!1 &1507463050
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1507463051}
+  - component: {fileID: 1507463053}
+  - component: {fileID: 1507463052}
+  m_Layer: 0
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1507463051
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1507463050}
+  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: 419919574}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1507463052
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1507463050}
+  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, g: 1, b: 0.10378051, 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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 &1507463053
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1507463050}
+  m_CullTransparentMesh: 1
 --- !u!1 &1557547542
 GameObject:
   m_ObjectHideFlags: 0
@@ -1622,6 +1963,7 @@ GameObject:
   - component: {fileID: 1656126344}
   - component: {fileID: 1656126346}
   - component: {fileID: 1656126347}
+  - component: {fileID: 1656126348}
   m_Layer: 0
   m_Name: gameShowView
   m_TagString: Untagged
@@ -1670,6 +2012,8 @@ MonoBehaviour:
   lowImg: {fileID: 303685715}
   areaIdBase: {fileID: 593691932}
   perfabPath: perfabs/areaGroupId
+  minShowFontSize: 12
+  showFontSizeMax: 22
   lowImgTexture2ds: []
 --- !u!114 &1656126344
 MonoBehaviour:
@@ -1690,8 +2034,6 @@ MonoBehaviour:
   - {fileID: 1893464095}
   - {fileID: 1755905471}
   - {fileID: 133508484}
-  - {fileID: 0}
-  - {fileID: 0}
   DebugSprites: []
 --- !u!222 &1656126346
 CanvasRenderer:
@@ -1715,6 +2057,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding: {x: 0, y: 0, z: 0, w: 0}
   m_Softness: {x: 0, y: 0}
+--- !u!114 &1656126348
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1656126340}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d1f5d2c8f31b4b408c2617ac6ccbcde, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1665697813
 GameObject:
   m_ObjectHideFlags: 0
@@ -1791,6 +2145,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1665697813}
   m_CullTransparentMesh: 1
+--- !u!1 &1686185569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1686185570}
+  - component: {fileID: 1686185572}
+  - component: {fileID: 1686185571}
+  m_Layer: 0
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1686185570
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1686185569}
+  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: 1935633728}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1686185571
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1686185569}
+  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: 0.42830187, b: 0.42830187, 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: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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 &1686185572
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1686185569}
+  m_CullTransparentMesh: 1
 --- !u!1 &1755905471
 GameObject:
   m_ObjectHideFlags: 0
@@ -1997,7 +2427,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1977147924}
   m_Direction: 0
   m_Value: 1
-  m_Size: 0.9999999
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2162,6 +2592,110 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1893464095}
   m_CullTransparentMesh: 1
+--- !u!1 &1935633727
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1935633728}
+  - component: {fileID: 1935633729}
+  - component: {fileID: 1935633730}
+  m_Layer: 0
+  m_Name: loadingbar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1935633728
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1935633727}
+  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: 1686185570}
+  - {fileID: 419919574}
+  - {fileID: 1329274449}
+  m_Father: {fileID: 1344696295}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -394}
+  m_SizeDelta: {x: 700, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1935633729
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1935633727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 725276718}
+  m_FillRect: {fileID: 1507463051}
+  m_HandleRect: {fileID: 725276717}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 100
+  m_WholeNumbers: 0
+  m_Value: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1935633730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1935633727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 582a8965e0faeec4a8df7d0271769c6d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1977147923
 GameObject:
   m_ObjectHideFlags: 0

Assets/scripts/Datas/GameScenUserInfo.cs

 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 [System.Serializable]
 public class AreaInfoUseData
@@ -10,6 +11,7 @@ public class AreaInfoUseData
 }
 public class GameScenUserInfo
 {
+    static public string RunGameDatasRootName = "gameData";
     public string img = "";//线图
     public string json = "";//数据
     public string finishImg = "";//完成图
@@ -17,6 +19,60 @@ public class GameScenUserInfo
     //以上是url
     public int status = 0;//0 未开始 1 这个id进过游戏 2 至少有一个区域点亮 3完成
     public double progress = 0;//0 -- 1 具体自己算百分比
-    public string localprogress = "";//缩略图路径 status < 2 文件是未创建
     public List<AreaInfoUseData> areaInfoUseData = new List<AreaInfoUseData>();
+    private string getUrlByLocalPath(string url)
+    {
+        if (url.StartsWith("http") == false) return "";
+        int idx = url.LastIndexOf("/");
+        int idx1 = url.LastIndexOf(".");
+        if (idx < 0 || idx1 < idx)
+        {
+            return "";
+        }
+        string localName = url.Substring(idx, idx1 - idx).Trim();
+        if (localName.Length == 0) return "";
+        if (localName.StartsWith("/")) localName = localName.Substring(1);
+        string ret = utilsTools.getWritableByPath(RunGameDatasRootName+"/" + localName);
+        ret = ret + url.Substring(idx1);
+        return ret;
+    }
+    
+    public string getLineImgLocalPath()
+    {
+        return getUrlByLocalPath(img);
+    }
+    public string getColorImgLocalPath()
+    {
+        return getUrlByLocalPath(finishImg);
+    }
+    public string getJsonLocalPath()
+    {
+        return getUrlByLocalPath(json);
+    }
+    public string getLocalThumbnailPath()
+    {
+        if (id.Equals("")) return "";
+        string path = getUrlByLocalPath(json);
+        if (path.Equals("")) return "";
+        int idx = path.LastIndexOf("/");
+        string ret = path.Substring(0, idx+1) + id + "/run_suolue_line.png";
+        return ret;
+    }
+    public bool createWorkDirectory()
+    {
+        string path = getLocalThumbnailPath();
+        if (path.Equals("")) return false;
+        int idx = path.LastIndexOf("/");
+        string dirpath = path.Substring(0, idx);
+        
+        utilsTools.CreateDirectory(dirpath);
+        return true;
+    }
+    //format 后出现目录，自己在外面控制这里不做判定
+    public string getPathByFormath(string format, params System.Object[] args)
+    {
+        string name = string.Format(format, args);
+        string ret = utilsTools.getWritableByPath(RunGameDatasRootName + "/"+ id+"/" + name);
+        return ret;
+    }
 }

Assets/scripts/Datas/gameIdJsonData.cs

 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 
 public class gameIdJsonData
@@ -9,4 +10,24 @@ public class gameIdJsonData
     public short height = 0;
     public List<gameAreaItem> roomDatas = new List<gameAreaItem>();
     public List<gameAreaGroupItem> roomGroupsData = new List<gameAreaGroupItem>();
+    public bool findGid(short gid)
+    {
+        for (int i = 0; i < roomGroupsData.Count; i++)
+        {
+            if (roomGroupsData[i].id.Equals(gid))return true;
+        }
+        return false;
+    }
+    public bool findAid(short id)
+    {
+        return false;
+    }
+    public gameAreaGroupItem getRoomGroup(short id)
+    {
+        for (int i = 0; i < roomGroupsData.Count; i++)
+        {
+            if (roomGroupsData[i].id.Equals(id)) return roomGroupsData[i];
+        }
+        return null;
+    }
 }

Assets/scripts/Views/gameScene/gameInLoading.cs

+using JetBrains.Annotations;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor.UI;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class gameInLoading : MonoBehaviour,IEventHandler
+{
+    private float nowValue = 0;
+    private float tarvalue = 0;
+    private float stepvalue = 0;
+    private float maxvalue = 100f;
+    private Slider slider = null;
+    public void onEventHandler(string eventName, List<UnityEngine.Object> uobjects, List<System.Object> objects)
+    {
+        if (eventName.Equals("inGameLoadingValue"))
+        {
+            float addValue = (float)objects[0];
+            bool isEnd = (bool)objects[1];
+            if(isEnd == false)
+            {
+                tarvalue += addValue;
+                if(tarvalue >= (maxvalue - 1f))
+                {
+                    tarvalue = maxvalue - 2f;//不要超出去
+                }
+            }
+            else
+            {
+                tarvalue = maxvalue;
+            }
+            float stepvalue1 = (tarvalue - nowValue) / 50f;
+            if(stepvalue1 < 0.015f)
+            {
+                stepvalue1 = 0.015f;
+            }
+            stepvalue = stepvalue1;
+        }
+    }
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        slider = this.GetComponent<Slider>();
+        slider.value = 0;
+        slider.maxValue = maxvalue;
+        slider.minValue = 0;
+        utilsTools.onEvent(this, "inGameLoadingValue");
+        //utilsTools.addTimer_Sec(gameObject, "testSce", (string name) =>
+        //{
+        //    utilsTools.sendEventObjectParams("inGameLoadingValue",8f,tarvalue > 60f);
+        //    return tarvalue < 99f;
+        //}, 3, 10);
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        if (utilsTools.isEqualByValue(stepvalue, 0.0f, 0.00000003f))
+        {
+            return;
+        }
+        nowValue = nowValue + stepvalue;
+        if(nowValue >= maxvalue)
+        {
+            nowValue = maxvalue;
+            slider.value = nowValue;
+            stepvalue = 0.0f;
+            gameObject.SetActive(false);
+            //需要通知出去满了
+            utilsTools.sendEvent("inGameLoadingBarEnd");
+            return;
+        }
+        else
+        {
+            if(nowValue > tarvalue)
+            {
+                nowValue = tarvalue;
+                stepvalue = 0.0f;
+            }
+            slider.value = nowValue;
+        }
+        
+    }    
+}

Assets/tempdirhash.meta → Assets/scripts/Views/gameScene/gameInLoading.cs.meta

 fileFormatVersion: 2
-guid: 986cf038c0340554193659d46375c99d
-folderAsset: yes
-DefaultImporter:
+guid: 582a8965e0faeec4a8df7d0271769c6d
+MonoImporter:
   externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/scripts/Views/gameScene/gameSceneAreaGroupHandler.cs

@@ -4,6 +4,9 @@ using UnityEngine;
 
 public class gameSceneAreaGroupHandler : gridView
 {
+    private float itemWidth = 100f;
+    private float itemHeight = 100f;
+    private float itemInterval = 20f;
     // Start is called before the first frame update
     void Start()
     {
@@ -11,14 +14,17 @@ public class gameSceneAreaGroupHandler : gridView
         utilsTools.DisplaySize = new Vector2(rectTransform.rect.width, rectTransform.rect.height);
         float scale = rectTransform.rect.height / 1920;
         var scale1 = transform.localScale;
-        scale1.y *= scale;
-        transform.localScale = scale1;
+        itemWidth = itemWidth * scale1.x;
+        itemHeight = itemHeight * scale1.y;
+        itemInterval = itemWidth * scale1.x;
+        //transform.localScale = scale1;
     }
 
     // Update is called once per frame
-    void Update()
+    void Update(){
+    }
+    public void setDataNoGrid(int cout, gradViewBack gradView)
     {
-        
+        setDataNoGrid(cout, itemWidth, itemHeight, itemInterval, gradView, false,null,20);
     }
-    
 }

Assets/scripts/Views/gameScene/gameSceneLogic.cs

@@ -15,19 +15,25 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
     private int nowidx = 4;
     public float progress = 0;
     public bool showAreaId = true;
-    private TextMeshProUGUI debugViewObj = null;
     private List<TempGroupInfos> groupInfos = null;
     private Vector2 pos1 = new Vector2(-10000, -10000);
     private int rvalue = -1;
+    Dictionary<string, EventChildItemBack> childEventHandlers = new Dictionary<string, EventChildItemBack>();
+    void onEvent(string name, EventChildItemBack func)
+    {
+        utilsTools.onEvent(this, name);
+        childEventHandlers.Add(name, func);
+    }
     void Start()
     {
-        //GetComponent<TextMeshProUGUI>()
-        utilsTools.onEvent(this, "switchGameAreaGroupId");
-        utilsTools.onEvent(this, "gameViewOnInitEnd");
-        utilsTools.onEvent(this, "gameClickPos");
+        Application.SetStackTraceLogType(LogType.Log, StackTraceLogType.None);
+        onEvent("switchGameAreaGroupId",this.onEvent_switchGameAreaGroupId_Handler);
+        onEvent("gameViewOnInitEnd",this.onEvent_gameViewOnInitEnd_Handler);
+        onEvent("gameClickPos",this.onEvent_gameClickPos_Handler);
+        onEvent("inGameLoadingBarEnd",this.onEvent_inGameLoadingBarEnd_Handler);
+        onEvent("showAreaEventOk", onSelectAreaEvent);
         var gridViewList = areaGroupList.GetComponent<gameSceneAreaGroupHandler>();
         gridViewList.gameObject.SetActive(false);
-        gameShowView.GetComponent<mainGameView>().loadTest();
     }
 
     // Update is called once per frame
@@ -45,7 +51,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             Vector3 vector3;
             Quaternion quaternion;
             gobject.transform.GetLocalPositionAndRotation(out vector3, out quaternion);
-            vector3.y = -95f;
+            vector3.y = -130f;
             if (isSelect)
             {
                 vector3.y = vector3.y + 14;
@@ -54,12 +60,18 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             item.IdName = (group.gid).ToString();
             item.index = idx;
             item.UseColor = group.rgb;
-            item.NowProgress = group.jindu;
+            item.NowProgress = group.Jindu;
         }
     }
+    
     public void onEventHandler(string eventName, List<UnityEngine.Object> uobjects, List<System.Object> objects)
     {
-        if (eventName.Equals("switchGameAreaGroupId"))
+        if (childEventHandlers.ContainsKey(eventName))
+        {
+            childEventHandlers[eventName](uobjects, objects);
+        }
+    }
+    private void onEvent_switchGameAreaGroupId_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects)
     {
         Vector3 vector3;
         Quaternion quaternion;
@@ -86,42 +98,85 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         maingameView.switchShowAreaGroup((short)nowSelectGroupId, (int id, bool isOk) => {
             Debug.Log("切换下标完成" + id.ToString());
         });
-        }else if (eventName.Equals("gameViewOnInitEnd"))
+    }
+    private void onEvent_gameViewOnInitEnd_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects)
     {
         var gridViewList = areaGroupList.GetComponent<gameSceneAreaGroupHandler>();
         gridViewList.gameObject.SetActive(true);
         var maingameView = gameShowView.GetComponent<mainGameView>();
-            groupInfos = maingameView.getGroups();
-            int cout = 0;
-            for (int i = 0; i < groupInfos.Count; i++)
+        var groupInfos1 = maingameView.getGroups();
+        groupInfos = new List<TempGroupInfos>();
+        
+        for (int i = 0; i < groupInfos1.Count; i++)
+        {
+            if (groupInfos1[i].Jindu == 1)
             {
-                if(groupInfos[i].jindu == 1) {
-                    break;
+                continue;
             }
 
-                cout++;
+            groupInfos.Add(groupInfos1[i]);
         }
-            gridViewList.setDataNoGrid(cout, 150, 150, 20, (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) =>
-            {
+        gradViewBack gradView = (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) => {
             this.onUpdateGroupGridHandler(gobject, idx, lvbType, groupInfos[idx]);
-            }, false);
-            if(nowidx > 0)
+        };
+        gridViewList.setDataNoGrid(groupInfos.Count, gradView);
+        if (nowidx >= 0)
         {
-                //Debug.Log("切换下标开始" + nowSelectGroupId.ToString());
-                maingameView.switchShowAreaGroup((short)(groupInfos[nowidx].gid), (int id,bool isOk) => {
+            maingameView.switchShowAreaGroup((short)(groupInfos[nowidx].gid), (int id, bool isOk) => {
                 Debug.Log("切换下标完成" + id.ToString());
             });
         }
-        }else if (eventName.Equals("gameClickPos"))
+    }
+    private void onEvent_gameClickPos_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects)
     {
         short x = (short)objects[0];
         short y = (short)objects[1];
         var maingameView = gameShowView.GetComponent<mainGameView>();
-            maingameView.showAreaByPos(x,y, (int id,bool isOk) => {
+        maingameView.showAreaByPos(x, y, (int id, bool isOk) => {
             Debug.Log("点击区域" + id.ToSafeString() + " 显示" + isOk.ToSafeString());
             return;
         });
-            //groupInfos = maingameView.getGroups();
+    }
+    private void onEvent_inGameLoadingBarEnd_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects)
+    {
+        transform.Find("ingameLoad/loadImg").gameObject.SetActive(false);
+    }
+    void onSelectAreaEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
+    {
+        gameAreaItem gameArea = (gameAreaItem)objects[0];
+        short x = (short)objects[1];
+        short y = (short)objects[2];
+        if (groupInfos != null)
+        {
+            var gridViewList = areaGroupList.GetComponent<gameSceneAreaGroupHandler>();
+            colorItem item = null;
+            groupInfos[nowidx].show++;
+            if (groupInfos[nowidx].show.Equals(groupInfos[nowidx].size))//直接移除
+            {
+                if(nowidx == groupInfos.Count - 1)
+                {
+                    groupInfos.RemoveAt(nowidx);
+                    nowidx--;
+                }else
+                    groupInfos.RemoveAt(nowidx);
+                //切换组
+                gradViewBack gradView = (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) => {
+                    this.onUpdateGroupGridHandler(gobject, idx, lvbType, groupInfos[idx]);
+                };
+                gridViewList.setDataNoGrid(groupInfos.Count, gradView);
+                if (nowidx >= 0)
+                {
+                    var maingameView = gameShowView.GetComponent<mainGameView>();
+                    maingameView.switchShowAreaGroup((short)(groupInfos[nowidx].gid), (int id, bool isOk) => {
+                        Debug.Log("切换下标完成" + id.ToString());
+                    });
+                }
+            }
+            else
+            {
+                item = gridViewList.getObjectById(nowidx).GetComponent<colorItem>();
+                item.NowProgress = groupInfos[nowidx].Jindu;
+            }
         }
     }
     public void onTestTemp1()
@@ -129,4 +184,5 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         Debug.Log("---->>>");
     }
 
+    
 }

Assets/scripts/Views/gameScene/gameUserInfos.cs

@@ -7,12 +7,34 @@ using UnityEngine.Assertions;
 public class gameUserInfos : MonoBehaviour, IEventHandler
 {
     private string gameSaveKey = "";
-    // Start is called before the first frame update
+    private GameScenUserInfo gameScenUserInfo = null;
+    Dictionary<string, EventChildItemBack> childEventHandlers = new Dictionary<string, EventChildItemBack>();
+    void onEvent(string name, EventChildItemBack func)
+    {
+        utilsTools.onEvent(this, name);
+        childEventHandlers.Add(name, func);
+    }
     void Start()
     {
-
+        onEvent("showAreaEventOk", onSelectAreaEvent);
+        loadTest();
+    }
+    public void loadTest()
+    {
+        string id = "test";
+        GameScenUserInfo gameScenUser = utilsTools.getGameScenUserInfo(id);
+        if (gameScenUser == null)
+        {
+            utilsTools.setGameScenUserInfo(id,"http://192.168.124.160:8795/srcImgs/colorFan/tuline.png","http://192.168.124.160:8795/srcImgs/colorFan/tucolor.png","http://192.168.124.160:8795/srcImgs/colorFan/tu.json");
+            gameScenUser = utilsTools.getGameScenUserInfo(id);
+        }
+        if (gameScenUser == null)
+        {
+            Debug.Log("无法加载测试图片信息");
+            return;
+        }
+        startId(id);
     }
-
     // Update is called once per frame
     void Update()
     {   
@@ -24,16 +46,40 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
         {
             return;
         }
-        List<short> shorts = new List<short>();
-        for (int i = 0; i < gameScenUser.areaInfoUseData.Count; i++)
+        //List<short> shorts = new List<short>();
+        //for (int i = 0; i < gameScenUser.areaInfoUseData.Count; i++)
+        //{
+        //    shorts.Add(gameScenUser.areaInfoUseData[i].id);
+        //}
+        //GetComponent<mainGameView>().loadGameImgId(gameScenUser.img, gameScenUser.finishImg, gameScenUser.json,"",shorts);
+        if(GetComponent<mainGameView>().loadGameImgId(gameScenUser) == false)
+        {
+            return;
+        }
+        else
         {
-            shorts.Add(gameScenUser.areaInfoUseData[i].id);
+            gameScenUserInfo = gameScenUser;
         }
-        GetComponent<mainGameView>().loadGameImgId(gameScenUser.img, gameScenUser.finishImg, gameScenUser.json,"",shorts);
     }
 
     void IEventHandler.onEventHandler(string eventName, List<UnityEngine.Object> uobjects, List<System.Object> objects)
     {
+        if (childEventHandlers.ContainsKey(eventName)) childEventHandlers[eventName](uobjects, objects);
+    }
+    //永久保存
+    void onSelectAreaEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
+    {
+        if(gameScenUserInfo != null)
+        {
+            gameAreaItem gameArea = (gameAreaItem)objects[0];
+            short x = (short)objects[1];
+            short y = (short)objects[2];
+            AreaInfoUseData areaInfoUseData = new AreaInfoUseData();
+            areaInfoUseData.clickX = x;
+            areaInfoUseData.clickY = y;
+            areaInfoUseData.id = gameArea.id;
+            gameScenUserInfo.areaInfoUseData.Add(areaInfoUseData);
+            utilsTools.saveGameScenUserInfo(gameScenUserInfo);
+        }
     }
-    
 }

Assets/scripts/Views/salaScene/bottom.cs

@@ -19,22 +19,16 @@ public class salaScene_bottom : MonoBehaviour
         {
             if (value >=0 && value < gameObject.transform.childCount)
             {
-                List<System.Object> objects = new List<System.Object>();
-                objects.Add("");
-                objects.Add(false);
                 if (oldIdx >= 0)
                 {
-                    objects[0] = transform.GetChild(OldIdx).name;
                     Button button = transform.GetChild(oldIdx).gameObject.GetComponent<Button>();
                     button.interactable = true;
-                    utilsTools.sendEventObjects("switchPage", objects);
+                    utilsTools.sendEventObjectParams("switchPage", transform.GetChild(OldIdx).name,false);
                 }
                 oldIdx = value;
-                objects[0] = transform.GetChild(OldIdx).name;
-                objects[1] = true;
                 Button button1 = transform.GetChild(oldIdx).gameObject.GetComponent<Button>();
                 button1.interactable = false;
-                utilsTools.sendEventObjects("switchPage", objects);
+                utilsTools.sendEventObjectParams("switchPage", transform.GetChild(OldIdx).name,true);
 
             }
         }
@@ -54,8 +48,7 @@ public class salaScene_bottom : MonoBehaviour
                 var btn = new UnityEngine.UI.Button.ButtonClickedEvent();
 
 
-                utilsTools.setUserData(gobjectItem.gameObject, "zhang", i);
-                utilsTools.sendEventObjects("switchPage", objects);
+                utilsTools.sendEventObjectParams("switchPage", gobjectItem.gameObject, "zhang", i);
                 btn.AddListener(() => {
                     Int32 i2 = -1;
                     System.Object i3 = i2;

Assets/scripts/Views/salaScene/home_labels.cs

@@ -21,9 +21,7 @@ public class salaScene_labels : gridView, IEventHandler
             lItem = getObjectById(idx).GetComponent<labelItem>();
             lItem.select = true;
             nowselect = idx;
-            List<System.Object> list = new List<System.Object>();
-            list.Add(name);
-            utilsTools.sendEventObjects("setImageViewLable", list);
+            utilsTools.sendEventObjectParams("setImageViewLable", name);
         }
     }
 
@@ -39,9 +37,7 @@ public class salaScene_labels : gridView, IEventHandler
                 label.select = nowselect == idx;
                 if (nowselect == idx)
                 {
-                    List<System.Object> list = new List<System.Object>();
-                    list.Add(alldata[idx]);
-                    utilsTools.sendEventObjects("setImageViewLable", list);
+                    utilsTools.sendEventObjectParams("setImageViewLable", alldata[idx]);
                 }
                 
             }

Assets/scripts/common/gameGroupEffect.cs

+using System.Collections;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+using Unity.VisualScripting;
+
+public class gameGroupEffect : MonoBehaviour
+{
+    // Start is called before the first frame update
+    public Color color1 = new Color(1, 1, 0,1);//颜色1
+    public Color color2 = new Color(1, 0, 1,1);//颜色2
+    
+    [SerializeField]
+    private float height = 0.25f;//当前高度
+    [SerializeField]
+    private float langValue = 0.2f;//波峰-波谷的插值
+
+    public float Height
+    {
+        get { return height; }
+        set
+        {
+            if (value >= 1)
+            {
+                height = 1 + langValue * 2;
+                return;
+            }
+            if (value <= 0)
+            {
+                height = 0 - langValue * 2;
+                return;
+            }
+            height = value;
+        }
+    }
+
+    public float LangValue
+    {
+        get { return langValue; }
+        set
+        {
+            if (value < 0 || value > 1) return;
+            langValue = value;
+            Height = height;
+        }
+    }
+    public short radius = 100;//显示的圆形大小
+    private Texture2D texture2D = null;
+    private float nowOffsetX = 0;
+    private string prveUpdateKey = "";
+    public float speed = 0.2f;//更新频率
+    void initMembers()
+    {
+        if(texture2D == null)
+        {
+            Image image = GetComponent<Image>();
+            RectTransform rectTransform = GetComponent<RectTransform>();
+            rectTransform.sizeDelta = new Vector2(radius * 2, radius * 2);
+            texture2D = new Texture2D(radius * 2, radius * 2);
+            updateTexture(ref texture2D);
+            Sprite sprite = Sprite.Create(texture2D, new Rect(0, 0, radius * 2, radius * 2), new Vector2(0.5f, 0.5f));
+            var oldSprite = image.sprite;
+            image.sprite = sprite;
+            texture2D.Apply();
+            GameObject.Destroy(oldSprite);
+            oldSprite = null;
+        }
+    }
+    void Start()
+    {
+        try
+        {
+            initMembers();
+        }
+        catch (Exception e)
+        {
+            Debug.Log(e);
+        }
+
+    }
+    bool updateTexture(ref Texture2D texture2D)
+    {
+        Color colorEmpty = new Color(0, 0, 0, 0);
+        float qujian = langValue * radius * 2;
+        float height1 = height * radius * 2;
+        string prvateKey = string.Format("{0}_{1}_{2}_{3}_{4}_{5}", color1.ToString(), color2.ToString(), height, langValue, radius, nowOffsetX);
+        if (prvateKey.Equals(prveUpdateKey) && (langValue == 0.0f || speed == 0.0f))
+        {
+            return false;
+        }
+        prveUpdateKey = prvateKey;
+        nowOffsetX = (nowOffsetX + speed) % 1080;
+        //边界值问题 
+        for (int x = 0 - radius; x < radius; x++)
+        {
+            double huduValue = ((x + this.nowOffsetX) % 360 * Math.PI) / 180.0;
+            double y1 = Math.Sin(huduValue);//-1 ---- +1
+            double fenge = height1 - qujian/2 + y1 * qujian/2;
+            for (int y = 0 - radius; y < radius; y++)
+            {
+                if ((x * x + y * y) < (radius * radius)){
+                    if(langValue == 0)
+                    {
+                        if((y + radius) > height1)
+                        {
+                            texture2D.SetPixel(x + radius, y + radius, color1);
+                        }
+                        else
+                        {
+                            texture2D.SetPixel(x + radius, y + radius, color2);
+                        }
+                    }
+                    else
+                    {
+                        if((y+radius) > fenge)
+                        {
+                            texture2D.SetPixel(x + radius, y + radius, color1);
+                        }
+                        else
+                        {
+                            texture2D.SetPixel(x + radius, y + radius, color2);
+                        }
+                    }
+                }
+                else
+                {
+                    texture2D.SetPixel(x+radius, y+radius, colorEmpty);
+                }
+            }
+        }
+        return true;
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        initMembers();
+        if (updateTexture(ref texture2D) == true)
+        {
+            texture2D.Apply();
+        }
+    }
+}

Assets/scripts/common/gameGroupEffect.cs.meta

+fileFormatVersion: 2
+guid: d6a140759d40b744e891af608357385b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/scripts/common/gridView.cs

@@ -158,7 +158,7 @@ public class gridView : MonoBehaviour
         }
     }
     //ֻ֧һԤ
-    virtual public void setDataNoGrid(int size,float widthItem,float heightItem,float interval,gradViewBack back, bool useVec = true, GetGradViewInfo getGradViewInfo = null)
+    virtual public void setDataNoGrid(int size,float widthItem,float heightItem,float interval,gradViewBack back, bool useVec = true, GetGradViewInfo getGradViewInfo = null,float offset1 = 0.0f)
     {
 
         if (perfabPaths.Count == 0)
@@ -215,7 +215,7 @@ public class gridView : MonoBehaviour
         {
             float h = GetComponent<RectTransform>().sizeDelta.y;
             startY = 0 - h / 2 + heightItem / 2 - (heightItem / 2 + interval / 2);
-            vector3.x = 0 - rectTransform.sizeDelta.x / 2;
+            vector3.x = 0 - rectTransform.sizeDelta.x / 2 - offset1;
             float spacingLen = 0;
             spacingLen = interval  * (size - 1);
             float height = spacingLen + coutPixel;
@@ -228,7 +228,7 @@ public class gridView : MonoBehaviour
         else
         {
             float w = GetComponent<RectTransform>().sizeDelta.x;
-            vector3.y = 0 - rectTransform.sizeDelta.y / 2;
+            vector3.y = 0 - rectTransform.sizeDelta.y / 2 - offset1;
             startX = 0 - w / 2 + widthItem / 2 - (widthItem / 2 + interval / 2);
             float spacingLen = 0;
             spacingLen = interval * (size - 1);

Assets/scripts/common/mainGameScaleMove.cs

@@ -291,8 +291,7 @@ public class mainGameScaleMove : MonoBehaviour
             Vector2 pos1 = vector * scaleVector;
             short x = Convert.ToInt16(pos1.x + width / 2);
             short y = Convert.ToInt16(pos1.y + height / 2);
-            List<System.Object> senddata = new List<System.Object>() {x,y};
-            utilsTools.sendEventObjects("gameClickPos", senddata);
+            utilsTools.sendEventObjectParams("gameClickPos", x,y);
         }
         else
         {

Assets/scripts/common/mainGameView.cs

@@ -16,7 +16,14 @@ public class TempGroupInfos
 {
     public Color rgb;
     public int gid;
-    public float jindu;
+    
+    public short size = 0;
+    public short show = 0;
+    public float Jindu
+    {
+        get { return (float)show / (float)size; }
+    }
+
 }
 class AreaAnimationDiffuse
 {
@@ -44,20 +51,21 @@ public class mainGameView : MonoBehaviour
     public string perfabPath = "";
     private GameObject areaIdperfabObj = null;
     public DigitMatrixShort digitMatrix = null;
-    
+    public float minShowFontSize = 15f;
+    public float showFontSizeMax = 30f;
     protected Texture2D lineTexture2d = null;
     public List<Texture2D> lowImgTexture2ds = new List<Texture2D>();
     protected short nowSelectgid = -1;
     private string[] initDigitMatrixs = { "", "" };
-    private string runGameDatas = "runGameDatas";
-    private List<short> nowSelectInfos = null;
-    private Vector2 pos1 = new Vector2(-1000, -1000);
+    private Dictionary<short, short> aid2selectOrderIdx = new Dictionary<short, short>();
+    private Vector3 prveAreaIdScale = new Vector3(-100, -100);
+    private GameScenUserInfo gameScenUseInfo = null;
     //x,y aid 当前帧向量 起点终点 等宽度计算扩散
     private List<AreaAnimationDiffuse> showAreaAnimationDatas = new List<AreaAnimationDiffuse>();
-    private int rvalue = -1;
 
     public void onInitDigitMatrix(string name)
     {
+        
         Debug.Log("onInitDigitMatrix >> " + name);
         if (lowImg == null && name.Equals("select") == false) 
             onInitDigitMatrix("select");
@@ -76,18 +84,19 @@ public class mainGameView : MonoBehaviour
     }
     protected string getSelectPathByGid(int gid)
     {
-        string savepath = utilsTools.getWritableByPath(runGameDatas + "/nowRunGameId");
-        utilsTools.CreateDirectory(savepath);
-        return savepath + "/temp_" + gid.ToString() + ".png";
+        return gameScenUseInfo.getPathByFormath("groupId_{0}.png",gid);
     }
-    public void saveGroupTexture(int pgid,Texture2D nowGroupIdTexture)
+    public void saveGroupTexture(int pgid,Texture2D nowGroupIdTexture,bool isDestroy = true)
     {
         string temppath = getSelectPathByGid(pgid);
         utilsTools.saveByteToPath(nowGroupIdTexture.EncodeToPNG(), temppath);
         utilsTools.saveImageDefaultMetaInfoToPath(temppath);
+        if (isDestroy)
+        {
             GameObject.Destroy(nowGroupIdTexture);
             nowGroupIdTexture = null;
         }
+    }
     public bool addTaskInMakeGroupMap(int i, Texture2D lowImgTexture2dFirst,bool isNowShow)
     {
         var tm = TaskManages.getInstance();
@@ -150,8 +159,12 @@ public class mainGameView : MonoBehaviour
                 }
                 return;
             }
-            if(nowGroupIdTexture != null)
-                saveGroupTexture((short)listparam[0],nowGroupIdTexture);
+            if (nowGroupIdTexture != null)
+            {
+                saveGroupTexture((short)listparam[0], nowGroupIdTexture);
+                if (isGameShow == false) utilsTools.sendEventObjectParams("inGameLoadingValue", 6f, false);
+                
+            }
         }, param1);
         return true;
     }
@@ -168,7 +181,7 @@ public class mainGameView : MonoBehaviour
                 int x = (int)datas[0];
                 int setp = (int)datas[1];
                 int height = (int)datas[2];
-                Debug.Log("执行任务参数列表 typeid 1 " + (x + setp).ToSafeString());
+                utilsTools.sendEventObjectParams("inGameLoadingValue", 4f, false);
                 for (int i = x; i < (x + setp); i++)
                 {
                     for (int j = 0; j < height; j++)
@@ -194,7 +207,14 @@ public class mainGameView : MonoBehaviour
                     TaskItemBack taskItemBack1 = (System.Object[] param) =>
                     {
                         gameAreaItem gai = (gameAreaItem)param[0];
-                        Debug.Log("area reset id " + (gai.id + 20).ToString());
+                        if (aid2selectOrderIdx != null && aid2selectOrderIdx.ContainsKey(gai.id))
+                        {
+                            Color color = new Color(1, 1, 1, 0);
+                            digitMatrix.FloodFill8WithStack(gai.px, gai.py, (short)(-1), 0, (short x, short y, short c) => {
+                                lineTexture2d.SetPixel(x, y, color);
+                                return true;
+                            });
+                        }
                         digitMatrix.FloodFill8WithStack(gai.px, gai.py, (short)(gai.id + 20), 0, null);
                     };
                     //给每一个空白设置 区域id
@@ -206,6 +226,10 @@ public class mainGameView : MonoBehaviour
                             taskManages.addTask(this, taskItemBack1, temps);
                         }
                     }
+                    taskManages.addTask(this, (System.Object[] objects) =>
+                    {
+                        lineTexture2d.Apply();
+                    });
                     onInitDigitMatrix("line");
 
                 }
@@ -226,16 +250,6 @@ public class mainGameView : MonoBehaviour
         {
             TaskManages tm = TaskManages.getInstance();
             var lowImgTexture2dFirst = lowImgTexture2ds[0];
-            Texture2D nowGroupIdTexture = null;
-            Action<int> tempSaveTexture = (int nowgid) =>
-            {
-                string temppath = getSelectPathByGid(nowgid);
-                utilsTools.saveByteToPath(nowGroupIdTexture.EncodeToPNG(), temppath);
-                utilsTools.saveImageDefaultMetaInfoToPath(temppath);
-                GameObject.Destroy(nowGroupIdTexture);
-                nowGroupIdTexture = null;
-                return;
-            };
             TaskItemBack checkPtNextHandler = null;
             checkPtNextHandler = (System.Object[] listparam) =>
             {
@@ -246,7 +260,7 @@ public class mainGameView : MonoBehaviour
                     tm.addTask(this, checkPtNextHandler);
                     return;
                 }
-                Debug.Log("开始生成组图片");
+                utilsTools.sendEventObjectParams("inGameLoadingValue", 5f, false);
                 gameidJsondata.roomGroupsData.Sort(gameAreaGroupItem.sortByIsComplete);
                 int j = 0;
                 int i = 0;
@@ -263,6 +277,7 @@ public class mainGameView : MonoBehaviour
                     //创建一堆节点
                     TaskItemBack onUpdateByIdNode = (System.Object[] listparam) =>
                     {
+                        utilsTools.sendEventObjectParams("inGameLoadingValue", 5f, false);
                         checkAddAreaId();
                         onInitDigitMatrix("select");
                     };
@@ -283,6 +298,7 @@ public class mainGameView : MonoBehaviour
         {
             TaskManages tm = TaskManages.getInstance();
             TaskItemBack firstHandlGid = (System.Object[] temp) => {
+                utilsTools.sendEventObjectParams("inGameLoadingValue", 2f, false);
                 for (int i = 0; i < gameidJsondata.roomGroupsData.Count; i++)
                 {
                     var group = gameidJsondata.roomGroupsData[i];                    
@@ -295,7 +311,6 @@ public class mainGameView : MonoBehaviour
             };
             tm.addTask(this, firstHandlGid);
         }
-        //while (TaskManages.getInstance().updateTask(this)) ;
     }
     protected void checkAddAreaId()
     {
@@ -305,6 +320,8 @@ public class mainGameView : MonoBehaviour
         Vector3 localPosTemp = new Vector3();
         Quaternion quaternion = new Quaternion();
         var areaIdBaseTransform = areaIdBase.transform.GetComponent<RectTransform>();
+        Vector3 vector3 = areaIdBase.transform.localScale;
+        prveAreaIdScale = vector3;
         for (int i = 0; i < gameidJsondata.roomDatas.Count; i++)
         {
             var item = gameidJsondata.roomDatas[i];
@@ -333,8 +350,21 @@ public class mainGameView : MonoBehaviour
                 localPosTemp.x = (float)item.px / (float)width * rectTransform.rect.width - (rectTransform.rect.width / 2);
                 localPosTemp.y = (float)item.py / (float)height * rectTransform.rect.height - (rectTransform.rect.height / 2);
                 idValueTran.SetLocalPositionAndRotation(localPosTemp, quaternion);
+                TextMeshProUGUI textMesh = idValueTran.GetComponent<TextMeshProUGUI>();
+                textMesh.text = (item.gid).ToString();
+                float fontSize = item.pr;
+
+                if (fontSize > showFontSizeMax) fontSize = showFontSizeMax;
+                textMesh.fontSize = fontSize;
+                
+                if ((fontSize * vector3.x) < minShowFontSize)
+                {
                     idValueTran.gameObject.SetActive(false);
-                idValueTran.GetComponent<TextMeshProUGUI>().text = (item.gid).ToString();
+                }
+                else
+                {
+                    idValueTran.gameObject.SetActive(true);
+                }
             }
         }
         for (int i = j; i < short.MaxValue; i++)
@@ -345,6 +375,32 @@ public class mainGameView : MonoBehaviour
             GameObject.Destroy(idValueTran.gameObject);
         }
     }
+    public void updateScaleView()
+    {
+        Vector3 vector3 = lineImg.transform.localScale;
+        if (areaIdBase != null && perfabPath.Equals("") == false)
+        {
+            //倍数怎么弄
+            for (int i = 0; i < gameidJsondata.roomDatas.Count; i++)
+            {
+                var item = gameidJsondata.roomDatas[i];
+                if (item.tempExKey.Equals("") == false)
+                {
+                    Transform idValueTran = areaIdBase.transform.Find(item.tempExKey);
+                    if (idValueTran == null) continue;
+                    float fontSize = item.pr * vector3.x;
+                    if(fontSize < minShowFontSize)
+                    {
+                        idValueTran.gameObject.SetActive(false);
+                    }
+                    else
+                    {
+                        idValueTran.gameObject.SetActive(true);
+                    }
+                }
+            }
+        }
+    }
     protected void onInitEndHandler()
     {
         utilsTools.sendEvent("gameViewOnInitEnd");
@@ -368,6 +424,7 @@ public class mainGameView : MonoBehaviour
                 else
                 {
                     utilsTools.saveImageDefaultMetaInfoToPath(localpath);
+                    utilsTools.sendEventObjectParams("inGameLoadingValue", 8f, false);
                     Image image = null;
                     if(typeId == 1)
                     {
@@ -380,15 +437,11 @@ public class mainGameView : MonoBehaviour
                     image.sprite = Sprite.Create(texture2d, new Rect(0, 0, texture2d.width, texture2d.height), new Vector2(0.5f, 0.5f));
                     if(lowImg != null && typeId == 2)
                     {
-                        //添加底图
-                        string dir = utilsTools.getWritableByPath(runGameDatas);
-                        string lowPath = dir + "/"+texture2d.width.ToSafeString() + "X" + texture2d.height.ToSafeString()+".png";
-                        Debug.Log(lowPath);
+                        string lowPath = gameScenUseInfo.getPathByFormath("../{0}_{1}X{2}.png","bule",texture2d.width,texture2d.height);
                         if(utilsTools.IsExistIO(lowPath) == false)
                         {
                             Texture2D lowTexture = new Texture2D(texture2d.width, texture2d.height, TextureFormat.RGBA32, false);
                             Color color = new Color(1, 1, 1, 0);
-                            Debug.Log("tttttttttttttttt **** create select img");
                             for (int x = 0; x < texture2d.width; x++)
                             {
                                 for(int y = 0;y < texture2d.height; y++)
@@ -400,11 +453,10 @@ public class mainGameView : MonoBehaviour
                             utilsTools.saveImageDefaultMetaInfoToPath(lowPath);
                         }
                         Image lowImgView = lowImg.GetComponent<Image>();
-                        Debug.Log(lowPath);
                         utilsTools.loadLocalImage(this, lowImgView, lowPath, (bool isOk) => {
-                            Debug.Log("lowImgTexture2d  isOk " + isOk.ToSafeString());
                             if (isOk)
                             {
+                                utilsTools.sendEventObjectParams("inGameLoadingValue", 10f, false);
                                 var lowImgTexture2d = lowImgView.sprite.texture;
                                 lowImgTexture2ds.Add(lowImgTexture2d);
                                 onLoadFileOk(4);
@@ -423,7 +475,6 @@ public class mainGameView : MonoBehaviour
                 {
                     utilsTools.addTimer_Sec(gameObject, url1, (string name1) =>
                     {
-                        
                         loadFileInfo(url1, localpath, typeId);
                         return false;
                     }, 5);
@@ -431,20 +482,13 @@ public class mainGameView : MonoBehaviour
                 }
                 else
                 {
+                    utilsTools.sendEventObjectParams("inGameLoadingValue", 8f, false);
                     string jsondata = data as string;
                     this.gameidJsondata = JsonUtility.FromJson<gameIdJsonData>(jsondata);
-                    if(this.nowSelectInfos != null)
-                    {
                     int centerSize = gameidJsondata.roomDatas.Count();
-                        for (int i = 0; i < this.nowSelectInfos.Count(); i++)
-                        {
-                            int aid = this.nowSelectInfos[i];
-                            if(aid < 0 || aid >= centerSize)
+                    foreach (var item in aid2selectOrderIdx)
                     {
-                                Debug.LogError("本地db错误，或者json错误，超出范围");
-                                return 0;
-                            }
-                            gameidJsondata.roomDatas[aid].isShow = true;
+                        gameidJsondata.roomDatas[item.Key].isShow = true;
                     }
                     for(int i = 0;i < gameidJsondata.roomGroupsData.Count(); i++)
                     {
@@ -459,68 +503,38 @@ public class mainGameView : MonoBehaviour
                             }
                         }
                     }
-                    }
                     onLoadFileOk(typeId);
                     return 0;
                 }
             });
         }
     }
-    public bool loadGameImgId(string lineUrl,string colorUrl,string jsonUrl,string gid,List<short> selectIds = null)
-    {
-        if (lowImg != null) lowImg.SetActive(false);
-        if (lineUrl.EndsWith(".png") == false)
-        {
-            return false;
-        }
-        if (colorUrl.EndsWith(".png") == false)
+    public bool loadGameImgId(GameScenUserInfo gameUserInfo)
     {
-            return false;
-        }
-        if (jsonUrl.EndsWith(".json") == false)
+        string linePath = gameUserInfo.getLineImgLocalPath();
+        string colorPath = gameUserInfo.getColorImgLocalPath();
+        string jsonPath = gameUserInfo.getJsonLocalPath();
+        string thumbnail = gameUserInfo.getLocalThumbnailPath();
+        if(jsonPath.Equals("") || linePath.Equals("") || colorPath.Equals("") || thumbnail.Equals(""))
         {
             return false;
         }
-        string lineLocalName = "";
-        int idx = lineUrl.LastIndexOf("/");
-        int idx1 = lineUrl.LastIndexOf(".");
-        if (idx < 0|| idx1 < idx)
+        if (false == gameUserInfo.createWorkDirectory())return false;
+        utilsTools.sendEventObjectParams("inGameLoadingValue", 3f, false);
+        this.gameScenUseInfo = gameUserInfo;
+        for (short i = 0; i < gameUserInfo.areaInfoUseData.Count; i++)
         {
-            return false;
+            var userAreaData = gameUserInfo.areaInfoUseData[i];
+            aid2selectOrderIdx.Add(userAreaData.id, i);
         }
-        lineLocalName = lineUrl.Substring(idx, idx1 - idx);
-
-        string colorLocalName = "";
-        idx = colorUrl.LastIndexOf("/");
-        idx1 = colorUrl.LastIndexOf(".");
-        if (idx < 0 || idx1 < idx)
-        {
-            return false;
+        loadFileInfo(gameUserInfo.json, jsonPath, 3);
+        loadFileInfo(gameUserInfo.finishImg,colorPath, 2);
+        loadFileInfo(gameUserInfo.img,linePath, 1);
+        return true;
     }
-        colorLocalName = colorUrl.Substring(idx, idx1 - idx);
-        string jsonLocalName = "";
-        idx = jsonUrl.LastIndexOf("/");
-        idx1 = jsonUrl.LastIndexOf(".");
-        if (idx < 0 || idx1 < idx)
+    public bool loadGameImgId(string lineUrl,string colorUrl,string jsonUrl,string gid,List<short> selectIds = null)
     {
-            return false;
-        }
-        jsonLocalName = jsonUrl.Substring(idx, idx1 - idx);
-        if (lineLocalName.Length == 0 || colorLocalName.Length == 0 || jsonLocalName.Length == 0) return false;
-        if (jsonLocalName.StartsWith("/")) jsonLocalName = jsonLocalName.Substring(1);
-        if (colorLocalName.StartsWith("/")) colorLocalName = colorLocalName.Substring(1);
-        if (lineLocalName.StartsWith("/")) lineLocalName = lineLocalName.Substring(1);
-        progresName = utilsTools.EncryptString(jsonLocalName);
-        string progresNameDir = utilsTools.getWritableByPath(runGameDatas+"/" + progresName);
-        if (utilsTools.IsExistIO(progresNameDir,false) == false)
-        {
-            utilsTools.CreateDirectory(progresNameDir);
-        }
-        this.nowSelectInfos = selectIds;
-        loadFileInfo(jsonUrl, runGameDatas+"/" + jsonLocalName + ".json", 3);
-        loadFileInfo(colorUrl, runGameDatas+"/" + colorLocalName + ".png", 2);
-        loadFileInfo(lineUrl, runGameDatas+"/" + lineLocalName + ".png", 1);
-        return true;
+        throw new NotImplementedException();
     }
     public void showArea(int areaId, OnAreaHandler onAreaHandler = null)
     {
@@ -561,8 +575,8 @@ public class mainGameView : MonoBehaviour
 
                 lineTexture2d.Apply();
                 lowImgTexture2d.Apply();
-                string path = utilsTools.getWritableByPath("runGameDatas/" + progresName + "/run_suolue_line.png");
-                utilsTools.saveByteToPath(utilsTools.ScaleTexture(lineTexture2d,500,500).EncodeToPNG(), path);
+                //string path = gameScenUseInfo.getLocalThumbnailPath();
+                //utilsTools.saveByteToPath(utilsTools.ScaleTexture(lineTexture2d,500,500).EncodeToPNG(), path);
                 if (onAreaHandler != null) onAreaHandler(areaItem.id, true);
                 string groupPath = getSelectPathByGid(areaItem.gid);
                 utilsTools.saveByteToPath(lowImgTexture2d.EncodeToPNG(), groupPath);
@@ -589,60 +603,44 @@ public class mainGameView : MonoBehaviour
                 onAreaHandler(gid, false);
             return false;
         }
-        if (!(digitMatrix != null && lineTexture2d != null && gameidJsondata != null && gid >= 0 && gid < gameidJsondata.roomGroupsData.Count))
+        if (!(digitMatrix != null && lineTexture2d != null && gameidJsondata != null && gameidJsondata.findGid(gid)))
         {
             if (onAreaHandler != null)
                 onAreaHandler(gid, false);
             return false;
         }
+        if(showAreaAnimationDatas.Count > 0)
+        {
+            if (onAreaHandler != null) onAreaHandler(gid, false);
+            return false;
+        }
         lowImg.SetActive(true);
         string groupPath = getSelectPathByGid(gid);
         Image image = lowImg.GetComponent<Image>();
         if (utilsTools.IsExistIO(groupPath))
         {
-            if (nowSelectgid >= 0) {
-                for (int i = 0; i < gameidJsondata.roomGroupsData[nowSelectgid-1].roomIds.Count(); i++)
-                {
-                    short aid = gameidJsondata.roomGroupsData[nowSelectgid-1].roomIds[i];
-                    string key = gameidJsondata.roomDatas[aid].tempExKey;
-                    if(key.Equals("") == false)
-                    {
-                        areaIdBase.transform.Find(key).gameObject.SetActive(false);
-                    }
-                }
-            }
+            short oldNowSelectGid = nowSelectgid;
             nowSelectgid = gid;            
-            
             utilsTools.loadLocalImage(this, image, groupPath, (bool isOk) =>
             {
                 if (isOk)
                 {
                     lowImgTexture2ds[0] = image.sprite.texture;
                     lowImgTexture2ds[0].Apply();
-                    for (int i = 0; i < gameidJsondata.roomGroupsData[nowSelectgid-1].roomIds.Count(); i++)
-                    {
-                        short aid = gameidJsondata.roomGroupsData[nowSelectgid-1].roomIds[i];
-                        string key = gameidJsondata.roomDatas[aid].tempExKey;
-                        if (key.Equals("") == false)
-                        {
-                            var node = areaIdBase.transform.Find(key);
-                            if(node == null)
-                            {
-                                gameidJsondata.roomDatas[aid].tempExKey = "";
-                                continue;
-                            }
-                            node.gameObject.SetActive(true);
-                        }
-                    }
                 }
                 if (onAreaHandler != null)
                     onAreaHandler(gid, isOk);
+                if (oldNowSelectGid < 0)
+                {
+                    //首次切换组完成
+                    utilsTools.sendEventObjectParams("inGameLoadingValue", 6f, true);
+                }
             });
         }
         else
         {
             // 需要添加一个紧急插队的操作
-            var group = gameidJsondata.roomGroupsData[nowSelectgid-1];
+            var group = gameidJsondata.getRoomGroup(nowSelectgid);
             var tm = TaskManages.getInstance();
             Texture2D texture2D = new Texture2D(image.sprite.texture.width, image.sprite.texture.height);
             texture2D.LoadRawTextureData(image.sprite.texture.GetRawTextureData());
@@ -671,8 +669,13 @@ public class mainGameView : MonoBehaviour
                 saveGroupTexture(pgid, texture2D);
                 image.sprite.texture.Apply();
                 OnAreaHandler onAreaHandler1 = (OnAreaHandler)param[1];
+                short oldNowSelectGid = (short)param[2];
                 if (onAreaHandler1 != null) onAreaHandler1(pgid,true);
-            },gid,onAreaHandler);
+                if(oldNowSelectGid < 0) {
+                    //首次切换组完成
+                    utilsTools.sendEventObjectParams("inGameLoadingValue", 6f, true);
+                }
+            },gid,onAreaHandler,nowSelectgid);
             for (int i = 0; i < group.roomIds.Count(); i++)
             {
                 var area = gameidJsondata.roomDatas[group.roomIds[i]];
@@ -681,7 +684,7 @@ public class mainGameView : MonoBehaviour
                     tm.insertTask(this, taskItemBack, area, false);
                 }
             }
-            var group2 = gameidJsondata.roomGroupsData[gid];
+            var group2 = gameidJsondata.getRoomGroup(gid);
             for (int i = 0; i < group2.roomIds.Count(); i++)
             {
                 var area = gameidJsondata.roomDatas[group2.roomIds[i]];
@@ -705,7 +708,8 @@ public class mainGameView : MonoBehaviour
                 TempGroupInfos tempGroupInfos = new TempGroupInfos();
                 item.getRGB(out tempGroupInfos.rgb);
                 tempGroupInfos.gid = item.id;
-                if (item.isComplete) tempGroupInfos.jindu = 1;
+                tempGroupInfos.size = (short)(item.roomIds.Count() - 1);
+                if (item.isComplete) tempGroupInfos.show = tempGroupInfos.size ;
                 else
                 {
                     short cout = 0;
@@ -717,23 +721,13 @@ public class mainGameView : MonoBehaviour
                         }
                     }
                     //防止出现 整数 2/5 ==> 0
-                    tempGroupInfos.jindu = (float)cout / (float)item.roomIds.Count();
+                    tempGroupInfos.show = cout;
                 }
                 ret.Add(tempGroupInfos);
             }
         }
         return ret;
     }
-    int getAreaByPos(int x,int y)
-    {
-        if (digitMatrix == null || lineTexture2d == null || gameidJsondata == null || x >= digitMatrix.RowCount || y >= digitMatrix.ColumnCount)
-            return -1;
-        short oldValue = digitMatrix.Data[x, y];
-        if (oldValue == -2) return -1;//已经显示
-        if (oldValue == 0) return -1;//请稍后尚未初始化完成
-        if (oldValue == -1) return -1;//这是轮廓上
-        return oldValue - 20;
-    }
     public bool showAreaByPos(short x,short y,OnAreaHandler showBack)
     {
         if (x >= digitMatrix.RowCount || y >= digitMatrix.ColumnCount || this.nowSelectgid < 0 || x < 0 || y < 0)
@@ -763,7 +757,6 @@ public class mainGameView : MonoBehaviour
             return false;
         }
         areaItem.isShow = true;
-        //showArea(aid);
         if (areaItem.tempExKey.Equals("") == false)
         {
             var node = areaIdBase.transform.Find(areaItem.tempExKey);
@@ -777,38 +770,25 @@ public class mainGameView : MonoBehaviour
         AreaAnimationDiffuse areaAnimationDiffuse = new AreaAnimationDiffuse(x, y, aid);
         areaAnimationDiffuse.m_fpsStart = 0;
         showAreaAnimationDatas.Add(areaAnimationDiffuse);
+        utilsTools.sendEventObjectParams("showAreaEventOk", areaItem,x,y);
+        if (showBack != null)
+            showBack(aid, true);
         return true;
     }
-    public void loadTest()
-    {
-    
-        loadGameImgId(
-        "http://192.168.124.160:8795/srcImgs/colorFan/tuline.png",
-        "http://192.168.124.160:8795/srcImgs/colorFan/tucolor.png",
-        "http://192.168.124.160:8795/srcImgs/colorFan/tu.json",
-        "tu");
-    }
-    // Start is called before the first frame update
-    void Start()
-    {
-        //Application.SetStackTraceLogType(LogType.Log, StackTraceLogType.None);
-    }
-    private void showColorByPos(int x,int y,short aid,Texture2D lowImgTexture2d)
-    {
-        digitMatrix.Data[(short)x, (short)y] = -2;
-        Color color = lineTexture2d.GetPixel(x, y);
-        color.a = 0;
-        lineTexture2d.SetPixel(x, y, color);
-        color = lowImgTexture2d.GetPixel(x, y);
-        color.a = 0;
-        lowImgTexture2d.SetPixel(x, y, color);
-    }
-
     // Update is called once per frame
     void Update()
     {
         TaskManages.getInstance().updateTask(this);
         onShowAnimationHandler();  
+        if(prveAreaIdScale.x > 0)
+        {
+            Vector3 vector3 = areaIdBase.transform.localScale;
+            if(prveAreaIdScale.Equals(vector3) == false)
+            {
+                updateScaleView();
+                prveAreaIdScale = vector3;
+            }
+        }
     }
     //暂时不支持 不同组在同一帧率填充过程
     void onShowAnimationHandler()
@@ -868,7 +848,8 @@ public class mainGameView : MonoBehaviour
                 {
                     //没有可渲染区域
                     removeAids.Add(item.m_aid);
-                    Debug.Log("没有找到填充的颜色像素"+item.m_aid.ToString());
+                    if(selectTexture != null)
+                        saveGroupTexture(nowSelectgid, selectTexture,false);
                 }
                 else
                 {
@@ -901,97 +882,12 @@ public class mainGameView : MonoBehaviour
                         }
                     }
                 }
-            }
-        }
-    }
-    void testFunByMousePtShowYuanAnimation()
+                if(showAreaAnimationDatas.Count == 0)
                 {
-        if (Input.GetMouseButtonDown(0))
-        {
-
-            RectTransform rectTransform = lineImg.GetComponent<RectTransform>();
-            Vector2 pos = utilsTools.ScreenToUILocalPos(rectTransform, Input.mousePosition);
-
-            rvalue = 1;
-            if (lowImgTexture2ds.Count == 0)
-            {
-                Texture2D texture2D = lineImg.GetComponent<Image>().sprite.texture;
-                Texture2D texture = new Texture2D(texture2D.width, texture2D.height, texture2D.format, false);
-                texture.LoadRawTextureData(texture.GetRawTextureData());
-                lowImgTexture2ds.Add(texture);
-                texture = new Texture2D(texture2D.width, texture2D.height, texture2D.format, false);
-                texture.LoadRawTextureData(texture.GetRawTextureData());
-                lowImgTexture2ds.Add(texture);
+                    //保存一次缩略遮罩图
+                    string path = gameScenUseInfo.getLocalThumbnailPath();
+                    utilsTools.saveByteToPath(utilsTools.ScaleTexture(lineTexture2d, 500, 500).EncodeToPNG(), path);
                 }
-            else
-            {
-                Texture2D texture2D = lowImgTexture2ds[1];
-                Texture2D texture = new Texture2D(texture2D.width, texture2D.height, texture2D.format, false);
-                texture.LoadRawTextureData(texture.GetRawTextureData());
-                GameObject.Destroy(lowImgTexture2ds[0]);
-                lowImgTexture2ds[0] = texture;
-            }
-            Vector2 scaleVector = new Vector2(1, 1);
-            scaleVector.x = lowImgTexture2ds[0].width / rectTransform.rect.width;
-            scaleVector.y = lowImgTexture2ds[0].height / rectTransform.rect.height;
-            pos1 = pos * scaleVector;
-        }
-        else if (rvalue > 0)
-        {
-            Dictionary<String, bool> keyValues = new Dictionary<string, bool>();
-            mainGameView gameView = this;
-            Texture2D texture2D = null;
-            RectTransform rectTransform = gameView.lineImg.GetComponent<RectTransform>();
-            float setp = 5f;
-            if (rvalue > 5)
-            {
-                setp = 2 / ((float)rvalue / 8);
-            }
-            for (float angle = 0; angle < 360; angle += setp)
-            {
-                float radians = angle * Mathf.Deg2Rad;
-                Vector2 direction = new Vector2(Mathf.Cos(radians), Mathf.Sin(radians));
-                for (float r = 0; r < 10; r++)
-                {
-                    if (r + rvalue > 100) break;
-                    Vector2 temp = direction * (r + rvalue);
-                    int x = Convert.ToInt32(pos1.x + temp.x);
-                    int y = Convert.ToInt32(pos1.y + temp.y);
-                    if (rectTransform.rect.Contains(new Vector2(x, y)) == false) continue;
-                    string key = x.ToString() + "_" + y.ToString();
-                    if (keyValues.ContainsKey(key)) continue;
-                    keyValues.Add(key, true);
-                    if (texture2D == null)
-                    {
-                        texture2D = gameView.lowImgTexture2ds[0];
-                    }
-                    //需要尺寸缩放
-                    x = Convert.ToInt32(x + texture2D.width / 2);//x + Convert.ToInt32(rectTransform.rect.width / 2);
-                    y = Convert.ToInt32(y + texture2D.height / 2);
-                    if (x < 0 || y < 0 || x > texture2D.width || y > texture2D.height) continue;
-                    Color color = texture2D.GetPixel(x, y);
-                    color.a = 0;
-                    texture2D.SetPixel(x, y, color);
-                }
-            }
-            if (texture2D == null)
-            {
-                rvalue = 0;
-                utilsTools.addTimer_Sec(gameObject, "tempTest_1", (string name) =>
-                {
-                    texture2D = gameView.lowImgTexture2ds[1];
-                    Sprite sprite = Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), new Vector2(0.5f, 0.5f));
-                    gameView.lineImg.GetComponent<Image>().sprite = sprite;
-                    sprite.texture.Apply();
-                    return false;
-                }, 3);
-            }
-            else
-            {
-                Sprite sprite = Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), new Vector2(0.5f, 0.5f));
-                gameView.lineImg.GetComponent<Image>().sprite = sprite;
-                sprite.texture.Apply();
-                rvalue += 10;
             }
         }
     }

Assets/scripts/funDelegate/IDelegates.cs

@@ -26,6 +26,7 @@ public delegate bool DigitMatrixSetBack(short x, short y,short c);
 public delegate bool DigitMatrixIsEqual<T>(T t1, T t2);
 public delegate bool DigitMatrixSetBackT<T>(short x, short y, T c);
 public delegate void TaskItemBack(System.Object[] list);
+public delegate void EventChildItemBack(List<UnityEngine.Object> uobjects, List<System.Object> objects);
 public delegate void OnAreaHandler(int id, bool isOk);//显示区域或者显示组完成回调
 public delegate void LoadImageBack(Sprite sprite,string id,Image image);
 //}

Assets/scripts/perfabItems/colorItem.cs

@@ -15,14 +15,25 @@ public class colorItem : MonoBehaviour
     [SerializeField]
     private Color useColor = new Color();
     public int index = 0;
+    public float selectLang = 0.05f;
+    private gameGroupEffect effectImg = null;
+    void initMember()
+    {
+        if(effectImg == null)
+        {
+            effectImg = transform.Find("circle").GetComponent<gameGroupEffect>();
+        }
+    }
     public bool IsSelect
     {
         set {
-            //if (nowProgress > 0.999999) return;
-            //transform.Find("finish").gameObject.SetActive(!value);
-            transform.Find("minBar").gameObject.SetActive(value);
-            transform.Find("nowSelectFlg").gameObject.SetActive(value);
+            initMember();
             isSelect = value;
+            effectImg.LangValue = isSelect ? selectLang : 0;            
+            //transform.Find("finish").gameObject.SetActive(!value);
+            //transform.Find("minBar").gameObject.SetActive(value);
+            transform.Find("nowSelectFlg").gameObject.SetActive(isSelect);
+            
         }
         get
         {
@@ -32,6 +43,7 @@ public class colorItem : MonoBehaviour
     public float NowProgress
     {
         set {
+            initMember();
             if (value <= 0) 
                 value = 0f; 
             else if (value >= 0.99999998) 
@@ -42,21 +54,14 @@ public class colorItem : MonoBehaviour
             }
             nowProgress = value;
             bool isend = this.isFinish();
-            var minBarTrans = transform.Find("minBar");
-            minBarTrans.GetComponent<Image>().fillAmount = isend ? 1.0f : 1.0f- nowProgress;
+            effectImg.Height = nowProgress;
             transform.Find("idname").gameObject.SetActive(!isend);
-            transform.Find("lowBar").gameObject.SetActive(!isend);
-            var finish = transform.Find("finish");
-            finish.gameObject.SetActive(isend);
             if (isend)
             {
-                minBarTrans.gameObject.SetActive(true);
-                minBarTrans.GetComponent<Image>().color = useColor;
-                finish.GetComponent<Image>().color = useColor;
+                effectImg.gameObject.SetActive(false);
             }
             else
             {
-                minBarTrans.gameObject.SetActive(isSelect);
             }
         }
         get
@@ -77,9 +82,9 @@ public class colorItem : MonoBehaviour
     {
         set
         {
+            initMember();
             useColor = value;
 
-            transform.Find("lowBar").GetComponent<Image>().color = useColor;
             var textColor = Color.white;
             if((useColor.r > 0.75 && useColor.g > 0.75) || (useColor.g > 0.75 && useColor.b > 0.75) || (useColor.r > 0.75 && useColor.b > 0.75))
             {
@@ -90,15 +95,20 @@ public class colorItem : MonoBehaviour
             float s;
             float v;
             Color.RGBToHSV(useColor, out h, out s, out v);
-            if (v < 0.2)
-                v = 0.8f;
-            else if (v > 0.8)
-                v = 0.2f;
+            if(v > 0.6)
+            {
+                v = v - 0.5f;
+            }else if(v < 0.45f)
+            {
+                v = v + 0.5f;
+            }
             else
-                v = v / 5 * 3;
+            {
+                v = v - v / 3;
+            }
             Color color1 = Color.HSVToRGB(h, s, v);
-            transform.Find("minBar").GetComponent<Image>().color =  color1;
-            transform.Find("finish").GetComponent<Image>().color = color1;
+            effectImg.color2 = useColor;
+            effectImg.color1 = color1;
         }
         get
         {
@@ -108,6 +118,7 @@ public class colorItem : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
+        initMember();
         //IsSelect = isSelect;
         //IdName = idName;
         //UseColor = useColor;
@@ -127,8 +138,7 @@ public class colorItem : MonoBehaviour
     {
         if (isSelect == false && isFinish() == false)
         {
-            List<System.Object> list = new List<System.Object>{ index };
-            utilsTools.sendEventObjects("switchGameAreaGroupId", list);
+            utilsTools.sendEventObjectParams("switchGameAreaGroupId", index);
         }
     }
 }

Assets/scripts/perfabItems/labelItem.cs

@@ -56,9 +56,7 @@ public class labelItem : MonoBehaviour
     }
     public void OnBtnClick()
     {
-        List<System.Object> lists = new List<System.Object>();
-        lists.Add(this.__title);
-        utilsTools.sendEventObjects("switchImageLabel", lists);
+        utilsTools.sendEventObjectParams("switchImageLabel", this.__title);
     }
     
 }

Assets/scripts/utils/TaskManages.cs

@@ -26,9 +26,9 @@ public class TaskManages
             utilsTools.getUserData<Stack<Tuple<TaskItemBack, System.Object[]>>>(monoBehaviour.gameObject, "PriorityStack", out taskInfos, null);
         utilsTools.setUserData(monoBehaviour.gameObject, "PriorityStack", taskInfos);
     }
-    public void insertTask(MonoBehaviour monoBehaviour, TaskItemBack taskItemBack, System.Object param1 = null,System.Object param2 = null)
+    public void insertTask(MonoBehaviour monoBehaviour, TaskItemBack taskItemBack, System.Object param1 = null,System.Object param2 = null,System.Object param3 = null)
     {
-        System.Object[] allparams = { param1,param2 };
+        System.Object[] allparams = { param1,param2,param3 };
         insertTask(monoBehaviour, taskItemBack, allparams);
     }
     public void addTask(MonoBehaviour monoBehaviour, TaskItemBack taskItemBack, System.Object param = null)

Assets/scripts/utils/utilsDB.cs

@@ -100,11 +100,11 @@ public class utilsDB
     }
     public static string getDBJsonDataByKey(string key, string defvalue)
     {
-        return getDBValueDataByKey<string>(key, "json", defvalue);
+        return getDBValueDataByKey<string>(key, "string", defvalue);
     }
     public static bool setDBJsonDataByKey(string key, string value)
     {
-        return setDBValueDataByKey<string>(key, "json", value);
+        return setDBValueDataByKey<string>(key, "string", value);
     }
     public static List<ScenePageCellGroupItemData> getScenePageCellGroupDataByDB()
     {

Assets/scripts/utils/utilsTools.cs

@@ -15,6 +15,7 @@ public class utilsTools
 {
     private static int isPhone = 0;
     private static Vector2 displaySize = new Vector2(0,0);
+    private static System.Random random = new System.Random();
     public static bool IsPhone
     {
         get { 
@@ -140,6 +141,25 @@ public class utilsTools
     public static bool sendEventUObjects(string name,List<UnityEngine.Object> objects,List<System.Object> list = null){
         return IRunEventManages.send(name, objects, list);
     }
+    public static bool sendEventObjectParams(string name, System.Object param1 = null,System.Object param2 = null, System.Object param3 = null, List<System.Object> listex = null)
+    {
+        List<System.Object> list = null;
+        if (param1 != null)
+        {
+            list = new List<System.Object>();
+            list.Add(param1);
+            if (param2 != null) list.Add(param2);
+            if (param3 != null) list.Add(param3);
+            if(listex != null)
+            {
+                for (int i = 0; i < listex.Count; i++)
+                {
+                    list.Add(listex[i]);
+                }
+            }
+        }
+        return sendEventObjects(name, list);
+    }
     public static bool sendEventObjects(string name,List<System.Object> list){
         return IRunEventManages.send(name, null, list);
     }
@@ -382,6 +402,7 @@ public class utilsTools
     //loadImageThumbnailById("6573",(Sprite sprite,string id,Image image)=>{if(image == null) image = gameObject.GetComponent<Image>();image.sprite = sprite;...},image1)
     public static void loadImageThumbnailById(string id, LoadImageBack loadImageBack, Image image = null)
     {
+
     }
     //初始化播放游戏过程
     //OnAreaHandler 回调的时候才能调用replayGameProcessById
@@ -391,7 +412,6 @@ public class utilsTools
     //开始播放游戏过程
     public static void replayGameProcessById(string id,GameObject gameObject,List<Tuple<short,float,float>> playOrders)
     {
-
     }
     public static bool setGameScenUserInfo(string id,string lineUrl,string colorUrl,string jsonUrl)
     {
@@ -425,10 +445,6 @@ public class utilsTools
     {
         string gameSaveKey = "gameUserData_" + gameScenUserInfo.id;
         string oldData = utilsDB.getDBStringDataByKey(gameSaveKey, "");
-        if (oldData.Equals("") == false)
-        {
-            return false;
-        }
         var data = JsonUtility.FromJson<GameScenUserInfo>(oldData);
         if (data.id.Equals(gameScenUserInfo.id) == false) return false;
         utilsDB.setDBJsonDataByKey(gameSaveKey, JsonUtility.ToJson(gameScenUserInfo));
@@ -478,5 +494,9 @@ public class utilsTools
             Directory.CreateDirectory(path1);
         }
     }  
+    public static float randValueByFloat(float min,float max)
+    {
+        return (float)random.NextDouble() * (max - min) + min;
+    }
     
 }

Logs/shadercompiler-UnityShaderCompiler.exe0.log

 Base path: 'C:/Program Files/Unity/Hub/Editor/2022.3.1f1c1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2022.3.1f1c1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler
 
-Cmd: shutdown
-
-Quitting shader compiler process

UserSettings/Layouts/default-2022.dwlt

@@ -14,12 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 7.2000003
-    y: 104.8
+    x: -20
+    y: 115.200005
     width: 2033.6
     height: 1000
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Inspector
   m_RootView: {fileID: 9}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -41,7 +41,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 619.2
-    width: 317.6001
+    width: 469.59998
     height: 330.8
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -67,14 +67,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 1463.2
+    x: 1304.8
     y: 0
-    width: 317.6001
+    width: 469.59998
     height: 950
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 63
+  controlID: 541
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -85,23 +85,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: SceneHierarchyWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 317.6001
+    width: 469.59998
     height: 619.2
-  m_MinSize: {x: 102, y: 121}
+  m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
   - {fileID: 17}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -117,9 +117,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 569.6
+    x: 566.4
     y: 0
-    width: 893.6
+    width: 738.4
     height: 950
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -148,12 +148,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1780.8
+    width: 1774.4
     height: 950
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 62
+  controlID: 51
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -178,7 +178,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 61
+  controlID: 123
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -194,9 +194,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1780.8
+    x: 1774.4
     y: 0
-    width: 252.79993
+    width: 259.19995
     height: 950
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -293,7 +293,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 569.6
+    width: 566.4
     height: 950
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
@@ -322,9 +322,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1470.4
-    y: 754.4
-    width: 315.6001
+    x: 1
+    y: 638.2
+    width: 467.59998
     height: 309.8
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -363,7 +363,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: f0660000
     m_LastClickedID: 26352
-    m_ExpandedIDs: 00000000126300003263000030640000326400003464000036640000386400003a6400003c6400003e64000040640000426400004464000046640000486400004a640000
+    m_ExpandedIDs: 0000000016630000366300003464000036640000386400003a6400003c6400003e64000040640000426400004464000046640000486400004a6400004c6400004e640000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -388,10 +388,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 1216.2}
+    scrollPos: {x: 0, y: 44}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000126300003263000030640000326400003464000036640000386400003a6400003c6400003e64000040640000426400004464000046640000486400004a640000
+    m_ExpandedIDs: ffffffff0000000016630000366300003464000036640000386400003a6400003c6400003e64000040640000426400004464000046640000486400004a6400004e64000090640000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -467,9 +467,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1788
-    y: 135.2
-    width: 251.79993
+    x: 1775.4
+    y: 19
+    width: 258.19995
     height: 929
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -514,9 +514,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1470.4
-    y: 135.2
-    width: 315.6001
+    x: 1
+    y: 19
+    width: 467.59998
     height: 598.2
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -533,7 +533,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 34dbfeff7cdbfeffe8ddfeff02defeff36defeff8adefeff92defeffa0defeffb2defeffe6f9ffff
+      m_ExpandedIDs: cc92feff1693feff7c95feff8a95feffb295feff0296feff0a96feff1896feff2a96feff029ffeff4c9ffeffb2a1feffc0a1feffe8a1fefff2a3fefff4a3fefff6a3fefffca3feff76abfeffbeabfeff24aefeff32aefeff5aaefeff64b0feff66b0feff68b0feff6eb0feff6e25ffffb425ffff1a28ffff2828ffff5028ffffe42affffec2afffffa2affff0c2bffff76d2ffff7ed2ffff8cd2ffff9ed2ffffb8d4ffffc0d4ffffced4ffffe0d4ffffe6f9ffff72700000a4700000da700000ee700000347b00009c7b0000b07b0000e28900004a8a0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -577,9 +577,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 576.8
-    y: 135.2
-    width: 891.6
+    x: 567.4
+    y: 19
+    width: 736.4
     height: 929
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -926,9 +926,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 458.518, y: 1234.1746, z: -0.11622809}
+    m_Target: {x: 606.118, y: 1009.4162, z: -0.04727836}
     speed: 2
-    m_Value: {x: 458.518, y: 1234.1746, z: -0.11622809}
+    m_Value: {x: 606.118, y: 1009.4162, z: -0.04727836}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -978,9 +978,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 576.71204
+    m_Target: 627.76843
     speed: 2
-    m_Value: 576.71204
+    m_Value: 627.76843
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1025,8 +1025,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1470.4
-    y: 135.2
+    x: 1568
+    y: 92
     width: 315.6001
     height: 598.2
   m_SerializedDataModeController:
@@ -1059,9 +1059,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 7.2000003
-    y: 135.2
-    width: 568.6
+    x: 0
+    y: 19
+    width: 565.4
     height: 929
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1105,7 +1105,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
-    m_HSlider: 0
+    m_HSlider: 1
     m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
@@ -1117,23 +1117,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 568.6
+      width: 565.4
       height: 908
-    m_Scale: {x: 0.525463, y: 0.525463}
-    m_Translation: {x: 284.3, y: 453.99997}
+    m_Scale: {x: 0.86220336, y: 0.86220336}
+    m_Translation: {x: 282.7, y: 453.99985}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -541.04663
-      y: -863.9999
-      width: 1082.0933
-      height: 1727.9999
+      x: -327.8809
+      y: -526.55774
+      width: 655.7618
+      height: 1053.1158
     m_MinimalGUI: 1
   m_defaultScale: 0.525463
-  m_LastWindowPixelSize: {x: 710.75, y: 1161.25}
+  m_LastWindowPixelSize: {x: 706.75, y: 1161.25}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000