diff --git a/Root/lanjing/duoyou/Android/_log/china_zf_test_12c5d1fa94420048aef9fc41166a172c02eb149d_2022_09_13_20_11_21.log b/Root/lanjing/duoyou/Android/_log/china_zf_test_12c5d1fa94420048aef9fc41166a172c02eb149d_2022_09_13_20_11_21.log new file mode 100644 index 000000000..f751d1122 --- /dev/null +++ b/Root/lanjing/duoyou/Android/_log/china_zf_test_12c5d1fa94420048aef9fc41166a172c02eb149d_2022_09_13_20_11_21.log @@ -0,0 +1,20 @@ +热更文件版本:china/zf_test_12c5d1fa94420048aef9fc41166a172c02eb149d_2022_09_13_20_11_21 +热更文件的工程对应的提交信息: +commit 12c5d1fa94420048aef9fc41166a172c02eb149d +Merge: 8e0e085b05 8677cc356d +Author: JieLing +Date: Tue Sep 13 19:02:34 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:24.09565067291259765625 +热更文件: +lz4/icons.unity3d +lz4/atlas/gmaltas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/newshenzunatlas.unity3d +lz4/prefabs/ui/gmpanel.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/newshenzun.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 76ff5ed65..81b51e1de 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/gmaltas.unity3d b/Root/lanjing/duoyou/Android/lz4/atlas/gmaltas.unity3d new file mode 100644 index 000000000..f6361df6a Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/atlas/gmaltas.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/atlas/mainatlas.unity3d b/Root/lanjing/duoyou/Android/lz4/atlas/mainatlas.unity3d index f9909330e..151bb575b 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/atlas/mainatlas.unity3d and b/Root/lanjing/duoyou/Android/lz4/atlas/mainatlas.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/atlas/newshenzunatlas.unity3d b/Root/lanjing/duoyou/Android/lz4/atlas/newshenzunatlas.unity3d new file mode 100644 index 000000000..0b6dd9df8 Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/atlas/newshenzunatlas.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/icons.unity3d b/Root/lanjing/duoyou/Android/lz4/icons.unity3d index 133280303..e90cf87e0 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/icons.unity3d and b/Root/lanjing/duoyou/Android/lz4/icons.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/gmpanel.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/gmpanel.unity3d new file mode 100644 index 000000000..56a2ba3af Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/gmpanel.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/main.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/main.unity3d index b234f2e00..1ee7b731e 100644 Binary files a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/main.unity3d and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newshenzun.unity3d b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newshenzun.unity3d new file mode 100644 index 000000000..3f89877ea Binary files /dev/null and b/Root/lanjing/duoyou/Android/lz4/prefabs/ui/newshenzun.unity3d differ diff --git a/Root/lanjing/duoyou/Android/lzma/luabytes.unity3d b/Root/lanjing/duoyou/Android/lzma/luabytes.unity3d index 429e4a080..0a9970c43 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 8e08df608..a86d393df 100644 Binary files a/Root/lanjing/duoyou/Android/lzma/resconfigs.unity3d and b/Root/lanjing/duoyou/Android/lzma/resconfigs.unity3d differ