diff --git a/Root/lanjing/sw/Android/_log/china_mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_09_55.log b/Root/lanjing/sw/Android/_log/china_mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_09_55.log new file mode 100644 index 000000000..e520e2393 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_09_55.log @@ -0,0 +1,19 @@ +热更文件版本:china/mht_sw_281d9145df1c8480388137032dcc703836af6ada_2022_03_14_18_09_55 +热更文件的工程对应的提交信息: +commit 281d9145df1c8480388137032dcc703836af6ada +Merge: 15d2fe8cfa af677d9090 +Author: zhangshanxue +Date: Mon Mar 14 17:26:17 2022 +0800 + + Merge branch 'china/test' into china/mht_sw +热更大小:24.89701080322265625 +热更文件: +lz4/icons.unity3d +lz4/atlas/battleatlas.unity3d +lz4/atlas/tianshumijuanatlas.unity3d +lz4/icon/hero.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/practice.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 16bbae426..6fef83916 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/battleatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d index c492fd03e..8a659ebd1 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d new file mode 100644 index 000000000..c9fae7ac9 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/tianshumijuanatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/icon/hero.unity3d b/Root/lanjing/sw/Android/lz4/icon/hero.unity3d index a9dab5942..297cb9212 100644 Binary files a/Root/lanjing/sw/Android/lz4/icon/hero.unity3d and b/Root/lanjing/sw/Android/lz4/icon/hero.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/icons.unity3d b/Root/lanjing/sw/Android/lz4/icons.unity3d index 65bc35e4f..91e34f0ab 100644 Binary files a/Root/lanjing/sw/Android/lz4/icons.unity3d and b/Root/lanjing/sw/Android/lz4/icons.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d index 9641db8ce..5fe6d28b3 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d index 5de3d216d..00c7203f5 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index 3a35cc844..26eaa76c3 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 8e3e529bf..fdc3086e0 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ