diff --git a/Root/lanjing/sw/Android/_log/china_mht_sw_3063dc7b1c772ae62bd48a533bcabfb5746796d9_2022_01_17_15_37_32.log b/Root/lanjing/sw/Android/_log/china_mht_sw_3063dc7b1c772ae62bd48a533bcabfb5746796d9_2022_01_17_15_37_32.log new file mode 100644 index 000000000..9cdd4bdfa --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_mht_sw_3063dc7b1c772ae62bd48a533bcabfb5746796d9_2022_01_17_15_37_32.log @@ -0,0 +1,17 @@ +热更文件版本:china/mht_sw_3063dc7b1c772ae62bd48a533bcabfb5746796d9_2022_01_17_15_37_32 +热更文件的工程对应的提交信息: +commit 3063dc7b1c772ae62bd48a533bcabfb5746796d9 +Merge: 32692b4a51 abfcd526d5 +Author: zhangshanxue +Date: Mon Jan 17 14:41:53 2022 +0800 + + Merge branch 'china/test' into china/mht_sw +热更大小:13.87844371795654296875 +热更文件: +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/rechargeview.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/lanjing/sw/Android/files.unity3d b/Root/lanjing/sw/Android/files.unity3d index 744e4ca97..167dc172c 100644 Binary files a/Root/lanjing/sw/Android/files.unity3d and b/Root/lanjing/sw/Android/files.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d index cd3de06bd..6513c8035 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d index b8a08c368..b6c38d369 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d index b102bdafc..16849c9cc 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d index 07c65a6c3..43fb995a0 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d index b9ca373cb..4d7a05230 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index eff7481b9..f3e7da3af 100644 Binary files a/Root/lanjing/sw/Android/lzma/luabytes.unity3d and b/Root/lanjing/sw/Android/lzma/luabytes.unity3d differ