diff --git a/Root/mht_china/xq/Android/_log/china_xq_66c015495feea043e4b5a1e5968c5f3b1a1125a0_2021_10_25_19_31_22.log b/Root/mht_china/xq/Android/_log/china_xq_66c015495feea043e4b5a1e5968c5f3b1a1125a0_2021_10_25_19_31_22.log new file mode 100644 index 000000000..70d496ed4 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_66c015495feea043e4b5a1e5968c5f3b1a1125a0_2021_10_25_19_31_22.log @@ -0,0 +1,18 @@ +热更文件版本:china/xq_66c015495feea043e4b5a1e5968c5f3b1a1125a0_2021_10_25_19_31_22 +热更文件的工程对应的提交信息: +commit 66c015495feea043e4b5a1e5968c5f3b1a1125a0 +Merge: 24b61cce0c 12348464e2 +Author: zhangshanxue +Date: Mon Oct 25 19:30:46 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:12.62722015380859375 +热更文件: +lz4/icon/item.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/treasurestore.unity3d +lz4/prefabs/ui/worldarena.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 a53cd40b3..9fd1932e1 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/icon/item.unity3d b/Root/mht_china/xq/Android/lz4/icon/item.unity3d index aff223143..0ae1cf8f2 100644 Binary files a/Root/mht_china/xq/Android/lz4/icon/item.unity3d and b/Root/mht_china/xq/Android/lz4/icon/item.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 261cf5bed..3a7e65240 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/lz4/prefabs/ui/practice.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d index 2d9132450..3f6b11991 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/treasurestore.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d index 50a6bb4f6..dfec20f16 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/lz4/prefabs/ui/worldarena.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d index 9970630d1..1dd2a6b89 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 06f17a475..185bc8e76 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 fae9d85cb..329f1d4ef 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ