diff --git a/Root/lanjing/fengti/Android/_log/china_zf_test_73c4e4a1a770f4235c5c7de337f32b95cf78819a_2022_08_17_22_03_52.log b/Root/lanjing/fengti/Android/_log/china_zf_test_73c4e4a1a770f4235c5c7de337f32b95cf78819a_2022_08_17_22_03_52.log new file mode 100644 index 000000000..74b744bb6 --- /dev/null +++ b/Root/lanjing/fengti/Android/_log/china_zf_test_73c4e4a1a770f4235c5c7de337f32b95cf78819a_2022_08_17_22_03_52.log @@ -0,0 +1,22 @@ +热更文件版本:china/zf_test_73c4e4a1a770f4235c5c7de337f32b95cf78819a_2022_08_17_22_03_52 +热更文件的工程对应的提交信息: +commit 73c4e4a1a770f4235c5c7de337f32b95cf78819a +Merge: 756ece8391 1d8c25565f +Author: JieLing +Date: Wed Aug 17 18:10:14 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:29.22493839263916015625 +热更文件: +files.unity3d +lz4/icons.unity3d +lz4/atlas/publicatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/rewardbox.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/xiaoyao.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 e2c7646ad..ee586bae6 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/publicatlas.unity3d b/Root/lanjing/fengti/Android/lz4/atlas/publicatlas.unity3d new file mode 100644 index 000000000..0fdfe4415 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/atlas/tagatlas.unity3d b/Root/lanjing/fengti/Android/lz4/atlas/tagatlas.unity3d index c62801356..601d49ef7 100644 Binary files a/Root/lanjing/fengti/Android/lz4/atlas/tagatlas.unity3d and b/Root/lanjing/fengti/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/icons.unity3d b/Root/lanjing/fengti/Android/lz4/icons.unity3d index 4652f02bd..133280303 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/dynamicacticity.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 557977060..b5a6e32f4 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/dynamicacticity.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 77ce09748..884bc48ed 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/rewardbox.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/rewardbox.unity3d new file mode 100644 index 000000000..8094ee5a7 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/rewardbox.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/shopview.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/shopview.unity3d new file mode 100644 index 000000000..6a387b10b Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/xiaoyao.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/xiaoyao.unity3d index 96675d20b..0945beab8 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/xiaoyao.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/xiaoyao.unity3d differ diff --git a/Root/lanjing/fengti/Android/lzma/luabytes.unity3d b/Root/lanjing/fengti/Android/lzma/luabytes.unity3d index 008c8a455..df65361a7 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 7ff7eabae..3fb3b7c58 100644 Binary files a/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d and b/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d differ