diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_79ff7ce59f2270103ade1d9ca7a6e41fb03cc2ad_2022_03_22_18_25_37.log b/Root/mht_china/zf/Android/_log/china_zf_test_79ff7ce59f2270103ade1d9ca7a6e41fb03cc2ad_2022_03_22_18_25_37.log new file mode 100644 index 000000000..18cb0dc1c --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_79ff7ce59f2270103ade1d9ca7a6e41fb03cc2ad_2022_03_22_18_25_37.log @@ -0,0 +1,19 @@ +热更文件版本:china/zf_test_79ff7ce59f2270103ade1d9ca7a6e41fb03cc2ad_2022_03_22_18_25_37 +热更文件的工程对应的提交信息: +commit 79ff7ce59f2270103ade1d9ca7a6e41fb03cc2ad +Merge: 4a1c8b3d35 954ee0079f +Author: JieLing +Date: Tue Mar 22 17:08:10 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:22.69086742401123046875 +热更文件: +lz4/icons.unity3d +lz4/atlas/upgradepackageatlas.unity3d +lz4/icon/fabao.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/eastseafindgod.unity3d +lz4/prefabs/ui/fightlevel.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 b32d97020..b20c6f998 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/upgradepackageatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/upgradepackageatlas.unity3d index 526e511fa..a26aad248 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/upgradepackageatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/upgradepackageatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d b/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d index bb7264d5a..b432bad39 100644 Binary files a/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d and b/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icons.unity3d b/Root/mht_china/zf/Android/lz4/icons.unity3d index 91e34f0ab..b44aed13f 100644 Binary files a/Root/mht_china/zf/Android/lz4/icons.unity3d and b/Root/mht_china/zf/Android/lz4/icons.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 3d61fffd7..d2429e1bd 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/eastseafindgod.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/eastseafindgod.unity3d new file mode 100644 index 000000000..d9a06e4ce Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/eastseafindgod.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d index f0844502a..00e382b6b 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index cad94bd4d..eb833c408 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 7e480b882..966d981d4 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ