diff --git a/Root/mht_china/xq/Android/_log/china_xq_5ab743233dddf43735daac4e2a84985f9edd339c_2021_11_22_18_50_19.log b/Root/mht_china/xq/Android/_log/china_xq_5ab743233dddf43735daac4e2a84985f9edd339c_2021_11_22_18_50_19.log new file mode 100644 index 000000000..d88f6eec4 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_xq_5ab743233dddf43735daac4e2a84985f9edd339c_2021_11_22_18_50_19.log @@ -0,0 +1,19 @@ +热更文件版本:china/xq_5ab743233dddf43735daac4e2a84985f9edd339c_2021_11_22_18_50_19 +热更文件的工程对应的提交信息: +commit 5ab743233dddf43735daac4e2a84985f9edd339c +Merge: b7401b6498 109d4cd216 +Author: zhangshanxue +Date: Mon Nov 22 18:03:34 2021 +0800 + + Merge branch 'china/test' into china/xq +热更大小:11.04844570159912109375 +热更文件: +lz4/atlas/tailsmansoulatlas.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/lingmaimijin.unity3d +lz4/prefabs/ui/tailsmansoulview.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 95a9d9c58..972310874 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/tailsmansoulatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/tailsmansoulatlas.unity3d index 370be5df1..25c46b1f0 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/tailsmansoulatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/tailsmansoulatlas.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 ba58875a9..fac34c3fb 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 fa0e679d5..a8830dc0d 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/generalpanel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d index 77ddd6a5e..0bf862f95 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d index 96d7d7027..d7885bbba 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/lingmaimijin.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d index 88cf5cedc..634c0864b 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/tailsmansoulview.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index 66f0820c5..ece458891 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 8c1ec5558..fb32404ac 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ