diff --git a/Root/mht_china/zf/Android/_log/china$zf_test_2d01acfcffcf5da1db2d2422af8e04ca2c742586_2021_07_16_20_43_44.log b/Root/mht_china/zf/Android/_log/china$zf_test_2d01acfcffcf5da1db2d2422af8e04ca2c742586_2021_07_16_20_43_44.log new file mode 100644 index 000000000..f6d6df21d --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china$zf_test_2d01acfcffcf5da1db2d2422af8e04ca2c742586_2021_07_16_20_43_44.log @@ -0,0 +1,22 @@ +热更文件版本:china/zf_test_2d01acfcffcf5da1db2d2422af8e04ca2c742586_2021_07_16_20_43_44 +热更文件的工程对应的提交信息: +commit 2d01acfcffcf5da1db2d2422af8e04ca2c742586 +Merge: 383938afe7 f71af87cde +Author: JieLing +Date: Fri Jul 16 19:51:04 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test +热更大小:9.4328765869140625 +热更文件: +lz4/bg/artfont/dl_ui_effect_mingzi_zh.unity3d +lz4/bg/map/wjfb-06/wjfb-06_14.unity3d +lz4/bg/map/wjfb-06/wjfb-06_15.unity3d +lz4/bg/map/wjfb-06/wjfb-06_2.unity3d +lz4/bg/map/wjfb-06/wjfb-06_3.unity3d +lz4/bg/map/wjfb-06/wjfb-06_8.unity3d +lz4/bg/map/wjfb-06/wjfb-06_9.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/luckyturntable.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 5fe702a89..2e937d8d8 100644 Binary files a/Root/mht_china/zf/Android/files.unity3d and b/Root/mht_china/zf/Android/files.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/artfont/dl_ui_effect_mingzi_zh.unity3d b/Root/mht_china/zf/Android/lz4/bg/artfont/dl_ui_effect_mingzi_zh.unity3d index a31dae0b0..2d34b19ce 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/artfont/dl_ui_effect_mingzi_zh.unity3d and b/Root/mht_china/zf/Android/lz4/bg/artfont/dl_ui_effect_mingzi_zh.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_14.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_14.unity3d index ce7e9fb57..3c638c2f4 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_14.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_14.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_15.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_15.unity3d index a27ed3037..ca0c961e9 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_15.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_15.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_2.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_2.unity3d index 14f7a4e25..29d61856a 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_2.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_2.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_3.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_3.unity3d index 247a9c041..95c6b5030 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_3.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_3.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_8.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_8.unity3d index 2684d1836..f4e1405f6 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_8.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_8.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_9.unity3d b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_9.unity3d index d5f41b3c0..2dc25378c 100644 Binary files a/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_9.unity3d and b/Root/mht_china/zf/Android/lz4/bg/map/wjfb-06/wjfb-06_9.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d index 19d4cff2f..328f31799 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/luckyturntable.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/luckyturntable.unity3d index 2832eb76b..ec34f5eb3 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/luckyturntable.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/luckyturntable.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index a50ce0931..ce6b54507 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index e77c5dfc8..4d368906d 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ