diff --git a/Root/mht_china/xq/Android/_log/china_xq_216599f49fa0ce0a36c723d46f447cc9f258cfc3_2021_10_09_19_16_45.log b/Root/mht_china/xq/Android/_log/china_xq_216599f49fa0ce0a36c723d46f447cc9f258cfc3_2021_10_09_19_16_45.log new file mode 100644 index 000000000..411cbddb4 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_216599f49fa0ce0a36c723d46f447cc9f258cfc3_2021_10_09_19_16_45.log @@ -0,0 +1,29 @@ +热更文件版本:china/xq_216599f49fa0ce0a36c723d46f447cc9f258cfc3_2021_10_09_19_16_45 +热更文件的工程对应的提交信息: +commit 216599f49fa0ce0a36c723d46f447cc9f258cfc3 +Merge: ce141f8bfc 928249bd8d +Author: jiaoyangna <3046463818@qq.com> +Date: Sat Oct 9 18:34:02 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:16.98294734954833984375 +热更文件: +lz4/atlas/floatingviewatlas.unity3d +lz4/atlas/likabilityatlas.unity3d +lz4/atlas/publicatlas.unity3d +lz4/audio/skill/actor_voc/audio_yj_jn_01.unity3d +lz4/audio/skill/actor_voc/audio_yj_jn_02.unity3d +lz4/dynamicatlas/d_dhxx_tiao_03.unity3d +lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d +lz4/effectresskill/effect_skill_nverguowang.unity3d +lz4/effectresskill/effect_skill_yangjian_gai.unity3d +lz4/effectresui/chenghao_new.unity3d +lz4/prefabs/live2d/live2d_c_zn_001.unity3d +lz4/prefabs/ui/fight.unity3d +lz4/prefabs/ui/likability.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/qijieshilian.unity3d +lz4/prefabs/ui/roleinfo.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 d30cf4603..557d844c0 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 895735763..0a6224122 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/likabilityatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/likabilityatlas.unity3d new file mode 100644 index 000000000..c4388631b Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/likabilityatlas.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 98937eb05..936348235 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/audio/skill/actor_voc/audio_yj_jn_01.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_yj_jn_01.unity3d new file mode 100644 index 000000000..425d0e340 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_yj_jn_01.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_yj_jn_02.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_yj_jn_02.unity3d new file mode 100644 index 000000000..9bb0f9b79 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_yj_jn_02.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d b/Root/mht_china/xq/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d index e88c4c487..62edb69a7 100644 Binary files a/Root/mht_china/xq/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d and b/Root/mht_china/xq/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d b/Root/mht_china/xq/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d index 63926d097..b0f38616c 100644 Binary files a/Root/mht_china/xq/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d and b/Root/mht_china/xq/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d index edaff6241..b700a78b7 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_yangjian_gai.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_yangjian_gai.unity3d new file mode 100644 index 000000000..7a0dcc673 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_yangjian_gai.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/chenghao_new.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/chenghao_new.unity3d index 48fe46f7a..e9a68ee48 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/chenghao_new.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/chenghao_new.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d index d745f3ff1..f469947ae 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/fight.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/fight.unity3d index 389c3ae1f..9c35ed3c1 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/fight.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/fight.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/likability.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/likability.unity3d new file mode 100644 index 000000000..8453d8e27 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/ui/likability.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 1632261c4..f387a2376 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/qijieshilian.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/qijieshilian.unity3d index fcffdfb64..573dec063 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/qijieshilian.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/qijieshilian.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 235c6b338..4367f43eb 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/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 0aa8819d9..8465a747c 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 15a256d5b..8e5ee6947 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ