diff --git a/Root/lanjing/aiwan/Android/_log/china_zf_test_4a5c7432588f49faebff319462413d067e177fcc_2022_04_25_19_01_50.log b/Root/lanjing/aiwan/Android/_log/china_zf_test_4a5c7432588f49faebff319462413d067e177fcc_2022_04_25_19_01_50.log new file mode 100644 index 000000000..570248d4c --- /dev/null +++ b/Root/lanjing/aiwan/Android/_log/china_zf_test_4a5c7432588f49faebff319462413d067e177fcc_2022_04_25_19_01_50.log @@ -0,0 +1,58 @@ +热更文件版本:china/zf_test_4a5c7432588f49faebff319462413d067e177fcc_2022_04_25_19_01_50 +热更文件的工程对应的提交信息: +commit 4a5c7432588f49faebff319462413d067e177fcc +Merge: f79255e0e6 7de86a79eb +Author: JieLing +Date: Mon Apr 25 13:57:59 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:34.180980682373046875 +热更文件: +files.unity3d +lz4/atlas/activityaltas.unity3d +lz4/atlas/carbonatlas.unity3d +lz4/atlas/carbonnewatlas.unity3d +lz4/atlas/continuepackageatlas.unity3d +lz4/atlas/fightlevelatlas.unity3d +lz4/atlas/formationatlas.unity3d +lz4/atlas/gematlas.unity3d +lz4/atlas/godsoulatlas.unity3d +lz4/atlas/guildatlas.unity3d +lz4/atlas/homelandatlas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/monstercampatlas.unity3d +lz4/atlas/newtipbgaltas.unity3d +lz4/atlas/popupatlas.unity3d +lz4/atlas/powerriceatlas.unity3d +lz4/atlas/publicatlas.unity3d +lz4/atlas/roleinfoatlas.unity3d +lz4/atlas/tagatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/atlas/tehuishenzhuangatlas.unity3d +lz4/atlas/timelimituphero.unity3d +lz4/atlas/vipatlas.unity3d +lz4/dynamicatlas/l_lishoutehui_xiamudi.unity3d +lz4/dynamicatlas/artfont/r_richang_banner_huihe_zh.unity3d +lz4/dynamicatlas/artfont/r_richang_banner_shanghai_zh.unity3d +lz4/dynamicatlas/commonatlas/r_liaotian_di_001.unity3d +lz4/dynamicatlas/commonatlas/r_liaotian_di_002.unity3d +lz4/icon/item.unity3d +lz4/icon/linshiskill.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/changeheropro.unity3d +lz4/prefabs/ui/chat.unity3d +lz4/prefabs/ui/compoundhero.unity3d +lz4/prefabs/ui/formation.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/godprint.unity3d +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/likability.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/tianshumijuan.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/aiwan/Android/files.unity3d b/Root/lanjing/aiwan/Android/files.unity3d index d8f236203..14fdf55c4 100644 Binary files a/Root/lanjing/aiwan/Android/files.unity3d and b/Root/lanjing/aiwan/Android/files.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/activityaltas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/activityaltas.unity3d new file mode 100644 index 000000000..2341f31c2 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/activityaltas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/carbonatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/carbonatlas.unity3d new file mode 100644 index 000000000..0fb887308 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/carbonatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/carbonnewatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/carbonnewatlas.unity3d new file mode 100644 index 000000000..53b7f7003 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/carbonnewatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/continuepackageatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/continuepackageatlas.unity3d new file mode 100644 index 000000000..8a2ddb72f Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/continuepackageatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/fightlevelatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/fightlevelatlas.unity3d new file mode 100644 index 000000000..2c7d58607 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/fightlevelatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/formationatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/formationatlas.unity3d new file mode 100644 index 000000000..b00650e52 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/formationatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/gematlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/gematlas.unity3d new file mode 100644 index 000000000..a7e6bbff1 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/gematlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/godsoulatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/godsoulatlas.unity3d new file mode 100644 index 000000000..bffda3670 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/godsoulatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/guildatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/guildatlas.unity3d new file mode 100644 index 000000000..15d260bd5 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/guildatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/homelandatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/homelandatlas.unity3d new file mode 100644 index 000000000..e2240a233 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/homelandatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d new file mode 100644 index 000000000..bda2b4f94 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/mainatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/monstercampatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/monstercampatlas.unity3d new file mode 100644 index 000000000..bb8db7895 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/monstercampatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/newtipbgaltas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/newtipbgaltas.unity3d new file mode 100644 index 000000000..89a002ab5 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/newtipbgaltas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/popupatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/popupatlas.unity3d new file mode 100644 index 000000000..7fb98a379 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/popupatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/powerriceatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/powerriceatlas.unity3d new file mode 100644 index 000000000..ccd63121f Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/powerriceatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/publicatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/publicatlas.unity3d new file mode 100644 index 000000000..353551b8f Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/publicatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/roleinfoatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/roleinfoatlas.unity3d new file mode 100644 index 000000000..ca23d52c8 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/roleinfoatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/tagatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/tagatlas.unity3d new file mode 100644 index 000000000..cd02521dd Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/tagatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/tagbuttonatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/tagbuttonatlas.unity3d new file mode 100644 index 000000000..f454e7d22 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/tagbuttonatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/tehuishenzhuangatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/tehuishenzhuangatlas.unity3d new file mode 100644 index 000000000..0051a6899 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/tehuishenzhuangatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/timelimituphero.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/timelimituphero.unity3d new file mode 100644 index 000000000..d16293771 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/timelimituphero.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/atlas/vipatlas.unity3d b/Root/lanjing/aiwan/Android/lz4/atlas/vipatlas.unity3d new file mode 100644 index 000000000..9fb0d79e3 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/atlas/vipatlas.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/dynamicatlas/artfont/r_richang_banner_huihe_zh.unity3d b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/artfont/r_richang_banner_huihe_zh.unity3d new file mode 100644 index 000000000..5be1a917a Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/artfont/r_richang_banner_huihe_zh.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/dynamicatlas/artfont/r_richang_banner_shanghai_zh.unity3d b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/artfont/r_richang_banner_shanghai_zh.unity3d new file mode 100644 index 000000000..757d85103 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/artfont/r_richang_banner_shanghai_zh.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/dynamicatlas/commonatlas/r_liaotian_di_001.unity3d b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/commonatlas/r_liaotian_di_001.unity3d new file mode 100644 index 000000000..35ac5bdae Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/commonatlas/r_liaotian_di_001.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/dynamicatlas/commonatlas/r_liaotian_di_002.unity3d b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/commonatlas/r_liaotian_di_002.unity3d new file mode 100644 index 000000000..feaf3e10c Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/commonatlas/r_liaotian_di_002.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/dynamicatlas/l_lishoutehui_xiamudi.unity3d b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/l_lishoutehui_xiamudi.unity3d new file mode 100644 index 000000000..e80b7abd8 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/dynamicatlas/l_lishoutehui_xiamudi.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d b/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d new file mode 100644 index 000000000..aff07bda5 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/icon/item.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/icon/linshiskill.unity3d b/Root/lanjing/aiwan/Android/lz4/icon/linshiskill.unity3d new file mode 100644 index 000000000..db86b541c Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/icon/linshiskill.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d new file mode 100644 index 000000000..dc6c31d59 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d index d2429e1bd..47d10661c 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/changeheropro.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/changeheropro.unity3d new file mode 100644 index 000000000..78a467df1 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/changeheropro.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/chat.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/chat.unity3d new file mode 100644 index 000000000..4a1c590be Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/chat.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compoundhero.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compoundhero.unity3d new file mode 100644 index 000000000..7afb973ed Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/compoundhero.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/formation.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/formation.unity3d new file mode 100644 index 000000000..8af47157b Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/formation.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d index 7454e24ae..a3e702200 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/godprint.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/godprint.unity3d new file mode 100644 index 000000000..08259408c Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/godprint.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/handbook.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/handbook.unity3d new file mode 100644 index 000000000..e67a5a267 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/likability.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/likability.unity3d new file mode 100644 index 000000000..0171e8b03 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/likability.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/newactivity.unity3d new file mode 100644 index 000000000..8fed64b26 Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d index 05168cc1a..4c92d87f8 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/practice.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/practice.unity3d index 00c7203f5..aee3a3a11 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/practice.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d index a18a1db8a..84d4e4bf2 100644 Binary files a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lz4/prefabs/ui/tianshumijuan.unity3d b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/tianshumijuan.unity3d new file mode 100644 index 000000000..ab284ed7b Binary files /dev/null and b/Root/lanjing/aiwan/Android/lz4/prefabs/ui/tianshumijuan.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d index d43ca0e31..4bd64d75d 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d and b/Root/lanjing/aiwan/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d index b236e40be..0398950ec 100644 Binary files a/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d and b/Root/lanjing/aiwan/Android/lzma/resconfigs.unity3d differ