diff --git a/Root/lanjing/sw/Android/_log/china_zf_test_773b5e51b2cd7cd90784cd230b2946529b698a6b_2022_06_09_16_36_39.log b/Root/lanjing/sw/Android/_log/china_zf_test_773b5e51b2cd7cd90784cd230b2946529b698a6b_2022_06_09_16_36_39.log new file mode 100644 index 000000000..335227b10 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_zf_test_773b5e51b2cd7cd90784cd230b2946529b698a6b_2022_06_09_16_36_39.log @@ -0,0 +1,14 @@ +热更文件版本:china/zf_test_773b5e51b2cd7cd90784cd230b2946529b698a6b_2022_06_09_16_36_39 +热更文件的工程对应的提交信息: +commit 773b5e51b2cd7cd90784cd230b2946529b698a6b +Merge: 1bc267937a df6eafad47 +Author: JieLing +Date: Thu Jun 9 16:02:36 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:11.20277881622314453125 +热更文件: +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/setting.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/lanjing/sw/Android/files.unity3d b/Root/lanjing/sw/Android/files.unity3d index f6569598e..790e6e758 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/prefabs/ui/recruit.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d index 1847171ca..c95ccf910 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/setting.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/setting.unity3d index 14aec6803..1dcf6551c 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/setting.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/setting.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index ea1553f6a..49daaeb6d 100644 Binary files a/Root/lanjing/sw/Android/lzma/luabytes.unity3d and b/Root/lanjing/sw/Android/lzma/luabytes.unity3d differ