diff --git a/Root/mht_china/xq/Android/_log/china_xq_68b1ffcab42a52f2516e35d16bd34304148d349e_2021_12_07_17_51_53.log b/Root/mht_china/xq/Android/_log/china_xq_68b1ffcab42a52f2516e35d16bd34304148d349e_2021_12_07_17_51_53.log new file mode 100644 index 000000000..ad0d83011 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_68b1ffcab42a52f2516e35d16bd34304148d349e_2021_12_07_17_51_53.log @@ -0,0 +1,16 @@ +热更文件版本:china/xq_68b1ffcab42a52f2516e35d16bd34304148d349e_2021_12_07_17_51_53 +热更文件的工程对应的提交信息: +commit 68b1ffcab42a52f2516e35d16bd34304148d349e +Merge: 7c3ebcd7dd 3b1ba253b5 +Author: zhangshanxue +Date: Tue Dec 7 16:54:44 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:9.1187534332275390625 +热更文件: +lz4/audio/ui/voice/audio_fangcunzhuanpan_0.unity3d +lz4/audio/ui/voice/audio_fangcunzhuanpan_1.unity3d +lz4/prefabs/ui/tailsmansoulview.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 0564fa024..748e91434 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/ui/voice/audio_fangcunzhuanpan_0.unity3d b/Root/mht_china/xq/Android/lz4/audio/ui/voice/audio_fangcunzhuanpan_0.unity3d new file mode 100644 index 000000000..e8222f4c2 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/ui/voice/audio_fangcunzhuanpan_0.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/ui/voice/audio_fangcunzhuanpan_1.unity3d b/Root/mht_china/xq/Android/lz4/audio/ui/voice/audio_fangcunzhuanpan_1.unity3d new file mode 100644 index 000000000..e37495078 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/audio/ui/voice/audio_fangcunzhuanpan_1.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 bae9cfab1..d93e3c9aa 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/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index d81ee5a65..566802253 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 7997ce2db..e24969b1e 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ