diff --git a/Root/mht_china/xq/Android/_log/china_xq_31b64b9aed911874a39225e93d974de9ed82f27c_2021_09_27_16_32_17.log b/Root/mht_china/xq/Android/_log/china_xq_31b64b9aed911874a39225e93d974de9ed82f27c_2021_09_27_16_32_17.log new file mode 100644 index 000000000..8c4d7dbb5 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_31b64b9aed911874a39225e93d974de9ed82f27c_2021_09_27_16_32_17.log @@ -0,0 +1,19 @@ +热更文件版本:china/xq_31b64b9aed911874a39225e93d974de9ed82f27c_2021_09_27_16_32_17 +热更文件的工程对应的提交信息: +commit 31b64b9aed911874a39225e93d974de9ed82f27c +Merge: 1eccc7ad21 32e5542855 +Author: zhangshanxue +Date: Mon Sep 27 15:38:30 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:12.380153656005859375 +热更文件: +lz4/audio/skill/actor_voc/audio_battle_vo_zn01.unity3d +lz4/audio/skill/actor_voc/audio_zn_jn_01.unity3d +lz4/audio/skill/actor_voc/audio_zn_jn_02.unity3d +lz4/effectresskill/effect_skill_zhinv.unity3d +lz4/icon/fabao.unity3d +lz4/prefabs/ui/popup.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 017ab3a69..eac02c471 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/audio/skill/actor_voc/audio_battle_vo_zn01.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_battle_vo_zn01.unity3d new file mode 100644 index 000000000..9a56e62ca Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/skill/actor_voc/audio_battle_vo_zn01.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_zhinv.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_zhinv.unity3d new file mode 100644 index 000000000..1cd056f4d Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_skill_zhinv.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/icon/fabao.unity3d b/Root/mht_china/xq/Android/lz4/icon/fabao.unity3d index a4907db28..bb7264d5a 100644 Binary files a/Root/mht_china/xq/Android/lz4/icon/fabao.unity3d and b/Root/mht_china/xq/Android/lz4/icon/fabao.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 6791cdf17..1632261c4 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/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 543b7eb00..83789a420 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 2a75d62cc..aacaa54bd 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ