diff --git a/Root/mht_china/xq/Android/_log/china_xq_545abad6f45b426facfda4e5ce6f664da63a23c7_2022_03_07_18_40_48.log b/Root/mht_china/xq/Android/_log/china_xq_545abad6f45b426facfda4e5ce6f664da63a23c7_2022_03_07_18_40_48.log new file mode 100644 index 000000000..d89424c5f --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_545abad6f45b426facfda4e5ce6f664da63a23c7_2022_03_07_18_40_48.log @@ -0,0 +1,23 @@ +热更文件版本:china/xq_545abad6f45b426facfda4e5ce6f664da63a23c7_2022_03_07_18_40_48 +热更文件的工程对应的提交信息: +commit 545abad6f45b426facfda4e5ce6f664da63a23c7 +Merge: 953cb1c9f0 c93b19f78d +Author: zhangshanxue +Date: Mon Mar 7 17:45:56 2022 +0800 + + Merge branch 'china/test' into china/xq +热更大小:19.603908538818359375 +热更文件: +lz4/atlas/dynamicactivityatlas.unity3d +lz4/atlas/fightlevelatlas.unity3d +lz4/prefabs/live2d/live2d_c_mp_00051.unity3d +lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/fightlevel.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/spine/c_mp_00051.unity3d +lz4/spine/c_yxz_0057.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 8d4ff3406..c0e7b574e 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/dynamicactivityatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d index a3d3f7b3b..8d4afda91 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d index 0e523aa26..4f2b0e9d8 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d index ac713a288..22ac411d4 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d new file mode 100644 index 000000000..dd4713c82 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 772dd4c88..c0dd3613f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.unity3d index ac62e458c..f0844502a 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.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 57631f8d4..438efb957 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/popup.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d index b9fed3ffb..4e3439f4d 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/spine/c_mp_00051.unity3d b/Root/mht_china/xq/Android/lz4/spine/c_mp_00051.unity3d index 4fe212149..c78d4075b 100644 Binary files a/Root/mht_china/xq/Android/lz4/spine/c_mp_00051.unity3d and b/Root/mht_china/xq/Android/lz4/spine/c_mp_00051.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/spine/c_yxz_0057.unity3d b/Root/mht_china/xq/Android/lz4/spine/c_yxz_0057.unity3d new file mode 100644 index 000000000..8892e0769 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/spine/c_yxz_0057.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index fee15b933..f5b827d34 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 adf84e5a1..8e3e529bf 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ