diff --git a/Root/mht_china/zf/IOS/_log/china_ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_19_59_00.log b/Root/mht_china/zf/IOS/_log/china_ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_19_59_00.log new file mode 100644 index 000000000..fc366eba6 --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_19_59_00.log @@ -0,0 +1,18 @@ +热更文件版本:china/ios_7e21a080ba174c6916637c46297bfd9047249af9_2021_11_02_19_59_00 +热更文件的工程对应的提交信息: +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 +热更大小:4.29355716705322265625 +热更文件: +files.unity3d +lzma_luabytes.unity3d +files.unity3d diff --git a/Root/mht_china/zf/IOS/files.unity3d b/Root/mht_china/zf/IOS/files.unity3d index 7f34dece1..8e5ed00f8 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/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index 32a047741..2e03ef86e 100644 Binary files a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d and b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d differ