diff --git a/Root/mht_china/xq/Android/_log/china_xq_cf00d1ad35dd117921819fbcc0b048a37661fc6a_2021_09_27_19_26_12.log b/Root/mht_china/xq/Android/_log/china_xq_cf00d1ad35dd117921819fbcc0b048a37661fc6a_2021_09_27_19_26_12.log new file mode 100644 index 000000000..a97af8c47 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_cf00d1ad35dd117921819fbcc0b048a37661fc6a_2021_09_27_19_26_12.log @@ -0,0 +1,15 @@ +热更文件版本:china/xq_cf00d1ad35dd117921819fbcc0b048a37661fc6a_2021_09_27_19_26_12 +热更文件的工程对应的提交信息: +commit cf00d1ad35dd117921819fbcc0b048a37661fc6a +Merge: fe7c5fa125 5ee038674d +Author: zhangshanxue +Date: Mon Sep 27 18:35:09 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:9.26152133941650390625 +热更文件: +lz4/prefabs/ui/compound.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/mht_china/xq/Android/files.unity3d b/Root/mht_china/xq/Android/files.unity3d index eac02c471..9eeac01b2 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/compound.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/compound.unity3d index 6996a6605..d2352b36f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/compound.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/compound.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d index cfaa3a8c8..638d776b9 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d index 3e0ce3bfb..235c6b338 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 83789a420..76820931b 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ