diff --git a/Root/lanjing/aiwan/Android/_log/china_zf_test_a114a16c96bbb450da40c259ec2e35edba9a9ae6_2022_07_27_18_05_58.log b/Root/lanjing/aiwan/Android/_log/china_zf_test_a114a16c96bbb450da40c259ec2e35edba9a9ae6_2022_07_27_18_05_58.log new file mode 100644 index 000000000..37c12f031 --- /dev/null +++ b/Root/lanjing/aiwan/Android/_log/china_zf_test_a114a16c96bbb450da40c259ec2e35edba9a9ae6_2022_07_27_18_05_58.log @@ -0,0 +1,20 @@ +热更文件版本:china/zf_test_a114a16c96bbb450da40c259ec2e35edba9a9ae6_2022_07_27_18_05_58 +热更文件的工程对应的提交信息: +commit a114a16c96bbb450da40c259ec2e35edba9a9ae6 +Merge: 84ca621329 e57503879e +Author: JieLing +Date: Wed Jul 27 16:43:14 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:14.17223453521728515625 +热更文件: +files.unity3d +lz4/atlas/incarnationatlas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/monthcardpageview.unity3d +lz4/prefabs/ui/rationnumber.unity3d +lz4/prefabs/ui/roleinfo.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 c5032912b..4fee14ed8 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/incarnationatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/incarnationatlas.unity3d new file mode 100644 index 000000000..0cfb5c62d Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/incarnationatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d index 9df130430..d755ffc1b 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/main.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/main.unity3d index a05406bb1..b234f2e00 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/main.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/monthcardpageview.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/monthcardpageview.unity3d index b4168a7ce..35b69304f 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/monthcardpageview.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/monthcardpageview.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/rationnumber.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/rationnumber.unity3d index 64bc557aa..5c3f3336e 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/rationnumber.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/rationnumber.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 36a51f15f..e1e315297 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 d3ef90355..0e6d8eeba 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 d4aa30068..48be90924 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d and b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d differ