diff --git a/Root/mht_china/xq/Android/_log/china_xq_509975c05f9390d79d99214a7f63d67085b044c6_2021_11_01_15_34_08.log b/Root/mht_china/xq/Android/_log/china_xq_509975c05f9390d79d99214a7f63d67085b044c6_2021_11_01_15_34_08.log new file mode 100644 index 000000000..32d9fa1bf --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_509975c05f9390d79d99214a7f63d67085b044c6_2021_11_01_15_34_08.log @@ -0,0 +1,40 @@ +热更文件版本:china/xq_509975c05f9390d79d99214a7f63d67085b044c6_2021_11_01_15_34_08 +热更文件的工程对应的提交信息: +commit 509975c05f9390d79d99214a7f63d67085b044c6 +Merge: 89c443c93c 678baa5ad6 +Author: zhangshanxue +Date: Mon Nov 1 14:11:17 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:20.0305385589599609375 +热更文件: +lz4/updatepanel.unity3d +lz4/atlas/publicatlas.unity3d +lz4/atlas/settingatlas.unity3d +lz4/audio/skill/actor_voc/audio_ab_jn_s1_01.unity3d +lz4/bg/map/endless2/wjfb-02_12.unity3d +lz4/bg/map/endless2/wjfb-02_13.unity3d +lz4/bg/map/endless2/wjfb-02_17.unity3d +lz4/bg/map/endless2/wjfb-02_18.unity3d +lz4/bg/map/endless2/wjfb-02_7.unity3d +lz4/bg/map/endless2/wjfb-02_8.unity3d +lz4/effectresskill/effect_skill_s1_aobing.unity3d +lz4/icon/item.unity3d +lz4/prefabs/live2d/live2d_s1_aobing.unity3d +lz4/prefabs/live2d/live2d_s_jiuweihu.unity3d +lz4/prefabs/ui/arena.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/demonslayer.unity3d +lz4/prefabs/ui/expedition.unity3d +lz4/prefabs/ui/formation.unity3d +lz4/prefabs/ui/jumpview.unity3d +lz4/prefabs/ui/pokemon.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/worldarena.unity3d +lz4/spine/s1_aobing.unity3d +lz4/spine/s_jiuweihu.unity3d +lz4/spine/zq_niu.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 99f077066..77206ce5e 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/publicatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/publicatlas.unity3d index 936348235..576af4641 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/publicatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/settingatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/settingatlas.unity3d index 34d4942da..43d8e5989 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/settingatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/settingatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_ab_jn_s1_01.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_ab_jn_s1_01.unity3d new file mode 100644 index 000000000..193defe56 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_ab_jn_s1_01.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_12.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_12.unity3d index 477a3955f..66b8d06b3 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_12.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_12.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_13.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_13.unity3d index 367aebd19..e66b5b74f 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_13.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_13.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_17.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_17.unity3d index e382d9331..3422e56e9 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_17.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_17.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_18.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_18.unity3d index 546ecbd09..1a3c43e5d 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_18.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_18.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_7.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_7.unity3d index 53829f643..a45a1d526 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_7.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_7.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_8.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_8.unity3d index f697c9af7..9bdafd5e3 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_8.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/endless2/wjfb-02_8.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_s1_aobing.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_s1_aobing.unity3d new file mode 100644 index 000000000..5bd39471e Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_s1_aobing.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/icon/item.unity3d b/Root/mht_china/xq/Android/lz4/icon/item.unity3d index 0ae1cf8f2..b7bc98e15 100644 Binary files a/Root/mht_china/xq/Android/lz4/icon/item.unity3d and b/Root/mht_china/xq/Android/lz4/icon/item.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s1_aobing.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s1_aobing.unity3d new file mode 100644 index 000000000..11bb3f8c1 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s1_aobing.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_jiuweihu.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_jiuweihu.unity3d new file mode 100644 index 000000000..2f77199de Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_jiuweihu.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/arena.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/arena.unity3d index c1a9ff4b1..c6d81dc19 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/arena.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/arena.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d index 88e649b65..6be1a380b 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/demonslayer.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/demonslayer.unity3d index de2e9f55e..9646cffa1 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/demonslayer.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/demonslayer.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d index 343e298d0..a39bfa4dc 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/formation.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/formation.unity3d index ec1c13e8b..b6248eb0c 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/formation.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/formation.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.unity3d index 81961942c..94257c203 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpview.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 263354bc5..7f0546c07 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 3a7e65240..f0683c4eb 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/roleinfo.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d index 262ddb3ca..ef468a6b0 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d index 1dd2a6b89..f96207397 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/s1_aobing.unity3d b/Root/mht_china/xq/Android/lz4/spine/s1_aobing.unity3d new file mode 100644 index 000000000..a8c4659ea Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/spine/s1_aobing.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/s_jiuweihu.unity3d b/Root/mht_china/xq/Android/lz4/spine/s_jiuweihu.unity3d new file mode 100644 index 000000000..3c81d41a7 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/spine/s_jiuweihu.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/zq_niu.unity3d b/Root/mht_china/xq/Android/lz4/spine/zq_niu.unity3d index 2945ecc23..df75ae11b 100644 Binary files a/Root/mht_china/xq/Android/lz4/spine/zq_niu.unity3d and b/Root/mht_china/xq/Android/lz4/spine/zq_niu.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/updatepanel.unity3d b/Root/mht_china/xq/Android/lz4/updatepanel.unity3d index 5053edac3..0d3ebbbf0 100644 Binary files a/Root/mht_china/xq/Android/lz4/updatepanel.unity3d and b/Root/mht_china/xq/Android/lz4/updatepanel.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 1a64949e4..da953b1cf 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 329f1d4ef..c2aecc61a 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ