diff --git a/Root/mht_china/zf/IOS/_log/china_ios_23406b0be06f9b51aa30041094d93d8c6016451b_2021_10_19_13_43_58.log b/Root/mht_china/zf/IOS/_log/china_ios_23406b0be06f9b51aa30041094d93d8c6016451b_2021_10_19_13_43_58.log new file mode 100644 index 000000000..a00704510 --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_23406b0be06f9b51aa30041094d93d8c6016451b_2021_10_19_13_43_58.log @@ -0,0 +1,29 @@ +热更文件版本:china/ios_23406b0be06f9b51aa30041094d93d8c6016451b_2021_10_19_13_43_58 +热更文件的工程对应的提交信息: +commit 23406b0be06f9b51aa30041094d93d8c6016451b +Merge: 09c6f0696f 7471193a9c +Author: JLIOSM1 <774727341@qq.com> +Date: Tue Oct 19 11:49:22 2021 +0800 + + Merge commit '7471193a9c7ed43fbe6a97b10b359d886f8ed1e1' into china/ios +热更大小:9.75231266021728515625 +热更文件: +lz4_atlas_settingatlas.unity3d +lz4_atlas_tianshumijuanatlas.unity3d +lz4_atlas_zhizhunjiangshiatlas.unity3d +lz4_effectresui_likeability.unity3d +lz4_icon_item.unity3d +lz4_prefabs_live2d_live2d_shenjian_zuoqi.unity3d +lz4_prefabs_ui_dynamicacticity.unity3d +lz4_prefabs_ui_fight.unity3d +lz4_prefabs_ui_generalpanel.unity3d +lz4_prefabs_ui_likability.unity3d +lz4_prefabs_ui_mission.unity3d +lz4_prefabs_ui_niuqichongtian.unity3d +lz4_prefabs_ui_roleinfo.unity3d +lz4_prefabs_ui_setting.unity3d +lz4_prefabs_ui_worldarena.unity3d +lz4_spine_shenjian_zuoqi.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 c19802e0e..e5d79f755 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_settingatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_settingatlas.unity3d index db17020fe..0f91468f4 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_atlas_tianshumijuanatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_tianshumijuanatlas.unity3d index 812375f76..332fe6dee 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_tianshumijuanatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_tianshumijuanatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_zhizhunjiangshiatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_zhizhunjiangshiatlas.unity3d index 03dd068aa..7b6e9aa53 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_zhizhunjiangshiatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_zhizhunjiangshiatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_likeability.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_likeability.unity3d new file mode 100644 index 000000000..0d9a764e5 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_effectresui_likeability.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 4a57116af..9564da8e2 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_shenjian_zuoqi.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_shenjian_zuoqi.unity3d new file mode 100644 index 000000000..60dc014e6 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_shenjian_zuoqi.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 ad6d805d8..3d36b390a 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_fight.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_fight.unity3d index ad6aaad7e..cd6cd6da3 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_fight.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_fight.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 7dfda0fb3..e681b6e0a 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_likability.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_likability.unity3d index 4a5e4c137..90701fa8c 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_likability.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_likability.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_mission.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_mission.unity3d index b37764598..ca773b24f 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_mission.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_mission.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_niuqichongtian.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_niuqichongtian.unity3d index 2724cc4d9..4e05fd79c 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_niuqichongtian.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_niuqichongtian.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 cc497821b..97eba7b0c 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_setting.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_setting.unity3d index 6533713e4..e13d63848 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_setting.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_setting.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 4049ae920..712dd5cb8 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_shenjian_zuoqi.unity3d b/Root/mht_china/zf/IOS/lz4_spine_shenjian_zuoqi.unity3d new file mode 100644 index 000000000..1c20c747a Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_spine_shenjian_zuoqi.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index 47812b33f..fe677d017 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 dadcb7042..17909ab0e 100644 Binary files a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d and b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d differ