diff --git a/Root/mht_china/xq/Android/_log/china_xq_4a12207b38252e4cda5264bcb4d3cb955bd14bbe_2022_01_18_16_28_09.log b/Root/mht_china/xq/Android/_log/china_xq_4a12207b38252e4cda5264bcb4d3cb955bd14bbe_2022_01_18_16_28_09.log new file mode 100644 index 000000000..4166b39be --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_4a12207b38252e4cda5264bcb4d3cb955bd14bbe_2022_01_18_16_28_09.log @@ -0,0 +1,16 @@ +热更文件版本:china/xq_4a12207b38252e4cda5264bcb4d3cb955bd14bbe_2022_01_18_16_28_09 +热更文件的工程对应的提交信息: +commit 4a12207b38252e4cda5264bcb4d3cb955bd14bbe +Merge: b26116f322 83316a3dfd +Author: zhangshanxue +Date: Tue Jan 18 15:35:50 2022 +0800 + + Merge branch 'china/test' into china/xq +热更大小:13.3352336883544921875 +热更文件: +lz4/atlas/tagatlas.unity3d +lz4/dynamicatlas/r_hero_yuansukuang.unity3d +lz4/prefabs/ui/generalpanel.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 0ff050431..2fa2a6768 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/atlas/tagatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d index efe2a58d4..1b41c7f52 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d b/Root/mht_china/xq/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d index 7ab003507..6f29b816e 100644 Binary files a/Root/mht_china/xq/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d and b/Root/mht_china/xq/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d index 9d16844ca..45ed3438a 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.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 5ee6af983..63bb8a21e 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 69d6780dc..e6c6a40f8 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ