diff --git a/Root/mht_china/xq/Android/_log/china_xq_ba01f7cb13191ee10cb150ea924ec3ab0fcfadad_2021_11_08_18_36_27.log b/Root/mht_china/xq/Android/_log/china_xq_ba01f7cb13191ee10cb150ea924ec3ab0fcfadad_2021_11_08_18_36_27.log new file mode 100644 index 000000000..8502cd422 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_ba01f7cb13191ee10cb150ea924ec3ab0fcfadad_2021_11_08_18_36_27.log @@ -0,0 +1,29 @@ +热更文件版本:china/xq_ba01f7cb13191ee10cb150ea924ec3ab0fcfadad_2021_11_08_18_36_27 +热更文件的工程对应的提交信息: +commit ba01f7cb13191ee10cb150ea924ec3ab0fcfadad +Merge: ac5d64de9c b06d80e15f +Author: zhangshanxue +Date: Mon Nov 8 17:14:27 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:16.6002349853515625 +热更文件: +lz4/atlas/godsoulatlas.unity3d +lz4/bg/map/wjfb-04/wjfb-04_14.unity3d +lz4/bg/map/wjfb-04/wjfb-04_15.unity3d +lz4/bg/map/wjfb-04/wjfb-04_2.unity3d +lz4/bg/map/wjfb-04/wjfb-04_3.unity3d +lz4/bg/map/wjfb-04/wjfb-04_8.unity3d +lz4/bg/map/wjfb-04/wjfb-04_9.unity3d +lz4/effectresui/equippopup.unity3d +lz4/prefabs/ui/arenatopmatch.unity3d +lz4/prefabs/ui/expedition.unity3d +lz4/prefabs/ui/guide.unity3d +lz4/prefabs/ui/jumpserver.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/view.unity3d +lz4/prefabs/ui/worldarena.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/xq/Android/files.unity3d b/Root/mht_china/xq/Android/files.unity3d index 60f171990..5d72571c9 100644 Binary files a/Root/mht_china/xq/Android/files.unity3d and b/Root/mht_china/xq/Android/files.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/godsoulatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/godsoulatlas.unity3d index 6a1ddecaf..bfd9ce885 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/godsoulatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/godsoulatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_14.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_14.unity3d index df2a68bbc..b38746802 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_14.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_14.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_15.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_15.unity3d index f6ac635b2..81f099c8d 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_15.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_15.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_2.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_2.unity3d index 5b3c332bb..d258169f2 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_2.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_2.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_3.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_3.unity3d index fd99ef5ff..b0ab41d4e 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_3.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_3.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_8.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_8.unity3d index f440c8441..f27ff2d52 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_8.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_8.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_9.unity3d b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_9.unity3d index fd2668ce3..47f5fb21f 100644 Binary files a/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_9.unity3d and b/Root/mht_china/xq/Android/lz4/bg/map/wjfb-04/wjfb-04_9.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/equippopup.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/equippopup.unity3d index 78e36c978..980df05cf 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/equippopup.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/equippopup.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/arenatopmatch.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/arenatopmatch.unity3d index 97d38a982..a2b92821b 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/arenatopmatch.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/arenatopmatch.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d index fcf1ac69d..34882fd46 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/expedition.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d index 8c96a8c1e..be58e84d1 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/guide.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d index 48234ad5f..0237794ac 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/jumpserver.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d index 6b6dd73fb..db4841627 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d index 602623613..7dcb42f44 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/view.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/view.unity3d index 1b318a96f..0c8d22488 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/view.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/view.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d index 6a77680cf..6efd87373 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/worldarena.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 1dcd33fda..5fec1d8b8 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d index 16f242bf9..493c2d1b5 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ