diff --git a/Root/mht_china/zf/IOS/_log/china_ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_17_14_36.log b/Root/mht_china/zf/IOS/_log/china_ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_17_14_36.log new file mode 100644 index 000000000..29822d343 --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_17_14_36.log @@ -0,0 +1,41 @@ +热更文件版本:china/ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_17_14_36 +热更文件的工程对应的提交信息: +commit 7e21a080ba174c6916637c46297bfd9047249af9 +Merge: 7ffc3fdd34 8f4df60593 +Author: JLIOSM1 <774727341@qq.com> +Date: Tue Nov 2 13:51:17 2021 +0800 + + Merge commit '8f4df605930ca0766a2e94792187396816249e5a' into china/ios + + # Conflicts: + # Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t1.png.meta + # Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t3.png.meta + # Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta +热更大小:21.52477169036865234375 +热更文件: +files.unity3d +lz4_atlas_publicatlas.unity3d +lz4_atlas_settingatlas.unity3d +lz4_audio_skill_actor_voc_audio_ab_jn_s1_01.unity3d +lz4_effectresskill_effect_skill_s1_aobing.unity3d +lz4_icon_hero.unity3d +lz4_icon_item.unity3d +lz4_prefabs_live2d_live2d_s1_aobing.unity3d +lz4_prefabs_live2d_live2d_s_jiuweihu.unity3d +lz4_prefabs_ui_arena.unity3d +lz4_prefabs_ui_carbon.unity3d +lz4_prefabs_ui_demonslayer.unity3d +lz4_prefabs_ui_expedition.unity3d +lz4_prefabs_ui_formation.unity3d +lz4_prefabs_ui_jumpview.unity3d +lz4_prefabs_ui_pokemon.unity3d +lz4_prefabs_ui_popup.unity3d +lz4_prefabs_ui_roleinfo.unity3d +lz4_prefabs_ui_worldarena.unity3d +lz4_spine_s1_aobing.unity3d +lz4_spine_s_jiuweihu.unity3d +lz4_spine_zq_niu.unity3d +lz4_updatepanel.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 6e1f8221d..7f34dece1 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_publicatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_publicatlas.unity3d index 2fa2da3f7..56383e3be 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_publicatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_publicatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_settingatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_settingatlas.unity3d index 0f91468f4..4d9603360 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_settingatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_settingatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_audio_skill_actor_voc_audio_ab_jn_s1_01.unity3d b/Root/mht_china/zf/IOS/lz4_audio_skill_actor_voc_audio_ab_jn_s1_01.unity3d new file mode 100644 index 000000000..92859ad2f Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_audio_skill_actor_voc_audio_ab_jn_s1_01.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_s1_aobing.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_s1_aobing.unity3d new file mode 100644 index 000000000..49439842b Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_s1_aobing.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_icon_hero.unity3d b/Root/mht_china/zf/IOS/lz4_icon_hero.unity3d index 9282ff1ac..0c86f4fd0 100644 Binary files a/Root/mht_china/zf/IOS/lz4_icon_hero.unity3d and b/Root/mht_china/zf/IOS/lz4_icon_hero.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 2fb163900..8fdcdadb8 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_live2d_live2d_s1_aobing.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_s1_aobing.unity3d new file mode 100644 index 000000000..a2dae7f1e Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_s1_aobing.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_s_jiuweihu.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_s_jiuweihu.unity3d new file mode 100644 index 000000000..be7c1f5e6 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_s_jiuweihu.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 d73438742..8a7f3399e 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_carbon.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d index e3a19c9cf..902fb3e99 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_demonslayer.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_demonslayer.unity3d index 1e8e47812..8b395a655 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_demonslayer.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_demonslayer.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 c3dc699bb..820ba4de8 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_formation.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_formation.unity3d index f2c0ef955..1ba07126f 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_formation.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_formation.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_jumpview.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_jumpview.unity3d index 57882eac1..7d358c886 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_jumpview.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_jumpview.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 d721d18e5..c6664db87 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 2d0d9e1bd..eee0a0169 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_roleinfo.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_roleinfo.unity3d index 75cdc108f..ed91be2fd 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_worldarena.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_worldarena.unity3d index cb64accb6..15467884a 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_worldarena.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_worldarena.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_spine_s1_aobing.unity3d b/Root/mht_china/zf/IOS/lz4_spine_s1_aobing.unity3d new file mode 100644 index 000000000..94000f1ea Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_spine_s1_aobing.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_spine_s_jiuweihu.unity3d b/Root/mht_china/zf/IOS/lz4_spine_s_jiuweihu.unity3d new file mode 100644 index 000000000..1d1194538 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_spine_s_jiuweihu.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_spine_zq_niu.unity3d b/Root/mht_china/zf/IOS/lz4_spine_zq_niu.unity3d index 5abdf2102..dc52cde97 100644 Binary files a/Root/mht_china/zf/IOS/lz4_spine_zq_niu.unity3d and b/Root/mht_china/zf/IOS/lz4_spine_zq_niu.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_updatepanel.unity3d b/Root/mht_china/zf/IOS/lz4_updatepanel.unity3d index c39f38f87..26b6cf2f5 100644 Binary files a/Root/mht_china/zf/IOS/lz4_updatepanel.unity3d and b/Root/mht_china/zf/IOS/lz4_updatepanel.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index e4592c973..32a047741 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 6ee31d24c..131a46abb 100644 Binary files a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d and b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d differ