diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_ccc5fd082fac415f3ef2a3b41de51926ba20b5cd_2021_12_21_19_43_25.log b/Root/mht_china/zf/Android/_log/china_zf_test_ccc5fd082fac415f3ef2a3b41de51926ba20b5cd_2021_12_21_19_43_25.log new file mode 100644 index 000000000..09641a2aa --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_ccc5fd082fac415f3ef2a3b41de51926ba20b5cd_2021_12_21_19_43_25.log @@ -0,0 +1,39 @@ +热更文件版本:china/zf_test_ccc5fd082fac415f3ef2a3b41de51926ba20b5cd_2021_12_21_19_43_25 +热更文件的工程对应的提交信息: +commit ccc5fd082fac415f3ef2a3b41de51926ba20b5cd +Merge: 8e78045e5f 83f81c4d0b +Author: JieLing +Date: Tue Dec 21 18:30:40 2021 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:33.51023197174072265625 +热更文件: +files.unity3d +lz4/icons.unity3d +lz4/atlas/arenaatlas.unity3d +lz4/atlas/continuepackageatlas.unity3d +lz4/atlas/fightatlas.unity3d +lz4/atlas/jingjishilianatlas.unity3d +lz4/atlas/roleinfoatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/atlas/vipatlas.unity3d +lz4/atlas/zhizhunjiangshiatlas.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/continuepackage.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/fight.unity3d +lz4/prefabs/ui/fightlevel.unity3d +lz4/prefabs/ui/itemview.unity3d +lz4/prefabs/ui/jumpview.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/rechargeview.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/tailsmansoulview.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 b3bf1b8cf..3ef9a4bdc 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/arenaatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/arenaatlas.unity3d index ec7d4c6b5..63bfe847a 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/arenaatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/arenaatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/continuepackageatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/continuepackageatlas.unity3d index 945e2224c..33fa0e750 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/continuepackageatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/continuepackageatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/fightatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/fightatlas.unity3d index 800db05e7..25b5a97b6 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/fightatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/fightatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/jingjishilianatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/jingjishilianatlas.unity3d index 8ff1b4eb2..f6e6df740 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/jingjishilianatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/jingjishilianatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/roleinfoatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/roleinfoatlas.unity3d index a3a89d3e1..dd22fa2e1 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/roleinfoatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/roleinfoatlas.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 224022950..2ef743c5c 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/vipatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/vipatlas.unity3d index a1b1ed6c7..03aeb836a 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/vipatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/vipatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d index b8132061e..716eb049f 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icons.unity3d b/Root/mht_china/zf/Android/lz4/icons.unity3d index 249f06591..65bc35e4f 100644 Binary files a/Root/mht_china/zf/Android/lz4/icons.unity3d and b/Root/mht_china/zf/Android/lz4/icons.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 fac34c3fb..cf8cd2436 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/battle.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/battle.unity3d index 2177c2544..f003b6843 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 fd7d171c0..8b456752a 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/continuepackage.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/continuepackage.unity3d index 723dd9786..e03888fcf 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/continuepackage.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/continuepackage.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 63ed27ce7..d9485b9dd 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 ae4dbd983..7f2c47f3e 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/fightlevel.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/fightlevel.unity3d index a37dfafe5..cc7aa9e21 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/itemview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d index b6b0423fd..4ae9848f5 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/itemview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d index ce3de1ccf..1d7f979d8 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpview.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 f22529789..5083bcf11 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 8b682ce2e..303be9e8d 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 2b0ef8aa3..75f37eced 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/rechargeview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/rechargeview.unity3d index 3b0f0412d..07c65a6c3 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/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index ad8561757..67caac92c 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/tailsmansoulview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/tailsmansoulview.unity3d index f1cd21c9b..55da2c075 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/tailsmansoulview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/tailsmansoulview.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 0a5a9b094..dd868d421 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 dceb51c6a..48a76285f 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 3d6784961..45e8a7a87 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ