diff --git a/Root/mht_china/zf/IOS/_log/china_ios_2a7ffff846f77382809660a571d0698fb152f4ff_2021_08_24_16_05_46.log b/Root/mht_china/zf/IOS/_log/china_ios_2a7ffff846f77382809660a571d0698fb152f4ff_2021_08_24_16_05_46.log new file mode 100644 index 000000000..f8784393c --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_2a7ffff846f77382809660a571d0698fb152f4ff_2021_08_24_16_05_46.log @@ -0,0 +1,32 @@ +热更文件版本:china/ios_2a7ffff846f77382809660a571d0698fb152f4ff_2021_08_24_16_05_46 +热更文件的工程对应的提交信息: +commit 2a7ffff846f77382809660a571d0698fb152f4ff +Merge: 59a462a126 4aa0a17a7b +Author: JLIOSM1 <774727341@qq.com> +Date: Tue Aug 24 15:05:36 2021 +0800 + + 【合并】zf_test->ios +热更大小:21.80371761322021484375 +热更文件: +lz4_atlas_recruitatlas.unity3d +lz4_atlas_taichumijuan.unity3d +lz4_dynamicatlas_commonatlas_artfont_t_taichumijuan_zhujiemiananniu.unity3d +lz4_effectresui_baibaoshanghui.unity3d +lz4_effectresui_recruit.unity3d +lz4_icon_item.unity3d +lz4_prefabs_ui_carbon.unity3d +lz4_prefabs_ui_dynamicacticity.unity3d +lz4_prefabs_ui_generalpanel.unity3d +lz4_prefabs_ui_guild.unity3d +lz4_prefabs_ui_harmony.unity3d +lz4_prefabs_ui_login.unity3d +lz4_prefabs_ui_main.unity3d +lz4_prefabs_ui_pokemon.unity3d +lz4_prefabs_ui_popup.unity3d +lz4_prefabs_ui_recruit.unity3d +lz4_prefabs_ui_roleinfo.unity3d +lz4_prefabs_ui_treasurestore.unity3d +lz4_publicartres_shaders.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 5ecdec9ea..25124bd63 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_recruitatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_recruitatlas.unity3d index f2d5e1d7f..edfbd82ea 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_recruitatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_recruitatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_taichumijuan.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_taichumijuan.unity3d new file mode 100644 index 000000000..212a77c70 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_atlas_taichumijuan.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_dynamicatlas_commonatlas_artfont_t_taichumijuan_zhujiemiananniu.unity3d b/Root/mht_china/zf/IOS/lz4_dynamicatlas_commonatlas_artfont_t_taichumijuan_zhujiemiananniu.unity3d new file mode 100644 index 000000000..ecd1dc9e7 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_dynamicatlas_commonatlas_artfont_t_taichumijuan_zhujiemiananniu.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d index f71b493eb..8e01a7539 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_recruit.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_recruit.unity3d new file mode 100644 index 000000000..e636a982a Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_effectresui_recruit.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_icon_item.unity3d b/Root/mht_china/zf/IOS/lz4_icon_item.unity3d index 7d5786097..b5db6070a 100644 Binary files a/Root/mht_china/zf/IOS/lz4_icon_item.unity3d and b/Root/mht_china/zf/IOS/lz4_icon_item.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d index aa9679ede..88200ae6a 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_dynamicacticity.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_dynamicacticity.unity3d index 25a0de95f..ad6d805d8 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_dynamicacticity.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_dynamicacticity.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 fcf15675d..0f5e66426 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_guild.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_guild.unity3d index 1b4cc39d6..85e0c7b8c 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_guild.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_guild.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_harmony.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_harmony.unity3d index ea79d06a5..513ab9473 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_harmony.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_harmony.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d index c428c7ba1..e0a29d76f 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_main.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_main.unity3d index 3325b9dbb..2824bbd81 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_main.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_main.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_pokemon.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_pokemon.unity3d index 70ce3f0d3..bee61ca22 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_pokemon.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_pokemon.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 37d0a12f7..bf7db9c21 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_recruit.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_recruit.unity3d index 5e9eb7cd2..7f930ec5c 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_recruit.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_recruit.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 8f456a7d0..690271778 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_treasurestore.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_treasurestore.unity3d index 0d046e92a..ee107224b 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_treasurestore.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_treasurestore.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d b/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d index 20a379c8c..a88cede7a 100644 Binary files a/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d and b/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index cbf53bdbf..3bbd81deb 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 ceac0fc2a..8da5fce74 100644 Binary files a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d and b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d differ