diff --git a/Root/mht_china/xq/Android/_log/china$test_05f9f121d18b265cc3c004308c902201754a9dac_2021_06_21_15_11_36.log b/Root/mht_china/xq/Android/_log/china$test_05f9f121d18b265cc3c004308c902201754a9dac_2021_06_21_15_11_36.log new file mode 100644 index 000000000..e9631a6d0 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china$test_05f9f121d18b265cc3c004308c902201754a9dac_2021_06_21_15_11_36.log @@ -0,0 +1,17 @@ +热更文件版本:china/test_05f9f121d18b265cc3c004308c902201754a9dac_2021_06_21_15_11_36 +热更文件的工程对应的提交信息: +commit 05f9f121d18b265cc3c004308c902201754a9dac +Merge: 63e5f8a705 ca982b566c +Author: JieLing +Date: Mon Jun 21 14:14:19 2021 +0800 + + Merge branch 'china/local' into china/test +热更大小:8.05582427978515625 +热更文件: +lz4/atlas/activityaltas.unity3d +lz4/prefabs/ui/dailyrecharge.unity3d +lz4/prefabs/ui/firstrecharge.unity3d +lz4/prefabs/ui/newactivity.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 4c68dabf9..05a9851c2 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/activityaltas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/activityaltas.unity3d index 2224794b5..26f041f41 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/activityaltas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/activityaltas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/dailyrecharge.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/dailyrecharge.unity3d index d65a0e6bb..e478f9dd0 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/dailyrecharge.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/dailyrecharge.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d index 8b3d852ca..9b8a5b824 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d index 480ad839b..00785a40e 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index b291d0584..b70b2f995 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 ffb452d83..fda68fa40 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ