diff --git a/Root/lanjing/aiwan/Android/_log/china_zf_test_d48fdbd7792e712c4d8e82d418a24bfb25141ed2_2022_06_15_17_31_40.log b/Root/lanjing/aiwan/Android/_log/china_zf_test_d48fdbd7792e712c4d8e82d418a24bfb25141ed2_2022_06_15_17_31_40.log new file mode 100644 index 000000000..749c01c9f --- /dev/null +++ b/Root/lanjing/aiwan/Android/_log/china_zf_test_d48fdbd7792e712c4d8e82d418a24bfb25141ed2_2022_06_15_17_31_40.log @@ -0,0 +1,19 @@ +热更文件版本:china/zf_test_d48fdbd7792e712c4d8e82d418a24bfb25141ed2_2022_06_15_17_31_40 +热更文件的工程对应的提交信息: +commit d48fdbd7792e712c4d8e82d418a24bfb25141ed2 +Merge: 6357501d32 2bab932602 +Author: JieLing +Date: Wed Jun 15 15:09:46 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:15.52131938934326171875 +热更文件: +lz4/splashpanel.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/compound.unity3d +lz4/prefabs/ui/itemview.unity3d +lz4/prefabs/ui/popup.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/aiwan/Android/files.unity3d b/Root/lanjing/aiwan/Android/files.unity3d index c4ee8a8c0..3f9f7b14e 100644 Binary files a/Root/lanjing/aiwan/Android/files.unity3d and b/Root/lanjing/aiwan/Android/files.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d index dc6c31d59..9c30ad7cc 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d index 47d10661c..d5888f522 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compound.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compound.unity3d index a0b499eb6..a6060d3d9 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compound.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compound.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/itemview.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/itemview.unity3d new file mode 100644 index 000000000..b12ffa165 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/itemview.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d index fbe72f93c..9ea3109bd 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/splashpanel.unity3d b/Root/lanjing/aiwan/Android/lz4/splashpanel.unity3d new file mode 100644 index 000000000..f26c0d944 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/splashpanel.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d index 594d24cc8..88988f1c3 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d and b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d index 204554b66..b37023e6d 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d and b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d differ