diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_095419f7f9ed1ba9a907527c7ce28f42762f4b7f_2021_11_23_16_31_01.log b/Root/mht_china/zf/Android/_log/china_zf_test_095419f7f9ed1ba9a907527c7ce28f42762f4b7f_2021_11_23_16_31_01.log new file mode 100644 index 000000000..6aac3839f --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_095419f7f9ed1ba9a907527c7ce28f42762f4b7f_2021_11_23_16_31_01.log @@ -0,0 +1,33 @@ +热更文件版本:china/zf_test_095419f7f9ed1ba9a907527c7ce28f42762f4b7f_2021_11_23_16_31_01 +热更文件的工程对应的提交信息: +commit 095419f7f9ed1ba9a907527c7ce28f42762f4b7f +Merge: 11711dbc6a 96a4af1532 +Author: JieLing +Date: Tue Nov 23 15:50:07 2021 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:19.3800201416015625 +热更文件: +lz4/atlas/floatingviewatlas.unity3d +lz4/atlas/lingmaimijingatlas.unity3d +lz4/atlas/recruitatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/atlas/tailsmansoulatlas.unity3d +lz4/bg/l_lmmj_beijingtu.unity3d +lz4/effectresui/tailsmansouleffect.unity3d +lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/findtreasure.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/jumpserver.unity3d +lz4/prefabs/ui/lingmaimijin.unity3d +lz4/prefabs/ui/pokemon.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/ranking.unity3d +lz4/prefabs/ui/tailsmansoulview.unity3d +lz4/spine/zuoqi_sibuxiang.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 7a7eb7beb..0a3d01a66 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 55b1c8684..252ecfb24 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/lingmaimijingatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/lingmaimijingatlas.unity3d new file mode 100644 index 000000000..f6f7b2291 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/lingmaimijingatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d index 1359840ca..283e4215c 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.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 0d80da7fd..9fc0beed1 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/tailsmansoulatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/tailsmansoulatlas.unity3d new file mode 100644 index 000000000..25c46b1f0 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/tailsmansoulatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/bg/l_lmmj_beijingtu.unity3d b/Root/mht_china/zf/Android/lz4/bg/l_lmmj_beijingtu.unity3d new file mode 100644 index 000000000..fe4ad379f Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/bg/l_lmmj_beijingtu.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/tailsmansouleffect.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/tailsmansouleffect.unity3d new file mode 100644 index 000000000..743070c20 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/effectresui/tailsmansouleffect.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.unity3d new file mode 100644 index 000000000..d9a5204a9 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.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 ba58875a9..fac34c3fb 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 3f6ad832e..55102c3c3 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/findtreasure.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/findtreasure.unity3d index 7d76e3079..0fe45b6a3 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/findtreasure.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/findtreasure.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 00ca166ed..b17acded9 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/jumpserver.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpserver.unity3d index 1e0eb90f3..64ea7191d 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpserver.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/jumpserver.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/lingmaimijin.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/lingmaimijin.unity3d new file mode 100644 index 000000000..d7885bbba Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/lingmaimijin.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d index 57a344a31..544b6eddb 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.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 ec14b031b..daf2f7610 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 2a3f4bf66..3e7e0e1ac 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/ranking.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.unity3d index 8117d2356..718d3a3da 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/ranking.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 new file mode 100644 index 000000000..aa7dfda5f Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/tailsmansoulview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/spine/zuoqi_sibuxiang.unity3d b/Root/mht_china/zf/Android/lz4/spine/zuoqi_sibuxiang.unity3d new file mode 100644 index 000000000..dd504532e Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/spine/zuoqi_sibuxiang.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 2f9457763..f9f4aa119 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 40b6ec355..d5d94ad69 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ