Merge branch 'master' into dev_20230919

# Conflicts:
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_lock_1.png
#	Assets/arts/textures/ui/common/common_lock_1.png.meta
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
#	Assets/lua/app/userdata/battle/battle_base_data.lua.bytes

Assets/Editor/JenkinsAdapter.cs

@@ -11,8 +11,8 @@ public class JenkinsAdapter {
     /// 构建版本号
     /// </summary>
     private static string BuildVersion = (int.Parse(DateTime.Now.ToString("yyMMddHH"))).ToString();
-    private static int versionCode = 9;
-    private static string versionName = "1.3.9";
+    private static int versionCode = 10;
+    private static string versionName = "1.4.0";
 
     [MenuItem("Jenkins/JenkinsBuildIos")]
     public static void CommandLineBuildIos() {

Assets/arts/atlas/ui/common.asset

@@ -22,18 +22,11 @@ MonoBehaviour:
   - {fileID: 21300000, guid: d8d7450c5023f744a93f70f8a2ac59f9, type: 3}
   - {fileID: 21300000, guid: dfd622b8474c03e42bba1e48879cb1a1, type: 3}
   - {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3}
-  - {fileID: 21300000, guid: 5cfb92ca440ded943b4fb19835bdf014, type: 3}
-  - {fileID: 21300000, guid: fc2fd64a48d31c74d82d0ade3316e65e, type: 3}
-  - {fileID: 21300000, guid: 42d94e3855ec9bc4f91a0236930bfbee, type: 3}
   - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3}
   - {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3}
   - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3}
   - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3}
-  - {fileID: 21300000, guid: 73b3a40073482f64d9a6d54b53125dde, type: 3}
   - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3}
-  - {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3}
-  - {fileID: 21300000, guid: 3cf1784287669db4f91e9b56d1ebc7e1, type: 3}
-  - {fileID: 21300000, guid: 4b4d73ac48dffca4fa760e7a48e51ad2, type: 3}
   - {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3}
   - {fileID: 21300000, guid: 88e3c9f601e749946ac9894634ce7894, type: 3}
   - {fileID: 21300000, guid: fd69d13156e74d540ae80d30ed9b638f, type: 3}
@@ -65,13 +58,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: a45458484ec9d2141ad185e56bcd4ab1, type: 3}
   - {fileID: 21300000, guid: e52ce74853e088a45bf26ac39cb6f6d0, type: 3}
   - {fileID: 21300000, guid: f49d6fae72acf1c45869f9ba7ae26afb, type: 3}
-  - {fileID: 21300000, guid: d327a0cd3898fb243a58a59000a18360, type: 3}
-  - {fileID: 21300000, guid: f773b7f856112be4a95fc88fc3a4ef1b, type: 3}
   - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3}
-  - {fileID: 21300000, guid: 9e2c640474bb7904c8227d0ce40a444e, type: 3}
-  - {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3}
-  - {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3}
-  - {fileID: 21300000, guid: 404c6896d4f37d948bdc120a8f209d2c, type: 3}
   - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3}
   - {fileID: 21300000, guid: 37058029318370c46be63c3fbe4d1758, type: 3}
   - {fileID: 21300000, guid: 15b627938e203f545ac49661789d7351, type: 3}
@@ -95,9 +82,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3}
   - {fileID: 21300000, guid: d9bf4f9aeccbaef4db450cefbf2c0f2d, type: 3}
   - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3}
-  - {fileID: 21300000, guid: 0b635a98f4ac7004ca9465ebf09e3048, type: 3}
-  - {fileID: 21300000, guid: 274520eeea82f184e83ffe5fb86e5d5d, type: 3}
-  - {fileID: 21300000, guid: e3d2e398051646d42a269b7a20167ff7, type: 3}
   - {fileID: 21300000, guid: 1e55a4a32dd1ec240af52ddccebc7c46, type: 3}
   - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
   - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3}
@@ -113,7 +97,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3}
   - {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3}
   - {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3}
-  - {fileID: 21300000, guid: db34c4cf3382c88428f4b016d896829d, type: 3}
   - {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3}
   - {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3}
   - {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3}
@@ -140,11 +123,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 2bf6cb4eb06aaee409099e3faaab97de, type: 3}
   - {fileID: 21300000, guid: cfa2dc76b0f5eb74da18e9498ecd9f06, type: 3}
   - {fileID: 21300000, guid: 198db5ebea9ee4b4d93b4a62cb879ea2, type: 3}
-  - {fileID: 21300000, guid: b7d6d0848b1b5ee45a12d0f5f1fd7fbc, type: 3}
-  - {fileID: 21300000, guid: d609bb6ab58973f499748e5e63f1e855, type: 3}
-  - {fileID: 21300000, guid: e3a315f26f48db6489d0176ca4c9aad1, type: 3}
-  - {fileID: 21300000, guid: cedbda28baac029408a0e0160c351ad7, type: 3}
-  - {fileID: 21300000, guid: 458ccc47b228bdc46a1ce6b15a037f5c, type: 3}
   - {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3}
   - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3}
   - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3}
@@ -162,20 +140,16 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 070fd6553e0b5bf4a816757085221bda, type: 3}
   - {fileID: 21300000, guid: 324d3fc5bf7f47241865971067a87b80, type: 3}
   - {fileID: 21300000, guid: e0a705a9921eb0e47b66cd36f2260d6f, type: 3}
-  - {fileID: 21300000, guid: 47c6df29a6803614aa3f74efce93cdb3, type: 3}
-  - {fileID: 21300000, guid: 2c35c0e2e4c2ae240afdbcba4a36c43e, type: 3}
   - {fileID: 21300000, guid: bf5180354d324cb4685dcfb6480b6a65, type: 3}
-  - {fileID: 21300000, guid: 0a7bc25d4d528a94e8c740233f6f5780, type: 3}
+  - {fileID: 21300000, guid: 96fd70b1d51e00641ab3107096c4994b, type: 3}
   - {fileID: 21300000, guid: cc36a2865259e6a449af8d0bfe2b7165, type: 3}
   - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3}
   - {fileID: 21300000, guid: 9abaaf4457b41ea46ba4f998c247ddb6, type: 3}
-  - {fileID: 21300000, guid: c19b6240a169be841a2f5d9bfa607302, type: 3}
   - {fileID: 21300000, guid: 5065219a9ba54e745b022463cac9dfbf, type: 3}
   - {fileID: 21300000, guid: 4ab1c4c9276157d4e9a5c3b3c29ccfab, type: 3}
   - {fileID: 21300000, guid: 2acbdd5496c4c59418aef59f65450ce8, type: 3}
   - {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3}
   - {fileID: 21300000, guid: fa9b2a7629bbd6e4cbcee92ce742c591, type: 3}
-  - {fileID: 21300000, guid: acd148c524edafa4c83cad76eb65e5df, type: 3}
   - {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3}
   - {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3}
   - {fileID: 21300000, guid: 31c5ffb6550fe564ab9f5159f4e9a1a6, type: 3}
@@ -200,7 +174,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 59e7829d4b4a4fb48b5d9af8cc8d6298, type: 3}
   - {fileID: 21300000, guid: 7d793a541d37b584ca94c3b139decd2c, type: 3}
   - {fileID: 21300000, guid: 33635a29a6552a34f802b1b8a4aa781f, type: 3}
-  - {fileID: 21300000, guid: ba88e8f958ab19047a666abf926edcf1, type: 3}
   - {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3}
   - {fileID: 21300000, guid: 66f7e9bcf829fc04d816daa40ffaad77, type: 3}
   - {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3}
@@ -211,4 +184,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d056d861a066d861a076d861a8c243e8d8d243e8d8e243e8d8f243e8da144473690243e8d91243e8d92243e8d93243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402efbed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1aa49b7ac57d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a922baf4357abe63dbff20842826e418d7a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47252af848262af848272af8484c159f46a07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb696e3feee158aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8d8e243e8d8f243e8d90243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f34973970349739713497397234973973349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a922baf4357abe63dbff20842826e418d7a737b477b737b477c737b477d737b477e737b477f737b47ffce428df116cb47252af848262af848272af848a07f7c4ea17f7c4ea27f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb696e3feee158aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -79,6 +79,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3}
   - {fileID: 21300000, guid: 447f8a5186ac53a4dab1c33c3a83cc08, type: 3}
   - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3}
+  - {fileID: 21300000, guid: 96fd70b1d51e00641ab3107096c4994b, type: 3}
   - {fileID: 21300000, guid: 330be4d1490173b4a8a049003427d8fb, type: 3}
   - {fileID: 21300000, guid: be8503e1af01f494fbd0e7207b593a5c, type: 3}
   - {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3}
@@ -278,6 +279,7 @@ SpriteAtlas:
   - common_menu_2
   - common_dec_21
   - common_bg_5
+  - common_lock_1
   - common_dec_6
   - common_board_104
   - common_btn_yellow_1

Assets/arts/atlas/ui/mail.asset

@@ -21,7 +21,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 524d8ada3219633418886910b5b1fe11, type: 3}
   - {fileID: 21300000, guid: 9b409fa2a72a4bb41bc4dc3578bb3cd0, type: 3}
   - {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, type: 3}
-  - {fileID: 21300000, guid: dd37630b5e7d6d54983be68b235b160f, type: 3}
   - {fileID: 21300000, guid: 33bec6471f24bf6468e5318b6cec9109, type: 3}
   - {fileID: 21300000, guid: 7d49105bbb826fe4592b21c43422fce1, type: 3}
-  spriteNameList: 3fc897ed40c897ed41c897ed90def1ff91def1ffac9a7cc5ad9a7cc5ae9a7cc5af9a7cc5c10668ff182b68ff
+  spriteNameList: 3fc897ed40c897ed41c897ed90def1ff91def1ffac9a7cc5ad9a7cc5ae9a7cc5c10668ff182b68ff

Assets/arts/atlas/ui/mail.spriteatlas

@@ -68,7 +68,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 33bec6471f24bf6468e5318b6cec9109, type: 3}
   - {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, type: 3}
   - {fileID: 21300000, guid: 524d8ada3219633418886910b5b1fe11, type: 3}
-  - {fileID: 21300000, guid: dd37630b5e7d6d54983be68b235b160f, type: 3}
   - {fileID: 21300000, guid: 7d49105bbb826fe4592b21c43422fce1, type: 3}
   - {fileID: 21300000, guid: 2c1ddf6d0fe39ce4caa48556adf15ead, type: 3}
   - {fileID: 21300000, guid: 82fcbd0e17ac13d46926340d89ff4981, type: 3}
@@ -80,7 +79,6 @@ SpriteAtlas:
   - mail_dot
   - mail_dec_3
   - mail_dec_1
-  - mail_dec_4
   - mail_new
   - mail_bg_1
   - mail_bg_3

Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt

@@ -2,16 +2,17 @@ ui_main_btn_bounty.png
 size:512,512
 filter:Linear,Linear
 2
-bounds:250,374,16,17
+bounds:1,304,16,17
 offsets:1,1,18,19
 3
-bounds:1,272,25,27
+bounds:484,486,25,27
 offsets:1,1,27,29
+rotate:90
 4
-bounds:461,458,33,36
+bounds:449,475,33,36
 offsets:1,1,35,38
 5
-bounds:1,301,247,90
+bounds:1,323,247,90
 offsets:1,1,249,92
 6
-bounds:1,393,458,101
+bounds:1,415,446,96

Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt

@@ -1,13 +1,11 @@
 ui_main_button_1.png
 size:256,256
 filter:Linear,Linear
-ck
-bounds:2,86,103,107
-offsets:1,0,104,107
-shop1
-bounds:2,20,103,64
-offsets:1,0,104,64
+1
+bounds:2,127,116,91
+offsets:1,1,118,93
+2
+bounds:2,46,94,79
+offsets:1,1,96,81
 shop2
-bounds:2,2,98,16
-shop3
-bounds:107,151,81,42
+bounds:120,202,98,16

Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt

@@ -1,10 +1,9 @@
 ui_main_chest.png
 size:128,128
 filter:Linear,Linear
-bx1
-bounds:2,59,64,55
-bx2
-bounds:2,4,64,53
-xx
-bounds:68,68,46,46
-offsets:9,9,64,64
+1
+bounds:1,27,46,44
+2
+bounds:1,1,24,24
+3
+bounds:49,57,18,14

Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.atlas.txt

@@ -2,8 +2,6 @@ ui_main_wave.png
 size:128,128
 filter:Linear,Linear
 1
-bounds:1,1,28,36
-offsets:1,1,30,38
+bounds:2,58,54,54
 2
-bounds:1,39,62,65
-offsets:1,1,64,67
+bounds:2,2,54,54

Assets/arts/spines/ui/ui_sevenday_chest_1/ui_sevenday_chest_1.atlas.txt

@@ -2,11 +2,12 @@ ui_sevenday_chest_1.png
 size:128,128
 filter:Linear,Linear
 1
-bounds:1,1,57,50
+bounds:1,2,57,50
 rotate:90
 2
-bounds:1,60,55,60
+bounds:1,61,55,53
 offsets:1,1,57,62
 xing
-bounds:58,64,51,56
+bounds:58,63,51,56
 offsets:2,3,55,61
+rotate:90

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt

@@ -2,9 +2,9 @@ ui_task_chest_1.png
 size:256,256
 filter:Linear,Linear
 1
-bounds:1,1,120,93
+bounds:1,1,120,104
 2
-bounds:1,96,120,115
+bounds:1,107,120,115
 xing
-bounds:123,155,51,56
+bounds:123,166,51,56
 offsets:2,3,55,61

Assets/arts/spines/ui/ui_task_chest_2/ui_task_chest_2.atlas.txt

@@ -2,9 +2,10 @@ ui_task_chest_2.png
 size:256,256
 filter:Linear,Linear
 1
-bounds:1,1,120,93
+bounds:1,1,120,107
 2
-bounds:1,96,120,123
+bounds:1,110,120,118
+offsets:0,0,120,119
 xing
-bounds:123,163,51,56
+bounds:123,172,51,56
 offsets:2,3,55,61

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a7bc25d4d528a94e8c740233f6f5780
+guid: 96fd70b1d51e00641ab3107096c4994b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/textures/ui/common.ab
   assetBundleVariant: 

Assets/arts/textures/ui/mail/mail_dec_4.png.meta

@@ -1,132 +0,0 @@
-fileFormatVersion: 2
-guid: dd37630b5e7d6d54983be68b235b160f
-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: arts/textures/ui/mail.ab
-  assetBundleVariant: 

Assets/prefabs/ui/mail/mail_ui.prefab

@@ -1560,7 +1560,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dd37630b5e7d6d54983be68b235b160f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/prefabs/ui/main_city/main_comp.prefab

@@ -14229,11 +14229,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -186
+      value: -177
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 60
+      value: 66
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x