diff --git a/Root/mht_china/xq/Android/_log/china_xq_192e208c56d057793d3dbb541c0ddb10d047da10_2021_09_17_17_20_39.log b/Root/mht_china/xq/Android/_log/china_xq_192e208c56d057793d3dbb541c0ddb10d047da10_2021_09_17_17_20_39.log new file mode 100644 index 000000000..4a5b9c110 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_192e208c56d057793d3dbb541c0ddb10d047da10_2021_09_17_17_20_39.log @@ -0,0 +1,30 @@ +热更文件版本:china/xq_192e208c56d057793d3dbb541c0ddb10d047da10_2021_09_17_17_20_39 +热更文件的工程对应的提交信息: +commit 192e208c56d057793d3dbb541c0ddb10d047da10 +Merge: 544c0d2a9f c0d74434c5 +Author: zhangshanxue +Date: Fri Sep 17 16:20:50 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:21.28041172027587890625 +热更文件: +lz4/atlas/fourelement.unity3d +lz4/atlas/sacredtreeatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/atlas/xunbaomizong.unity3d +lz4/bg/x_xbmz_beijin.unity3d +lz4/effectresskill/effect_chongsheng.unity3d +lz4/effectresui/xunbaomizong.unity3d +lz4/effectresui/yijingbaoku.unity3d +lz4/prefabs/effect/buff/fx_ranshao_zong.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/playerliveview.unity3d +lz4/prefabs/ui/pokemon.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/xunbaomizong.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 7d0169396..5fdf012cb 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/fourelement.unity3d b/Root/mht_china/xq/Android/lz4/atlas/fourelement.unity3d index 9b1cf1c4b..e95716d9f 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/fourelement.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/fourelement.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/sacredtreeatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/sacredtreeatlas.unity3d index 9401c45da..b111d2e99 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/sacredtreeatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/sacredtreeatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d index 6f899ef2d..66e7cf670 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/tagbuttonatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/tagbuttonatlas.unity3d index 0ff6dc642..221862f8f 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/tagbuttonatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/tagbuttonatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/xunbaomizong.unity3d b/Root/mht_china/xq/Android/lz4/atlas/xunbaomizong.unity3d new file mode 100644 index 000000000..23acac7cc Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/xunbaomizong.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/bg/x_xbmz_beijin.unity3d b/Root/mht_china/xq/Android/lz4/bg/x_xbmz_beijin.unity3d new file mode 100644 index 000000000..ec8e553a5 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/bg/x_xbmz_beijin.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresskill/effect_chongsheng.unity3d b/Root/mht_china/xq/Android/lz4/effectresskill/effect_chongsheng.unity3d index abc6bb3cd..e5e5f51d6 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresskill/effect_chongsheng.unity3d and b/Root/mht_china/xq/Android/lz4/effectresskill/effect_chongsheng.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/xunbaomizong.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/xunbaomizong.unity3d index 23ab0cfa9..efa9cc44f 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/xunbaomizong.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/xunbaomizong.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/yijingbaoku.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/yijingbaoku.unity3d index 9ae276ce6..2c94ee8d2 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/yijingbaoku.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/yijingbaoku.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/effect/buff/fx_ranshao_zong.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/effect/buff/fx_ranshao_zong.unity3d index 8445976d3..5e1c293bc 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/effect/buff/fx_ranshao_zong.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/effect/buff/fx_ranshao_zong.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/bag.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/bag.unity3d index 8aeb6891c..68348908e 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/bag.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d index 874c4fd4a..f950a1cba 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/battle.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/playerliveview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/playerliveview.unity3d index 4652b8d7e..5f374d11c 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/playerliveview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/playerliveview.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d index bf77162d3..263354bc5 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d index 310097344..486015734 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/practice.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 18795c18c..7a7dcf1a7 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/xunbaomizong.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/xunbaomizong.unity3d new file mode 100644 index 000000000..befd72457 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/ui/xunbaomizong.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index fbec19a2c..983471024 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 a31a22ac5..7b7ac4d2f 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ