diff --git a/Root/mht_china/xq/Android/_log/china$test_5ef6bc9365698dabec6a32f12ef41cdf739a82a9_2021_07_06_11_20_44.log b/Root/mht_china/xq/Android/_log/china$test_5ef6bc9365698dabec6a32f12ef41cdf739a82a9_2021_07_06_11_20_44.log new file mode 100644 index 000000000..f887e0c08 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china$test_5ef6bc9365698dabec6a32f12ef41cdf739a82a9_2021_07_06_11_20_44.log @@ -0,0 +1,16 @@ +热更文件版本:china/test_5ef6bc9365698dabec6a32f12ef41cdf739a82a9_2021_07_06_11_20_44 +热更文件的工程对应的提交信息: +commit 5ef6bc9365698dabec6a32f12ef41cdf739a82a9 +Merge: 0c0c757e11 d29613e32a +Author: JieLing +Date: Tue Jul 6 10:37:02 2021 +0800 + + Merge branch 'china/dev' into china/test +热更大小:7.99155426025390625 +热更文件: +lz4/atlas/journeywithwindatlas.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/journeywithwind.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 9d1e28860..cb2574db2 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/atlas/journeywithwindatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d index c8bb879de..ce6540607 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d index ee1e60a18..19d4cff2f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/journeywithwind.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/journeywithwind.unity3d index 30362ea7f..4f35df9d2 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/journeywithwind.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/journeywithwind.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 2a025e50b..8a5bf2476 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 c73f0c7a9..d3840b05a 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ