diff --git a/Root/lanjing/qianyou/Android/_log/china_zf_test_31a2b3f2e0d424a475f5f3a722da9e5d528e2eca_2022_09_02_19_03_15.log b/Root/lanjing/qianyou/Android/_log/china_zf_test_31a2b3f2e0d424a475f5f3a722da9e5d528e2eca_2022_09_02_19_03_15.log new file mode 100644 index 000000000..f69d252fa --- /dev/null +++ b/Root/lanjing/qianyou/Android/_log/china_zf_test_31a2b3f2e0d424a475f5f3a722da9e5d528e2eca_2022_09_02_19_03_15.log @@ -0,0 +1,16 @@ +热更文件版本:china/zf_test_31a2b3f2e0d424a475f5f3a722da9e5d528e2eca_2022_09_02_19_03_15 +热更文件的工程对应的提交信息: +commit 31a2b3f2e0d424a475f5f3a722da9e5d528e2eca +Merge: f674aa86ca 7cf2923aa4 +Author: JieLing +Date: Fri Sep 2 16:47:02 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:15.83911895751953125 +热更文件: +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/qianyou/Android/files.unity3d b/Root/lanjing/qianyou/Android/files.unity3d index 86010e437..3376189cd 100644 Binary files a/Root/lanjing/qianyou/Android/files.unity3d and b/Root/lanjing/qianyou/Android/files.unity3d differ diff --git a/Root/lanjing/qianyou/Android/lz4/prefabs/ui/bag.unity3d b/Root/lanjing/qianyou/Android/lz4/prefabs/ui/bag.unity3d index 9c30ad7cc..eb2e6a518 100644 Binary files a/Root/lanjing/qianyou/Android/lz4/prefabs/ui/bag.unity3d and b/Root/lanjing/qianyou/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/lanjing/qianyou/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/qianyou/Android/lz4/prefabs/ui/popup.unity3d index 884bc48ed..4949cd881 100644 Binary files a/Root/lanjing/qianyou/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/qianyou/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/qianyou/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/lanjing/qianyou/Android/lz4/prefabs/ui/roleinfo.unity3d index e1e315297..8502707c8 100644 Binary files a/Root/lanjing/qianyou/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/lanjing/qianyou/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/lanjing/qianyou/Android/lzma/luabytes.unity3d b/Root/lanjing/qianyou/Android/lzma/luabytes.unity3d index 0092f4bcc..7089bd1c8 100644 Binary files a/Root/lanjing/qianyou/Android/lzma/luabytes.unity3d and b/Root/lanjing/qianyou/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/qianyou/Android/lzma/resconfigs.unity3d b/Root/lanjing/qianyou/Android/lzma/resconfigs.unity3d index 44c2c54fb..8e08df608 100644 Binary files a/Root/lanjing/qianyou/Android/lzma/resconfigs.unity3d and b/Root/lanjing/qianyou/Android/lzma/resconfigs.unity3d differ