diff --git a/Root/lanjing/aiwan/Android/_log/china_zf_test_5c999deed5f52260b4c78c23bc8f8203f8977b91_2022_09_07_19_01_11.log b/Root/lanjing/aiwan/Android/_log/china_zf_test_5c999deed5f52260b4c78c23bc8f8203f8977b91_2022_09_07_19_01_11.log new file mode 100644 index 000000000..b2c7dafa6 --- /dev/null +++ b/Root/lanjing/aiwan/Android/_log/china_zf_test_5c999deed5f52260b4c78c23bc8f8203f8977b91_2022_09_07_19_01_11.log @@ -0,0 +1,18 @@ +热更文件版本:china/zf_test_5c999deed5f52260b4c78c23bc8f8203f8977b91_2022_09_07_19_01_11 +热更文件的工程对应的提交信息: +commit 5c999deed5f52260b4c78c23bc8f8203f8977b91 +Merge: d57edc0a73 5436862e0b +Author: JieLing +Date: Wed Sep 7 17:05:57 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:16.5810413360595703125 +热更文件: +files.unity3d +lz4/atlas/mainatlas.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/resolve.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/lanjing/aiwan/Android/files.unity3d b/Root/lanjing/aiwan/Android/files.unity3d index e5d26dfc7..abb9de7df 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/atlas/mainatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d index d755ffc1b..f9909330e 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d and b/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.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 eb2e6a518..316521e24 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/popup.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d index 4949cd881..5548b5706 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/prefabs/ui/resolve.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/resolve.unity3d new file mode 100644 index 000000000..1affecf47 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/resolve.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d index 8502707c8..e8d542222 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d index 7b9e037a3..58bf4d380 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d and b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d differ