diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_76d1ca53e185a9e3e97367346690721c55489961_2021_09_28_21_13_34.log b/Root/mht_china/zf/Android/_log/china_zf_test_76d1ca53e185a9e3e97367346690721c55489961_2021_09_28_21_13_34.log new file mode 100644 index 000000000..763fe08f8 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_76d1ca53e185a9e3e97367346690721c55489961_2021_09_28_21_13_34.log @@ -0,0 +1,12 @@ +热更文件版本:china/zf_test_76d1ca53e185a9e3e97367346690721c55489961_2021_09_28_21_13_34 +热更文件的工程对应的提交信息: +commit 76d1ca53e185a9e3e97367346690721c55489961 +Merge: 5f3a97279c 3d4ce6a43d +Author: JieLing +Date: Tue Sep 28 19:37:20 2021 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:1.7271518707275390625 +热更文件: +lz4/effectresui/carbons.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 2fd3795fe..a17670d35 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/lz4/effectresui/carbons.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/carbons.unity3d index 957e1190b..1ffd583ea 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/carbons.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/carbons.unity3d differ