diff --git a/Root/lanjing/fengti/Android/_log/china_zf_test_14885ff006be05b9188ef4833ed08af70ddf4ae6_2022_07_20_18_06_00.log b/Root/lanjing/fengti/Android/_log/china_zf_test_14885ff006be05b9188ef4833ed08af70ddf4ae6_2022_07_20_18_06_00.log new file mode 100644 index 000000000..282d94c92 --- /dev/null +++ b/Root/lanjing/fengti/Android/_log/china_zf_test_14885ff006be05b9188ef4833ed08af70ddf4ae6_2022_07_20_18_06_00.log @@ -0,0 +1,19 @@ +热更文件版本:china/zf_test_14885ff006be05b9188ef4833ed08af70ddf4ae6_2022_07_20_18_06_00 +热更文件的工程对应的提交信息: +commit 14885ff006be05b9188ef4833ed08af70ddf4ae6 +Merge: be003b3704 6d9077d298 +Author: JieLing +Date: Wed Jul 20 15:02:45 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:29.78701686859130859375 +热更文件: +lz4/icons.unity3d +lz4/atlas/bishuzi.unity3d +lz4/prefabs/ui/dailyrecharge.unity3d +lz4/prefabs/ui/firstrecharge.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/setting.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 ee8343aef..c5032912b 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/bishuzi.unity3d b/Root/lanjing/fengti/Android/lz4/atlas/bishuzi.unity3d index 7b745d7ec..cd7eb2474 100644 Binary files a/Root/lanjing/fengti/Android/lz4/atlas/bishuzi.unity3d and b/Root/lanjing/fengti/Android/lz4/atlas/bishuzi.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/icons.unity3d b/Root/lanjing/fengti/Android/lz4/icons.unity3d index 509ad66dc..4652f02bd 100644 Binary files a/Root/lanjing/fengti/Android/lz4/icons.unity3d and b/Root/lanjing/fengti/Android/lz4/icons.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/dailyrecharge.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/dailyrecharge.unity3d new file mode 100644 index 000000000..5a6408550 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/dailyrecharge.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/firstrecharge.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/firstrecharge.unity3d index fdadbc695..6f9ef165d 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/firstrecharge.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/firstrecharge.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/popup.unity3d index b26fb735e..77ce09748 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/setting.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/setting.unity3d index 1dcf6551c..61917b377 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/setting.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/setting.unity3d differ diff --git a/Root/lanjing/fengti/Android/lzma/luabytes.unity3d b/Root/lanjing/fengti/Android/lzma/luabytes.unity3d index f88ea9f89..d3ef90355 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 8bc6bc35c..d4aa30068 100644 Binary files a/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d and b/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d differ