diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_14_57_21.log b/Root/mht_china/zf/Android/_log/china_zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_14_57_21.log new file mode 100644 index 000000000..a3bbc4c60 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_14_57_21.log @@ -0,0 +1,30 @@ +热更文件版本:china/zf_test_03a5a535cd4417da6924172540bd9631aecf7231_2021_11_16_14_57_21 +热更文件的工程对应的提交信息: +commit 03a5a535cd4417da6924172540bd9631aecf7231 +Merge: 57dbb21e5b 6dc9993671 +Author: JieLing +Date: Mon Nov 15 19:11:55 2021 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:17.47882556915283203125 +热更文件: +lz4/atlas/monstercampatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/icon/item.unity3d +lz4/prefabs/effect/skill/c_ts_00017_t3_attack.unity3d +lz4/prefabs/live2d/live2d_c_0023_02.unity3d +lz4/prefabs/live2d/live2d_c_0038_02.unity3d +lz4/prefabs/live2d/live2d_c_0043_02.unity3d +lz4/prefabs/live2d/live2d_c_sjnn_00012_02.unity3d +lz4/prefabs/ui/btview.unity3d +lz4/prefabs/ui/formation.unity3d +lz4/prefabs/ui/mission.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/worldarena.unity3d +lz4/spine/c_0023_02.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 146d12c36..c96ad418b 100644 Binary files a/Root/mht_china/zf/Android/files.unity3d and b/Root/mht_china/zf/Android/files.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d index f512ecffe..a68fc14d6 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/monstercampatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d index 7efd3368d..0d80da7fd 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d index 0324c8d45..d8ec42c89 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/tagbuttonatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icon/item.unity3d b/Root/mht_china/zf/Android/lz4/icon/item.unity3d index 66727425a..b7bc98e15 100644 Binary files a/Root/mht_china/zf/Android/lz4/icon/item.unity3d and b/Root/mht_china/zf/Android/lz4/icon/item.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/effect/skill/c_ts_00017_t3_attack.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/effect/skill/c_ts_00017_t3_attack.unity3d index c1f9027ab..fcd364b6e 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/effect/skill/c_ts_00017_t3_attack.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/effect/skill/c_ts_00017_t3_attack.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0023_02.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0023_02.unity3d new file mode 100644 index 000000000..f3a038dd0 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0023_02.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0038_02.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0038_02.unity3d index 9cf7de7a2..80e760f52 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0038_02.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0038_02.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0043_02.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0043_02.unity3d index 35744da7e..8bffc2208 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0043_02.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_0043_02.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_sjnn_00012_02.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_sjnn_00012_02.unity3d index 051d51f6e..fcbb1a512 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_sjnn_00012_02.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/live2d/live2d_c_sjnn_00012_02.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/btview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/btview.unity3d index d1d38cb05..a299ac965 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/btview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/btview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/formation.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/formation.unity3d index 466b524d0..7c23d044d 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/formation.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/formation.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d index 8b620aa1a..73e7d5f3d 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/mission.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d index 762d3014b..ec14b031b 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index 7dcb42f44..1e0a70b9f 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d index 65f1de630..08ebec1cf 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/worldarena.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/worldarena.unity3d index 6efd87373..cad87f910 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/worldarena.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/worldarena.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/spine/c_0023_02.unity3d b/Root/mht_china/zf/Android/lz4/spine/c_0023_02.unity3d new file mode 100644 index 000000000..b0d64ab28 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/spine/c_0023_02.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 897c25c02..32c1fd7d6 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d index 0846fc4c0..42c4410e3 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ