diff --git a/Root/mht_china/xq/Android/_log/china_xq_07394e96647b244da9a128505b7a8d2f435be2f5_2021_09_28_14_48_28.log b/Root/mht_china/xq/Android/_log/china_xq_07394e96647b244da9a128505b7a8d2f435be2f5_2021_09_28_14_48_28.log new file mode 100644 index 000000000..434e449df --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_07394e96647b244da9a128505b7a8d2f435be2f5_2021_09_28_14_48_28.log @@ -0,0 +1,13 @@ +热更文件版本:china/xq_07394e96647b244da9a128505b7a8d2f435be2f5_2021_09_28_14_48_28 +热更文件的工程对应的提交信息: +commit 07394e96647b244da9a128505b7a8d2f435be2f5 +Merge: a262e3016b 983ee8c800 +Author: zhangshanxue +Date: Tue Sep 28 11:32:00 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:8.4162921905517578125 +热更文件: +lz4/prefabs/ui/linglong.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 9eeac01b2..a10d81faf 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/linglong.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/linglong.unity3d index 66a661322..3b33c7a0f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/linglong.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/linglong.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 76820931b..b99058369 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ