fix bug

Assets/arts/atlas/ui/common.spriteatlas

@@ -128,6 +128,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3}
   - {fileID: 21300000, guid: d4eff7d3958d69e42b5af7ef40d06263, type: 3}
   - {fileID: 21300000, guid: 4ba59bd3fda322748836bed4cfab73c5, type: 3}
+  - {fileID: 21300000, guid: 14ee130415b5f493eb358a92ec2fc547, type: 3}
   - {fileID: 21300000, guid: 9e2c640474bb7904c8227d0ce40a444e, type: 3}
   - {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3}
   - {fileID: 21300000, guid: 864645145b73d4ab8a2444427acabf23, type: 3}
@@ -275,6 +276,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3}
   - {fileID: 21300000, guid: 198db5ebea9ee4b4d93b4a62cb879ea2, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
+  - {fileID: 21300000, guid: 19cb89eba1b174df4b091ee3984e7f9b, type: 3}
   - {fileID: 21300000, guid: d8d7450c5023f744a93f70f8a2ac59f9, type: 3}
   - {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3}
   - {fileID: 21300000, guid: 3f4e012cd25229546b5f5859ebecdf66, type: 3}
@@ -410,6 +412,7 @@ SpriteAtlas:
   - common_dec_3
   - common_tick_2
   - common_progress_3_bg
+  - common_tettle_5
   - common_board_130
   - common_bg_24
   - common_bg_33
@@ -557,6 +560,7 @@ SpriteAtlas:
   - common_btn_green_1
   - common_dec_24
   - common_toast_2
+  - common_info_3
   - common_arrow_3
   - common_bg_1
   - common_board_22

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

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 19cb89eba1b174df4b091ee3984e7f9b
+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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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
+  cookieLightType: 0
+  platformSettings:
+  - 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
+  - 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: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 14ee130415b5f493eb358a92ec2fc547
+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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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
+  cookieLightType: 0
+  platformSettings:
+  - 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
+  - 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: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/battle/battle_ui.prefab

@@ -8111,7 +8111,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -97}
-  m_SizeDelta: {x: 44, y: 46}
+  m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5298323509264782958
 CanvasRenderer:
@@ -8141,7 +8141,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d860c7ea2dcad1c4a804fe48f07fcdf3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/prefabs/ui/battle/cell/boss_skill_cell.prefab

@@ -170,9 +170,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 6, y: 25}
+  m_AnchoredPosition: {x: 0, y: 16}
   m_SizeDelta: {x: 40, y: 40}
-  m_Pivot: {x: 0.5, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7079987920237558666
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -235,7 +235,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 4
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0

Assets/prefabs/ui/common/hero_cell.prefab

@@ -1891,7 +1891,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -110
+      value: -81
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/prefabs/ui/tips/battle_skill_tips.prefab

@@ -29,6 +29,7 @@ RectTransform:
   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: 5645507542806277176}
   - {fileID: 1925662468098749943}
@@ -70,7 +71,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -121,6 +122,7 @@ RectTransform:
   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: 8791040051132454713}
   m_RootOrder: 0
@@ -255,6 +257,7 @@ RectTransform:
   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: 8791040051132454713}
   m_RootOrder: 2
@@ -388,6 +391,7 @@ RectTransform:
   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: 4056600596185916769}
   - {fileID: 1984804375910059848}
@@ -454,6 +458,7 @@ RectTransform:
   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: 8791040051132454713}
   m_RootOrder: 1
@@ -588,6 +593,7 @@ RectTransform:
   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: 4165930251451731960}
   m_RootOrder: 0
@@ -664,6 +670,7 @@ RectTransform:
   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: 7870804908802134986}
   - {fileID: 8791040051132454713}
@@ -891,16 +898,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
---- !u!1 &9016219067863350618 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
-  m_PrefabInstance: {fileID: 498969359749059258}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8683452073775529129 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
   m_PrefabInstance: {fileID: 498969359749059258}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &9016219067863350618 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
+  m_PrefabInstance: {fileID: 498969359749059258}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1657392673621149989
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1014,16 +1021,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
---- !u!1 &7839789894111766213 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
-  m_PrefabInstance: {fileID: 1657392673621149989}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &7596830953811961654 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
   m_PrefabInstance: {fileID: 1657392673621149989}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &7839789894111766213 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
+  m_PrefabInstance: {fileID: 1657392673621149989}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4620586183689332508
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1256,16 +1263,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
---- !u!1 &4461424973874029714 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
-  m_PrefabInstance: {fileID: 5054886947465317234}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4056600596185916769 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
   m_PrefabInstance: {fileID: 5054886947465317234}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4461424973874029714 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
+  m_PrefabInstance: {fileID: 5054886947465317234}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5852786256340752907
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1502,16 +1509,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
---- !u!1 &2173738678967291579 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
-  m_PrefabInstance: {fileID: 7342575252383457627}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1984804375910059848 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
   m_PrefabInstance: {fileID: 7342575252383457627}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2173738678967291579 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
+  m_PrefabInstance: {fileID: 7342575252383457627}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8296193270043901242
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1625,13 +1632,13 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
---- !u!224 &958316230288249641 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
-  m_PrefabInstance: {fileID: 8296193270043901242}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &643246562357498586 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
   m_PrefabInstance: {fileID: 8296193270043901242}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &958316230288249641 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
+  m_PrefabInstance: {fileID: 8296193270043901242}
+  m_PrefabAsset: {fileID: 0}