diff --git a/Root/lanjing/sw/Android/_log/china_zf_test_6be7dd668e81e65f9cc9e0bd6a9d1d9fe36aeff0_2022_06_21_16_25_13.log b/Root/lanjing/sw/Android/_log/china_zf_test_6be7dd668e81e65f9cc9e0bd6a9d1d9fe36aeff0_2022_06_21_16_25_13.log new file mode 100644 index 000000000..7cde914b0 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_zf_test_6be7dd668e81e65f9cc9e0bd6a9d1d9fe36aeff0_2022_06_21_16_25_13.log @@ -0,0 +1,20 @@ +热更文件版本:china/zf_test_6be7dd668e81e65f9cc9e0bd6a9d1d9fe36aeff0_2022_06_21_16_25_13 +热更文件的工程对应的提交信息: +commit 6be7dd668e81e65f9cc9e0bd6a9d1d9fe36aeff0 +Merge: d48fdbd779 f0eadfcc1f +Author: JieLing +Date: Tue Jun 21 15:28:57 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:16.27823352813720703125 +热更文件: +lz4/atlas/continuepackageatlas.unity3d +lz4/atlas/surpriseboxatlas.unity3d +lz4/prefabs/ui/continuepackage.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/monthcardpageview.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/surprisebox.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 3f9f7b14e..8f51e39f1 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/continuepackageatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d index 8a2ddb72f..aea1046cb 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/surpriseboxatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/surpriseboxatlas.unity3d index 3d6d40da4..fc37e247e 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/surpriseboxatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/surpriseboxatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d index e0199bf18..337898357 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 31fbe0042..ab1de970b 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d index b7f408b00..b4168a7ce 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d index 9ea3109bd..346e1b978 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/surprisebox.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/surprisebox.unity3d new file mode 100644 index 000000000..7f555e121 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/surprisebox.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index 88988f1c3..8e94648f8 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 b37023e6d..047d446cf 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ