Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919

Assets/arts/spines/characters/m20058/m20058.atlas.txt

@@ -2,136 +2,137 @@ m20058.png
 size:512,512
 filter:Linear,Linear
 eye_xuanyun
-bounds:71,348,22,22
+bounds:488,488,22,22
 fang_01
-bounds:74,128,10,11
+bounds:380,411,10,11
 offsets:1,1,12,13
-rotate:90
 fang_03
-bounds:71,237,8,14
+bounds:256,384,8,14
 offsets:1,1,10,16
+rotate:90
 fang_05
-bounds:84,331,11,15
+bounds:488,471,11,15
 offsets:1,1,13,17
 fang_07
-bounds:97,327,83,78
+bounds:403,432,83,78
 gan
-bounds:1,372,94,139
+bounds:2,371,94,139
 offsets:1,1,96,141
 hit_yan3
-bounds:279,410,28,28
+bounds:111,243,28,28
 kuai_01
-bounds:239,413,25,38
+bounds:353,384,25,38
 offsets:1,1,27,40
-rotate:90
 kuai_02
-bounds:1,1,86,91
+bounds:310,424,86,91
 offsets:1,1,88,93
+rotate:90
 kuai_03
-bounds:71,253,71,72
+bounds:72,273,71,72
 offsets:1,1,73,74
 kuai_04
-bounds:144,276,49,43
+bounds:256,394,49,43
 offsets:1,1,51,45
-rotate:90
 kuai_05
-bounds:1,237,133,68
+bounds:2,236,133,68
 offsets:1,1,135,70
 rotate:90
 kuai_06
-bounds:28,140,57,95
+bounds:98,347,57,95
 offsets:1,1,59,97
-kuai_07
-bounds:420,439,72,89
-offsets:1,1,74,91
 rotate:90
+kuai_07
+bounds:2,2,72,89
+offsets:1,1,74,91
 kuai_08
-bounds:97,407,101,104
+bounds:98,406,101,104
 offsets:1,1,103,106
 kuai_09
-bounds:309,458,53,109
+bounds:29,125,53,109
 offsets:1,1,55,111
-rotate:90
 kuai_10
-bounds:200,440,107,71
+bounds:201,439,107,71
 offsets:1,1,109,73
 yinying
-bounds:1,94,141,25
+bounds:2,93,141,25
 rotate:90
 yuan1_01
-bounds:81,247,4,4
+bounds:195,400,4,4
 offsets:1,1,6,6
 yuan2_01
-bounds:81,247,4,4
+bounds:195,400,4,4
 offsets:1,1,6,6
 yuan3_01
-bounds:81,247,4,4
+bounds:195,400,4,4
 offsets:1,1,6,6
 yuan1_02
-bounds:239,405,6,6
+bounds:403,424,6,6
 offsets:1,1,8,8
 yuan2_02
-bounds:239,405,6,6
+bounds:403,424,6,6
 offsets:1,1,8,8
 yuan3_02
-bounds:239,405,6,6
+bounds:403,424,6,6
 offsets:1,1,8,8
 yuan1_03
-bounds:71,327,11,19
+bounds:145,273,11,19
 offsets:1,1,13,21
+rotate:90
 yuan2_03
-bounds:71,327,11,19
+bounds:145,273,11,19
 offsets:1,1,13,21
+rotate:90
 yuan3_03
-bounds:71,327,11,19
+bounds:145,273,11,19
 offsets:1,1,13,21
+rotate:90
 yuan1_04
-bounds:341,428,25,28
+bounds:84,208,25,28
 offsets:1,1,27,30
 yuan2_04
-bounds:341,428,25,28
+bounds:84,208,25,28
 offsets:1,1,27,30
 yuan3_04
-bounds:341,428,25,28
+bounds:84,208,25,28
 offsets:1,1,27,30
 yuan1_05
-bounds:28,94,44,44
+bounds:307,378,44,44
 offsets:1,1,46,46
 yuan2_05
-bounds:28,94,44,44
+bounds:307,378,44,44
 offsets:1,1,46,46
 yuan3_05
-bounds:28,94,44,44
+bounds:307,378,44,44
 offsets:1,1,46,46
 yuan4_01
-bounds:144,253,5,5
+bounds:87,364,5,5
 offsets:1,1,7,7
 yuan4_02
-bounds:368,449,7,7
+bounds:141,264,7,7
 offsets:1,1,9,9
 yuan4_03
-bounds:182,383,13,22
+bounds:72,347,13,22
 offsets:1,1,15,24
 yuan4_04
-bounds:309,423,30,33
+bounds:29,93,30,33
 offsets:1,1,32,35
+rotate:90
 yuan4_05
-bounds:87,137,53,53
+bounds:201,384,53,53
 offsets:1,1,55,55
 yuan5_01
-bounds:171,268,6,6
+bounds:84,200,6,6
 offsets:1,1,8,8
 yuan5_02
-bounds:309,413,8,8
+bounds:111,233,8,8
 offsets:1,1,10,10
 yuan5_03
-bounds:144,260,14,25
+bounds:64,98,14,25
 offsets:1,1,16,27
-rotate:90
 yuan5_04
-bounds:200,405,33,37
+bounds:72,238,33,37
 offsets:1,1,35,39
 rotate:90
 yuan5_05
-bounds:87,192,59,59
+bounds:145,286,59,59
 offsets:1,1,61,61

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4.atlas.txt

@@ -0,0 +1,126 @@
+ui_bounty_banner_4.png
+size:2048,2048
+filter:Linear,Linear
+LD_3
+bounds:2,407,73,437
+offsets:2,3,76,442
+LD_4
+bounds:490,1640,133,423
+offsets:2,3,137,428
+rotate:90
+LD_5
+bounds:1660,1914,132,333
+offsets:2,1,136,337
+rotate:90
+baoqi_1
+bounds:1284,1811,374,235
+baoqi_2
+bounds:2,1380,486,393
+baoqi_3
+bounds:2,846,304,222
+bj
+bounds:2,1775,1280,271
+ren_1
+bounds:2,14,47,102
+offsets:1,1,49,104
+ren_10
+bounds:835,1528,40,41
+offsets:1,1,42,43
+rotate:90
+ren_11
+bounds:1236,1729,38,44
+offsets:1,1,40,46
+ren_12
+bounds:678,1387,37,43
+offsets:1,1,39,45
+rotate:90
+ren_13
+bounds:58,191,136,78
+offsets:1,1,138,80
+ren_14
+bounds:1104,1650,87,76
+offsets:1,1,89,78
+ren_15
+bounds:77,525,146,175
+ren_16
+bounds:1284,1777,32,60
+offsets:1,1,34,62
+rotate:90
+ren_17
+bounds:225,588,62,28
+offsets:1,1,64,30
+rotate:90
+ren_18
+bounds:77,395,147,128
+ren_19
+bounds:225,557,29,29
+offsets:1,1,31,31
+ren_2
+bounds:416,1084,46,52
+offsets:1,1,48,54
+ren_20
+bounds:416,1138,47,240
+offsets:1,1,49,242
+ren_21
+bounds:58,132,63,57
+offsets:1,1,65,59
+ren_22
+bounds:2,1070,308,308
+offsets:1,1,310,310
+ren_3
+bounds:282,820,23,24
+offsets:1,1,25,26
+ren_4
+bounds:1346,1781,33,28
+offsets:1,1,35,30
+ren_5
+bounds:58,271,140,122
+offsets:1,1,142,124
+ren_6
+bounds:778,1530,55,38
+offsets:1,1,57,40
+ren_7
+bounds:729,1424,38,39
+offsets:1,1,40,41
+ren_8
+bounds:77,702,203,142
+offsets:1,1,205,144
+ren_9
+bounds:729,1465,61,38
+offsets:1,1,63,40
+rotate:90
+shitou
+bounds:225,652,48,48
+offsets:1,1,50,50
+shitou_1
+bounds:123,141,48,48
+xian_1
+bounds:490,1528,286,110
+xian_10
+bounds:2,118,287,54
+rotate:90
+xian_11
+bounds:915,1636,187,90
+xian_12
+bounds:1879,1841,101,71
+xian_2
+bounds:1995,1854,192,51
+rotate:90
+xian_3
+bounds:915,1728,319,45
+xian_4
+bounds:1660,1837,217,75
+xian_5
+bounds:312,1082,296,102
+rotate:90
+xian_6
+bounds:1193,1668,58,33
+offsets:1,0,59,33
+rotate:90
+xian_7
+bounds:778,1570,121,68
+offsets:1,0,122,68
+xian_8
+bounds:490,1386,186,38
+xian_9
+bounds:490,1426,237,100

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4.atlas.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 550b4d63db1cb594e8664fdc21e9f4f6
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: f6980cb395de1c14b9ab7fa3a42baf94
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4.skel.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5685bb18865c83c44b6a52fb8458059e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4_atlas.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
+  m_Name: ui_bounty_banner_4_atlas
+  m_EditorClassIdentifier: 
+  atlasFile: {fileID: 4900000, guid: 550b4d63db1cb594e8664fdc21e9f4f6, type: 3}
+  materials:
+  - {fileID: 2100000, guid: 6a40faad97a0efa478ec85ff36fd188b, type: 2}

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4_atlas.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 73566a1e35a7c1340ae7020b695b6946
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4_material.mat

@@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_bounty_banner_4_material
+  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: f6980cb395de1c14b9ab7fa3a42baf94, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4_material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a40faad97a0efa478ec85ff36fd188b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4_skeletondata.asset

@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
+  m_Name: ui_bounty_banner_4_skeletondata
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: 73566a1e35a7c1340ae7020b695b6946, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: 5685bb18865c83c44b6a52fb8458059e, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 0
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}

Assets/arts/spines/ui/ui_bounty_banner_4/ui_bounty_banner_4_skeletondata.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6cd6599c8fe0d142be024894457b9a9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/hero/hero_detail_ui.prefab

@@ -3914,13 +3914,14 @@ GameObject:
   - component: {fileID: 3780409263127609283}
   - component: {fileID: 7795216043129919817}
   - component: {fileID: 4605405162218795137}
+  - component: {fileID: 3968328377517282360}
   m_Layer: 5
   m_Name: img_white
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3780409263127609283
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3962,7 +3963,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -3978,6 +3979,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &3968328377517282360
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 989777879928749120}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &998136893774846843
 GameObject:
   m_ObjectHideFlags: 0
@@ -8758,13 +8771,14 @@ GameObject:
   - component: {fileID: 4493507582366950736}
   - component: {fileID: 5881223327057069780}
   - component: {fileID: 7697693723548655751}
+  - component: {fileID: 8431899921788329474}
   m_Layer: 5
   m_Name: img_white
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4493507582366950736
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8806,7 +8820,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -8822,6 +8836,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &8431899921788329474
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2660486005169848706}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &2662829003451485992
 GameObject:
   m_ObjectHideFlags: 0
@@ -11693,13 +11719,14 @@ GameObject:
   - component: {fileID: 1860349844489689832}
   - component: {fileID: 7735755725802317822}
   - component: {fileID: 6535971331329092463}
+  - component: {fileID: 6494891635634040185}
   m_Layer: 5
   m_Name: img_white
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1860349844489689832
 RectTransform:
   m_ObjectHideFlags: 0
@@ -11741,7 +11768,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -11757,6 +11784,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &6494891635634040185
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3579672367201137223}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &3597129136227462248
 GameObject:
   m_ObjectHideFlags: 0
@@ -15550,13 +15589,14 @@ GameObject:
   - component: {fileID: 3678134983365810079}
   - component: {fileID: 8910649053929504172}
   - component: {fileID: 8116581346980268575}
+  - component: {fileID: 2940046762558773665}
   m_Layer: 5
   m_Name: img_white
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3678134983365810079
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15598,7 +15638,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -15614,6 +15654,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &2940046762558773665
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4538318267178305444}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &4556571182114799776
 GameObject:
   m_ObjectHideFlags: 0
@@ -24701,13 +24753,14 @@ GameObject:
   - component: {fileID: 665879164737770575}
   - component: {fileID: 5958942622522811166}
   - component: {fileID: 2908558160409610836}
+  - component: {fileID: 7765215094240127682}
   m_Layer: 5
   m_Name: img_white
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &665879164737770575
 RectTransform:
   m_ObjectHideFlags: 0
@@ -24749,7 +24802,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -24765,6 +24818,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &7765215094240127682
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7117557190474272625}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &7152384223298841715
 GameObject:
   m_ObjectHideFlags: 0
@@ -26900,13 +26965,14 @@ GameObject:
   - component: {fileID: 7247267507193084929}
   - component: {fileID: 5907251120106231639}
   - component: {fileID: 8908868728865577705}
+  - component: {fileID: 2998841485628985530}
   m_Layer: 5
   m_Name: img_white
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7247267507193084929
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26948,7 +27014,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -26964,6 +27030,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &2998841485628985530
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852721795945677474}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &7879987071568579816
 GameObject:
   m_ObjectHideFlags: 0