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

2023-06-01 21:12:35 +08:00 · 2023-06-01 21:12:35 +08:00 · a68c089aff
commit a68c089aff
parent fb38d04282 ae21941b99
4 changed files with 965 additions and 98 deletions
--- a/Assets/arts/textures/ui/common/common_board_103.png.meta
+++ b/Assets/arts/textures/ui/common/common_board_103.png.meta
@ -47,7 +47,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 22, y: 22, z: 22, w: 22}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
--- a/Assets/lua/app/global/global_func.lua.bytes
+++ b/Assets/lua/app/global/global_func.lua.bytes
--- a/Assets/lua/app/ui/shop/cell/hot_sell_cell.lua.bytes
+++ b/Assets/lua/app/ui/shop/cell/hot_sell_cell.lua.bytes
--- a/Assets/prefabs/ui/shop/shop_comp.prefab
+++ b/Assets/prefabs/ui/shop/shop_comp.prefab