diff --git a/Root/you_gu/Android/_log/china_dev_bt_9b72d4d9488856a39f70f0c61caa54e03487b68f_2022_12_23_17_37_40.log b/Root/you_gu/Android/_log/china_dev_bt_9b72d4d9488856a39f70f0c61caa54e03487b68f_2022_12_23_17_37_40.log new file mode 100644 index 000000000..97267e2cd --- /dev/null +++ b/Root/you_gu/Android/_log/china_dev_bt_9b72d4d9488856a39f70f0c61caa54e03487b68f_2022_12_23_17_37_40.log @@ -0,0 +1,17 @@ +热更文件版本:china/dev_bt_9b72d4d9488856a39f70f0c61caa54e03487b68f_2022_12_23_17_37_40 +热更文件的工程对应的提交信息: +commit 9b72d4d9488856a39f70f0c61caa54e03487b68f +Merge: da5316e20b 030254afe4 +Author: wangzhenxing +Date: Fri Dec 23 16:22:04 2022 +0800 + + Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt +热更大小:10.516742706298828125 +热更文件: +lz4/atlas/harmonyatlas.unity3d +lz4/prefabs/ui/harmony.unity3d +lz4/prefabs/ui/login.unity3d +lz4/prefabs/ui/playerinfoview.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/you_gu/Android/files.unity3d b/Root/you_gu/Android/files.unity3d index d059d7bc1..5c04bf387 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/lz4/atlas/harmonyatlas.unity3d b/Root/you_gu/Android/lz4/atlas/harmonyatlas.unity3d index fe44f8d6b..4f8667f19 100644 Binary files a/Root/you_gu/Android/lz4/atlas/harmonyatlas.unity3d and b/Root/you_gu/Android/lz4/atlas/harmonyatlas.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/harmony.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/harmony.unity3d new file mode 100644 index 000000000..33179f197 Binary files /dev/null and b/Root/you_gu/Android/lz4/prefabs/ui/harmony.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/login.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/login.unity3d index 553f9b7b4..08e637823 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/login.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/login.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/playerinfoview.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/playerinfoview.unity3d index 3d3e00f57..0387b1a38 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/playerinfoview.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/playerinfoview.unity3d differ diff --git a/Root/you_gu/Android/lzma/luabytes.unity3d b/Root/you_gu/Android/lzma/luabytes.unity3d index 94495e136..559929a06 100644 Binary files a/Root/you_gu/Android/lzma/luabytes.unity3d and b/Root/you_gu/Android/lzma/luabytes.unity3d differ diff --git a/Root/you_gu/Android/lzma/resconfigs.unity3d b/Root/you_gu/Android/lzma/resconfigs.unity3d index 81bae65d4..94c7b360b 100644 Binary files a/Root/you_gu/Android/lzma/resconfigs.unity3d and b/Root/you_gu/Android/lzma/resconfigs.unity3d differ