diff --git a/Root/lanjing/duoyou/Android/_log/china_zf_test_2ca1d8c7bf38ee6a3812b5980e4ca6fda1ce5dd6_2022_07_06_17_31_21.log b/Root/lanjing/duoyou/Android/_log/china_zf_test_2ca1d8c7bf38ee6a3812b5980e4ca6fda1ce5dd6_2022_07_06_17_31_21.log new file mode 100644 index 000000000..8975a1a27 --- /dev/null +++ b/Root/lanjing/duoyou/Android/_log/china_zf_test_2ca1d8c7bf38ee6a3812b5980e4ca6fda1ce5dd6_2022_07_06_17_31_21.log @@ -0,0 +1,20 @@ +热更文件版本:china/zf_test_2ca1d8c7bf38ee6a3812b5980e4ca6fda1ce5dd6_2022_07_06_17_31_21 +热更文件的工程对应的提交信息: +commit 2ca1d8c7bf38ee6a3812b5980e4ca6fda1ce5dd6 +Merge: 6be7dd668e eab0e11e44 +Author: JieLing +Date: Wed Jul 6 14:36:03 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:15.99400424957275390625 +热更文件: +lz4/splashpanel.unity3d +lz4/atlas/firstrechargeatlas.unity3d +lz4/prefabs/ui/fight.unity3d +lz4/prefabs/ui/journeywithwind.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/publicartres/shaders.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/duoyou/Android/files.unity3d b/Root/lanjing/duoyou/Android/files.unity3d index 27171529a..7db9482b0 100644 Binary files a/Root/lanjing/duoyou/Android/files.unity3d and b/Root/lanjing/duoyou/Android/files.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/atlas/firstrechargeatlas.unity3d b/Root/lanjing/duoyou/Android/lz4/atlas/firstrechargeatlas.unity3d new file mode 100644 index 000000000..83987c9af Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/atlas/firstrechargeatlas.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/fight.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/fight.unity3d new file mode 100644 index 000000000..5de3412f1 Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/fight.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/journeywithwind.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/journeywithwind.unity3d new file mode 100644 index 000000000..520cdcfdf Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/journeywithwind.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newactivity.unity3d index 8fed64b26..1ecbaeb37 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/popup.unity3d index 346e1b978..b26fb735e 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/publicartres/shaders.unity3d b/Root/lanjing/duoyou/Android/lz4/publicartres/shaders.unity3d index 37ebda8ce..7eebc23a7 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/publicartres/shaders.unity3d and b/Root/lanjing/duoyou/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/splashpanel.unity3d b/Root/lanjing/duoyou/Android/lz4/splashpanel.unity3d index f26c0d944..391c282a1 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/splashpanel.unity3d and b/Root/lanjing/duoyou/Android/lz4/splashpanel.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lzma/luabytes.unity3d b/Root/lanjing/duoyou/Android/lzma/luabytes.unity3d index f8e177997..88e0fcc98 100644 Binary files a/Root/lanjing/duoyou/Android/lzma/luabytes.unity3d and b/Root/lanjing/duoyou/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lzma/resconfigs.unity3d b/Root/lanjing/duoyou/Android/lzma/resconfigs.unity3d index 047d446cf..29d7439b5 100644 Binary files a/Root/lanjing/duoyou/Android/lzma/resconfigs.unity3d and b/Root/lanjing/duoyou/Android/lzma/resconfigs.unity3d differ