diff --git a/Assets/arts/textures/ui/common/common_btn_blue_1.png b/Assets/arts/textures/ui/common/common_btn_blue_1.png index 5895174df..88265f00c 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_blue_1.png and b/Assets/arts/textures/ui/common/common_btn_blue_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_blue_2.png b/Assets/arts/textures/ui/common/common_btn_blue_2.png index 1ce227578..5c7e8bdf6 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_blue_2.png and b/Assets/arts/textures/ui/common/common_btn_blue_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_close.png b/Assets/arts/textures/ui/common/common_btn_close.png index bed1cc398..56d670b0b 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_close.png and b/Assets/arts/textures/ui/common/common_btn_close.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_grey_1.png b/Assets/arts/textures/ui/common/common_btn_grey_1.png index a0434c10c..c2844e365 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_grey_1.png and b/Assets/arts/textures/ui/common/common_btn_grey_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_grey_2.png b/Assets/arts/textures/ui/common/common_btn_grey_2.png index c408303b9..fe7daed5f 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_grey_2.png and b/Assets/arts/textures/ui/common/common_btn_grey_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_1.png b/Assets/arts/textures/ui/common/common_btn_yellow_1.png index 99fb8b0fa..86cbf3d33 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_yellow_1.png and b/Assets/arts/textures/ui/common/common_btn_yellow_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_2.png b/Assets/arts/textures/ui/common/common_btn_yellow_2.png index 41f6ba0c9..ad1f53121 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_yellow_2.png and b/Assets/arts/textures/ui/common/common_btn_yellow_2.png differ diff --git a/Assets/arts/textures/ui/common/common_quality_1.png b/Assets/arts/textures/ui/common/common_quality_1.png index b82f6da13..f86591cba 100644 Binary files a/Assets/arts/textures/ui/common/common_quality_1.png and b/Assets/arts/textures/ui/common/common_quality_1.png differ diff --git a/Assets/arts/textures/ui/common/common_quality_2.png b/Assets/arts/textures/ui/common/common_quality_2.png index 1c2fc9346..35621d287 100644 Binary files a/Assets/arts/textures/ui/common/common_quality_2.png and b/Assets/arts/textures/ui/common/common_quality_2.png differ diff --git a/Assets/arts/textures/ui/common/common_quality_3.png b/Assets/arts/textures/ui/common/common_quality_3.png index 8831b71bc..f1f9ccd4e 100644 Binary files a/Assets/arts/textures/ui/common/common_quality_3.png and b/Assets/arts/textures/ui/common/common_quality_3.png differ diff --git a/Assets/arts/textures/ui/common/common_quality_4.png b/Assets/arts/textures/ui/common/common_quality_4.png index 7a40a05a3..6a8e8d34c 100644 Binary files a/Assets/arts/textures/ui/common/common_quality_4.png and b/Assets/arts/textures/ui/common/common_quality_4.png differ diff --git a/Assets/arts/textures/ui/common/common_quality_5.png b/Assets/arts/textures/ui/common/common_quality_5.png index 82dcee2d1..692e03593 100644 Binary files a/Assets/arts/textures/ui/common/common_quality_5.png and b/Assets/arts/textures/ui/common/common_quality_5.png differ diff --git a/Assets/arts/textures/ui/common/common_tab_1.png b/Assets/arts/textures/ui/common/common_tab_1.png index 3f88baec5..86b91ce71 100644 Binary files a/Assets/arts/textures/ui/common/common_tab_1.png and b/Assets/arts/textures/ui/common/common_tab_1.png differ diff --git a/Assets/arts/textures/ui/common/common_tab_2.png b/Assets/arts/textures/ui/common/common_tab_2.png index f09aa0d2e..efd0caf0d 100644 Binary files a/Assets/arts/textures/ui/common/common_tab_2.png and b/Assets/arts/textures/ui/common/common_tab_2.png differ diff --git a/Assets/lua/app/config/act_gift.lua.bytes b/Assets/lua/app/config/act_gift.lua.bytes index 1b9af153a..11a4be9af 100644 Binary files a/Assets/lua/app/config/act_gift.lua.bytes and b/Assets/lua/app/config/act_gift.lua.bytes differ diff --git a/Assets/lua/app/config/arena_bounty_level.lua.bytes b/Assets/lua/app/config/arena_bounty_level.lua.bytes index 7dae6b4ba..e98d7d7dc 100644 Binary files a/Assets/lua/app/config/arena_bounty_level.lua.bytes and b/Assets/lua/app/config/arena_bounty_level.lua.bytes differ diff --git a/Assets/lua/app/config/arena_rank.lua.bytes b/Assets/lua/app/config/arena_rank.lua.bytes index 033e27136..62e1f630d 100644 Binary files a/Assets/lua/app/config/arena_rank.lua.bytes and b/Assets/lua/app/config/arena_rank.lua.bytes differ diff --git a/Assets/lua/app/config/arena_time.lua.bytes b/Assets/lua/app/config/arena_time.lua.bytes index 68ac28b31..9ee3eb367 100644 Binary files a/Assets/lua/app/config/arena_time.lua.bytes and b/Assets/lua/app/config/arena_time.lua.bytes differ diff --git a/Assets/lua/app/config/attr.lua.bytes b/Assets/lua/app/config/attr.lua.bytes index 996cb14cb..b1fd47ff0 100644 Binary files a/Assets/lua/app/config/attr.lua.bytes and b/Assets/lua/app/config/attr.lua.bytes differ diff --git a/Assets/lua/app/config/chapter.lua.bytes b/Assets/lua/app/config/chapter.lua.bytes index 0f2719faf..c8ef8ad4c 100644 Binary files a/Assets/lua/app/config/chapter.lua.bytes and b/Assets/lua/app/config/chapter.lua.bytes differ diff --git a/Assets/lua/app/config/chapter_daily_challenge.lua.bytes b/Assets/lua/app/config/chapter_daily_challenge.lua.bytes index b29ebfd22..e662572a1 100644 Binary files a/Assets/lua/app/config/chapter_daily_challenge.lua.bytes and b/Assets/lua/app/config/chapter_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/const.lua.bytes b/Assets/lua/app/config/const.lua.bytes index f2775f48f..30722e44f 100644 Binary files a/Assets/lua/app/config/const.lua.bytes and b/Assets/lua/app/config/const.lua.bytes differ diff --git a/Assets/lua/app/config/item.lua.bytes b/Assets/lua/app/config/item.lua.bytes index 5de0e791d..16a82d9fe 100644 Binary files a/Assets/lua/app/config/item.lua.bytes and b/Assets/lua/app/config/item.lua.bytes differ diff --git a/Assets/lua/app/config/mall_daily_store.lua.bytes b/Assets/lua/app/config/mall_daily_store.lua.bytes new file mode 100644 index 000000000..a2fc712ad Binary files /dev/null and b/Assets/lua/app/config/mall_daily_store.lua.bytes differ diff --git a/Assets/lua/app/config/mall_daily_store.lua.bytes.meta b/Assets/lua/app/config/mall_daily_store.lua.bytes.meta new file mode 100644 index 000000000..3c846cd4b --- /dev/null +++ b/Assets/lua/app/config/mall_daily_store.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b5e0c912b6b8be40a653a553a3e7bb3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/config/mall_gold.lua.bytes b/Assets/lua/app/config/mall_gold.lua.bytes index 468d4decb..4584a99e1 100644 Binary files a/Assets/lua/app/config/mall_gold.lua.bytes and b/Assets/lua/app/config/mall_gold.lua.bytes differ diff --git a/Assets/lua/app/config/mall_treasure.lua.bytes b/Assets/lua/app/config/mall_treasure.lua.bytes index 22f2c3ee3..15aab8cca 100644 Binary files a/Assets/lua/app/config/mall_treasure.lua.bytes and b/Assets/lua/app/config/mall_treasure.lua.bytes differ diff --git a/Assets/lua/app/config/player_exp.lua.bytes b/Assets/lua/app/config/player_exp.lua.bytes index 36bfc009e..4bd39ed92 100644 --- a/Assets/lua/app/config/player_exp.lua.bytes +++ b/Assets/lua/app/config/player_exp.lua.bytes @@ -1,14 +1,39 @@ bf_encrypt_luai)1X+H-8GH:uua0 -3D9xI4k5MR0qYxs~X9Z#4Y^T!K',L!'Qqqi8reD9xH12MR;1xiseDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs85MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDs85MSpir%5r`LR:p123a4:02’8I5!:1qseDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDs85MSpir%5r`LR:p123a4:02’8I5!:1qseDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDs85MSpir%5r`LR:p123a4:02’8I5!:1qseDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDs85MSpir%5r`LR:p123a4:02’8I5!:1qseDs5MSpir%5r`LR:p123a4:02’8I5!:1qseDsx5MSpir%5r`LR:p123a4:02’8I5!:1qseDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDs5MSpir%5r`LR:p123a4:02’8I5!:1seDsx5MSpir%5r`LR:p123a4:02’8I5!:1seDsx!9VqqhrDxI4x4MR0qqi8vl*\-kM=Aqqi8reD=u%QP! BJaAM9Qo$9+@.W:*V !]RIWfLTreD9xI'{5MR0qqi+cD9xI4k&\R0qqi8rvL>xI4k5MA"qqi8reD*N4k5MR0bbi8reD9xZl5MR0qqz zeD9xI4x MR0qqi8aL9xI4k5^D0qqi8reWpI4k5MR#fqi8reD9k)=k5MR0qbq8reD9xI'I4k5MR#Nqi8reD9kq~k5MR0qb)8reD9xI'K{MR0qqi+3eD9xI4k&0qqi8rv9xI4k5MA,qi8reD*;I4k5MR0b 8reD9xZpk5MR0qqzXeD9xI4xpMR0qqi8aU19xI4k5^0qqi8reW9I4k5MR#6qi8reD9kk5MR0qb!8reD9xI'˹MR0qqi+;eD9xI4k&=0qqi8rv9xI4k5MApqi8reD*3I4k5MR0b8reD9xZxk5MR0qqzeD9xI4xxMR0qqi8a 9xI4k5^0qqi8reWI4k5MR#>qi8reD9kk5MR0qb98reD9xI'MR0qqi+#eD9xI4k&U0qqi8rv9xI4k5MAtpi8reD*+I4k5MR0b)|9reD9xZ`k5MR0qqzVdD9xI4x`MR0qqi8a|8xI4k5^0qqi8reW14H4k5MR#&qi8reD9kkj5MR0qb18reD9xI'sFLR0qqi++eD9xI4k&1qqi8rv9xI4k5MApi8reD*#I4k5MR0b9reD9xZhk5MR0qqzdD9xI4xhMR0qqi8af;xI4k5^ 0qqi8reW1K4k5MR#.qi8reD9kIEi5MR0qb 8reD9xI'{OR0qqi+eD9xI4k&m2qqi8rv&9xI4k5MAsi8reD*I4k5MR0b1d;reD9xZPk5MR0qqzDD9xI4o0)3Duo[*MyI4k4MR0qq?reE9xI6k5MQ0qqm8re@9xI2k5MU0qqa8reM9xI>k5MY0qqe8reJ9xI;k5MB0qqx8reV9xI'k5MG0qq|8reR9xI#k5MJ0qqp8re]9xI/k5MN0qqt8reZ9xI+k5Mr0qqH8reg9xIk5Mw0qqO8rec9xIk5Mx0qqC8reo9xIk5M0qqG8rej9xIk5Mc0qq[8rew9xIk5Mg0qq_8re|9xI k5Mh0qqR8rex9xI k5Mm0qqV8re9xIuk5M0qq*8re9xIqk5M0qq.8re 9xI}k5M0qq"8re 9xIzk5M0qq98re9xIfk5M0qq=8re9xIbk5M0qq18re9xInk5M 0qq58re9xIjk5M 0qq 8re&9xIWk5M60qq 8re"9xISk5M;0qq8re.9xI_k5M>0qq8re)9xI[k5M"0qq8re69xIGk5M&0qq8re39xILk5M+0qq8re?9xIHk5M,0qq8re;9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qq8re9xIk5M0qqi9reD8xI6j5MQ1qqm9reA8xI2j5MU1qqa9reN8xI?j5M^1qqd9reJ8xI;j5MC1qqx9reV8xI'j5MF1qq|9reQ8xI#j5MJ1qqp9re^8xI/j5MN1qqt9re[8xIj5Ms1qqK9reg8xIj5Mt1qqO9rec8xIj5M{1qqC9ren8xIj5M1qqG9rek8xIj5Mc1qq[9rep8xIj5Md1qq^9re|8xI j5Mi1qqR9rex8xI j5Ml1qqV9re{8xIuj5M1qq*9re8xIqj5M1qq.9re 8xI~j5M1qq%9re 8xIzj5M1qq99re8xIfj5M1qq=9re8xIbj5M1qq19re8xInj5M 1qq59re8xIkj5M21qq9re&8xIWj5M71qq 9re"8xISj5M:1qq9re-8xI_j5M>1qq9re*8xI[j5M"1qq9re78xI@j5M'1qq9re38xILj5M(1qq9re?8xIHj5M/1qq9re:8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qq9re8xIj5M1qqi:reE;xI6i5MQ2qqm:reB;xI3i5MZ2qq`:reN;xI?i5M_2qqd:reJ;xI;i5MB2qqx:reU;xI'i5MF2qq|:reR;xI#i5MJ2qqp:re_;xI(i5MO2qqw:re[;xIi5Mp2qqK:reg;xIi5Mw2qqO:reb;xIi5M{2qqC:reo;xIi5M2qqG:ret;xIi5M`2qqZ:rep;xIi5Me2qq^:re|;xI i5Mh2qqR:re;xI i5Ml2qqV:re;xIui5M2qq*:re;xIri5M2qq!:re ;xI~i5M2qq%:re ;xIzi5M2qq9:re;xIfi5M2qq=:re;xIbi5M2qq1:re;xIoi5M2qq4:re;xIki5M32qq:re&;xIWi5M62qq :re!;xISi5M:2qq:re.;xI_i5M>2qq:re+;xIDi5M#2qq:re7;xI@i5M$2qq:re3;xILi5M+2qq:re>;xIHi5M/2qq:re;;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qq:re;xIi5M2qqi;reF:xI7h5MV3qql;reB:xI3h5M[3qq`;reN:xI?h5M^3qqd;reI:xI;h5MB3qqx;reV:xI'h5MF3qq|;reS:xI,h5MK3qqs;re_:xI(h5ML3qqw;re[:xIh5Ms3qqK;ref:xIh5Mw3qqO;rec:xIh5M{3qqC;reh:xIh5M|3qqF;ret:xIh5Ma3qqZ;rep:xIh5Md3qq^;res:xI h5Mh3qqR;rex:xI h5Ml3qqV;re:xIvh5M3qq-;re:xIrh5M3qq!;re :xI~h5M3qq%;re:xIzh5M3qq9;re:xIfh5M3qq=;re:xIch5M -3qq0;re:xIoh5M3qq4;re:xIkh5M23qq;re%:xIWh5M63qq ;re":xISh5M:3qq;re/:xIXh5M?3qq;re+:xIDh5M 3qq;re7:xI@h5M'3qq;re2:xILh5M+3qq;re?:xIHh5M/3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5M3qq;re:xIh5MR4qqhreE?xI7m5MV6qql>reB?xI3m5MZ6qq`>reO?xI8m5M_6qqg>reK?xI$m5M@6qq{>reW?xI m5MG6qq>reR?xI,m5MK6qqs>re_?xI(m5MO6qqw>red?xIm5Mp6qqJ>re`?xIm5Mu6qqN>rel?xIm5Mx6qqB>reo?xIm5M|6qqF>ret?xIm5M`6qqZ>req?xIm5Me6qqQ>re}?xIm5Mn6qqU>rey?xI -m5Mm6qq)>re?xIvm5M6qq->re?xIrm5M6qq!>re?xIm5M6qq$>re -?xI{m5M6qq8>re?xIgm5M6qq<>re?xIcm5M -6qq0>re?xIom5M6qq4>re?xITm5M36qq >re'?xIPm5M46qq>re#?xI\m5M;6qq>re.?xIXm5M?6qq>re+?xIDm5M#6qq>re0?xIAm5M$6qq>rere8?xIIm5M,6qq>re;?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5M6qq>re?xIm5MR7qqh?reF>xI7l5MV7qql?reC>xIxI8l5M\7qqg?reK>xI$l5MC7qq{?reV>xI l5MG7qq?reS>xI,l5MK7qqs?reX>xI)l5ML7qqv?red>xIl5Mq7qqJ?re`>xIl5Mt7qqN?rec>xIl5Mx7qqB?reh>xIl5M|7qqF?reu>xIl5Ma7qq]?req>xIl5Mj7qqQ?re}>xIl5Mi7qqU?rex>xI -l5Mm7qq)?re>xIvl5M7qq-?re>xIsl5M7qq ?re>xIl5M7qq$?re ->xI{l5M7qq8?re>xIgl5M7qqxIcl5M -7qq0?re>xIhl5M7qq7?re>xITl5M07qq ?re'>xIPl5M77qq?re">xI\l5M;7qq?re/>xIXl5M?7qq?re4>xIEl5M 7qq?re0>xIAl5M%7qq?re<>xIMl5M(7qq?re?>xIIl5M,7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5M7qq?re>xIl5MR8qqh0reG1xI0c5MW8qqo0reC1xIDxȲM:iy2>DxH4RreE2H4a4 :2s3a4:sdDsy !zrss9!1qhx5j4ORq0ti3`D85pir%59>Dxȱj4Rqﲲe34*uRqpi9Dɴ5MS;pi2s%3a4:2s3 LRzp1rs!4z0r8I5qh9seDx9L4_R1hH45 rj4Rq99DxȲM:iseDx4!5MS1,i29DsI5 5MSqiNseD*yI4k5MR0ux]\9'5MR0qqi< !O%kP:3BulL !=i=MP4_.W -WM1=Bpo4r +peD9xI4k1B;T.J- +M Z 1HqLLm<)*lI4k5MR0uaM:"V +ZA%;^uln3y*{I4k5MR0ut?iOXW3xI4k5MR4t'_OaNM%QA;Tbui8reD9xZ3k5MR0qqm= +7Mk7k5MR0qu`n 'xt xLR0qqi8amD9xI4k5^7qqi8re@0.\t:o bh8reD9xZ1k5MR0qqzyeD9xI4o<X0Ov8xI4k5MA6qqi8reD*F4k5MR0ux<_NEt'37MR0qqi+{eD9xI4k&A0qqi8raMl!W*Bpo#si8reD9k9#k5MR0qu`m3 'xt xNR0qqi8a=_9xI4k5I[e  +yXy*J4k5MR0b1v8reD9xM=3R%1qLT+ZFD9xI4k1D +G(OOXWu|I4k5MR#aVi8reD9|@b].$Lz3reD9xI4xIR0qqi8an9xI4k5I[f +y@0y*tI4k5MR0bel8reD9xZE5MR0qqm1$4Z9{aV&@R0qqi8rv<t b`i8reD9xZ5MR0qqm1$$4Z9{aV&ZR0qqi8rv$0xI4k5MA(qi8reD=quV `eLbq8reD9xI'R91qC$T+^eD9xI4k&0qqi8raMl1W*o#\qi8reD9k,k5MR0qbreD9xI0b`*cS0C<aKD9xI4k5^)qqi8reWI4k5MR4x$ $vlEZk5MR0qqzheD9xI4xR0qqi8vl^A*uY`pAqqi8reD*XU4k5MR0b8reD9xM=>R1qC$T+CeD9xI4k&O0qqi8rv,xI4k5MV9$/[3Wk{4k5MR0qb9reD9xI0b`::S0C<aVD9xI4k5^fqqi8reWI4k5MR4x$T$vlEZk5MR0qqzeD9xI4o<%@0[mOvq9xI4k5MA,Tqi8reD*p4k5MR0ux@t b/i8reD9xZ"7MR0qqzdD9xI4o<%H0[mOv9xI4k5MA0si8reD=qCZV `eLb 8reD9xI'{OR0qqi+rE9xI4k1D +GD( +'XWXxI4k5MR#Qk8reD9kNj5MR0qu``\'xJ xWMR0qqi8aU;xI4k5^Npqi8re@0 >vt bi8reD9xZtf6MR0qqzdD9xI4o<%v0[mOv 9xI4k5MAPi8reD=qCV `f#ul\%=~*[[9S0qqh8reD9D4k4MR0sqi8qeD9|I4k1MR0wqi8ueD9pI4kdD94H4kxLR0?pi8=dD9(H4kdLR0#pi8!dD9,H4k`LR0'pi8%dD9 H4kmLR0+pi8)dD9$H4khLR0/pi8-dD9H4kWLR0pi8dD9H4kSLR0pi8dD9H4k_LR0pi8dD9H4k[LR0pi8dD9H4kDLR0pi8dD9 H4k@LR0pi8dD9H4kLLR0 pi8dD9H4kHLR0pi8 dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9H4kLR0pi8dD9xK4k4OR0ssi8pgD9|K4k0OR0wsi8ugD9pK4kui8"aD9)M4kgIR0"ui8'aD9-M4kcIR0&ui8*aD9"M4koIR0+ui8)aD9$M4khIR0/ui8-aD9M4kTIR0ui8aD9M4kPIR0ui8aD9M4k\IR0ui8aD9M4kXIR0ui8aD9 M4kGIR0ui8aD9 M4kBIR0ui8 +aD9M4kOIR0 ui8aD9M4kHIR0ui8 aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8aD9M4kIR0ui8r`D9yL4k7HR0uti8v`D9|L4k0HR0wti8u`D9pL4kcD95O4k{KR0>wi8"cD9)O4kfKR0"wi8&cD9-O4kcKR0)wi8*cD9 O4klKR0+wi8)cD9$O4khKR0/wi8-cD9O4kTKR0wi8cD9O4kQKR0wi8cD9O4k\KR0wi8cD9O4k[KR0wi8cD9 O4kGKR0wi8cD9 O4kCKR0wi8 +cD9O4kOKR0 wi8 cD9O4kHKR0wi8 cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8cD9O4kKR0wi8rbD9zN4k7JR0svi8qbD9|N4k0JR0wvi8ubD9pN4kN4ksJR07vi85bD90N4k|JR0;vi89bD94N4kxJR0?vi8=bD9(N4kdJR0#vi8 bD9,N4k`JR0'vi8%bD9 N4klJR0+vi8.bD9%N4kkJR0.vi8bD9N4kVJR0vi8bD9N4kSJR0vi8bD9N4k\JR0vi8bD9N4kXJR0vi8bD9N4kDJR0vi8bD9 N4kAJR0vi8bD9N4kLJR0 vi8 bD9N4kKJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9N4kJR0vi8bD9xA4k4ER0syi8qmD9|A4k3ER0vyi8zmD9qA4k?ER0zyi8mD9uA4k;ER0~yi8bmD9jA4k'ER0cyi8amD9lA4k ER0gyi8emD9`A4k,ER0kyi8imD9dA4k(ER0oyi8lmD9XA4kER0Syi8QmD9\A4kER0Wyi8ZmD9QA4kER0Zyi8^mD9UA4kER0^yi8BmD9IA4kER0Eyi8FmD9LA4kER0Gyi8EmD9@A4k ER0Kyi8ImD9DA4kER0Oyi8MmD98A4kuER03yi81mD9mD95A4k{ER0>yi8#mD9)A4kgER0"yi8&mD9.A4kcER0'yi8%mD9 A4klER0+yi8)mD9$A4khER0/yi8-mD9A4kTER0yi8mD9A4kPER0yi8mD9A4k\ER0yi8mD9A4k[ER0yi8mD9 A4kFER0yi8mD9 A4kCER0 yi8 +mD9A4kLER0 yi8 mD9A4kHER0yi8 mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4kER0yi8mD9A4k5DR0qxi8rlD9y@4k7DR0rxi8vlD9}@4k3DR0wxi8ulD9@4k=DR0xxi8xlD9r@4k>DR0}xi8~lD9v@4k:DR0axi8clD9j@4k&DR0exi8dlD9o@4k-DR0hxi8hlD9c@4k(DR0lxi8llD9g@4kDR0Sxi8PlD9Z@4kDR0Uxi8WlD9^@4kDR0Yxi8ZlD9Q@4kDR0[xi8YlD9T@4kDR0\xi8\lD9V@4kDR0@xi8@lD9K@4kDR0Dxi8DlD9@@4k DR0Kxi8IlD9D@4kDR0Nxi8MlD98@4ktDR03xi86lD9<@4kqDR04xi84lD9?@4k}DR08xi88lD92@4k~DR0:xi8>lD95@4k{DR0?xi8=lD9(@4keDR0#xi8!lD9,@4k`DR0'xi8%lD9 @4koDR0*xi8.lD9%@4kkDR0.xi8lD9@4kWDR0xi8lD9@4kSDR0xi8lD9@4k\DR0xi8lD9@4kYDR0xi8lD9@4kZDR0xi8lD9 @4kGDR0xi8lD9 @4kCDR0xi8 +lD9@4kODR0 xi8lD9@4kJDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8lD9@4kDR0xi8roD9yC4k7GR0u{i8woD9~C4k2GR0y{i8{oD9sC4k>GR0}{i8oD9vC4k%GR0a{i8boD9iC4k'GR0b{i8foD9mC4k#GR0g{i8eoD9oC4k-GR0h{i8hoD9bC4k.GR0m{i8noD9fC4k*GR0Q{i8SoD9ZC4kGR0U{i8ToD9_C4kGR0X{i8XoD9SC4kGR0\{i8\oD9WC4kGR0C{i8@oD9JC4kGR0E{i8GoD9NC4kGR0I{i8JoD9AC4k GR0K{i8IoD9DC4k GR0L{i8LoD9FC4kuGR00{i80oD9;C4kqGR04{i84oD90C4k|GR0;{i89oD94C4kxGR0>{i8=oD9(C4kdGR0#{i8&oD9,C4kaGR0${i8$oD9/C4kmGR0({i8(oD9"C4knGR0*{i8.oD9%C4kkGR0/{i8-oD9C4kUGR0{i8oD9C4kPGR0{i8oD9C4k_GR0{i8oD9C4k[GR0{i8oD9 C4kGGR0{i8oD9C4kCGR0{i8oD9C4kLGR0 {i8 oD9C4kIGR0 {i8oD9C4kJGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0{i8oD9C4kGR0qzi8snD9zB4k6FR0uzi8vnD9}B4k0FR0wzi8unD9pB4k=FR0xzi8{nD9rB4k?FR0}zi8nD9vB4k:FR0azi8cnD9jB4k!FR0dzi8dnD9oB4k-FR0hzi8inD9cB4k)FR0lzi8lnD9XB4kFR0Qzi8SnD9ZB4kFR0Uzi8WnD9^B4kFR0Vzi8UnD9PB4kFR0[zi8XnD9SB4kFR0]zi8^nD9VB4kFR0Azi8CnD9JB4kFR0Ezi8DnD9OB4k FR0Hzi8HnD9CB4kFR0Lzi8LnD9GB4kuFR03zi80nD9:B4kvFR05zi87nD9>B4krFR09zi8:nD91B4k|FR0;zi89nD94B4kyFR0@R0}|i8hD9vD4k:@R0a|i8`hD9kD4k!@R0d|i8dhD9oD4k,@R0h|i8hhD9cD4k)@R0o|i8lhD9fD4k*@R0Q|i8ShD9ZD4k@R0U|i8VhD9]D4k@R0W|i8UhD9PD4k@R0X|i8[hD9RD4k@R0]|i8_hD9VD4k@R0A|i8ChD9JD4k@R0D|i8DhD9OD4k @R0H|i8IhD9CD4k @R0L|i8LhD98D4ku@R01|i83hD9:D4kv@R05|i87hD9>D4ks@R06|i85hD90D4k|@R0:|i8>hD94D4ky@R0=|i8>hD96D4k{@R0sqi8y(X,F4P5"|qieD>&Z \*=qq5reE9xI14p \ No newline at end of file diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 5478b7a96..f5109217f 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/task_type.lua.bytes b/Assets/lua/app/config/strings/cn/task_type.lua.bytes index 28866f495..32d4072d6 100644 Binary files a/Assets/lua/app/config/strings/cn/task_type.lua.bytes and b/Assets/lua/app/config/strings/cn/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/de/task_type.lua.bytes b/Assets/lua/app/config/strings/de/task_type.lua.bytes index ce3480b17..5d6cd765e 100644 Binary files a/Assets/lua/app/config/strings/de/task_type.lua.bytes and b/Assets/lua/app/config/strings/de/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/en/task_type.lua.bytes b/Assets/lua/app/config/strings/en/task_type.lua.bytes index c6ea7e8b4..01ed02743 100644 Binary files a/Assets/lua/app/config/strings/en/task_type.lua.bytes and b/Assets/lua/app/config/strings/en/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/es/task_type.lua.bytes b/Assets/lua/app/config/strings/es/task_type.lua.bytes index 0ccfce1c0..ae88336e6 100644 Binary files a/Assets/lua/app/config/strings/es/task_type.lua.bytes and b/Assets/lua/app/config/strings/es/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/fr/task_type.lua.bytes b/Assets/lua/app/config/strings/fr/task_type.lua.bytes index 4170372cb..ea7a0dc49 100644 Binary files a/Assets/lua/app/config/strings/fr/task_type.lua.bytes and b/Assets/lua/app/config/strings/fr/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/id/task_type.lua.bytes b/Assets/lua/app/config/strings/id/task_type.lua.bytes index 73eb2e7a7..9b7242376 100644 Binary files a/Assets/lua/app/config/strings/id/task_type.lua.bytes and b/Assets/lua/app/config/strings/id/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ja/task_type.lua.bytes b/Assets/lua/app/config/strings/ja/task_type.lua.bytes index 0f713c4f5..dcee9add9 100644 Binary files a/Assets/lua/app/config/strings/ja/task_type.lua.bytes and b/Assets/lua/app/config/strings/ja/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ko/task_type.lua.bytes b/Assets/lua/app/config/strings/ko/task_type.lua.bytes index 2bd38e140..20e5b4eb6 100644 Binary files a/Assets/lua/app/config/strings/ko/task_type.lua.bytes and b/Assets/lua/app/config/strings/ko/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/pt/task_type.lua.bytes b/Assets/lua/app/config/strings/pt/task_type.lua.bytes index 8858db9c5..50ed7fe24 100644 Binary files a/Assets/lua/app/config/strings/pt/task_type.lua.bytes and b/Assets/lua/app/config/strings/pt/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/th/task_type.lua.bytes b/Assets/lua/app/config/strings/th/task_type.lua.bytes index fb3af8334..f5b7e2755 100644 Binary files a/Assets/lua/app/config/strings/th/task_type.lua.bytes and b/Assets/lua/app/config/strings/th/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/vi/task_type.lua.bytes b/Assets/lua/app/config/strings/vi/task_type.lua.bytes index 16fe011da..8249a6385 100644 Binary files a/Assets/lua/app/config/strings/vi/task_type.lua.bytes and b/Assets/lua/app/config/strings/vi/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/strings/zh/task_type.lua.bytes b/Assets/lua/app/config/strings/zh/task_type.lua.bytes index 62bea497d..b8fdf5b26 100644 Binary files a/Assets/lua/app/config/strings/zh/task_type.lua.bytes and b/Assets/lua/app/config/strings/zh/task_type.lua.bytes differ diff --git a/Assets/lua/app/config/struct.lua.bytes b/Assets/lua/app/config/struct.lua.bytes index feef31add..b17d47458 100644 Binary files a/Assets/lua/app/config/struct.lua.bytes and b/Assets/lua/app/config/struct.lua.bytes differ diff --git a/Assets/lua/app/config/talent.lua.bytes b/Assets/lua/app/config/talent.lua.bytes new file mode 100644 index 000000000..884310e6b Binary files /dev/null and b/Assets/lua/app/config/talent.lua.bytes differ diff --git a/Assets/lua/app/config/talent.lua.bytes.meta b/Assets/lua/app/config/talent.lua.bytes.meta new file mode 100644 index 000000000..738283c6f --- /dev/null +++ b/Assets/lua/app/config/talent.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 836a44663f934654f9e009a0a213d46a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/config/task_achievement.lua.bytes b/Assets/lua/app/config/task_achievement.lua.bytes new file mode 100644 index 000000000..07a9656a7 Binary files /dev/null and b/Assets/lua/app/config/task_achievement.lua.bytes differ diff --git a/Assets/lua/app/config/task_achievement.lua.bytes.meta b/Assets/lua/app/config/task_achievement.lua.bytes.meta new file mode 100644 index 000000000..5b8f0a408 --- /dev/null +++ b/Assets/lua/app/config/task_achievement.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1bc5f1838f8819f48ba135c2ddcfe621 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/config/task_daily.lua.bytes b/Assets/lua/app/config/task_daily.lua.bytes index 5f3ccd686..5582dfe9d 100644 Binary files a/Assets/lua/app/config/task_daily.lua.bytes and b/Assets/lua/app/config/task_daily.lua.bytes differ diff --git a/Assets/lua/app/config/task_daily_challenge.lua.bytes b/Assets/lua/app/config/task_daily_challenge.lua.bytes index 431f96d3c..e8e7f0db5 100644 Binary files a/Assets/lua/app/config/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/task_daily_stage.lua.bytes b/Assets/lua/app/config/task_daily_stage.lua.bytes new file mode 100644 index 000000000..23550516c Binary files /dev/null and b/Assets/lua/app/config/task_daily_stage.lua.bytes differ diff --git a/Assets/lua/app/config/task_daily_stage.lua.bytes.meta b/Assets/lua/app/config/task_daily_stage.lua.bytes.meta new file mode 100644 index 000000000..cab14479c --- /dev/null +++ b/Assets/lua/app/config/task_daily_stage.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d54e0a8563935249b1412389611a8f7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/config/task_type.lua.bytes b/Assets/lua/app/config/task_type.lua.bytes index 1bc151f7e..3ffd0e2fc 100644 Binary files a/Assets/lua/app/config/task_type.lua.bytes and b/Assets/lua/app/config/task_type.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 478d6241c..64711a0c4 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/maincity/maincity_const.lua.bytes b/Assets/lua/app/module/maincity/maincity_const.lua.bytes index 6c7e9e434..bac4b617f 100644 Binary files a/Assets/lua/app/module/maincity/maincity_const.lua.bytes and b/Assets/lua/app/module/maincity/maincity_const.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index ecd8d5e7c..4e9eb3b95 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 5929514fd..e40615432 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/arena/arena_data.lua.bytes b/Assets/lua/app/userdata/arena/arena_data.lua.bytes index b697066c9..c882b96d2 100644 Binary files a/Assets/lua/app/userdata/arena/arena_data.lua.bytes and b/Assets/lua/app/userdata/arena/arena_data.lua.bytes differ diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index f5ad81775..3a5e96054 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -2388,6 +2388,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -2397,7 +2398,9 @@ MonoBehaviour: freeze: 0 layoutScaleMode: 0 referenceSize: {x: 1, y: 1} + pivotOffset: {x: 0, y: 0} referenceScale: 1 + layoutScale: 1 rectTransformSize: {x: 0, y: 0} editReferenceRect: 0 updateWhenInvisible: 3 @@ -2409,15 +2412,18 @@ MonoBehaviour: updateSeparatorPartLocation: 1 updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 @@ -2529,7 +2535,7 @@ RectTransform: - {fileID: 4823341342929098919} - {fileID: 3477334206727936928} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4140,6 +4146,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -4149,7 +4156,9 @@ MonoBehaviour: freeze: 0 layoutScaleMode: 0 referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} referenceScale: 1 + layoutScale: 1 rectTransformSize: {x: 0, y: 0} editReferenceRect: 0 updateWhenInvisible: 3 @@ -4161,15 +4170,18 @@ MonoBehaviour: updateSeparatorPartLocation: 1 updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 @@ -4950,7 +4962,7 @@ RectTransform: - {fileID: 6705604434351636062} - {fileID: 1307478930562252765} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -5387,6 +5399,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -5396,7 +5409,9 @@ MonoBehaviour: freeze: 0 layoutScaleMode: 0 referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} referenceScale: 1 + layoutScale: 1 rectTransformSize: {x: 0, y: 0} editReferenceRect: 0 updateWhenInvisible: 3 @@ -5408,15 +5423,18 @@ MonoBehaviour: updateSeparatorPartLocation: 1 updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 @@ -6520,7 +6538,7 @@ RectTransform: - {fileID: 4005312702798379930} - {fileID: 6426852567812005699} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -14170,7 +14188,6 @@ RectTransform: - {fileID: 695546136260584160} - {fileID: 4444211905114488189} - {fileID: 3627930560419446073} - - {fileID: 7660559910128057540} - {fileID: 7317176164002787664} - {fileID: 4949950993334253111} - {fileID: 6695163000850577717} @@ -14223,10 +14240,6 @@ MonoBehaviour: hashName: 2824433901 objectType: 1 gameObject: {fileID: 5354679190370682360} - - name: main_comp.hero_formation_comp - hashName: 2931189545 - objectType: 1 - gameObject: {fileID: 3995920760742853779} - name: main_comp.left hashName: 4252051584 objectType: 0 @@ -15273,117 +15286,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 3732174623407794182} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4117931743722912774 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4165930251451731960} - m_Modifications: - - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Name - value: hero_formation_comp - objectReference: {fileID: 0} - - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_SizeDelta.x - value: 672 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_SizeDelta.y - value: 204 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: -191 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} ---- !u!1 &3995920760742853779 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 4117931743722912774} - m_PrefabAsset: {fileID: 0} ---- !u!224 &7660559910128057540 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 4117931743722912774} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5061460047304183613 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 6ff0f72a9..a4400c95f 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -26,6 +26,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: 4259641861814473670} - {fileID: 1699708307813134699} @@ -65,6 +66,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65, y: 0.65, z: 0.65} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1691310444861320729} m_RootOrder: 2 @@ -140,6 +142,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: 283388478364906741} m_RootOrder: 0 @@ -147,7 +150,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 360, y: 120} + m_SizeDelta: {x: 144, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5699002463863463999 CanvasRenderer: @@ -177,7 +180,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -216,6 +219,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: 7530826278446483045} m_Father: {fileID: 9037901304184321032} @@ -267,6 +271,109 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &645625342348365000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3957114751299371996} + - component: {fileID: 3116061881344130086} + - component: {fileID: 1936161339263465054} + - component: {fileID: 1048227236953687845} + - component: {fileID: 3004220906560317393} + m_Layer: 5 + m_Name: bottom_btn_cell_5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3957114751299371996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645625342348365000} + 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: 5672309619514121058} + m_Father: {fileID: 1848150626198586907} + m_RootOrder: 5 + 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: 288, y: 60} + m_SizeDelta: {x: 144, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3116061881344130086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645625342348365000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: bottom_btn_cell.icon + hashName: 612463694 + objectType: 6 + gameObject: {fileID: 882061927657312465} + - name: bottom_btn_cell.desc + hashName: 612316774 + objectType: 0 + gameObject: {fileID: 4514938442144405357} +--- !u!222 &1936161339263465054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645625342348365000} + m_CullTransparentMesh: 1 +--- !u!114 &1048227236953687845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645625342348365000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3004220906560317393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645625342348365000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &751691943515882629 GameObject: m_ObjectHideFlags: 0 @@ -294,6 +401,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: 4345138650635023754} m_RootOrder: 0 @@ -339,6 +447,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: 1691310444861320729} m_RootOrder: 3 @@ -471,6 +580,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: 7703189336704565753} m_Father: {fileID: 4165930251451731960} @@ -510,6 +620,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: 4827931133527556794} m_RootOrder: 1 @@ -598,6 +709,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: 7703189336704565753} m_RootOrder: 0 @@ -645,6 +757,230 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1613546754609646589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9171908986363045397} + - component: {fileID: 7057678347636094768} + m_Layer: 5 + m_Name: rp_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9171908986363045397 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613546754609646589} + 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: 4570676550312760887} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 40, y: 35} + m_SizeDelta: {x: 32, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7057678347636094768 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613546754609646589} + m_CullTransparentMesh: 1 +--- !u!1 &1734138120679578809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3950272665304155534} + - component: {fileID: 6541306769701804076} + - component: {fileID: 2385239527587245230} + m_Layer: 5 + m_Name: line_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3950272665304155534 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734138120679578809} + 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: 1848150626198586907} + m_RootOrder: 9 + 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: 216, y: 0} + m_SizeDelta: {x: 8, y: 112} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &6541306769701804076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734138120679578809} + m_CullTransparentMesh: 1 +--- !u!114 &2385239527587245230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734138120679578809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2073173842493673980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2783812535925271722} + - component: {fileID: 4201147951486007049} + - component: {fileID: 1696979624772837405} + - component: {fileID: 2052440165480894797} + - component: {fileID: 4235700053339360333} + m_Layer: 5 + m_Name: bottom_btn_cell_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2783812535925271722 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073173842493673980} + 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: 1316887812596152156} + m_Father: {fileID: 1848150626198586907} + m_RootOrder: 4 + 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: 144, y: 60} + m_SizeDelta: {x: 144, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4201147951486007049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073173842493673980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: bottom_btn_cell.icon + hashName: 612463694 + objectType: 6 + gameObject: {fileID: 4324069770643324379} + - name: bottom_btn_cell.desc + hashName: 612316774 + objectType: 0 + gameObject: {fileID: 7866310538619448207} +--- !u!222 &1696979624772837405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073173842493673980} + m_CullTransparentMesh: 1 +--- !u!114 &2052440165480894797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073173842493673980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4235700053339360333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073173842493673980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &2276996793609630113 GameObject: m_ObjectHideFlags: 0 @@ -671,6 +1007,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: 2732517323862691995} m_Father: {fileID: 4827931133527556794} @@ -709,6 +1046,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: 2732517323862691995} m_RootOrder: 0 @@ -750,6 +1088,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -757,6 +1096,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -764,16 +1110,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 @@ -803,6 +1153,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: 6536015749642588291} - {fileID: 3759312271480939732} @@ -842,6 +1193,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: 120835241197761831} m_RootOrder: 1 @@ -976,6 +1328,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: 1848150626198586907} m_RootOrder: 0 @@ -1048,6 +1401,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: 9037901304184321032} m_RootOrder: 0 @@ -1123,6 +1477,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: 1691310444861320729} m_RootOrder: 0 @@ -1164,6 +1519,217 @@ MonoBehaviour: m_FillDirection: 0 m_Value: 1 m_FillCenter: 1 +--- !u!1 &3809611494908126825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5672309619514121058} + - component: {fileID: 8113601187884392478} + - component: {fileID: 7170634935904518626} + m_Layer: 5 + m_Name: bg_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5672309619514121058 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3809611494908126825} + 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: 3957114751299371996} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 144, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8113601187884392478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3809611494908126825} + m_CullTransparentMesh: 1 +--- !u!114 &7170634935904518626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3809611494908126825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4514938442144405357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 120070219968835740} + - component: {fileID: 7334252525594518203} + - component: {fileID: 1510072434147099762} + m_Layer: 5 + m_Name: desc5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &120070219968835740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4514938442144405357} + 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: 1172621875782705344} + m_RootOrder: 4 + 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: 288, y: 16} + m_SizeDelta: {x: 140, y: 60} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &7334252525594518203 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4514938442144405357} + m_CullTransparentMesh: 1 +--- !u!114 &1510072434147099762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4514938442144405357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 30 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4610624162753089541 GameObject: m_ObjectHideFlags: 0 @@ -1190,6 +1756,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: 6489186638350296583} - {fileID: 759060791702564536} @@ -1231,6 +1798,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: 1699708307813134699} m_RootOrder: 0 @@ -1317,6 +1885,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: 4870476458847439978} - {fileID: 6383478646067087139} @@ -1357,13 +1926,14 @@ 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: 1848150626198586907} - m_RootOrder: 5 + m_RootOrder: 7 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: 127, y: 0} + m_AnchoredPosition: {x: -72, y: 0} m_SizeDelta: {x: 8, y: 112} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3194657544111682895 @@ -1434,15 +2004,16 @@ 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: 4675071818508983604} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 2 + m_RootOrder: 1 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: 0, y: 60} - m_SizeDelta: {x: 240, y: 120} + m_AnchoredPosition: {x: -288, y: 60} + m_SizeDelta: {x: 144, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1099394748050609760 MonoBehaviour: @@ -1534,6 +2105,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: 3759312271480939732} m_RootOrder: 0 @@ -1609,6 +2181,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: 6963299347440152119} m_Father: {fileID: 7703189336704565753} @@ -1685,6 +2258,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: 8093419265017816340} m_RootOrder: 0 @@ -1760,6 +2334,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: 3696961338274091344} - {fileID: 3949621824981300676} @@ -1839,15 +2414,16 @@ 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: 1412240001720365271} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 1 + m_RootOrder: 3 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: -240, y: 60} - m_SizeDelta: {x: 240, y: 120} + m_AnchoredPosition: {x: 0, y: 60} + m_SizeDelta: {x: 144, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3393165931814203606 MonoBehaviour: @@ -1911,6 +2487,51 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &6036325191286748500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5379911824459212165} + - component: {fileID: 1928313962639110284} + m_Layer: 5 + m_Name: rp_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5379911824459212165 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6036325191286748500} + 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: 1103898913653635901} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 40, y: 35} + m_SizeDelta: {x: 32, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1928313962639110284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6036325191286748500} + m_CullTransparentMesh: 1 --- !u!1 &6110878786953891751 GameObject: m_ObjectHideFlags: 0 @@ -1939,13 +2560,14 @@ 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: 1172621875782705344} - m_RootOrder: 0 + m_RootOrder: 2 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: -240, y: 16} + m_AnchoredPosition: {x: 0, y: 16} m_SizeDelta: {x: 140, y: 60} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2588435685544701223 @@ -2074,6 +2696,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: 4827931133527556794} m_RootOrder: 0 @@ -2163,13 +2786,18 @@ 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: 8567680819716509041} - - {fileID: 8544134998154596831} - {fileID: 283388478364906741} - {fileID: 7704011638835030197} + - {fileID: 8544134998154596831} + - {fileID: 2783812535925271722} + - {fileID: 3957114751299371996} - {fileID: 4661127000006697023} - {fileID: 7427886148868494453} + - {fileID: 5502300907052497866} + - {fileID: 3950272665304155534} - {fileID: 9063231875777621435} - {fileID: 8760634027036144284} - {fileID: 1172621875782705344} @@ -2260,6 +2888,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: 1691310444861320729} m_RootOrder: 1 @@ -2394,6 +3023,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: 7703189336704565753} m_RootOrder: 1 @@ -2435,6 +3065,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -2442,6 +3073,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 1, y: 1} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -2449,16 +3087,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 @@ -2490,6 +3132,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: 2732517323862691995} m_RootOrder: 2 @@ -2626,15 +3269,16 @@ 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: 4722671853838293499} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 3 + m_RootOrder: 2 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: 240, y: 60} - m_SizeDelta: {x: 240, y: 120} + m_AnchoredPosition: {x: -144, y: 60} + m_SizeDelta: {x: 144, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6596663853057175422 MonoBehaviour: @@ -2727,6 +3371,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: 1220542898982553693} - {fileID: 7791805197152138237} @@ -2818,6 +3463,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: 120835241197761831} m_RootOrder: 0 @@ -2892,6 +3538,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: 4460309012350241894} m_RootOrder: 0 @@ -2937,13 +3584,14 @@ 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: 1172621875782705344} - m_RootOrder: 1 + m_RootOrder: 0 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: 0, y: 16} + m_AnchoredPosition: {x: -288, y: 16} m_SizeDelta: {x: 140, y: 60} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6626558091867559523 @@ -3071,6 +3719,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: 7704011638835030197} m_RootOrder: 0 @@ -3078,7 +3727,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 360, y: 120} + m_SizeDelta: {x: 144, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5681271147148741275 CanvasRenderer: @@ -3108,7 +3757,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3146,6 +3795,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: 7791805197152138237} m_RootOrder: 1 @@ -3280,14 +3930,15 @@ 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: 1848150626198586907} - m_RootOrder: 6 + m_RootOrder: 10 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: 0, y: 60} - m_SizeDelta: {x: 254, y: 120} + m_SizeDelta: {x: 158, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2829657353007137055 CanvasRenderer: @@ -3317,7 +3968,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} + m_Sprite: {fileID: 21300000, guid: e6ec7dd0257a3435ca158889047e65c1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3355,13 +4006,14 @@ 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: 1848150626198586907} - m_RootOrder: 4 + m_RootOrder: 6 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: -127, y: 0} + m_AnchoredPosition: {x: -216, y: 0} m_SizeDelta: {x: 8, y: 112} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1386399875459108104 @@ -3402,6 +4054,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7496008740440596781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5502300907052497866} + - component: {fileID: 1521074832057945095} + - component: {fileID: 2100203001866138053} + m_Layer: 5 + m_Name: line_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5502300907052497866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7496008740440596781} + 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: 1848150626198586907} + m_RootOrder: 8 + 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: 72, y: 0} + m_SizeDelta: {x: 8, y: 112} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &1521074832057945095 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7496008740440596781} + m_CullTransparentMesh: 1 +--- !u!114 &2100203001866138053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7496008740440596781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7831684272148554428 GameObject: m_ObjectHideFlags: 0 @@ -3432,6 +4160,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: 5685856364196914479} - {fileID: 7582710375693909186} @@ -3555,6 +4284,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: 8544134998154596831} m_RootOrder: 0 @@ -3562,7 +4292,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 360, y: 120} + m_SizeDelta: {x: 144, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6909047663007489475 CanvasRenderer: @@ -3592,7 +4322,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3602,6 +4332,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7866310538619448207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6945680310952839193} + - component: {fileID: 5848107009359098222} + - component: {fileID: 7308710243039857034} + m_Layer: 5 + m_Name: desc4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6945680310952839193 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866310538619448207} + 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: 1172621875782705344} + m_RootOrder: 3 + 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: 144, y: 16} + m_SizeDelta: {x: 140, y: 60} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &5848107009359098222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866310538619448207} + m_CullTransparentMesh: 1 +--- !u!114 &7308710243039857034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866310538619448207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 30 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8196055782175860004 GameObject: m_ObjectHideFlags: 0 @@ -3630,6 +4495,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: 7228277265609253518} m_RootOrder: 0 @@ -3764,6 +4630,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7791805197152138237} m_RootOrder: 0 @@ -3837,12 +4704,15 @@ 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: 4460309012350241894} - {fileID: 7900683791719762125} - {fileID: 4345138650635023754} + - {fileID: 4460309012350241894} + - {fileID: 1103898913653635901} + - {fileID: 4570676550312760887} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 7 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3875,6 +4745,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: 2195415561721556952} - {fileID: 8897476989028766107} @@ -3915,6 +4786,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: 5194317633082647185} - {fileID: 3376580947375456280} @@ -3994,13 +4866,14 @@ 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: 1172621875782705344} - m_RootOrder: 2 + m_RootOrder: 1 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: 240, y: 16} + m_AnchoredPosition: {x: -144, y: 16} m_SizeDelta: {x: 140, y: 60} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6969912997078958239 @@ -4130,6 +5003,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: 4830373999101852056} - {fileID: 1848150626198586907} @@ -4345,6 +5219,30 @@ MonoBehaviour: hashName: 1127913225 objectType: 0 gameObject: {fileID: 3571660619602358056} + - name: main_ui.bottom_node.bottom_btn_cell_4 + hashName: 1039712770 + objectType: 1 + gameObject: {fileID: 2073173842493673980} + - name: main_ui.bottom_node.bottom_btn_cell_5 + hashName: 1039712771 + objectType: 1 + gameObject: {fileID: 645625342348365000} + - name: main_ui.bottom_node.icons.ui_spine_obj_4 + hashName: 512318501 + objectType: 6 + gameObject: {fileID: 4324069770643324379} + - name: main_ui.bottom_node.icons.ui_spine_obj_5 + hashName: 512318502 + objectType: 6 + gameObject: {fileID: 882061927657312465} + - name: main_ui.bottom_node.icons.ui_spine_obj_4.rp_node + hashName: 2296055450 + objectType: 0 + gameObject: {fileID: 6036325191286748500} + - name: main_ui.bottom_node.icons.ui_spine_obj_5.rp_node + hashName: 488600987 + objectType: 0 + gameObject: {fileID: 1613546754609646589} --- !u!114 &6214590949040345325 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4397,6 +5295,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: 6206731893931372099} m_Father: {fileID: 8093419265017816340} @@ -4474,18 +5373,97 @@ 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: 1737144463360230035} - {fileID: 2433600075686959437} - {fileID: 3046881078233975478} + - {fileID: 1737144463360230035} + - {fileID: 6945680310952839193} + - {fileID: 120070219968835740} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 8 + m_RootOrder: 12 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: 0, y: 79} m_SizeDelta: {x: 720, y: 158} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9152687657302861754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1316887812596152156} + - component: {fileID: 6813423934539876068} + - component: {fileID: 916439347525579046} + m_Layer: 5 + m_Name: bg_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1316887812596152156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152687657302861754} + 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: 2783812535925271722} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 144, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6813423934539876068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152687657302861754} + m_CullTransparentMesh: 1 +--- !u!114 &916439347525579046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152687657302861754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1001 &1493531801552903700 PrefabInstance: m_ObjectHideFlags: 0 @@ -4497,6 +5475,14 @@ PrefabInstance: propertyPath: m_Name value: ui_spine_obj_2 objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: @@ -4509,6 +5495,125 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: -144 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!1 &1089572221801411436 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1493531801552903700} + m_PrefabAsset: {fileID: 0} +--- !u!224 &4345138650635023754 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1493531801552903700} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1518043736896497656 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8760634027036144284} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj_3 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 4989a4c057c89ff4da77d5168a96ecc7, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder value: 2 @@ -4567,7 +5672,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: 240 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y @@ -4587,17 +5692,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &1089572221801411436 stripped +--- !u!1 &1059977412716825216 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1493531801552903700} + m_PrefabInstance: {fileID: 1518043736896497656} m_PrefabAsset: {fileID: 0} ---- !u!224 &4345138650635023754 stripped +--- !u!224 &4460309012350241894 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1493531801552903700} + m_PrefabInstance: {fileID: 1518043736896497656} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1518043736896497656 +--- !u!1001 &1700480276330544553 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -4606,12 +5711,20 @@ PrefabInstance: m_Modifications: - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Name - value: ui_spine_obj_3 + value: ui_spine_obj_5 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 234507584d8c82347a60a064dd7827a1, type: 2} + objectReference: {fileID: 11400000, guid: 95dc39d6bc747aa44b75b095a1170f00, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4622,7 +5735,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -4678,7 +5791,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: -240 + value: 288 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y @@ -4698,15 +5811,134 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &4460309012350241894 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1518043736896497656} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1059977412716825216 stripped +--- !u!1 &882061927657312465 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1518043736896497656} + m_PrefabInstance: {fileID: 1700480276330544553} + m_PrefabAsset: {fileID: 0} +--- !u!224 &4570676550312760887 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1700480276330544553} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2857192981799588003 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8760634027036144284} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj_4 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 95dc39d6bc747aa44b75b095a1170f00, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 144 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &1103898913653635901 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2857192981799588003} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4324069770643324379 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2857192981799588003} m_PrefabAsset: {fileID: 0} --- !u!1001 &4803769959397203555 PrefabInstance: @@ -4739,6 +5971,18 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 1307478930562252765, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307478930562252765, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307478930562252765, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1336857412970353468, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} propertyPath: m_text value: @@ -4783,6 +6027,22 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 4005312702798379930, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005312702798379930, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005312702798379930, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005312702798379930, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4939,6 +6199,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 6426852567812005699, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6426852567812005699, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6426852567812005699, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6426852567812005699, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6520612233707068014, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} propertyPath: m_Layer value: 5 @@ -4947,6 +6223,18 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 6705604434351636062, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6705604434351636062, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6705604434351636062, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7073701338508384741, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} propertyPath: m_Material value: @@ -5015,21 +6303,28 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 9222850470875267671, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9222850470875267671, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9222850470875267671, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} ---- !u!1 &3709158421462868600 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8202172837849562139, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} - m_PrefabInstance: {fileID: 4803769959397203555} - m_PrefabAsset: {fileID: 0} --- !u!1 &641146163435183003 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5354679190370682360, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} m_PrefabInstance: {fileID: 4803769959397203555} m_PrefabAsset: {fileID: 0} ---- !u!224 &8897476989028766107 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} +--- !u!1 &3709158421462868600 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8202172837849562139, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} m_PrefabInstance: {fileID: 4803769959397203555} m_PrefabAsset: {fileID: 0} --- !u!1 &4175967731956866547 stripped @@ -5037,6 +6332,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} m_PrefabInstance: {fileID: 4803769959397203555} m_PrefabAsset: {fileID: 0} +--- !u!224 &8897476989028766107 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + m_PrefabInstance: {fileID: 4803769959397203555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4995549557732434771 PrefabInstance: m_ObjectHideFlags: 0 @@ -5048,10 +6348,18 @@ PrefabInstance: propertyPath: m_Name value: ui_spine_obj_1 objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 4989a4c057c89ff4da77d5168a96ecc7, type: 2} + objectReference: {fileID: 11400000, guid: 95dc39d6bc747aa44b75b095a1170f00, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5062,7 +6370,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -5118,7 +6426,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -288 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y @@ -5138,16 +6446,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &7900683791719762125 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 4995549557732434771} - m_PrefabAsset: {fileID: 0} --- !u!1 &6842980704613305899 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 4995549557732434771} m_PrefabAsset: {fileID: 0} +--- !u!224 &7900683791719762125 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 4995549557732434771} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7572813254719329804 PrefabInstance: m_ObjectHideFlags: 0 @@ -5950,6 +7258,10 @@ PrefabInstance: propertyPath: m_Name value: shop_comp objectReference: {fileID: 0} + - target: {fileID: 5997397792976241942, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6035091261327340095, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} propertyPath: m_Layer value: 5