diff --git a/Root/lanjing/sw/Android/_log/china_mht_sw_2a5863b57510067ca18d2bd3fc2e91c8c4ea9db0_2022_03_21_17_49_50.log b/Root/lanjing/sw/Android/_log/china_mht_sw_2a5863b57510067ca18d2bd3fc2e91c8c4ea9db0_2022_03_21_17_49_50.log new file mode 100644 index 000000000..a4e2448d1 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_mht_sw_2a5863b57510067ca18d2bd3fc2e91c8c4ea9db0_2022_03_21_17_49_50.log @@ -0,0 +1,19 @@ +热更文件版本:china/mht_sw_2a5863b57510067ca18d2bd3fc2e91c8c4ea9db0_2022_03_21_17_49_50 +热更文件的工程对应的提交信息: +commit 2a5863b57510067ca18d2bd3fc2e91c8c4ea9db0 +Merge: 281d9145df b7ce89f597 +Author: zhangshanxue +Date: Mon Mar 21 16:39:37 2022 +0800 + + Merge branch 'china/test' into china/mht_sw +热更大小:22.667530059814453125 +热更文件: +lz4/icons.unity3d +lz4/atlas/upgradepackageatlas.unity3d +lz4/icon/fabao.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/eastseafindgod.unity3d +lz4/prefabs/ui/fightlevel.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 6fef83916..0da6b952b 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/upgradepackageatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/upgradepackageatlas.unity3d new file mode 100644 index 000000000..a26aad248 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/upgradepackageatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/icon/fabao.unity3d b/Root/lanjing/sw/Android/lz4/icon/fabao.unity3d new file mode 100644 index 000000000..f2a47addb Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/icon/fabao.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/icons.unity3d b/Root/lanjing/sw/Android/lz4/icons.unity3d index 91e34f0ab..5793d3333 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/carbon.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d index 3d61fffd7..d2429e1bd 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/eastseafindgod.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/eastseafindgod.unity3d new file mode 100644 index 000000000..d9a06e4ce Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/eastseafindgod.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 f0844502a..f19ccc7bb 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/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index 26eaa76c3..105e0f388 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 fdc3086e0..13b03d536 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ