diff --git a/Root/tcx_haizeiBT/IOS/_log/onepiece_bt_ios_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_18_56_21.log b/Root/tcx_haizeiBT/IOS/_log/onepiece_bt_ios_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_18_56_21.log new file mode 100644 index 000000000..dede18057 --- /dev/null +++ b/Root/tcx_haizeiBT/IOS/_log/onepiece_bt_ios_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_18_56_21.log @@ -0,0 +1,16 @@ +热更文件版本:onepiece_bt_ios_ab3e905cbf7b2b12073f6d100d9276bd47badbcb_2024_08_01_18_56_21 +热更文件的工程对应的提交信息: +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 +热更大小:5.45605564117431640625 +热更文件: +files.unity3d +lzma_luabytes.unity3d +files.unity3d diff --git a/Root/tcx_haizeiBT/IOS/files.unity3d b/Root/tcx_haizeiBT/IOS/files.unity3d index 6d596de14..5dc9a2142 100644 Binary files a/Root/tcx_haizeiBT/IOS/files.unity3d and b/Root/tcx_haizeiBT/IOS/files.unity3d differ diff --git a/Root/tcx_haizeiBT/IOS/lzma_luabytes.unity3d b/Root/tcx_haizeiBT/IOS/lzma_luabytes.unity3d index cb41a7647..a0bb4c426 100644 Binary files a/Root/tcx_haizeiBT/IOS/lzma_luabytes.unity3d and b/Root/tcx_haizeiBT/IOS/lzma_luabytes.unity3d differ