diff --git a/Root/you_gu/Android/_log/dev_bt_and_7151b74419a963862729da7950aea4f1457cf32f_2023_03_22_14_37_58.log b/Root/you_gu/Android/_log/dev_bt_and_7151b74419a963862729da7950aea4f1457cf32f_2023_03_22_14_37_58.log new file mode 100644 index 000000000..6dca0d300 --- /dev/null +++ b/Root/you_gu/Android/_log/dev_bt_and_7151b74419a963862729da7950aea4f1457cf32f_2023_03_22_14_37_58.log @@ -0,0 +1,16 @@ +热更文件版本:dev_bt_and_7151b74419a963862729da7950aea4f1457cf32f_2023_03_22_14_37_58 +热更文件的工程对应的提交信息: +commit 7151b74419a963862729da7950aea4f1457cf32f +Merge: 349ea56895 c5c237493b +Author: zhangshanxue +Date: Tue Mar 21 10:20:17 2023 +0800 + + Merge branch 'china/dev_bt' into dev_bt_and + + # Conflicts: + # Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont/f_fuben_fubenming_08.png.meta +热更大小:10.24013805389404296875 +热更文件: +files.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/you_gu/Android/files.unity3d b/Root/you_gu/Android/files.unity3d index f0f873c86..9e30f1f68 100644 Binary files a/Root/you_gu/Android/files.unity3d and b/Root/you_gu/Android/files.unity3d differ diff --git a/Root/you_gu/Android/lzma/luabytes.unity3d b/Root/you_gu/Android/lzma/luabytes.unity3d index b971ed6ba..9c62ceb6e 100644 Binary files a/Root/you_gu/Android/lzma/luabytes.unity3d and b/Root/you_gu/Android/lzma/luabytes.unity3d differ