diff --git a/Root/mht_china/xq/Android/_log/china_test_3121d36fe5e02dc090c269b3a10988f3258f739a_2021_08_03_21_00_54.log b/Root/mht_china/xq/Android/_log/china_test_3121d36fe5e02dc090c269b3a10988f3258f739a_2021_08_03_21_00_54.log new file mode 100644 index 000000000..5e4f542ed --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_test_3121d36fe5e02dc090c269b3a10988f3258f739a_2021_08_03_21_00_54.log @@ -0,0 +1,19 @@ +热更文件版本:china/test_3121d36fe5e02dc090c269b3a10988f3258f739a_2021_08_03_21_00_54 +热更文件的工程对应的提交信息: +commit 3121d36fe5e02dc090c269b3a10988f3258f739a +Merge: 41897661dd c927af441a +Author: JieLing +Date: Tue Aug 3 18:28:43 2021 +0800 + + Merge branch 'china/local' into china/test +热更大小:9.17195606231689453125 +热更文件: +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/xq/Android/files.unity3d b/Root/mht_china/xq/Android/files.unity3d index c2a58c8f3..597259e0b 100644 Binary files a/Root/mht_china/xq/Android/files.unity3d and b/Root/mht_china/xq/Android/files.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 8060a6b95..9a594d17f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/handbook.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/handbook.unity3d index c1e2d5f25..5fd9cc575 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d index 85ac42ce8..1c692f281 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d index a7f1974ad..f22529789 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.unity3d index 982cd0990..32a6f7027 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d index 339fdb66a..05a1be38c 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index e0639eeff..bdf0e299d 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d index 8ac89c873..cf114c6e3 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ