diff --git a/Root/mht_china/zf/IOS/_log/china_ios_07e27183dc86ae8fadb7913aa31a2f0f03cf8e4d_2021_09_14_14_22_16.log b/Root/mht_china/zf/IOS/_log/china_ios_07e27183dc86ae8fadb7913aa31a2f0f03cf8e4d_2021_09_14_14_22_16.log new file mode 100644 index 000000000..5eb4f57df --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_07e27183dc86ae8fadb7913aa31a2f0f03cf8e4d_2021_09_14_14_22_16.log @@ -0,0 +1,36 @@ +热更文件版本:china/ios_07e27183dc86ae8fadb7913aa31a2f0f03cf8e4d_2021_09_14_14_22_16 +热更文件的工程对应的提交信息: +commit 07e27183dc86ae8fadb7913aa31a2f0f03cf8e4d +Merge: 85b011ac36 1f489697c2 +Author: JLIOSM1 <774727341@qq.com> +Date: Tue Sep 14 13:40:42 2021 +0800 + + 【合并】zf_test->ios +热更大小:18.03497314453125 +热更文件: +lz4_atlas_fourelement.unity3d +lz4_atlas_monstercampatlas.unity3d +lz4_atlas_sacredtreeatlas.unity3d +lz4_atlas_tagbuttonatlas.unity3d +lz4_bg_r_shouchao_yaoquan.unity3d +lz4_dynamicatlas_skill_artfont_c_zn_001_t9_zh.unity3d +lz4_effectresui_recruitpanel.unity3d +lz4_icon_fabao.unity3d +lz4_prefabs_ui_arena.unity3d +lz4_prefabs_ui_arenatopmatch.unity3d +lz4_prefabs_ui_bag.unity3d +lz4_prefabs_ui_expedition.unity3d +lz4_prefabs_ui_fightlevel.unity3d +lz4_prefabs_ui_generalpanel.unity3d +lz4_prefabs_ui_monstercamp.unity3d +lz4_prefabs_ui_popup.unity3d +lz4_prefabs_ui_practice.unity3d +lz4_prefabs_ui_resolve.unity3d +lz4_prefabs_ui_roleinfo.unity3d +lz4_prefabs_ui_sacredtree.unity3d +lz4_prefabs_ui_shopview.unity3d +lz4_prefabs_ui_view.unity3d +lz4_prefabs_ui_xiaoyao.unity3d +lzma_luabytes.unity3d +lzma_resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/zf/IOS/files.unity3d b/Root/mht_china/zf/IOS/files.unity3d index 245ce4bd7..57d0bbf2b 100644 Binary files a/Root/mht_china/zf/IOS/files.unity3d and b/Root/mht_china/zf/IOS/files.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_fourelement.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_fourelement.unity3d index 9ae4102bb..95264dd75 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_fourelement.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_fourelement.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_monstercampatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_monstercampatlas.unity3d index f1f7188b7..e56b1b47d 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_monstercampatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_monstercampatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_sacredtreeatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_sacredtreeatlas.unity3d new file mode 100644 index 000000000..0db0f9aa4 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_atlas_sacredtreeatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_tagbuttonatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_tagbuttonatlas.unity3d index 1661b4d94..9d42fa212 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_tagbuttonatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_tagbuttonatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_bg_r_shouchao_yaoquan.unity3d b/Root/mht_china/zf/IOS/lz4_bg_r_shouchao_yaoquan.unity3d new file mode 100644 index 000000000..bbcb5615d Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_bg_r_shouchao_yaoquan.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_dynamicatlas_skill_artfont_c_zn_001_t9_zh.unity3d b/Root/mht_china/zf/IOS/lz4_dynamicatlas_skill_artfont_c_zn_001_t9_zh.unity3d new file mode 100644 index 000000000..ab0fbd89f Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_dynamicatlas_skill_artfont_c_zn_001_t9_zh.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_recruitpanel.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_recruitpanel.unity3d new file mode 100644 index 000000000..c401f9538 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_effectresui_recruitpanel.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_icon_fabao.unity3d b/Root/mht_china/zf/IOS/lz4_icon_fabao.unity3d index 46bb9496e..0fe5117bf 100644 Binary files a/Root/mht_china/zf/IOS/lz4_icon_fabao.unity3d and b/Root/mht_china/zf/IOS/lz4_icon_fabao.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_arena.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_arena.unity3d index 1846d5439..d73438742 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_arena.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_arena.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_arenatopmatch.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_arenatopmatch.unity3d index 43c17adf3..d1f61c9d4 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_arenatopmatch.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_arenatopmatch.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_bag.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_bag.unity3d index de16e2560..3db71582f 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_bag.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_bag.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_expedition.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_expedition.unity3d index 58b675b7f..5e5aaf5ce 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_expedition.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_expedition.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_fightlevel.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_fightlevel.unity3d index 74d2338f9..7bc8a055f 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_fightlevel.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_fightlevel.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_generalpanel.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_generalpanel.unity3d index 0f5e66426..6997eeda7 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_generalpanel.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_generalpanel.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_monstercamp.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_monstercamp.unity3d index 2b88d4eda..f5edf63bf 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_monstercamp.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_monstercamp.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d index 91f272d30..cca5d9c7d 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_practice.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_practice.unity3d index d364d2677..4051cc336 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_practice.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_practice.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_resolve.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_resolve.unity3d index c8143df7c..d7cb6fc4c 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_resolve.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_resolve.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_roleinfo.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_roleinfo.unity3d index be0b6e12c..167a46507 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_roleinfo.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_roleinfo.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_sacredtree.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_sacredtree.unity3d new file mode 100644 index 000000000..10832d220 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_sacredtree.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d index 29b454804..898157aac 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_view.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_view.unity3d new file mode 100644 index 000000000..b493a2967 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_view.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_xiaoyao.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_xiaoyao.unity3d index 5f7480712..e69502fff 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_xiaoyao.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_xiaoyao.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index 114273c55..cb3d7233c 100644 Binary files a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d and b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d index f94ace5e1..bc2262868 100644 Binary files a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d and b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d differ