diff --git a/Root/mht_china/zf/IOS/_log/china_ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_23_03_18.log b/Root/mht_china/zf/IOS/_log/china_ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_23_03_18.log new file mode 100644 index 000000000..537f49e16 --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_23_03_18.log @@ -0,0 +1,15 @@ +热更文件版本:china/ios_10b534403f87fec09ae3daa2e675943fcf77fbf5_2021_09_18_23_03_18 +热更文件的工程对应的提交信息: +commit 10b534403f87fec09ae3daa2e675943fcf77fbf5 +Merge: cd65ba1a3d 9021021c93 +Author: JLIOSM1 <774727341@qq.com> +Date: Sat Sep 18 21:20:09 2021 +0800 + + Merge commit '9021021c932b36d06347ac872d85b2fd69fdb22e' into china/ios + + # Conflicts: + # Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +热更大小:1.881378173828125 +热更文件: +lz4_effectresui_carbons.unity3d +files.unity3d diff --git a/Root/mht_china/zf/IOS/files.unity3d b/Root/mht_china/zf/IOS/files.unity3d index 721084230..fe4fb03e1 100644 Binary files a/Root/mht_china/zf/IOS/files.unity3d and b/Root/mht_china/zf/IOS/files.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d index 622ad29f7..d5a83a940 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d differ