diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_18_04_20.log b/Root/mht_china/zf/Android/_log/china_zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_18_04_20.log new file mode 100644 index 000000000..c1345fb46 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_18_04_20.log @@ -0,0 +1,15 @@ +热更文件版本:china/zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_18_04_20 +热更文件的工程对应的提交信息: +commit 03a5a535cd4417da6924172540bd9631aecf7231 +Merge: 57dbb21e5b 6dc9993671 +Author: JieLing +Date: Mon Nov 15 19:11:55 2021 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:0.427379608154296875 +热更文件: +lz4/atlas/missionatlas.unity3d +lz4/atlas/monstercampatlas.unity3d +lz4/prefabs/ui/mission.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index c96ad418b..fd78978f6 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/atlas/monstercampatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d index a68fc14d6..f512ecffe 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d index 73e7d5f3d..8b620aa1a 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d index 42c4410e3..40b6ec355 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ