diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_c210f4d86ded31e5c67e0651165d049595b651e8_2021_08_06_19_00_02.log b/Root/mht_china/zf/Android/_log/china_zf_test_c210f4d86ded31e5c67e0651165d049595b651e8_2021_08_06_19_00_02.log new file mode 100644 index 000000000..7b2078904 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_c210f4d86ded31e5c67e0651165d049595b651e8_2021_08_06_19_00_02.log @@ -0,0 +1,17 @@ +热更文件版本:china/zf_test_c210f4d86ded31e5c67e0651165d049595b651e8_2021_08_06_19_00_02 +热更文件的工程对应的提交信息: +commit c210f4d86ded31e5c67e0651165d049595b651e8 +Merge: 20d8d6debe 56d41630ce +Author: JieLing +Date: Fri Aug 6 18:52:35 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test +热更大小:8.17878627777099609375 +热更文件: +files.unity3d +lz4/bg/w_wybq_bg.unity3d +lz4/prefabs/ui/power.unity3d +lz4/publicartres/shaders.unity3d +lzma/luabytes.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 51724ed74..153c921a2 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/prefabs/ui/power.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/power.unity3d index 161ee45ac..24441c53c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/power.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/power.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d index c7472af64..04311b783 100644 Binary files a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d and b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index d95e0b6a1..abc3797c7 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d index 4c62769cb..8daa91497 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ