diff --git a/Root/mht_china/zf/Android/_log/china$zf_test_8a9a58e19e4002b00ee8376c5901dd1599aa195b_2021_07_06_18_07_30.log b/Root/mht_china/zf/Android/_log/china$zf_test_8a9a58e19e4002b00ee8376c5901dd1599aa195b_2021_07_06_18_07_30.log new file mode 100644 index 000000000..4296446ed --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china$zf_test_8a9a58e19e4002b00ee8376c5901dd1599aa195b_2021_07_06_18_07_30.log @@ -0,0 +1,71 @@ +热更文件版本:china/zf_test_8a9a58e19e4002b00ee8376c5901dd1599aa195b_2021_07_06_18_07_30 +热更文件的工程对应的提交信息: +commit 8a9a58e19e4002b00ee8376c5901dd1599aa195b +Merge: f8a5d2cb65 8df851509f +Author: JieLing +Date: Tue Jul 6 17:16:04 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test + + # Conflicts: + # Assets/Editor/AutoPack.cs +热更大小:21.18834781646728515625 +热更文件: +lz4/updatepanel.unity3d +lz4/atlas/floatingviewatlas.unity3d +lz4/atlas/fourelement.unity3d +lz4/atlas/journeywithwindatlas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/publicatlas.unity3d +lz4/atlas/recruitatlas.unity3d +lz4/atlas/tehuishenzhuangatlas.unity3d +lz4/bg/p_piaomialzhilv_banzi.unity3d +lz4/bg/p_piaomialzhilv_beijin.unity3d +lz4/bg/p_piaomialzhilv_yifuhua.unity3d +lz4/bg/t_tehuishenzhuang_ditu.unity3d +lz4/bg/map/map99/wjfb-99_1.unity3d +lz4/bg/map/map99/wjfb-99_10.unity3d +lz4/bg/map/map99/wjfb-99_11.unity3d +lz4/bg/map/map99/wjfb-99_13.unity3d +lz4/bg/map/map99/wjfb-99_14.unity3d +lz4/bg/map/map99/wjfb-99_15.unity3d +lz4/bg/map/map99/wjfb-99_16.unity3d +lz4/bg/map/map99/wjfb-99_17.unity3d +lz4/bg/map/map99/wjfb-99_19.unity3d +lz4/bg/map/map99/wjfb-99_2.unity3d +lz4/bg/map/map99/wjfb-99_20.unity3d +lz4/bg/map/map99/wjfb-99_21.unity3d +lz4/bg/map/map99/wjfb-99_22.unity3d +lz4/bg/map/map99/wjfb-99_23.unity3d +lz4/bg/map/map99/wjfb-99_3.unity3d +lz4/bg/map/map99/wjfb-99_4.unity3d +lz4/bg/map/map99/wjfb-99_5.unity3d +lz4/bg/map/map99/wjfb-99_7.unity3d +lz4/bg/map/map99/wjfb-99_8.unity3d +lz4/bg/map/map99/wjfb-99_9.unity3d +lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d +lz4/effectresui/baibaoshanghui.unity3d +lz4/effectresui/pokemonmain.unity3d +lz4/effectresui/shop.unity3d +lz4/fonts/artfont_4.unity3d +lz4/fonts/battlefont.unity3d +lz4/prefabs/ui/expert.unity3d +lz4/prefabs/ui/fight.unity3d +lz4/prefabs/ui/floatingview.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/journeywithwind.unity3d +lz4/prefabs/ui/jumpview.unity3d +lz4/prefabs/ui/mail.unity3d +lz4/prefabs/ui/monstercamp.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/setting.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/tehuishenzhuang.unity3d +lz4/publicartres/shaders.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 7be2b6d67..b8a8511f8 100644 Binary files a/Root/mht_china/zf/Android/files.unity3d and b/Root/mht_china/zf/Android/files.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d index 4a0fde40b..874456819 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d b/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d index 3c8bd3bf9..8dbee2f44 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/journeywithwindatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/journeywithwindatlas.unity3d new file mode 100644 index 000000000..ce6540607 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/journeywithwindatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d index 559bb0973..337307032 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d index 5f8d9b0f2..51449cb34 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d index cd92c1e0d..53c3ec69a 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/tehuishenzhuangatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/tehuishenzhuangatlas.unity3d new file mode 100644 index 000000000..6ce57ef82 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/tehuishenzhuangatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_1.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_1.unity3d index b4381c21d..a7279ece0 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_1.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_1.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_10.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_10.unity3d index bd27cd7cf..11d680b8b 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_10.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_10.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_11.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_11.unity3d index 4d648c56c..d272701f5 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_11.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_11.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_13.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_13.unity3d index 566a116c6..595346047 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_13.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_13.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_14.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_14.unity3d index 418e7ad3e..228a6b0b0 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_14.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_14.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_15.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_15.unity3d index 36da0a4d1..ab802acb5 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_15.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_15.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_16.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_16.unity3d index f92f4e822..4e8f5b1d9 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_16.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_16.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_17.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_17.unity3d index 08caf6298..2bf8fd6ae 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_17.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_17.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_19.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_19.unity3d index 522ddeacf..d644461e3 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_19.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_19.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_2.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_2.unity3d index 4083c6374..3ee9e3e73 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_2.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_2.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_20.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_20.unity3d index 28d47b92e..c3eb4021d 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_20.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_20.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_21.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_21.unity3d index 3be81fb12..8b03badda 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_21.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_21.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_22.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_22.unity3d index cf049f649..bdd991314 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_22.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_22.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_23.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_23.unity3d index 4453c7e0f..d31c59f93 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_23.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_23.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_3.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_3.unity3d index eaf7ae7f8..3aee0d06a 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_3.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_3.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_4.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_4.unity3d index d9a11e7b1..6838b811b 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_4.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_4.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_5.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_5.unity3d index 8944f579e..9d049e62b 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_5.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_5.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_7.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_7.unity3d index 2dbe4ef1c..7bf1e95b7 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_7.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_7.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_8.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_8.unity3d index da7dda0f7..69670cd12 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_8.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_8.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_9.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_9.unity3d index 909e90406..337e4fee5 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_9.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/map99/wjfb-99_9.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_banzi.unity3d b/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_banzi.unity3d new file mode 100644 index 000000000..2cecb1494 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_banzi.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_beijin.unity3d b/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_beijin.unity3d new file mode 100644 index 000000000..6de6090db Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_beijin.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_yifuhua.unity3d b/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_yifuhua.unity3d new file mode 100644 index 000000000..7b7bea2a7 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/p_piaomialzhilv_yifuhua.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/t_tehuishenzhuang_ditu.unity3d b/Root/mht_china/zf/Android/lz4/bg/t_tehuishenzhuang_ditu.unity3d new file mode 100644 index 000000000..597dbf409 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/t_tehuishenzhuang_ditu.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d index 25040e966..ec7d544d7 100644 Binary files a/Root/mht_china/zf/Android/lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d and b/Root/mht_china/zf/Android/lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d index cfe3210bc..3fce48a1b 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/pokemonmain.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/pokemonmain.unity3d index 05d6a53d5..8fe19328b 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/pokemonmain.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/pokemonmain.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/shop.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/shop.unity3d new file mode 100644 index 000000000..3674ed6b5 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/effectresui/shop.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/fonts/artfont_4.unity3d b/Root/mht_china/zf/Android/lz4/fonts/artfont_4.unity3d new file mode 100644 index 000000000..9f15a5c9a Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/fonts/artfont_4.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/fonts/battlefont.unity3d b/Root/mht_china/zf/Android/lz4/fonts/battlefont.unity3d index 494b6ac10..6f35276b1 100644 Binary files a/Root/mht_china/zf/Android/lz4/fonts/battlefont.unity3d and b/Root/mht_china/zf/Android/lz4/fonts/battlefont.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/expert.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/expert.unity3d index 3ee7d82e0..33554b5bb 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/expert.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/expert.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d index df8d57b9b..93070f00f 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/floatingview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/floatingview.unity3d index 142b70c45..0ac4213c4 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/floatingview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/floatingview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d index aeea686b1..19d4cff2f 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d index 81fbc111d..71093d633 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/journeywithwind.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/journeywithwind.unity3d new file mode 100644 index 000000000..4f35df9d2 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/journeywithwind.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d index cbb6938c6..81961942c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/mail.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/mail.unity3d index 994b2c545..3d2b0a160 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/mail.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/mail.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d index 494a2e9d0..a2c5157fa 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d index 00785a40e..9dc6f27d1 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d index 3202eb5d8..2da857616 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d index eff145bbf..21e8a2824 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index 92d866d2d..3ef3e3638 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/setting.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/setting.unity3d index 5b8f5c469..5fda03728 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/setting.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/setting.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d index 88e50664b..982cd0990 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/tehuishenzhuang.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/tehuishenzhuang.unity3d new file mode 100644 index 000000000..0cc695d12 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/tehuishenzhuang.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d index 27df5b78c..607e8d783 100644 Binary files a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d and b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/updatepanel.unity3d b/Root/mht_china/zf/Android/lz4/updatepanel.unity3d index b303af76b..86253ca29 100644 Binary files a/Root/mht_china/zf/Android/lz4/updatepanel.unity3d and b/Root/mht_china/zf/Android/lz4/updatepanel.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 88883b271..26585af1c 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d index 58dddc85f..20999f5d8 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ