diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_689abfb5683f53cd324ce3a574d3060dab8c2fa5_2022_03_01_19_07_20.log b/Root/mht_china/zf/Android/_log/china_zf_test_689abfb5683f53cd324ce3a574d3060dab8c2fa5_2022_03_01_19_07_20.log new file mode 100644 index 000000000..67076bb53 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_689abfb5683f53cd324ce3a574d3060dab8c2fa5_2022_03_01_19_07_20.log @@ -0,0 +1,18 @@ +热更文件版本:china/zf_test_689abfb5683f53cd324ce3a574d3060dab8c2fa5_2022_03_01_19_07_20 +热更文件的工程对应的提交信息: +commit 689abfb5683f53cd324ce3a574d3060dab8c2fa5 +Merge: 9a6ebd6d6e 8b939a4f41 +Author: JieLing +Date: Tue Mar 1 18:39:11 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:15.5928897857666015625 +热更文件: +files.unity3d +lz4/atlas/zhizhunjiangshiatlas.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/powerrice.unity3d +lz4/prefabs/ui/ranking.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 235825b33..c2693874d 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/zhizhunjiangshiatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d index 716eb049f..945f3de72 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.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 0b62f4fc2..4a18a65bf 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/powerrice.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/powerrice.unity3d index a05c139fb..2595c2e09 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/powerrice.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/powerrice.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.unity3d index 4e4d7bb4f..3391d5d85 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 3c7b48d5c..330a65337 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 6ad75b381..d827799da 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ