diff --git a/Root/lanjing/fengti/Android/_log/china_zf_test_6357501d32a8bef91b7c8a299f23934ad8abd315_2022_06_13_15_03_52.log b/Root/lanjing/fengti/Android/_log/china_zf_test_6357501d32a8bef91b7c8a299f23934ad8abd315_2022_06_13_15_03_52.log new file mode 100644 index 000000000..d4d25aeea --- /dev/null +++ b/Root/lanjing/fengti/Android/_log/china_zf_test_6357501d32a8bef91b7c8a299f23934ad8abd315_2022_06_13_15_03_52.log @@ -0,0 +1,41 @@ +热更文件版本:china/zf_test_6357501d32a8bef91b7c8a299f23934ad8abd315_2022_06_13_15_03_52 +热更文件的工程对应的提交信息: +commit 6357501d32a8bef91b7c8a299f23934ad8abd315 +Merge: 773b5e51b2 9d0ae084f6 +Author: JieLing +Date: Fri Jun 10 17:14:06 2022 +0800 + + Merge branch 'china/test' into china/zf_test +热更大小:25.59294891357421875 +热更文件: +lz4/icons.unity3d +lz4/bg/ui/monthcard/m_putongyueka_tag.unity3d +lz4/bg/ui/monthcard/m_zhouka_bg.unity3d +lz4/bg/ui/monthcard/m_zhouka_img.unity3d +lz4/bg/ui/monthcard/m_zhouka_shuangbei.unity3d +lz4/bg/ui/monthcard/m_zhouka_sign.unity3d +lz4/bg/ui/monthcard/m_zhouka_tag.unity3d +lz4/bg/ui/monthcard/y_20400.unity3d +lz4/bg/ui/monthcard/y_9000.unity3d +lz4/bg/ui/monthcard/y_btn_an.unity3d +lz4/bg/ui/monthcard/y_btn_liang.unity3d +lz4/bg/ui/monthcard/y_ditu_03.unity3d +lz4/bg/ui/monthcard/y_haohuayueka_bg.unity3d +lz4/bg/ui/monthcard/y_haohuayueka_img.unity3d +lz4/bg/ui/monthcard/y_haohuayueka_tag.unity3d +lz4/bg/ui/monthcard/y_hong_di.unity3d +lz4/bg/ui/monthcard/y_hong_zuoxiajiao_di.unity3d +lz4/bg/ui/monthcard/y_huang_di.unity3d +lz4/bg/ui/monthcard/y_huang_fanhuan_di.unity3d +lz4/bg/ui/monthcard/y_huang_zuoxiajiao_di.unity3d +lz4/bg/ui/monthcard/y_putongyueka_bg.unity3d +lz4/bg/ui/monthcard/y_putongyueka_img.unity3d +lz4/bg/ui/monthcard/y_zi_di.unity3d +lz4/bg/ui/monthcard/y_zi_zuoxiajiao_di.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/homeland.unity3d +lz4/prefabs/ui/monthcardpageview.unity3d +lz4/prefabs/ui/operating.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/fengti/Android/files.unity3d b/Root/lanjing/fengti/Android/files.unity3d index 790e6e758..c4ee8a8c0 100644 Binary files a/Root/lanjing/fengti/Android/files.unity3d and b/Root/lanjing/fengti/Android/files.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_putongyueka_tag.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_putongyueka_tag.unity3d new file mode 100644 index 000000000..80826a0e4 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_putongyueka_tag.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_bg.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_bg.unity3d new file mode 100644 index 000000000..84cfad993 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_bg.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_img.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_img.unity3d new file mode 100644 index 000000000..7af0bf1cf Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_img.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_shuangbei.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_shuangbei.unity3d new file mode 100644 index 000000000..c4ebcab38 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_shuangbei.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_sign.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_sign.unity3d new file mode 100644 index 000000000..a6d487eb3 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_sign.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_tag.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_tag.unity3d new file mode 100644 index 000000000..debf74834 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/m_zhouka_tag.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_20400.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_20400.unity3d new file mode 100644 index 000000000..aa51d1b48 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_20400.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_9000.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_9000.unity3d new file mode 100644 index 000000000..ee1c3fbe4 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_9000.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_btn_an.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_btn_an.unity3d new file mode 100644 index 000000000..a4ef5561b Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_btn_an.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_btn_liang.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_btn_liang.unity3d new file mode 100644 index 000000000..0259e4903 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_btn_liang.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_ditu_03.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_ditu_03.unity3d new file mode 100644 index 000000000..dae09b4f3 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_ditu_03.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_bg.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_bg.unity3d new file mode 100644 index 000000000..05814eb14 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_bg.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_img.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_img.unity3d new file mode 100644 index 000000000..7333961da Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_img.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_tag.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_tag.unity3d new file mode 100644 index 000000000..71197f4ec Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_haohuayueka_tag.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_hong_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_hong_di.unity3d new file mode 100644 index 000000000..38f07f442 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_hong_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_hong_zuoxiajiao_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_hong_zuoxiajiao_di.unity3d new file mode 100644 index 000000000..cba875ec6 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_hong_zuoxiajiao_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_di.unity3d new file mode 100644 index 000000000..cf4d2a739 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_fanhuan_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_fanhuan_di.unity3d new file mode 100644 index 000000000..58278e0cc Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_fanhuan_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_zuoxiajiao_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_zuoxiajiao_di.unity3d new file mode 100644 index 000000000..d81e72350 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_huang_zuoxiajiao_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_putongyueka_bg.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_putongyueka_bg.unity3d new file mode 100644 index 000000000..ea2d67d6c Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_putongyueka_bg.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_putongyueka_img.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_putongyueka_img.unity3d new file mode 100644 index 000000000..bce622ff4 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_putongyueka_img.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_zi_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_zi_di.unity3d new file mode 100644 index 000000000..f21e79ee2 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_zi_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_zi_zuoxiajiao_di.unity3d b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_zi_zuoxiajiao_di.unity3d new file mode 100644 index 000000000..02ae111a2 Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/bg/ui/monthcard/y_zi_zuoxiajiao_di.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/icons.unity3d b/Root/lanjing/fengti/Android/lz4/icons.unity3d new file mode 100644 index 000000000..509ad66dc Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/icons.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/generalpanel.unity3d index 8e83d535a..f682278d3 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/homeland.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/homeland.unity3d new file mode 100644 index 000000000..4468a326f Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/homeland.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/monthcardpageview.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/monthcardpageview.unity3d index c9799cad2..b7f408b00 100644 Binary files a/Root/lanjing/fengti/Android/lz4/prefabs/ui/monthcardpageview.unity3d and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/monthcardpageview.unity3d differ diff --git a/Root/lanjing/fengti/Android/lz4/prefabs/ui/operating.unity3d b/Root/lanjing/fengti/Android/lz4/prefabs/ui/operating.unity3d new file mode 100644 index 000000000..bf0560fdf Binary files /dev/null and b/Root/lanjing/fengti/Android/lz4/prefabs/ui/operating.unity3d differ diff --git a/Root/lanjing/fengti/Android/lzma/luabytes.unity3d b/Root/lanjing/fengti/Android/lzma/luabytes.unity3d index 49daaeb6d..594d24cc8 100644 Binary files a/Root/lanjing/fengti/Android/lzma/luabytes.unity3d and b/Root/lanjing/fengti/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d b/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d index 575f7209d..204554b66 100644 Binary files a/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d and b/Root/lanjing/fengti/Android/lzma/resconfigs.unity3d differ