diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_1f489697c29ebadca6fc8013e1f809a909cf1c33_2021_09_14_13_11_15.log b/Root/mht_china/zf/Android/_log/china_zf_test_1f489697c29ebadca6fc8013e1f809a909cf1c33_2021_09_14_13_11_15.log new file mode 100644 index 000000000..f1f82aec9 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_1f489697c29ebadca6fc8013e1f809a909cf1c33_2021_09_14_13_11_15.log @@ -0,0 +1,36 @@ +热更文件版本:china/zf_test_1f489697c29ebadca6fc8013e1f809a909cf1c33_2021_09_14_13_11_15 +热更文件的工程对应的提交信息: +commit 1f489697c29ebadca6fc8013e1f809a909cf1c33 +Merge: 51082ebc22 5e3e8ee47a +Author: JieLing +Date: Tue Sep 14 11:19:56 2021 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:17.96134471893310546875 +热更文件: +lz4/atlas/fourelement.unity3d +lz4/atlas/monstercampatlas.unity3d +lz4/atlas/sacredtreeatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/bg/r_shouchao_yaoquan.unity3d +lz4/dynamicatlas/skill/artfont/c_zn_001_t9_zh.unity3d +lz4/effectresui/recruitpanel.unity3d +lz4/icon/fabao.unity3d +lz4/prefabs/ui/arena.unity3d +lz4/prefabs/ui/arenatopmatch.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/expedition.unity3d +lz4/prefabs/ui/fightlevel.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/monstercamp.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/resolve.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/sacredtree.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/view.unity3d +lz4/prefabs/ui/xiaoyao.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 22aa2c70f..191baaf06 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/atlas/fourelement.unity3d b/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d index 3f4bd28ad..9b1cf1c4b 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/fourelement.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d index 0dd704ccf..f512ecffe 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/sacredtreeatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/sacredtreeatlas.unity3d new file mode 100644 index 000000000..9401c45da Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/sacredtreeatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d index 0d8b22fbc..0ff6dc642 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/r_shouchao_yaoquan.unity3d b/Root/mht_china/zf/Android/lz4/bg/r_shouchao_yaoquan.unity3d new file mode 100644 index 000000000..479a35a5e Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/r_shouchao_yaoquan.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/skill/artfont/c_zn_001_t9_zh.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/skill/artfont/c_zn_001_t9_zh.unity3d new file mode 100644 index 000000000..7b0a1b1d3 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/dynamicatlas/skill/artfont/c_zn_001_t9_zh.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/recruitpanel.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/recruitpanel.unity3d new file mode 100644 index 000000000..9b2039df5 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/effectresui/recruitpanel.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d b/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d index fc494d7ac..a4907db28 100644 Binary files a/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d and b/Root/mht_china/zf/Android/lz4/icon/fabao.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/arena.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/arena.unity3d index a6b6feb84..c1a9ff4b1 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/arena.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/arena.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/arenatopmatch.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/arenatopmatch.unity3d index ec5435633..a88ef0d2e 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/arenatopmatch.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/arenatopmatch.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/bag.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/bag.unity3d index 8dd16bebe..8aeb6891c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/bag.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/expedition.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/expedition.unity3d index 8fcec319d..4acd96b0d 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/expedition.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/expedition.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d index 2c7d48f81..01d7a5d86 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.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 27843ed55..984f9ab2f 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/monstercamp.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d index 910fdf92d..f0ed4641a 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/monstercamp.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d index 07c248c67..6692db416 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/practice.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/practice.unity3d index ad11eb94d..310097344 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/practice.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d index 83ef16bbb..ecc52549b 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/resolve.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 73b3f3284..18795c18c 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/lz4/prefabs/ui/sacredtree.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/sacredtree.unity3d new file mode 100644 index 000000000..baf07bfc1 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/sacredtree.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d index 9aee90d11..226f6084c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/view.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/view.unity3d new file mode 100644 index 000000000..7829693f8 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/view.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/xiaoyao.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/xiaoyao.unity3d index 1aaa6f132..325a1b828 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/xiaoyao.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/xiaoyao.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index fca9c0de7..1450ab17c 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d index 23a8afb01..84fea2356 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ