diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_29ddbdf3a07007d96574440aa4639e95a0044f17_2021_08_03_19_46_56.log b/Root/mht_china/zf/Android/_log/china_zf_test_29ddbdf3a07007d96574440aa4639e95a0044f17_2021_08_03_19_46_56.log new file mode 100644 index 000000000..81c50c865 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_29ddbdf3a07007d96574440aa4639e95a0044f17_2021_08_03_19_46_56.log @@ -0,0 +1,19 @@ +热更文件版本:china/zf_test_29ddbdf3a07007d96574440aa4639e95a0044f17_2021_08_03_19_46_56 +热更文件的工程对应的提交信息: +commit 29ddbdf3a07007d96574440aa4639e95a0044f17 +Merge: b6c911acaa 3121d36fe5 +Author: JieLing +Date: Tue Aug 3 18:33:04 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test +热更大小:9.213802337646484375 +热更文件: +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/treasurestore.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 47233b605..4f876fd36 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/dynamicacticity.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d index eb04ebb25..677ae18ed 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d index c1e2d5f25..5fd9cc575 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d index 85ac42ce8..1c692f281 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d index a7f1974ad..f22529789 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d index 982cd0990..32a6f7027 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d index 339fdb66a..05a1be38c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 01a2f3fdb..3940c16a3 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 e4527fd52..929eec5ca 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ