diff --git a/Root/lanjing/aiwan/Android/_log/china_zf_test_5be09dd50fbfbe8b218f602800eb0be8290af8a5_2022_05_25_22_30_22.log b/Root/lanjing/aiwan/Android/_log/china_zf_test_5be09dd50fbfbe8b218f602800eb0be8290af8a5_2022_05_25_22_30_22.log new file mode 100644 index 000000000..8a800134d --- /dev/null +++ b/Root/lanjing/aiwan/Android/_log/china_zf_test_5be09dd50fbfbe8b218f602800eb0be8290af8a5_2022_05_25_22_30_22.log @@ -0,0 +1,19 @@ +热更文件版本:china/zf_test_5be09dd50fbfbe8b218f602800eb0be8290af8a5_2022_05_25_22_30_22 +热更文件的工程对应的提交信息: +commit 5be09dd50fbfbe8b218f602800eb0be8290af8a5 +Merge: 227bcb1dbb 25683d637e +Author: JieLing +Date: Wed May 25 17:29:16 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:13.65730953216552734375 +热更文件: +files.unity3d +lz4/atlas/tagatlas.unity3d +lz4/icon/item.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/generalpanel.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 62d0e1874..c815f30da 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/tagatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/tagatlas.unity3d index cd02521dd..c62801356 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/atlas/tagatlas.unity3d and b/Root/lanjing/aiwan/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d b/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d index aff07bda5..74fa570e9 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d and b/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/battle.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/battle.unity3d new file mode 100644 index 000000000..fda7b0e5f Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/battle.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/dynamicacticity.unity3d index de6135014..31fbe0042 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d index 3914b2edc..8e83d535a 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d index 294f77373..e9918b443 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 10bf5a6fd..a56e3e848 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d and b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d differ