diff --git a/Root/mht_china/xq/Android/_log/china_xq_fcab3955fb7181f9c56606c341613f608125a241_2021_09_28_21_18_11.log b/Root/mht_china/xq/Android/_log/china_xq_fcab3955fb7181f9c56606c341613f608125a241_2021_09_28_21_18_11.log new file mode 100644 index 000000000..6757f97ca --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_fcab3955fb7181f9c56606c341613f608125a241_2021_09_28_21_18_11.log @@ -0,0 +1,14 @@ +热更文件版本:china/xq_fcab3955fb7181f9c56606c341613f608125a241_2021_09_28_21_18_11 +热更文件的工程对应的提交信息: +commit fcab3955fb7181f9c56606c341613f608125a241 +Merge: 690129eb35 3d4ce6a43d +Author: zhangshanxue +Date: Tue Sep 28 19:36:23 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:2.3620052337646484375 +热更文件: +lz4/effectresui/carbons.unity3d +lz4/prefabs/ui/linglong.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 730293210..21b5a73c1 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/effectresui/carbons.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/carbons.unity3d index 957e1190b..1ffd583ea 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/carbons.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/carbons.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 36bf1bcec..efd0c5cef 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/resconfigs.unity3d b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d index aacaa54bd..15a256d5b 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ