diff --git a/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png b/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png index 6341586df8..d41edebb51 100644 Binary files a/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png and b/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png.meta b/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png.meta index d488e47c9f..4c56a416eb 100644 --- a/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/b_baridenglu_slogan08_zh_1_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: b_baridenglu_slogan08_zh_1_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 756 + height: 299 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/bianpao_en.png b/Assets/ManagedResources/ArtFont_en/bianpao_en.png index b3e17898b6..fc25fdd61d 100644 Binary files a/Assets/ManagedResources/ArtFont_en/bianpao_en.png and b/Assets/ManagedResources/ArtFont_en/bianpao_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/bianpao_en.png.meta b/Assets/ManagedResources/ArtFont_en/bianpao_en.png.meta index 638f62885a..e2b862cfd3 100644 --- a/Assets/ManagedResources/ArtFont_en/bianpao_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/bianpao_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: bianpao_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png index 985f13206f..7e37a50d17 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png.meta index 4e6f639db5..84e1513d2a 100644 --- a/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_gg_0005_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_gg_0005_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 408 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png index 11b57b9315..396e01f29b 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png.meta index 032fa4cf0b..c51605c28e 100644 --- a/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_gyps_00020_t9_en.png.meta @@ -112,8 +112,8 @@ TextureImporter: serializedVersion: 2 x: 0 y: 0 - width: 386 - height: 249 + width: 410 + height: 232 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -121,7 +121,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 81f0cf47b0e19034b9dbf9f8fdf9c50d + spriteID: vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png index b55a8254aa..96c2ef666d 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png.meta index 40a3bfccff..92e3c27754 100644 --- a/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_hhe_00011_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_hhe_00011_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 404 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png index 5be1ee48ab..55583386ea 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png.meta index bc3df984de..76cecebcce 100644 --- a/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_jcdp_00027_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_jcdp_00027_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 409 + height: 230 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png index fb699840ba..3bb223dc7b 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png.meta index d72634755c..466e856181 100644 --- a/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_jls_00044_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_jls_00044_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 403 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png index f4d60b5611..1316968bd4 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png.meta index 052ff93cb9..95f3e29d1c 100644 --- a/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_jtxn_00045_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_jtxn_00045_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 402 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png index 3ebb86d659..67370fadf8 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png.meta index 7109d3067c..33071e3cef 100644 --- a/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_ljgz_00032_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_ljgz_00032_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 403 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png index 6f68897633..2777b95e1b 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png.meta index eeac8aee39..1caee7ba1f 100644 --- a/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_ls_0004_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_ls_0004_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 398 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png b/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png index 152b02eacf..f648437fd8 100644 Binary files a/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png and b/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png.meta b/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png.meta index 7d59ed4795..d781af9ba6 100644 --- a/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/c_ny_00036_t9_en.png.meta @@ -104,7 +104,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_ny_00036_t9_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 400 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png index 05dab4d011..2200e93249 100644 Binary files a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png and b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png.meta b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png.meta index 9d5dce2807..34601860fe 100644 --- a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaojifanlizi_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_chaojifanlizi_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 293 + height: 63 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png index e7380f974b..b054656ef3 100644 Binary files a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png and b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png.meta b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png.meta index edf589415b..43bd628667 100644 --- a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chaozhijiangli_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_chaozhijiangli_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 462 + height: 137 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png index e2e5a89747..533a59e7bf 100644 Binary files a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png and b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png.meta b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png.meta index a4a90f1d23..fab4922f57 100644 --- a/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_chucun_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_chucun_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 146 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png b/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png index 40f0babea8..8f09bb5f7f 100644 Binary files a/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png and b/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png index a8c3630315..40810ae408 100644 Binary files a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png and b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png.meta index 1cfbc070cf..0bca9b64cd 100644 --- a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-niuqichongchong_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: r_zjm_huodongicon-niuqichongchong_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 164 + height: 134 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png index 1acf985112..a8441da038 100644 Binary files a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png and b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png.meta index 1837afa7ee..8c4f40010e 100644 --- a/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/r_zjm_huodongicon-xianshishenzhuang_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: r_zjm_huodongicon-xianshishenzhuang_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 141 + height: 145 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png index 545bcbd636..bcacdb52e9 100644 Binary files a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png and b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png.meta b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png.meta index e1196f91e5..253a707fb0 100644 --- a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_dazi1_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: s_shoulinglaixi_dazi1_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 816 + height: 330 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png index 9830b67c3d..99e5fb7f17 100644 Binary files a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png and b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png.meta b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png.meta index 3819fafe5d..882c4220cb 100644 --- a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_fabao_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: s_shoulinglaixi_fabao_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 226 + height: 130 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png index 2b12202467..219f6e280c 100644 Binary files a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png and b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png.meta b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png.meta index 68bc918ba2..2fe52f461b 100644 --- a/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/s_shoulinglaixi_jueji_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: s_shoulinglaixi_jueji_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 226 + height: 130 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png index 536d311681..01bf7f4844 100644 Binary files a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png and b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png.meta b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png.meta index 08ffbc2a98..0d73cee978 100644 --- a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_anniu_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_anniu_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 127 + height: 126 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png index 8f8b5e79bb..c877bdc340 100644 Binary files a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png and b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png.meta b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png.meta index ac3804ffde..8c12f7447f 100644 --- a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_hunyingpian_zi_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_hunyingpian_zi_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 427 + height: 116 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png index c4f0b3d3c6..6ed7207176 100644 Binary files a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png and b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png.meta b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png.meta index c517478641..0f71fed773 100644 --- a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_lingshoupian_zi_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_lingshoupian_zi_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 427 + height: 115 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png index 9e48de1c26..768a5308e0 100644 Binary files a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png and b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png.meta b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png.meta index 88bbe479dc..0ce27b0358 100644 --- a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_shenjiangpian_zi_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_shenjiangpian_zi_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 407 + height: 121 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png index f637e118e6..d8d4be83be 100644 Binary files a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png and b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png.meta b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png.meta index df492e8722..08858cb497 100644 --- a/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/t_tianshumijuan_yijihuo_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_yijihuo_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 169 + height: 91 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png b/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png index 534eafa369..2d1ce01e4a 100644 Binary files a/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png and b/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta b/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta index 4dd9d04cd5..029bcfdf4c 100644 --- a/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: x_xianshizaohuan_wujiangyulan 1_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 129 + height: 126 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png b/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png index 2fb5814cab..61bcca92b3 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png and b/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png.meta index b5fa903d25..3e1d1c2d05 100644 --- a/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/b_baridenglu_slogan08_zh_1_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: b_baridenglu_slogan08_zh_1_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 756 + height: 299 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png b/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png index b3e17898b6..fc25fdd61d 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png and b/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png.meta index 9f391bd34e..5d9ced584a 100644 --- a/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/bianpao_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: bianpao_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png index 3f5dd1e45c..833d0af383 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png.meta index 63496e3210..2be6b04ce8 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_gg_0005_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_gg_0005_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 408 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png index 1a87e6f5bb..0117a46887 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png.meta index 11060cec01..b35ee44d6b 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_gyps_00020_t9_vi.png.meta @@ -90,8 +90,8 @@ TextureImporter: serializedVersion: 2 x: 0 y: 0 - width: 386 - height: 249 + width: 410 + height: 232 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -99,7 +99,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 6a506c3b4d8cbab4b8590a39dddca903 + spriteID: vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png index 0299dc3989..1b13a47cd0 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png.meta index 28c2f956f2..2c45b19afd 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_hhe_00011_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_hhe_00011_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 404 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png index c7296622a1..4f75480a93 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png.meta index d92d2e061e..7d41b501a3 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_jcdp_00027_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_jcdp_00027_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 409 + height: 230 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png index 70c04b9f30..19b0d4f076 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png.meta index 7ac458004f..8e5af7b926 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_jls_00044_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_jls_00044_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 403 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png index fff8ba5748..cfe3afc920 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png.meta index 98e91d5692..64cc4b0707 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_jtxn_00045_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_jtxn_00045_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 402 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png index 81a5303ad7..ea56317b0c 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png.meta index 4aad72b593..a79dc3592b 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_ljgz_00032_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_ljgz_00032_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 403 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png b/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png index 92220c99b7..66166ca9fd 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png and b/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png.meta index 89636498e4..55eb58bfac 100644 --- a/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/c_ny_00036_t9_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_ny_00036_t9_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 400 + height: 234 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png index 20680854d3..40d4ed3336 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png and b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png.meta index ab5b8ccf67..e79aa0c6a4 100644 --- a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaojifanlizi_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_chaojifanlizi_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 293 + height: 63 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png index 46c4ac34ca..4452fe728a 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png and b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png.meta index 38a9963bc2..be38784704 100644 --- a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chaozhijiangli_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_chaozhijiangli_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 462 + height: 137 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png index 1add9315b6..c5539cab30 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png and b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png.meta index 8f93be1b52..a5515be56f 100644 --- a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_chucun_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_chucun_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 146 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png index 447e36e628..ace0c0558b 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png and b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png.meta index 081ab7363b..7d0a6e31dc 100644 --- a/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/f_fuxinggaozhao_zida_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: f_fuxinggaozhao_zida_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 939 + height: 321 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png b/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png index 8ac3bf85cd..2c263fb357 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png and b/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png index 1529d1a959..01349e20aa 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png and b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png.meta index 579cf9afad..e163f698af 100644 --- a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-niuqichongchong_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: r_zjm_huodongicon-niuqichongchong_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 164 + height: 134 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png index 4d1ec10988..0f484b1857 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png and b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png.meta index 363115fdfe..e17c2f73bb 100644 --- a/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/r_zjm_huodongicon-xianshishenzhuang_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: r_zjm_huodongicon-xianshishenzhuang_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 141 + height: 145 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png index dc99a55022..2888749751 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png and b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png.meta index b22c0dcaa7..972e8875d7 100644 --- a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_dazi1_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: s_shoulinglaixi_dazi1_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 816 + height: 330 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png index b5fd8c44c8..b0c7d495c3 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png and b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png.meta index b2dd40dd08..ea2980e6fd 100644 --- a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_fabao_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: s_shoulinglaixi_fabao_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 226 + height: 130 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png index 8d47fbd0a2..47fa186b39 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png and b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png.meta index 006a43fa69..ef1ddd08e1 100644 --- a/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/s_shoulinglaixi_jueji_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: s_shoulinglaixi_jueji_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 226 + height: 130 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png index a4604e11b2..b91cf9f87c 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png and b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png.meta index 6fc2f6a83a..2f3c2764a5 100644 --- a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_anniu_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_anniu_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 127 + height: 126 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png index ce4cab9a7a..d5c2b080fa 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png and b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png.meta index d9c6d5351e..2d98da0dbb 100644 --- a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_hunyingpian_zi_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_hunyingpian_zi_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 427 + height: 116 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png index cf67617fd9..5a19fc120f 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png and b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png.meta index d525fa45ef..d7a8031cdb 100644 --- a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_lingshoupian_zi_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_lingshoupian_zi_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 427 + height: 115 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png index 16b440d10a..32a9136b09 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png and b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png.meta index d73674b378..2a52f7e11d 100644 --- a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_shenjiangpian_zi_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_shenjiangpian_zi_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 407 + height: 121 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png index 30a76f2c26..3045e460e3 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png and b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png.meta index 31ab24d21e..983db5ccbb 100644 --- a/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_yijihuo_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: t_tianshumijuan_yijihuo_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 169 + height: 91 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png b/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png index d563f79c83..f858e81794 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png and b/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png.meta index 3724df7012..2e789428df 100644 --- a/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/x_xianshizaohuan_wujiangyulan 1_vi.png.meta @@ -82,7 +82,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: x_xianshizaohuan_wujiangyulan 1_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 129 + height: 126 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh_1_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png rename to Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh_1_zh.png diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png.meta b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh_1_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png.meta rename to Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh_1_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi.png rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi_zh.png diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi.png.meta rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaojifanlizi_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli.png rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli_zh.png diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli.png.meta rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chaozhijiangli_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun.png rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun_zh.png diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun.png.meta rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_chucun_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli.png rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli_zh.png diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli.png.meta rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_fenqifanli_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida.png rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida_zh.png diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida.png.meta rename to Assets/ManagedResources/Atlas/FuXingGaoZhao/ArtFont/f_fuxinggaozhao_zida_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2.png rename to Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2_zh.png diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2.png.meta b/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2.png.meta rename to Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_2_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu.png rename to Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_zh.png diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu.png.meta b/Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu.png.meta rename to Assets/ManagedResources/Atlas/TianShuMiJuan/ArtFont/t_tianshumijuan_zhujiemiananniu_zh.png.meta diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat new file mode 100644 index 0000000000..c1be88bb51 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI_Effect_TouXiang_FightBtn + m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Lin: + m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3} + m_Scale: {x: 1, y: 0.8} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: bed0f3ecb49860b44b7fc53703900f59, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + - _Num: 0.3 + - _Speed: 0.4 + - _Stencil: 0 + m_Colors: + - _MainColor: {r: 1, g: 1, b: 1, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta new file mode 100644 index 0000000000..a6154e9538 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 77ebe0cd68ff366428bd5f0776c28033 +timeCreated: 1528724438 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat new file mode 100644 index 0000000000..fd5515a5e3 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI_Effect_TouXiang_OneKey_Recharge + m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Lin: + m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3} + m_Scale: {x: 1, y: 0.8} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 98b646746e686b6438555ec8552ecc60, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + - _Num: 0.3 + - _Speed: 0.4 + - _Stencil: 0 + m_Colors: + - _MainColor: {r: 1, g: 1, b: 1, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta new file mode 100644 index 0000000000..3479905351 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 302dfa1210d2d414781fdb1258ff87f7 +timeCreated: 1528724438 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 31a0ba297a..3451d75fd8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -6129,7 +6129,7 @@ RectTransform: - {fileID: 3620672236438832033} - {fileID: 6452811165627678722} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -31365,6 +31365,83 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &550172830994131731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5204423984622933357} + - component: {fileID: 4364765942041843341} + - component: {fileID: 2972268997527647440} + m_Layer: 0 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5204423984622933357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550172830994131731} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} + m_LocalPosition: {x: -1.2, y: -27.6, z: 100.32529} + m_LocalScale: {x: 142.7168, y: 45.916, z: 0} + m_Children: [] + m_Father: {fileID: 3829532297210306968} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} +--- !u!33 &4364765942041843341 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550172830994131731} + m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3} +--- !u!23 &2972268997527647440 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550172830994131731} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 77ebe0cd68ff366428bd5f0776c28033, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 300 --- !u!1 &643417629125995719 GameObject: m_ObjectHideFlags: 0 @@ -31743,7 +31820,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -36831,7 +36908,7 @@ RectTransform: m_Children: - {fileID: 7260768385889208524} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -79898,7 +79975,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3829532297210306968} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -101652,7 +101729,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -113021,6 +113098,7 @@ RectTransform: m_Children: - {fileID: 8077834434338251515} - {fileID: 4823769979385840690} + - {fileID: 5204423984622933357} - {fileID: 8443255222074332825} - {fileID: 2039730614} - {fileID: 2835335463341580670} diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index 8edd840870..3b5bcd2f0c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -2410,6 +2410,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6110885791313462184} + - {fileID: 7238345453039068175} m_Father: {fileID: 802783340} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8613,7 +8614,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000029371866, y: 0} + m_AnchoredPosition: {x: -0.0000011437851, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -10344,6 +10345,83 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4356364362538793344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7238345453039068175} + - component: {fileID: 5388700874519848325} + - component: {fileID: 7545929012998373937} + m_Layer: 0 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7238345453039068175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4356364362538793344} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} + m_LocalPosition: {x: 0.6, y: 0.51, z: 100.32529} + m_LocalScale: {x: 77.79492, y: 25.823158, z: 0} + m_Children: [] + m_Father: {fileID: 1948612919371492188} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} +--- !u!33 &5388700874519848325 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4356364362538793344} + m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3} +--- !u!23 &7545929012998373937 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4356364362538793344} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 302dfa1210d2d414781fdb1258ff87f7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 300 --- !u!1 &4621832663263693582 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index aa6f00cfcd..ecc690cffd 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -304,6 +304,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4363160613285279899} m_CullTransparentMesh: 0 +--- !u!1 &4391287929986418072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8778226543071966709} + - component: {fileID: 1303385263412231138} + - component: {fileID: 2459249386874405349} + m_Layer: 0 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8778226543071966709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4391287929986418072} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} + m_LocalPosition: {x: 0, y: 0, z: 100.32529} + m_LocalScale: {x: 77.79493, y: 25.82316, z: 0} + m_Children: [] + m_Father: {fileID: 9069308257944265737} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} +--- !u!33 &1303385263412231138 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4391287929986418072} + m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3} +--- !u!23 &2459249386874405349 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4391287929986418072} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 302dfa1210d2d414781fdb1258ff87f7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 300 --- !u!1 &5049567396853013260 GameObject: m_ObjectHideFlags: 0 @@ -5704,7 +5781,7 @@ ParticleSystem: --- !u!199 &5835294107039667155 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10801,7 +10878,7 @@ ParticleSystem: --- !u!199 &5835345885398115607 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11046,6 +11123,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3609706222115065085} + - {fileID: 8778226543071966709} m_Father: {fileID: 7410245404359298873} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 17622a4f68..3af421d403 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -99,6 +99,7 @@ function FightPointPassMainPanel:InitComponent() this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight") this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text") + this.fightSaoGuang = Util.GetGameObject(this.btnFight, "saoguang") LanguageFontSizeFilter(this.fightText, 50) -- 你要变强 this.btnGetForce = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnIWantMilk") @@ -551,10 +552,12 @@ end -- 设置挑战按钮文字 function this.SetFightBtnText() this.fightLock:SetActive(false) + this.fightSaoGuang:SetActive(true) local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight) if not isCounting then if not isPass then this.fightLock:SetActive(true) + this.fightSaoGuang:SetActive(false) this.lockText.text = FightPointPassManager.GetBtnText() else this.fightText.text = FightPointPassManager.GetBtnText() @@ -595,6 +598,7 @@ function FightPointPassMainPanel:OnSortingOrderChange() Util.AddParticleSortLayer(this.GuideJumpEffectGo, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.pgEffect, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.UI_Effect_MuBiaoJiangLi, self.sortingOrder - orginLayer) + Util.SetParticleSortLayer(this.fightSaoGuang, self.sortingOrder + 1) fightMap:OnSortingOrderChange(self.sortingOrder) orginLayer = self.sortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua index 0cacc90bba..f6b2e48e38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua @@ -108,9 +108,11 @@ function this.GetMailRedPointState() break end end + LogGreen("检测邮件红点---------"..#this.mialDataList.." 红点状态 "..tostring(isShowRedPoint)) -- 无红点可显示,重置服务器邮件红点 if not isShowRedPoint then ResetServerRedPointStatus(RedPointType.Mail_Server) + isShowRedPoint = false end return isShowRedPoint end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 04a63867b2..c3124d7c3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -36,6 +36,7 @@ function EveryDayGift:InitComponent() self.buyAllBtn = Util.GetGameObject(self.oneKey,"oneKeyBtn") self.oriPrice = Util.GetGameObject(self.oneKey,"oriPrice"):GetComponent("Text") self.nowPrice = Util.GetGameObject(self.oneKey,"nowPrice"):GetComponent("Text") + self.allSaoGuang = Util.GetGameObject(self.oneKey, "saoguang") self.endTimeBg = Util.GetGameObject(self.bg,"tiao") self.endTime = Util.GetGameObject(self.endTimeBg,"time"):GetComponent("Text") @@ -180,6 +181,7 @@ function EveryDayGift:isBought() if self.shopData[i].data.boughtNum > 0 then Util.SetGray(self.buyAllBtn,true) self.buyAllBtn:GetComponent("Button").interactable = false + self.allSaoGuang:SetActive(false) break end end @@ -210,6 +212,7 @@ function EveryDayGift:RefreshOneKeyShow() end Util.SetGray(self.buyAllBtn,false) self.buyAllBtn:GetComponent("Button").interactable = true + self.allSaoGuang:SetActive(true) -- 计算总价 local ori = 0 for i = 1 , #self.shopData do diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index f1b5ff7b2e..bb67639ade 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -52,8 +52,10 @@ function GiftView:InitComponent(gameObject) self.buyAllBtn = Util.GetGameObject(self.oneKey, "Button") self.oriPrice = Util.GetGameObject(self.oneKey, "oriPrice"):GetComponent("Text") self.nowPrice = Util.GetGameObject(self.oneKey, "nowPrice"):GetComponent("Text") + self.allSaoGuang = Util.GetGameObject(self.oneKey, "saoguang") Util.SetGray(self.buyAllBtn,false) self.buyAllBtn:GetComponent("Button").interactable = true + self.allSaoGuang:SetActive(true) self.scrollItem = Util.GetGameObject(gameObject, "rzyBg/scrollItem") self.tip3 = Util.GetGameObject(gameObject, "rzyBg/tip3") self.lightList = { @@ -108,6 +110,8 @@ function GiftView:OnSortingOrderChange(cursortingOrder) self.ItemList[i][j]:SetEffectLayer(cursortingOrder) end end + + Util.SetParticleSortLayer(self.allSaoGuang, self.sortingOrder + 1) end -- function GiftView.refresh() @@ -381,6 +385,7 @@ function GiftView:isBought() if data[i].buyTimes >0 then Util.SetGray(self.buyAllBtn,true) self.buyAllBtn:GetComponent("Button").interactable = false + self.allSaoGuang:SetActive(false) break end end diff --git a/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs b/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs index 2e5eeb5f45..e246efa166 100644 --- a/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs +++ b/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs @@ -958,10 +958,12 @@ namespace Assets.Scripts.Editor.LanguageTool Debug.Log("文件路径" + files[j]); fileName = fileName.Substring(0, fileName.Length - 3); } + // 空格 替换为 下划线 + fileName = fileName.Replace(" ", "_"); fileName = Path.GetDirectoryName(files[j]) + "/" + fileName + artTab + _ex; Debug.Log("文件名:" + fileName); EditorUtility.DisplayProgressBar("遍历图片资源目录", string.Format("正在检索数据:{0}/{1}", i, dirs.Count), (float)i / dirs.Count); - AssetDatabase.MoveAsset(files[j], fileName); + AssetDatabase.MoveAsset(files[j].Replace(Environment.CurrentDirectory + "\\", ""), fileName.Replace(Environment.CurrentDirectory + "\\", "")); } } EditorUtility.ClearProgressBar();