diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_32c2ad766197b7bb89fe30f5c9c1a3ce4c14d33e_2021_10_11_20_23_47.log b/Root/mht_china/zf/Android/_log/china_zf_test_32c2ad766197b7bb89fe30f5c9c1a3ce4c14d33e_2021_10_11_20_23_47.log new file mode 100644 index 000000000..8f649e1ae --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_32c2ad766197b7bb89fe30f5c9c1a3ce4c14d33e_2021_10_11_20_23_47.log @@ -0,0 +1,32 @@ +热更文件版本:china/zf_test_32c2ad766197b7bb89fe30f5c9c1a3ce4c14d33e_2021_10_11_20_23_47 +热更文件的工程对应的提交信息: +commit 32c2ad766197b7bb89fe30f5c9c1a3ce4c14d33e +Merge: 17d6dab1d6 146a728da7 +Author: jiaoyangna <3046463818@qq.com> +Date: Mon Oct 11 19:41:49 2021 +0800 + + Merge branch 'china/test' into china/zf_test + + # Conflicts: + # Assets/LuaFramework/GameIcon/icon_youxin.png.meta +热更大小:17.3604278564453125 +热更文件: +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_yangjian_gai.unity3d +lz4/effectresui/chenghao_new.unity3d +lz4/effectresui/xunbaomizong.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/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index bf96cf15f..a0f136567 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 895735763..0a6224122 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/likabilityatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/likabilityatlas.unity3d new file mode 100644 index 000000000..c4388631b Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/likabilityatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d index 98937eb05..936348235 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/audio/skill/actor_voc/audio_yj_jn_01.unity3d b/Root/mht_china/zf/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/zf/Android/lz4/audio/skill/actor_voc/audio_yj_jn_01.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/audio/skill/actor_voc/audio_yj_jn_02.unity3d b/Root/mht_china/zf/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/zf/Android/lz4/audio/skill/actor_voc/audio_yj_jn_02.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d index e88c4c487..62edb69a7 100644 Binary files a/Root/mht_china/zf/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d and b/Root/mht_china/zf/Android/lz4/dynamicatlas/d_dhxx_tiao_03.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d b/Root/mht_china/zf/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d index 63926d097..b0f38616c 100644 Binary files a/Root/mht_china/zf/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d and b/Root/mht_china/zf/Android/lz4/dynamicatlas/w_xianshizhekou_banzi.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresskill/effect_skill_yangjian_gai.unity3d b/Root/mht_china/zf/Android/lz4/effectresskill/effect_skill_yangjian_gai.unity3d new file mode 100644 index 000000000..7a0dcc673 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/effectresskill/effect_skill_yangjian_gai.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/chenghao_new.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/chenghao_new.unity3d index 48fe46f7a..d5cef4d8f 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/chenghao_new.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/chenghao_new.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/xunbaomizong.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/xunbaomizong.unity3d index efa9cc44f..46386a53f 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/xunbaomizong.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/xunbaomizong.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d index d745f3ff1..f469947ae 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_zn_001.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d index 6c1ed28b7..e6647d5fb 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/fight.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.unity3d new file mode 100644 index 000000000..8453d8e27 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/ui/likability.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 1632261c4..f387a2376 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/qijieshilian.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/qijieshilian.unity3d index fcffdfb64..573dec063 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/qijieshilian.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/qijieshilian.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index 235c6b338..4367f43eb 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 6a3f9655a..b42e61574 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 aa36fff6b..ab5b910a3 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ