diff --git a/Root/mht_china/xq/Android/_log/china_xq_63a1ddc05c50eb09393dd25a2621385dea8c3347_2021_11_22_10_51_46.log b/Root/mht_china/xq/Android/_log/china_xq_63a1ddc05c50eb09393dd25a2621385dea8c3347_2021_11_22_10_51_46.log new file mode 100644 index 000000000..c20ab555d --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_63a1ddc05c50eb09393dd25a2621385dea8c3347_2021_11_22_10_51_46.log @@ -0,0 +1,33 @@ +热更文件版本:china/xq_63a1ddc05c50eb09393dd25a2621385dea8c3347_2021_11_22_10_51_46 +热更文件的工程对应的提交信息: +commit 63a1ddc05c50eb09393dd25a2621385dea8c3347 +Merge: f27c3784d2 fae2083ae9 +Author: zhangshanxue +Date: Mon Nov 22 09:41:05 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:19.36837863922119140625 +热更文件: +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/battle.unity3d +lz4/prefabs/ui/findtreasure.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/guide.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/xq/Android/files.unity3d b/Root/mht_china/xq/Android/files.unity3d index a8f87bedf..95a9d9c58 100644 Binary files a/Root/mht_china/xq/Android/files.unity3d and b/Root/mht_china/xq/Android/files.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/floatingviewatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/floatingviewatlas.unity3d index 55b1c8684..252ecfb24 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/floatingviewatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/floatingviewatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/lingmaimijingatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/lingmaimijingatlas.unity3d new file mode 100644 index 000000000..f6f7b2291 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/lingmaimijingatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d index 1359840ca..283e4215c 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d index 0d80da7fd..9fc0beed1 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/tailsmansoulatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/tailsmansoulatlas.unity3d new file mode 100644 index 000000000..370be5df1 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/tailsmansoulatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/l_lmmj_beijingtu.unity3d b/Root/mht_china/xq/Android/lz4/bg/l_lmmj_beijingtu.unity3d new file mode 100644 index 000000000..fe4ad379f Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/bg/l_lmmj_beijingtu.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/tailsmansouleffect.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/tailsmansouleffect.unity3d new file mode 100644 index 000000000..743070c20 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresui/tailsmansouleffect.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.unity3d new file mode 100644 index 000000000..d9a5204a9 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_zuoqi_sibuxiang.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d index 1b5585b25..fa0e679d5 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/findtreasure.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/findtreasure.unity3d index 7d76e3079..0fe45b6a3 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/findtreasure.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/findtreasure.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d index 00ca166ed..77ddd6a5e 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d index be58e84d1..8c96a8c1e 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d index 1e0eb90f3..64ea7191d 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d new file mode 100644 index 000000000..96d7d7027 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d index 57a344a31..544b6eddb 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d index 1183f74fa..332b9727f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d index 2a3f4bf66..3e7e0e1ac 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/ranking.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/ranking.unity3d index 8117d2356..718d3a3da 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/ranking.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/ranking.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d new file mode 100644 index 000000000..88cf5cedc Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/zuoqi_sibuxiang.unity3d b/Root/mht_china/xq/Android/lz4/spine/zuoqi_sibuxiang.unity3d new file mode 100644 index 000000000..dd504532e Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/spine/zuoqi_sibuxiang.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 3251a3dbf..66f0820c5 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d index 3354e7ca4..8c1ec5558 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ