diff --git a/Root/mht_china/zf/Android/_log/china$zf_test_d809c9820d8b811e66fd11329b247c6117cea598_2021_07_14_14_29_22.log b/Root/mht_china/zf/Android/_log/china$zf_test_d809c9820d8b811e66fd11329b247c6117cea598_2021_07_14_14_29_22.log new file mode 100644 index 000000000..19968b611 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china$zf_test_d809c9820d8b811e66fd11329b247c6117cea598_2021_07_14_14_29_22.log @@ -0,0 +1,13 @@ +热更文件版本:china/zf_test_d809c9820d8b811e66fd11329b247c6117cea598_2021_07_14_14_29_22 +热更文件的工程对应的提交信息: +commit d809c9820d8b811e66fd11329b247c6117cea598 +Merge: 6729f1e78c fa1e3e15e0 +Author: JieLing +Date: Tue Jul 13 14:18:44 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test +热更大小:7.5647754669189453125 +热更文件: +files.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 2537cdf83..0ebf6f760 100644 Binary files a/Root/mht_china/zf/Android/files.unity3d and b/Root/mht_china/zf/Android/files.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index a3d8ac6ba..d0a34d58d 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ