diff --git a/Root/lanjing/fengti/Android/_log/china_zf_test_f674aa86cae4265cee3cd898aa1b02b7dcf962a1_2022_08_24_20_00_39.log b/Root/lanjing/fengti/Android/_log/china_zf_test_f674aa86cae4265cee3cd898aa1b02b7dcf962a1_2022_08_24_20_00_39.log new file mode 100644 index 000000000..bd7daf24a --- /dev/null +++ b/Root/lanjing/fengti/Android/_log/china_zf_test_f674aa86cae4265cee3cd898aa1b02b7dcf962a1_2022_08_24_20_00_39.log @@ -0,0 +1,17 @@ +热更文件版本:china/zf_test_f674aa86cae4265cee3cd898aa1b02b7dcf962a1_2022_08_24_20_00_39 +热更文件的工程对应的提交信息: +commit f674aa86cae4265cee3cd898aa1b02b7dcf962a1 +Merge: 73c4e4a1a7 b3aa8db31d +Author: JieLing +Date: Wed Aug 24 14:37:41 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:10.7774829864501953125 +热更文件: +files.unity3d +lz4/atlas/activitygiftatlas.unity3d +lz4/prefabs/ui/map.unity3d +lz4/prefabs/ui/tianshumijuan.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/fengti/Android/files.unity3d b/Root/lanjing/fengti/Android/files.unity3d index ee586bae6..86010e437 100644 Binary files a/Root/lanjing/fengti/Android/files.unity3d and b/Root/lanjing/fengti/Android/files.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/atlas/activitygiftatlas.unity3d b/Root/lanjing/fengti/Android/lz4/atlas/activitygiftatlas.unity3d new file mode 100644 index 000000000..839465e7a Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/atlas/activitygiftatlas.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/map.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/map.unity3d new file mode 100644 index 000000000..267a18d8d Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/map.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/tianshumijuan.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/tianshumijuan.unity3d index 210225ef9..38a7e544d 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/tianshumijuan.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/tianshumijuan.unity3d differ diff --git a/Root/lanjing/fengti/Android/lzma/luabytes.unity3d b/Root/lanjing/fengti/Android/lzma/luabytes.unity3d index df65361a7..0092f4bcc 100644 Binary files a/Root/lanjing/fengti/Android/lzma/luabytes.unity3d and b/Root/lanjing/fengti/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d b/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d index 3fb3b7c58..44c2c54fb 100644 Binary files a/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d and b/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d differ