diff --git a/Root/tcx_haizeiBT/Android/_log/onepiece_bt_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_21_04_03.log b/Root/tcx_haizeiBT/Android/_log/onepiece_bt_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_21_04_03.log new file mode 100644 index 000000000..7c43ac8d5 --- /dev/null +++ b/Root/tcx_haizeiBT/Android/_log/onepiece_bt_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_21_04_03.log @@ -0,0 +1,16 @@ +热更文件版本:onepiece_bt_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_21_04_03 +热更文件的工程对应的提交信息: +commit ab3e905cbf7b2b12073f6d100d9276bd47badbcb +Merge: 3c1ab171b2 3c904c83a4 +Author: wangzhenxing <1545929779@qq.com> +Date: Sun Jul 28 12:15:57 2024 +0800 + + Merge branch 'onepiece_bt' of http://192.168.1.21:3000/root/miduo_client into onepiece_bt + + # Conflicts: + # Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab +热更大小:10.7745208740234375 +热更文件: +files.unity3d +lzma/luabytes.unity3d +files.unity3d diff --git a/Root/tcx_haizeiBT/Android/files.unity3d b/Root/tcx_haizeiBT/Android/files.unity3d index 37367d2f3..f5e5e9f5d 100644 Binary files a/Root/tcx_haizeiBT/Android/files.unity3d and b/Root/tcx_haizeiBT/Android/files.unity3d differ diff --git a/Root/tcx_haizeiBT/Android/lzma/luabytes.unity3d b/Root/tcx_haizeiBT/Android/lzma/luabytes.unity3d index 5d9bd9919..f271e319b 100644 Binary files a/Root/tcx_haizeiBT/Android/lzma/luabytes.unity3d and b/Root/tcx_haizeiBT/Android/lzma/luabytes.unity3d differ