diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_b0f01eb4bd3fe3fdfae2a8ad8976c5df380a8ffd_2022_01_18_16_32_33.log b/Root/mht_china/zf/Android/_log/china_zf_test_b0f01eb4bd3fe3fdfae2a8ad8976c5df380a8ffd_2022_01_18_16_32_33.log new file mode 100644 index 000000000..b08e6b6e1 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_b0f01eb4bd3fe3fdfae2a8ad8976c5df380a8ffd_2022_01_18_16_32_33.log @@ -0,0 +1,46 @@ +热更文件版本:china/zf_test_b0f01eb4bd3fe3fdfae2a8ad8976c5df380a8ffd_2022_01_18_16_32_33 +热更文件的工程对应的提交信息: +commit b0f01eb4bd3fe3fdfae2a8ad8976c5df380a8ffd +Merge: 76b297376d 83316a3dfd +Author: JieLing +Date: Tue Jan 18 15:38:22 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:30.230617523193359375 +热更文件: +lz4/atlas/floatingviewatlas.unity3d +lz4/atlas/heroatlas.unity3d +lz4/atlas/homelandatlas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/publicatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/atlas/timelimituphero.unity3d +lz4/bg/f_feishengshi_beijing.unity3d +lz4/bg/x_xinjiangzhaohuan_beijin.unity3d +lz4/dynamicatlas/r_hero_yuansukuang.unity3d +lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu.unity3d +lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu001.unity3d +lz4/effectresui/homeland.unity3d +lz4/effectresui/tiangongxunbao.unity3d +lz4/icon/item.unity3d +lz4/icon/linshiskill.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/fight.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/homeland.unity3d +lz4/prefabs/ui/likability.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/rechargeview.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/publicartres/shaders.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 04b699df0..f6bfd07b5 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/floatingviewatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d index 6612c8532..86d3601d3 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/floatingviewatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/heroatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/heroatlas.unity3d index 5f9a79866..612fe2280 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/heroatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/heroatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/homelandatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/homelandatlas.unity3d index 3d9da2097..bd1ef4cee 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/homelandatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/homelandatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d index e52dfd402..db0852555 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/mainatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d index cde7fddbf..901d2e3a6 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d index efe2a58d4..1b41c7f52 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/tagatlas.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 2ef743c5c..4cdab7a3a 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/atlas/timelimituphero.unity3d b/Root/mht_china/zf/Android/lz4/atlas/timelimituphero.unity3d index dcd8e35e6..3209747e4 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/timelimituphero.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/timelimituphero.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/f_feishengshi_beijing.unity3d b/Root/mht_china/zf/Android/lz4/bg/f_feishengshi_beijing.unity3d new file mode 100644 index 000000000..424799b72 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/f_feishengshi_beijing.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/x_xinjiangzhaohuan_beijin.unity3d b/Root/mht_china/zf/Android/lz4/bg/x_xinjiangzhaohuan_beijin.unity3d new file mode 100644 index 000000000..7c51044c5 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/x_xinjiangzhaohuan_beijin.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu.unity3d new file mode 100644 index 000000000..e19639521 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu001.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu001.unity3d new file mode 100644 index 000000000..0ffce4288 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/r_zjm_icon-dongfu001.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d index 7ab003507..6f29b816e 100644 Binary files a/Root/mht_china/zf/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d and b/Root/mht_china/zf/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/homeland.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/homeland.unity3d new file mode 100644 index 000000000..a094a507c Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/effectresui/homeland.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/tiangongxunbao.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/tiangongxunbao.unity3d index 3078adef3..82e36b441 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/tiangongxunbao.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/tiangongxunbao.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icon/item.unity3d b/Root/mht_china/zf/Android/lz4/icon/item.unity3d index d66fe35ac..189b6d4fd 100644 Binary files a/Root/mht_china/zf/Android/lz4/icon/item.unity3d and b/Root/mht_china/zf/Android/lz4/icon/item.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icon/linshiskill.unity3d b/Root/mht_china/zf/Android/lz4/icon/linshiskill.unity3d new file mode 100644 index 000000000..1003859f8 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/icon/linshiskill.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/battle.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/battle.unity3d index f003b6843..515e8fad8 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/battle.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/battle.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d index 436463004..3d61fffd7 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d index d9485b9dd..c38ddc34a 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d index f763cfc86..a05e3b5d4 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.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 21b9eeea7..45ed3438a 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/guild.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d index 6ce8bc4cd..3b423bccd 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d index f4458411f..6513c8035 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/homeland.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/homeland.unity3d index c82f928c8..1c5dde7ba 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/homeland.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/homeland.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.unity3d index fa1676582..7b11b2c6d 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d index ca9da2cce..5d2824f23 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d index b8a08c368..b6c38d369 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/newactivity.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 c6dd0f35d..120706eff 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/rechargeview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/rechargeview.unity3d index 07c65a6c3..43fb995a0 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/rechargeview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/rechargeview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d index 903c563d9..4edc1c137 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.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 67caac92c..b0bec6f11 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/publicartres/shaders.unity3d b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d index dd868d421..f6f507ad0 100644 Binary files a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d and b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index e97c55d4e..2526940e0 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 0e0fe044a..3262eedac 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ