diff --git a/Root/mht_china/zf/IOS/_log/china_ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_21_49_41.log b/Root/mht_china/zf/IOS/_log/china_ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_21_49_41.log new file mode 100644 index 000000000..bb0a61005 --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_21_49_41.log @@ -0,0 +1,35 @@ +热更文件版本:china/ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_21_49_41 +热更文件的工程对应的提交信息: +commit 10b534403f87fec09ae3daa2e675943fcf77fbf5 +Merge: cd65ba1a3d 9021021c93 +Author: JLIOSM1 <774727341@qq.com> +Date: Sat Sep 18 21:20:09 2021 +0800 + + Merge commit '9021021c932b36d06347ac872d85b2fd69fdb22e' into china/ios + + # Conflicts: + # Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +热更大小:27.26990222930908203125 +热更文件: +lz4_atlas_fourelement.unity3d +lz4_atlas_sacredtreeatlas.unity3d +lz4_atlas_tagatlas.unity3d +lz4_atlas_tagbuttonatlas.unity3d +lz4_atlas_xunbaomizong.unity3d +lz4_bg_x_xbmz_beijin.unity3d +lz4_dynamicatlas_skill_artfont_c_zn_001_t9_zh.unity3d +lz4_effectresui_carbons.unity3d +lz4_effectresui_xunbaomizong.unity3d +lz4_effectresui_yijingbaoku.unity3d +lz4_icon_item.unity3d +lz4_prefabs_effect_buff_fx_ranshao_zong.unity3d +lz4_prefabs_ui_bag.unity3d +lz4_prefabs_ui_battle.unity3d +lz4_prefabs_ui_playerliveview.unity3d +lz4_prefabs_ui_pokemon.unity3d +lz4_prefabs_ui_practice.unity3d +lz4_prefabs_ui_roleinfo.unity3d +lz4_prefabs_ui_xunbaomizong.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 de692a8c1..721084230 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 95264dd75..aa62654fa 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_sacredtreeatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_sacredtreeatlas.unity3d index 0db0f9aa4..f31a89a09 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_sacredtreeatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_sacredtreeatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_tagatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_tagatlas.unity3d index 4dad13d63..8a8e3eb2e 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_tagatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_tagatlas.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 9d42fa212..2a7e71671 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_atlas_xunbaomizong.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_xunbaomizong.unity3d new file mode 100644 index 000000000..dea3210b3 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_atlas_xunbaomizong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_bg_x_xbmz_beijin.unity3d b/Root/mht_china/zf/IOS/lz4_bg_x_xbmz_beijin.unity3d new file mode 100644 index 000000000..16e72c777 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_bg_x_xbmz_beijin.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 index ab0fbd89f..e343fbdee 100644 Binary files a/Root/mht_china/zf/IOS/lz4_dynamicatlas_skill_artfont_c_zn_001_t9_zh.unity3d 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_carbons.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d index 28c03307b..622ad29f7 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d index af7666a02..7f9f571b6 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_yijingbaoku.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_yijingbaoku.unity3d index 5d346413d..4e07af2e7 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_yijingbaoku.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_yijingbaoku.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 b5db6070a..3bb5827bc 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_effect_buff_fx_ranshao_zong.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_effect_buff_fx_ranshao_zong.unity3d index 938b44e72..c7150b904 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_effect_buff_fx_ranshao_zong.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_effect_buff_fx_ranshao_zong.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 3db71582f..c77f6633c 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_battle.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_battle.unity3d index 50adee3e0..e63ab12aa 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_battle.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_battle.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_playerliveview.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_playerliveview.unity3d index 422e18bfc..86ad5402c 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_playerliveview.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_playerliveview.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 bee61ca22..d721d18e5 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_practice.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_practice.unity3d index 4051cc336..447dcf17f 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_roleinfo.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_roleinfo.unity3d index 167a46507..180cdceae 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_xunbaomizong.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_xunbaomizong.unity3d new file mode 100644 index 000000000..7cace1c1b Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_xunbaomizong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index b57b66c5c..560088a1c 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 383011fa4..85563705d 100644 Binary files a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d and b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d differ