diff --git a/Root/lanjing/sw/Android/_log/china_mht_sw_15d2fe8cfa1241b182ad409a95cbbfd2a9283d5d_2022_03_09_07_40_54.log b/Root/lanjing/sw/Android/_log/china_mht_sw_15d2fe8cfa1241b182ad409a95cbbfd2a9283d5d_2022_03_09_07_40_54.log new file mode 100644 index 000000000..38f95d8f5 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_mht_sw_15d2fe8cfa1241b182ad409a95cbbfd2a9283d5d_2022_03_09_07_40_54.log @@ -0,0 +1,23 @@ +热更文件版本:china/mht_sw_15d2fe8cfa1241b182ad409a95cbbfd2a9283d5d_2022_03_09_07_40_54 +热更文件的工程对应的提交信息: +commit 15d2fe8cfa1241b182ad409a95cbbfd2a9283d5d +Merge: dc0821bd5c 0dcefc586a +Author: zhangshanxue +Date: Tue Mar 8 22:19:47 2022 +0800 + + Merge branch 'china/test' into china/mht_sw +热更大小:19.59910297393798828125 +热更文件: +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/lanjing/sw/Android/files.unity3d b/Root/lanjing/sw/Android/files.unity3d index d8126e553..b8d16610c 100644 Binary files a/Root/lanjing/sw/Android/files.unity3d and b/Root/lanjing/sw/Android/files.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d index 9d1d11b20..a17a1f91d 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/fightlevelatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/fightlevelatlas.unity3d new file mode 100644 index 000000000..a27441147 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/fightlevelatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d new file mode 100644 index 000000000..22ac411d4 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d new file mode 100644 index 000000000..dd4713c82 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d index d62bc2cae..de6135014 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d index ac62e458c..f0844502a 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/guild.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/guild.unity3d index 57631f8d4..438efb957 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/guild.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d index b9fed3ffb..4e3439f4d 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/spine/c_mp_00051.unity3d b/Root/lanjing/sw/Android/lz4/spine/c_mp_00051.unity3d new file mode 100644 index 000000000..c78d4075b Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/spine/c_mp_00051.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/spine/c_yxz_0057.unity3d b/Root/lanjing/sw/Android/lz4/spine/c_yxz_0057.unity3d new file mode 100644 index 000000000..8892e0769 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/spine/c_yxz_0057.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index 535acac21..66892c9f4 100644 Binary files a/Root/lanjing/sw/Android/lzma/luabytes.unity3d and b/Root/lanjing/sw/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d index adf84e5a1..8e3e529bf 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ