diff --git a/Root/lanjing/sw/Android/_log/china_mht_sw_fba2dc2510ab4b1d0dee8655b25ff49e881e2cac_2022_01_18_17_43_52.log b/Root/lanjing/sw/Android/_log/china_mht_sw_fba2dc2510ab4b1d0dee8655b25ff49e881e2cac_2022_01_18_17_43_52.log new file mode 100644 index 000000000..c952aaf7c --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_mht_sw_fba2dc2510ab4b1d0dee8655b25ff49e881e2cac_2022_01_18_17_43_52.log @@ -0,0 +1,20 @@ +热更文件版本:china/mht_sw_fba2dc2510ab4b1d0dee8655b25ff49e881e2cac_2022_01_18_17_43_52 +热更文件的工程对应的提交信息: +commit fba2dc2510ab4b1d0dee8655b25ff49e881e2cac +Merge: 3063dc7b1c 83316a3dfd +Author: zhangshanxue +Date: Tue Jan 18 15:48:50 2022 +0800 + + Merge branch 'china/test' into china/mht_sw +热更大小:17.00579166412353515625 +热更文件: +lz4/atlas/tagatlas.unity3d +lz4/dynamicatlas/r_hero_yuansukuang.unity3d +lz4/icon/linshiskill.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/sw/Android/files.unity3d b/Root/lanjing/sw/Android/files.unity3d index 167dc172c..75630d618 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/atlas/tagatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/tagatlas.unity3d index c8420ef1e..41a002fa2 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/tagatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d b/Root/lanjing/sw/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d new file mode 100644 index 000000000..6f29b816e Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/dynamicatlas/r_hero_yuansukuang.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/icon/linshiskill.unity3d b/Root/lanjing/sw/Android/lz4/icon/linshiskill.unity3d index fd8136cf6..1003859f8 100644 Binary files a/Root/lanjing/sw/Android/lz4/icon/linshiskill.unity3d and b/Root/lanjing/sw/Android/lz4/icon/linshiskill.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/generalpanel.unity3d index 9f351f681..45ed3438a 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/generalpanel.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 16849c9cc..63bb8a21e 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/recruit.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d index 62737a9b1..4edc1c137 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.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 4d7a05230..b0bec6f11 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 f3e7da3af..51749d4ec 100644 Binary files a/Root/lanjing/sw/Android/lzma/luabytes.unity3d and b/Root/lanjing/sw/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d index 857334584..838d83eda 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ