diff --git a/Root/lanjing/aiwan/Android/_log/china_zf_test_b5f341f8083d7ac95d51395e7c0c43f09733f3c5_2022_05_10_08_31_36.log b/Root/lanjing/aiwan/Android/_log/china_zf_test_b5f341f8083d7ac95d51395e7c0c43f09733f3c5_2022_05_10_08_31_36.log new file mode 100644 index 000000000..fa20623f9 --- /dev/null +++ b/Root/lanjing/aiwan/Android/_log/china_zf_test_b5f341f8083d7ac95d51395e7c0c43f09733f3c5_2022_05_10_08_31_36.log @@ -0,0 +1,15 @@ +热更文件版本:china/zf_test_b5f341f8083d7ac95d51395e7c0c43f09733f3c5_2022_05_10_08_31_36 +热更文件的工程对应的提交信息: +commit b5f341f8083d7ac95d51395e7c0c43f09733f3c5 +Merge: d779e2809f e2e9897796 +Author: JieLing +Date: Mon May 9 21:13:42 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:10.6553783416748046875 +热更文件: +lz4/dynamicatlas/b_baridenglu_slogan02_zh.unity3d +lz4/publicartres/shaders.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/aiwan/Android/files.unity3d b/Root/lanjing/aiwan/Android/files.unity3d index e203dd8c1..0c8a52006 100644 Binary files a/Root/lanjing/aiwan/Android/files.unity3d and b/Root/lanjing/aiwan/Android/files.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/dynamicatlas/b_baridenglu_slogan02_zh.unity3d b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/b_baridenglu_slogan02_zh.unity3d new file mode 100644 index 000000000..61d364b30 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/b_baridenglu_slogan02_zh.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/publicartres/shaders.unity3d b/Root/lanjing/aiwan/Android/lz4/publicartres/shaders.unity3d index f0c31d821..37ebda8ce 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/publicartres/shaders.unity3d and b/Root/lanjing/aiwan/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d index 338c137a6..a3650dfde 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d and b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d index 5707acb94..4bce7faec 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d and b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d differ