diff --git a/Root/mht_china/xq/Android/_log/china_xq_cfee6e1b73aeb3555e891f6d6e677c296f4dfca6_2021_11_02_16_37_57.log b/Root/mht_china/xq/Android/_log/china_xq_cfee6e1b73aeb3555e891f6d6e677c296f4dfca6_2021_11_02_16_37_57.log new file mode 100644 index 000000000..2bf3f136d --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_cfee6e1b73aeb3555e891f6d6e677c296f4dfca6_2021_11_02_16_37_57.log @@ -0,0 +1,16 @@ +热更文件版本:china/xq_cfee6e1b73aeb3555e891f6d6e677c296f4dfca6_2021_11_02_16_37_57 +热更文件的工程对应的提交信息: +commit cfee6e1b73aeb3555e891f6d6e677c296f4dfca6 +Merge: 2487270b6f 7be3cc8919 +Author: zhangshanxue +Date: Tue Nov 2 14:55:13 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:12.18771266937255859375 +热更文件: +files.unity3d +lz4/prefabs/ui/jumpview.unity3d +lz4/prefabs/ui/linglong.unity3d +lz4/prefabs/ui/popup.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 6c1c7b8d0..2e51f85e5 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/jumpview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.unity3d index 94257c203..ce3de1ccf 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.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 efd0c5cef..4fa22a126 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/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d index 06a7e99ee..fccd742ed 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 23f3d2e90..353f36a51 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ