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

Assets/arts/atlas/ui/common.asset

@@ -24,6 +24,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3}
   - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3}
   - {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3}
+  - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3}
   - {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3}
   - {fileID: 21300000, guid: 88e3c9f601e749946ac9894634ce7894, type: 3}
   - {fileID: 21300000, guid: fd69d13156e74d540ae80d30ed9b638f, type: 3}
@@ -45,6 +46,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 2c02dd0fac140614899bd855278c7f3c, type: 3}
   - {fileID: 21300000, guid: 58e2103287a3baf44aeb0b1dbcc3391f, type: 3}
   - {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3}
+  - {fileID: 21300000, guid: f59c326898ffa0542833b6afc94fb556, type: 3}
   - {fileID: 21300000, guid: cf89f3bc92056c548b62a7278c2c6522, type: 3}
   - {fileID: 21300000, guid: cb25076ad884dd64a9f85a54955be236, type: 3}
   - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3}
@@ -144,4 +146,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ee49916f02f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a03c0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8d8e243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a03c0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -119,9 +119,11 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3}
   - {fileID: 21300000, guid: c4514947f60678c4e90c498ef095db61, type: 3}
   - {fileID: 21300000, guid: 841a1467a1c47414c91ac18891f9c65d, type: 3}
+  - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3}
   - {fileID: 21300000, guid: c9a70ad71344ef54cb824c55bdae85cb, type: 3}
   - {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3}
   - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3}
+  - {fileID: 21300000, guid: f59c326898ffa0542833b6afc94fb556, type: 3}
   - {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3}
   - {fileID: 21300000, guid: b8056a6868f41394c95a779ca9ccc217, type: 3}
   - {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3}
@@ -251,9 +253,11 @@ SpriteAtlas:
   - common_progress_1
   - common_progress_4
   - common_title_10
+  - common_bg_4
   - common_ad_4
   - common_board_118
   - common_board_13
+  - common_board_119
   - common_progress_4_bg
   - common_title_5
   - common_title_4

Assets/arts/textures/ui/common/common_bg_4.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 4d5eca674cfc87745bd0c368f2270a6c
+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: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/textures/ui/common/common_board_119.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: f59c326898ffa0542833b6afc94fb556
+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: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/main_city/main_comp.prefab

@@ -262,7 +262,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 35}
-  m_SizeDelta: {x: 89.9292, y: 75.622}
+  m_SizeDelta: {x: 92.4, y: 77.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &185068978493969815
 CanvasRenderer: