diff --git a/Root/mht_china/xq/Android/_log/china_xq_d10aafd5964bad9d71e0ecb30ee4db2fc1abc177_2021_12_06_20_03_08.log b/Root/mht_china/xq/Android/_log/china_xq_d10aafd5964bad9d71e0ecb30ee4db2fc1abc177_2021_12_06_20_03_08.log new file mode 100644 index 000000000..5e6c3bee3 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_d10aafd5964bad9d71e0ecb30ee4db2fc1abc177_2021_12_06_20_03_08.log @@ -0,0 +1,52 @@ +热更文件版本:china/xq_d10aafd5964bad9d71e0ecb30ee4db2fc1abc177_2021_12_06_20_03_08 +热更文件的工程对应的提交信息: +commit d10aafd5964bad9d71e0ecb30ee4db2fc1abc177 +Merge: 3d832d900d 9ddd7a3ddf +Author: zhangshanxue +Date: Mon Dec 6 19:19:01 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:41.5189342498779296875 +热更文件: +lz4/icons.unity3d +lz4/atlas/continuepackageatlas.unity3d +lz4/atlas/floatingviewatlas.unity3d +lz4/atlas/incarnationatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/audio/bgm/bgm_story_1_1.unity3d +lz4/audio/bgm/bgm_story_1_2.unity3d +lz4/audio/bgm/bgm_story_2_1.unity3d +lz4/audio/bgm/bgm_story_2_2.unity3d +lz4/audio/skill/actor_voc/audio_battle_vo_nmw02.unity3d +lz4/audio/skill/skill/audio_normal_effect_dao_attack.unity3d +lz4/audio/skill/skill/audio_normal_effect_dao_hit.unity3d +lz4/audio/skill/skill/audio_normal_effect_yao_attack.unity3d +lz4/audio/skill/skill/audio_normal_effect_yao_hit.unity3d +lz4/dynamicatlas/skill/artfont/c_qcdn_000_t9.unity3d +lz4/effectresskill/effect_c_normal_attack_new.unity3d +lz4/effectresskill/effect_c_player_skill_1.unity3d +lz4/effectresskill/effect_skin_nmw_1.unity3d +lz4/effectresui/lingmaimijing.unity3d +lz4/icon/hero.unity3d +lz4/prefabs/live2d/live2d_s_nmw_1.unity3d +lz4/prefabs/live2d/live2d_s_rd_1.unity3d +lz4/prefabs/ui/activitygift.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/continuepackage.unity3d +lz4/prefabs/ui/expedition.unity3d +lz4/prefabs/ui/guide.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/lingmaimijin.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/tailsmansoulview.unity3d +lz4/prefabs/ui/xunbaomizong.unity3d +lz4/prefabs/ui/yujianxing.unity3d +lz4/publicartres/shaders.unity3d +lz4/spine/c_0043_02.unity3d +lz4/spine/s_nmw_1.unity3d +lz4/spine/s_rd_1.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 afa9bf994..1d15731f7 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/continuepackageatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/continuepackageatlas.unity3d new file mode 100644 index 000000000..945e2224c Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/continuepackageatlas.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 252ecfb24..198671e88 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/incarnationatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/incarnationatlas.unity3d index 5d9b31b24..85dde689d 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/incarnationatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/incarnationatlas.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 509748101..8013ef53c 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/audio/bgm/bgm_story_1_1.unity3d b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_1.unity3d index 1c087d6f5..41d732166 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_1.unity3d and b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_2.unity3d b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_2.unity3d index 18defa9a1..bd826435f 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_2.unity3d and b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_1_2.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_1.unity3d b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_1.unity3d index efb663479..5ccac36f6 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_1.unity3d and b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_2.unity3d b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_2.unity3d index b7d916aeb..cf3bcc5f5 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_2.unity3d and b/Root/mht_china/xq/Android/lz4/audio/bgm/bgm_story_2_2.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_battle_vo_nmw02.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_battle_vo_nmw02.unity3d new file mode 100644 index 000000000..7c3cf407d Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_battle_vo_nmw02.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/dynamicatlas/skill/artfont/c_qcdn_000_t9.unity3d b/Root/mht_china/xq/Android/lz4/dynamicatlas/skill/artfont/c_qcdn_000_t9.unity3d new file mode 100644 index 000000000..4012a1d47 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/dynamicatlas/skill/artfont/c_qcdn_000_t9.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_normal_attack_new.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_normal_attack_new.unity3d index ae0a8e00d..eaa694861 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_normal_attack_new.unity3d and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_normal_attack_new.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_player_skill_1.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_player_skill_1.unity3d new file mode 100644 index 000000000..f83626fd2 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_c_player_skill_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_skin_nmw_1.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skin_nmw_1.unity3d new file mode 100644 index 000000000..25bc4ff9c Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skin_nmw_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/lingmaimijing.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/lingmaimijing.unity3d index ef616db4b..5458fc653 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/lingmaimijing.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/lingmaimijing.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/icon/hero.unity3d b/Root/mht_china/xq/Android/lz4/icon/hero.unity3d index a8a5e7ca6..a9dab5942 100644 Binary files a/Root/mht_china/xq/Android/lz4/icon/hero.unity3d and b/Root/mht_china/xq/Android/lz4/icon/hero.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/icons.unity3d b/Root/mht_china/xq/Android/lz4/icons.unity3d index 5d3b6dc37..249f06591 100644 Binary files a/Root/mht_china/xq/Android/lz4/icons.unity3d and b/Root/mht_china/xq/Android/lz4/icons.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_nmw_1.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_nmw_1.unity3d new file mode 100644 index 000000000..d7835a5b3 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_nmw_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_rd_1.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_rd_1.unity3d new file mode 100644 index 000000000..e9dd20cd3 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_s_rd_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/activitygift.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/activitygift.unity3d index fbf7c4f3c..57b6cf4c3 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/activitygift.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/activitygift.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 d117bac5f..256f9c0c3 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/continuepackage.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/continuepackage.unity3d new file mode 100644 index 000000000..723dd9786 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/ui/continuepackage.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 34882fd46..15c9676fc 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/guide.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d index 8c96a8c1e..be58e84d1 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/guild.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.unity3d index 1868e9548..6ce8bc4cd 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.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 index 4ab766221..6a879da5a 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.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 f13e0b118..2b0ef8aa3 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/roleinfo.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d index 1e0a70b9f..ad8561757 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/shopview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.unity3d index 08ebec1cf..4e6789a7f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/shopview.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 index a0ccff01d..bae9cfab1 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/xunbaomizong.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/xunbaomizong.unity3d index bf85d9ded..d7cf1e52b 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/xunbaomizong.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/xunbaomizong.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/yujianxing.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/yujianxing.unity3d index 53c72bf1f..b14d20175 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/yujianxing.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/yujianxing.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d b/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d index f6f507ad0..0a5a9b094 100644 Binary files a/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d and b/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/c_0043_02.unity3d b/Root/mht_china/xq/Android/lz4/spine/c_0043_02.unity3d index 907a5258c..26ee728fd 100644 Binary files a/Root/mht_china/xq/Android/lz4/spine/c_0043_02.unity3d and b/Root/mht_china/xq/Android/lz4/spine/c_0043_02.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/s_nmw_1.unity3d b/Root/mht_china/xq/Android/lz4/spine/s_nmw_1.unity3d new file mode 100644 index 000000000..f77d53ea7 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/spine/s_nmw_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/s_rd_1.unity3d b/Root/mht_china/xq/Android/lz4/spine/s_rd_1.unity3d new file mode 100644 index 000000000..addfb778b Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/spine/s_rd_1.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 1c453f0fd..060cfe589 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 6af5b3dba..262ef51d9 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ