diff --git a/Root/lanjing/sw/Android/_log/china_zf_test_1bc267937a5610a86f238eebb583d4d89f37cef8_2022_06_09_10_57_19.log b/Root/lanjing/sw/Android/_log/china_zf_test_1bc267937a5610a86f238eebb583d4d89f37cef8_2022_06_09_10_57_19.log new file mode 100644 index 000000000..649313cb0 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_zf_test_1bc267937a5610a86f238eebb583d4d89f37cef8_2022_06_09_10_57_19.log @@ -0,0 +1,33 @@ +热更文件版本:china/zf_test_1bc267937a5610a86f238eebb583d4d89f37cef8_2022_06_09_10_57_19 +热更文件的工程对应的提交信息: +commit 1bc267937a5610a86f238eebb583d4d89f37cef8 +Merge: aa1bc25396 f6d3a8c0d7 +Author: JieLing +Date: Thu Jun 9 09:59:41 2022 +0800 + + Merge branch 'china/test' into china/zf_test + + # Conflicts: + # Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +热更大小:22.15425872802734375 +热更文件: +lz4/atlas/baibaoshanghuiatlas.unity3d +lz4/atlas/firstrechargeatlas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/shenzun.unity3d +lz4/atlas/zhoukaatlas.unity3d +lz4/bg/artfont/s_zsk_beijin.unity3d +lz4/dynamicatlas/r_hero_di.unity3d +lz4/prefabs/ui/chat.unity3d +lz4/prefabs/ui/cumulativesigninpage.unity3d +lz4/prefabs/ui/firstrecharge.unity3d +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/monthcardpageview.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/xiaoyao.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/sw/Android/files.unity3d b/Root/lanjing/sw/Android/files.unity3d index 098f557e0..f6569598e 100644 Binary files a/Root/lanjing/sw/Android/files.unity3d and b/Root/lanjing/sw/Android/files.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/baibaoshanghuiatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/baibaoshanghuiatlas.unity3d index 8a7acea82..566c37cef 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/baibaoshanghuiatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/baibaoshanghuiatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/firstrechargeatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/firstrechargeatlas.unity3d index 96ba40acd..6aa4713ac 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/firstrechargeatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/firstrechargeatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/mainatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/mainatlas.unity3d index 9df130430..23bb2ded0 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/mainatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/mainatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/shenzun.unity3d b/Root/lanjing/sw/Android/lz4/atlas/shenzun.unity3d index 2d957fcd6..831f3fd03 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/shenzun.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/shenzun.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/zhoukaatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/zhoukaatlas.unity3d new file mode 100644 index 000000000..5d3771d65 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/zhoukaatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/bg/artfont/s_zsk_beijin.unity3d b/Root/lanjing/sw/Android/lz4/bg/artfont/s_zsk_beijin.unity3d new file mode 100644 index 000000000..2a58d9b51 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/bg/artfont/s_zsk_beijin.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/dynamicatlas/r_hero_di.unity3d b/Root/lanjing/sw/Android/lz4/dynamicatlas/r_hero_di.unity3d new file mode 100644 index 000000000..a6dd8836b Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/dynamicatlas/r_hero_di.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/chat.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/chat.unity3d index 4a1c590be..aa799a5ce 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/chat.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/chat.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d index e4d1128ce..91c61ff66 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/firstrecharge.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/firstrecharge.unity3d index 68e47470b..62fc0fd14 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/firstrecharge.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/firstrecharge.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d index e67a5a267..f3f95a120 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d index 27ead1015..a05406bb1 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d index 48171435b..c9799cad2 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/monthcardpageview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d index 68a079ea3..fbe72f93c 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d index a4d264bbe..1847171ca 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/recruit.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d index ac7d256a2..36a51f15f 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/xiaoyao.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/xiaoyao.unity3d index e370389e8..96675d20b 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/xiaoyao.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/xiaoyao.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index 208195719..ea1553f6a 100644 Binary files a/Root/lanjing/sw/Android/lzma/luabytes.unity3d and b/Root/lanjing/sw/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d index a56e3e848..575f7209d 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ