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

Assets/arts/atlas/ui/dungeon_rune.asset

@@ -50,4 +50,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: fd437743da2aefa41a06284557d00667, type: 3}
   - {fileID: 21300000, guid: 5ead9af60f880184e9bcf463f690e342, type: 3}
   - {fileID: 21300000, guid: ac7ebff5d9821a440814195ba5c4a170, type: 3}
-  spriteNameList: 57a5d91458a5d91459a5d9146e2c6186946076869756726398567263995672639a5672639b5672639d5672639e567263b2beadbbb3beadbbb4beadbb932e01f02a768e1171eb3750d427491cd527491cd627491c44fbf921badac6b638e7c6b6115d1faf3826cab6a0c00fc6a1c00fc6a2c00fc6bdf04381bef04381bff04381af329881b0329881b1329881bcce19b88483cbb6
+  spriteNameList: 57a5d91458a5d91459a5d9146e2c6186946076869756726398567263995672639a5672639b5672639d5672639e567263b2beadbbb3beadbbb4beadbb932e01f02a768e1171eb3750f413aee5f513aee5f613aee544fbf921badac6b638e7c6b6115d1faf3826cab6a0c00fc6a1c00fc6a2c00fc6bdf04381bef04381bff04381af329881b0329881b1329881bcce19b88483cbb6

Assets/arts/atlas/ui/dungeon_rune.spriteatlas

@@ -114,12 +114,12 @@ SpriteAtlas:
   - dungeon_rune_task_stone_1
   - dungeon_rune_task_8
   - dungeon_rune_task_vine
-  - dungeon_rune_task_iron_1
+  - dungeon_rune_task_Iron_1
   - dungeon_rune_task_stone_3
   - dungeon_rune_task_blister
   - dungeon_rune_task_tussock
   - dungeon_rune_task_7
-  - dungeon_rune_task_iron_3
+  - dungeon_rune_task_Iron_3
   - dungeon_rune_task_stump_1
   - dungeon_rune_task_5
   - dungeon_rune_task_circle
@@ -127,7 +127,7 @@ SpriteAtlas:
   - dungeon_rune_task_silt
   - dungeon_rune_task_1
   - dungeon_rune_task_altar_3
-  - dungeon_rune_task_iron_2
+  - dungeon_rune_task_Iron_2
   - dungeon_rune_bg_2
   - dungeon_rune_task_altar_2
   - dungeon_rune_task_stalactite_3

Assets/arts/atlas/ui/module.asset

@@ -19,7 +19,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: ddcd4059618a0504fa0ec381ab948b47, type: 3}
   - {fileID: 21300000, guid: 134a5aa805646e140ae431abe42dde91, type: 3}
   - {fileID: 21300000, guid: 701ba2b5a79411c428a2b9c262bf9003, type: 3}
+  - {fileID: 21300000, guid: 31f3a208fab39e948a56c165495f8fc4, type: 3}
   - {fileID: 21300000, guid: 3798427320fee134d8368add9acaa559, type: 3}
   - {fileID: 21300000, guid: 0d38908ad3a58e0458098eed1d3adde3, type: 3}
   - {fileID: 21300000, guid: da2afc163977e5644893dab941455163, type: 3}
-  spriteNameList: 3f9597b53217937fc77acdf168bacfb58da9d5e49cc6d6e4370f90cd4dbcdbe4e4b62c22
+  spriteNameList: 3f9597b53217937fc77acdf168bacfb58da9d5e49cc6d6e4021edbe4370f90cd4dbcdbe4e4b62c22

Assets/arts/atlas/ui/module.spriteatlas

@@ -65,6 +65,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 3798427320fee134d8368add9acaa559, type: 3}
   - {fileID: 21300000, guid: 701ba2b5a79411c428a2b9c262bf9003, type: 3}
   - {fileID: 21300000, guid: da2afc163977e5644893dab941455163, type: 3}
+  - {fileID: 21300000, guid: 31f3a208fab39e948a56c165495f8fc4, type: 3}
   - {fileID: 21300000, guid: 134a5aa805646e140ae431abe42dde91, type: 3}
   - {fileID: 21300000, guid: ddcd4059618a0504fa0ec381ab948b47, type: 3}
   - {fileID: 21300000, guid: 0d38908ad3a58e0458098eed1d3adde3, type: 3}
@@ -75,6 +76,7 @@ SpriteAtlas:
   - module_unlock_sevenday
   - module_unlock_idle
   - module_unlock_weapon
+  - module_unlock_rune
   - module_unlock_fund
   - module_unlock_equip
   - module_unlock_task

Assets/arts/textures/ui/module/module_unlock_rune.png.meta

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