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

Assets/arts/atlas/ui/hero.asset

@@ -26,6 +26,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 1767274d13d53a2449467e6209588af3, type: 3}
   - {fileID: 21300000, guid: c5b636b42c0365744914663e4752e5d5, type: 3}
   - {fileID: 21300000, guid: 88f77b77ef28a304db1b398438a88cd4, type: 3}
+  - {fileID: 21300000, guid: 41c3c371627795345a7e66488924c1dc, type: 3}
   - {fileID: 21300000, guid: 2406b504a91c18b43af5f1e8479825e4, type: 3}
   - {fileID: 21300000, guid: cda2aa3241ac98f4ba89e3debd597c08, type: 3}
   - {fileID: 21300000, guid: da36a68e123533e4797476431612061c, type: 3}
@@ -78,4 +79,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 172d4d5f9a8bb9e4fa2be8cf0b90403f, type: 3}
   - {fileID: 21300000, guid: b4a559b38eb78474995dc80ba996a3fa, type: 3}
   - {fileID: 21300000, guid: 43caa329b5f2f364584532df1b3c95fe, type: 3}
-  spriteNameList: 8986dade8a86dade8b86dade8c86dade8d86dade8e86dade8f86dadedceffc88ddeffc88deeffc88affbc025af66bc96616fd040b066bc96b166bc96b266bc96b366bc96b466bc96b566bc96b666bc96b766bc969bea23599cea23599dea2359aeabb95aafabb95ab0abb95ab1abb95a8baeb44e366531503765315051dc9a5952dc9a5953dc9a5954dc9a5955dc9a5981dc9a5982dc9a5983dc9a5984dc9a5985dc9a5986dc9a5993dc9a5940b6c0d9d4a5c05ad5a5c05ad6a5c05ad7a5c05a346eb9f8356eb9f8366eb9f8376eb9f87470603e43ad56393574603e44ad5639f677603e45ad5639b77b603e8b0acf4937881e3238881e3239881e323a881e323b881e32
+  spriteNameList: 8986dade8a86dade8b86dade8c86dade8d86dade8e86dade8f86dadedceffc88ddeffc88deeffc88affbc025af66bc96616fd040626fd040b066bc96b166bc96b266bc96b366bc96b466bc96b566bc96b666bc96b766bc969bea23599cea23599dea2359aeabb95aafabb95ab0abb95ab1abb95a8baeb44e366531503765315051dc9a5952dc9a5953dc9a5954dc9a5955dc9a5981dc9a5982dc9a5983dc9a5984dc9a5985dc9a5986dc9a5993dc9a5940b6c0d9d4a5c05ad5a5c05ad6a5c05ad7a5c05a346eb9f8356eb9f8366eb9f8376eb9f87470603e43ad56393574603e44ad5639f677603e45ad5639b77b603e8b0acf4937881e3238881e3239881e323a881e323b881e32

Assets/arts/atlas/ui/hero.spriteatlas

@@ -66,6 +66,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 393d2b604902bf748b60369fa745382c, type: 3}
   - {fileID: 21300000, guid: 1a72ab01b7f2dca4cbb5095891cd1009, type: 3}
   - {fileID: 21300000, guid: 31673d61953a1bb40a63b2fa93367988, type: 3}
+  - {fileID: 21300000, guid: 41c3c371627795345a7e66488924c1dc, type: 3}
   - {fileID: 21300000, guid: b0c53a9101857b14b8b955d491170396, type: 3}
   - {fileID: 21300000, guid: 665882b1677b81e40a50423142f0651e, type: 3}
   - {fileID: 21300000, guid: b948caf11f03c9e4b99011fe8bd84ff5, type: 3}
@@ -132,6 +133,7 @@ SpriteAtlas:
   - hero_rune_s
   - hero_rune_1
   - hero_dec_6
+  - hero_dec_11
   - hero_attribute_6
   - hero_attribute_4
   - hero_skin_1

Assets/arts/textures/ui/hero/hero_dec_11.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 41c3c371627795345a7e66488924c1dc
+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: