diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_e9e555481926a33ce771afdcad557612b8a1fbf6_2021_09_08_13_44_02.log b/Root/mht_china/zf/Android/_log/china_zf_test_e9e555481926a33ce771afdcad557612b8a1fbf6_2021_09_08_13_44_02.log new file mode 100644 index 000000000..b6f7b51dc --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_e9e555481926a33ce771afdcad557612b8a1fbf6_2021_09_08_13_44_02.log @@ -0,0 +1,19 @@ +热更文件版本:china/zf_test_e9e555481926a33ce771afdcad557612b8a1fbf6_2021_09_08_13_44_02 +热更文件的工程对应的提交信息: +commit e9e555481926a33ce771afdcad557612b8a1fbf6 +Merge: 7c9e79b559 1edb420b93 +Author: JieLing +Date: Wed Sep 8 12:49:51 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test +热更大小:13.17321300506591796875 +热更文件: +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/itemview.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/resolve.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/spine/c_zn_001.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 9be6403cf..3716428d2 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/carbon.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d index 3252407c7..88e649b65 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d index 709bd8df5..9fee962dc 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d index 2ba9e05f1..07c248c67 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d index c856f39f1..83ef16bbb 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index 2147c6b8c..73b3f3284 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/spine/c_zn_001.unity3d b/Root/mht_china/zf/Android/lz4/spine/c_zn_001.unity3d index d7ca0bddc..bfb153296 100644 Binary files a/Root/mht_china/zf/Android/lz4/spine/c_zn_001.unity3d and b/Root/mht_china/zf/Android/lz4/spine/c_zn_001.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 789a7593e..7994213ba 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 bdad66fa5..b31318062 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ