diff --git a/Root/mht_china/sw/Android/_log/china_mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_07_48.log b/Root/mht_china/sw/Android/_log/china_mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_07_48.log new file mode 100644 index 000000000..a9cd99d7f --- /dev/null +++ b/Root/mht_china/sw/Android/_log/china_mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_07_48.log @@ -0,0 +1,29 @@ +热更文件版本:china/mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_07_48 +热更文件的工程对应的提交信息: +commit 281d9145df1c8480388137032dcc703836af6ada +Merge: 15d2fe8cfa af677d9090 +Author: zhangshanxue +Date: Mon Mar 14 17:26:17 2022 +0800 + + Merge branch 'china/test' into china/mht_sw +热更大小:34.97956085205078125 +热更文件: +lz4/icons.unity3d +lz4/atlas/battleatlas.unity3d +lz4/atlas/dynamicactivityatlas.unity3d +lz4/atlas/fightlevelatlas.unity3d +lz4/atlas/tianshumijuanatlas.unity3d +lz4/icon/hero.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/main.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.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/sw/Android/files.unity3d b/Root/mht_china/sw/Android/files.unity3d index d8126e553..6fef83916 100644 Binary files a/Root/mht_china/sw/Android/files.unity3d and b/Root/mht_china/sw/Android/files.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/atlas/battleatlas.unity3d b/Root/mht_china/sw/Android/lz4/atlas/battleatlas.unity3d index c492fd03e..8a659ebd1 100644 Binary files a/Root/mht_china/sw/Android/lz4/atlas/battleatlas.unity3d and b/Root/mht_china/sw/Android/lz4/atlas/battleatlas.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d b/Root/mht_china/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d index 9d1d11b20..a17a1f91d 100644 Binary files a/Root/mht_china/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d and b/Root/mht_china/sw/Android/lz4/atlas/dynamicactivityatlas.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/atlas/fightlevelatlas.unity3d b/Root/mht_china/sw/Android/lz4/atlas/fightlevelatlas.unity3d index 75fe590b0..a27441147 100644 Binary files a/Root/mht_china/sw/Android/lz4/atlas/fightlevelatlas.unity3d and b/Root/mht_china/sw/Android/lz4/atlas/fightlevelatlas.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d b/Root/mht_china/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d index ea31b62d8..c9fae7ac9 100644 Binary files a/Root/mht_china/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d and b/Root/mht_china/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/icon/hero.unity3d b/Root/mht_china/sw/Android/lz4/icon/hero.unity3d index a9dab5942..297cb9212 100644 Binary files a/Root/mht_china/sw/Android/lz4/icon/hero.unity3d and b/Root/mht_china/sw/Android/lz4/icon/hero.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/icons.unity3d b/Root/mht_china/sw/Android/lz4/icons.unity3d index 65bc35e4f..91e34f0ab 100644 Binary files a/Root/mht_china/sw/Android/lz4/icons.unity3d and b/Root/mht_china/sw/Android/lz4/icons.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d index ac713a288..22ac411d4 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/live2d/live2d_c_mp_00051.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d b/Root/mht_china/sw/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/sw/Android/lz4/prefabs/live2d/live2d_c_yxz_0057.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d index d62bc2cae..de6135014 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/ui/fightlevel.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/ui/fightlevel.unity3d index ac62e458c..f0844502a 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/ui/fightlevel.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/ui/guild.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/ui/guild.unity3d index 57631f8d4..438efb957 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/ui/guild.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/ui/main.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/ui/main.unity3d index 9641db8ce..5fe6d28b3 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/ui/main.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/ui/popup.unity3d index b9fed3ffb..4e3439f4d 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/prefabs/ui/practice.unity3d b/Root/mht_china/sw/Android/lz4/prefabs/ui/practice.unity3d index 5de3d216d..00c7203f5 100644 Binary files a/Root/mht_china/sw/Android/lz4/prefabs/ui/practice.unity3d and b/Root/mht_china/sw/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/spine/c_mp_00051.unity3d b/Root/mht_china/sw/Android/lz4/spine/c_mp_00051.unity3d index 4fe212149..c78d4075b 100644 Binary files a/Root/mht_china/sw/Android/lz4/spine/c_mp_00051.unity3d and b/Root/mht_china/sw/Android/lz4/spine/c_mp_00051.unity3d differ diff --git a/Root/mht_china/sw/Android/lz4/spine/c_yxz_0057.unity3d b/Root/mht_china/sw/Android/lz4/spine/c_yxz_0057.unity3d new file mode 100644 index 000000000..8892e0769 Binary files /dev/null and b/Root/mht_china/sw/Android/lz4/spine/c_yxz_0057.unity3d differ diff --git a/Root/mht_china/sw/Android/lzma/luabytes.unity3d b/Root/mht_china/sw/Android/lzma/luabytes.unity3d index 535acac21..26eaa76c3 100644 Binary files a/Root/mht_china/sw/Android/lzma/luabytes.unity3d and b/Root/mht_china/sw/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/sw/Android/lzma/resconfigs.unity3d b/Root/mht_china/sw/Android/lzma/resconfigs.unity3d index adf84e5a1..fdc3086e0 100644 Binary files a/Root/mht_china/sw/Android/lzma/resconfigs.unity3d and b/Root/mht_china/sw/Android/lzma/resconfigs.unity3d differ