Merge branch 'master' of http://60.1.1.230/jl/JL_HotFix

# Conflicts:
#	Root/mht_china/zf/cdn_caohua/__Download/files.unity3d
#	Root/mht_china/zf/cdn_caohua/__Download/version.txt
#	Root/mht_china/zf/cdn_dongyou/__Download/files.unity3d
#	Root/mht_china/zf/cdn_dongyou/__Download/version.txt
#	Root/mht_china/zf/cdn_mht_zf_quick/__Download/files.unity3d
#	Root/mht_china/zf/cdn_mht_zf_quick/__Download/version.txt
#	Root/mht_china/zf/cdn_mht_zf_release/__Download/files.unity3d
#	Root/mht_china/zf/cdn_mht_zf_release/__Download/version.txt
#	Root/mht_china/zf/cdn_mht_zf_test/__Download/files.unity3d
#	Root/mht_china/zf/cdn_mht_zf_test/__Download/version.txt
#	Root/mht_china/zf/cdn_quick/__Download/files.unity3d
#	Root/mht_china/zf/cdn_quick/__Download/version.txt
#	Root/mht_china/zf/cdn_xipu/__Download/files.unity3d
#	Root/mht_china/zf/cdn_xipu/__Download/version.txt
#	Root/mht_china/zf/cdn_youxin/__Download/files.unity3d
#	Root/mht_china/zf/cdn_youxin/__Download/version.txt

.gitignore

@@ -0,0 +1 @@
+**/__Download/

Root/mht_china/kf/Android/_log/china_test_61bfa0d326250b4a8d25b6ffbd4a0f8f9a842e69_2021_08_28_20_42_04.log

@@ -0,0 +1,224 @@
+热更文件版本：china/test_61bfa0d326250b4a8d25b6ffbd4a0f8f9a842e69_2021_08_28_20_42_04
+热更文件的工程对应的提交信息：
+commit 61bfa0d326250b4a8d25b6ffbd4a0f8f9a842e69
+Author: gaoxin <gaoxin@ljsd.com>
+Date:   Sat Aug 28 20:21:42 2021 +0800
+
+    【尝试升级数数】
+热更大小：79.64910793304443359375
+热更文件：
+files.unity3d
+lz4/updatepanel.unity3d
+lz4/atlas/activityaltas.unity3d
+lz4/atlas/activitygiftatlas.unity3d
+lz4/atlas/adventurealtas.unity3d
+lz4/atlas/adventureatlas.unity3d
+lz4/atlas/aiyuanactivityatlas.unity3d
+lz4/atlas/alienatlas.unity3d
+lz4/atlas/arenaatlas.unity3d
+lz4/atlas/arenatopmatchatlas.unity3d
+lz4/atlas/baibaoshanghuiatlas.unity3d
+lz4/atlas/battleatlas.unity3d
+lz4/atlas/carbonatlas.unity3d
+lz4/atlas/carbonnewatlas.unity3d
+lz4/atlas/chatatlas.unity3d
+lz4/atlas/commonatlas.unity3d
+lz4/atlas/compoundheroatlas.unity3d
+lz4/atlas/createnameatlas.unity3d
+lz4/atlas/dailyrechargeatlas.unity3d
+lz4/atlas/demonslayeratlas.unity3d
+lz4/atlas/diffmonsteratlas.unity3d
+lz4/atlas/diffmonsterpanelatlas.unity3d
+lz4/atlas/dyact_activity3.unity3d
+lz4/atlas/dyact_activity4.unity3d
+lz4/atlas/dyact_activity5.unity3d
+lz4/atlas/dyact_activity8.unity3d
+lz4/atlas/dyact_xiangyaoduobao.unity3d
+lz4/atlas/dynamicacticityatlas.unity3d
+lz4/atlas/dynamicactivityatlas.unity3d
+lz4/atlas/eightdayatlas.unity3d
+lz4/atlas/eightdaygiftatlas.unity3d
+lz4/atlas/elitemonsteratlas.unity3d
+lz4/atlas/expeditionatlas.unity3d
+lz4/atlas/expertatlas.unity3d
+lz4/atlas/fifteendaygiftatlas.unity3d
+lz4/atlas/fightatlas.unity3d
+lz4/atlas/fightlevelatlas.unity3d
+lz4/atlas/findfairyatlas.unity3d
+lz4/atlas/findtreasureatlas.unity3d
+lz4/atlas/firstrechargeatlas.unity3d
+lz4/atlas/floatingviewatlas.unity3d
+lz4/atlas/fogmaskatlas.unity3d
+lz4/atlas/formationatlas.unity3d
+lz4/atlas/fourelement.unity3d
+lz4/atlas/fuxinggaozhao.unity3d
+lz4/atlas/fuxinggaozhaoatlas.unity3d
+lz4/atlas/goodfriendatlas.unity3d
+lz4/atlas/guildatlas.unity3d
+lz4/atlas/harmonyatlas.unity3d
+lz4/atlas/herocompoundreplaceatlas.unity3d
+lz4/atlas/hongmengzhenatlas.unity3d
+lz4/atlas/journeywithwindatlas.unity3d
+lz4/atlas/jumpserver.unity3d
+lz4/atlas/linglongatlas.unity3d
+lz4/atlas/loginatlas.unity3d
+lz4/atlas/mainatlas.unity3d
+lz4/atlas/mapatlas.unity3d
+lz4/atlas/mapchooseatlas.unity3d
+lz4/atlas/mapfightatlas.unity3d
+lz4/atlas/missionatlas.unity3d
+lz4/atlas/monstercampatlas.unity3d
+lz4/atlas/niuqichongtianatlas.unity3d
+lz4/atlas/niuzhuanqiankunatlas.unity3d
+lz4/atlas/onlinerewardatlas.unity3d
+lz4/atlas/operatingatlas.unity3d
+lz4/atlas/pokemonatlas.unity3d
+lz4/atlas/popupatlas.unity3d
+lz4/atlas/practiceatlas.unity3d
+lz4/atlas/prayatlas.unity3d
+lz4/atlas/publicatlas.unity3d
+lz4/atlas/recruitatlas.unity3d
+lz4/atlas/resolveatlas.unity3d
+lz4/atlas/roleinfoatlas.unity3d
+lz4/atlas/secretboxatlas.unity3d
+lz4/atlas/settingatlas.unity3d
+lz4/atlas/settingplayeratlas.unity3d
+lz4/atlas/sevendaycarnivalatlas.unity3d
+lz4/atlas/shopatlas.unity3d
+lz4/atlas/soulprintastrologyatlas.unity3d
+lz4/atlas/soulprintatlas.unity3d
+lz4/atlas/story.unity3d
+lz4/atlas/storyatlas.unity3d
+lz4/atlas/sunroatlas.unity3d
+lz4/atlas/surpriseboxatlas.unity3d
+lz4/atlas/tagatlas.unity3d
+lz4/atlas/tagbuttonatlas.unity3d
+lz4/atlas/taichumijuan.unity3d
+lz4/atlas/tasuilingxiaoatlas.unity3d
+lz4/atlas/tehuishenzhuangatlas.unity3d
+lz4/atlas/tianshumijuanatlas.unity3d
+lz4/atlas/timelimitskinatlas.unity3d
+lz4/atlas/timelimituphero.unity3d
+lz4/atlas/treasurestoreatlas.unity3d
+lz4/atlas/upgradepackageatlas.unity3d
+lz4/atlas/vipatlas.unity3d
+lz4/atlas/workshopatlas.unity3d
+lz4/atlas/xiaoyaoatlas.unity3d
+lz4/atlas/yunyoumanatlas.unity3d
+lz4/atlas/zhizhunjiangshiatlas.unity3d
+lz4/atlas/zhizunhaoliatlas.unity3d
+lz4/effectresskill/effect_chongsheng.unity3d
+lz4/effectresskill/effect_c_0035.unity3d
+lz4/effectresskill/effect_c_jlzz_00060.unity3d
+lz4/effectresskill/effect_c_jpw_0024.unity3d
+lz4/effectresskill/effect_c_mlmm_0054.unity3d
+lz4/effectresskill/effect_c_swk_00015_s1.unity3d
+lz4/effectresskill/effect_c_ym_0052.unity3d
+lz4/effectresskill/effect_ls_04_zhulong.unity3d
+lz4/effectresskill/effect_ls_06_baize.unity3d
+lz4/effectresskill/effect_ls_08_jinwu.unity3d
+lz4/effectresskill/effect_ls_09_jukun.unity3d
+lz4/effectresskill/effect_normal_nezha.unity3d
+lz4/effectresskill/effect_normal_yuhuangdadi.unity3d
+lz4/effectresskill/effect_skill_chiyou.unity3d
+lz4/effectresskill/effect_skill_congheihu.unity3d
+lz4/effectresskill/effect_skill_jinzha.unity3d
+lz4/effectresui/baibaoshanghui.unity3d
+lz4/effectresui/carbons.unity3d
+lz4/effectresui/chenghao_new.unity3d
+lz4/effectresui/chenghao_tasuilingxiao.unity3d
+lz4/effectresui/jiaoxiahuan.unity3d
+lz4/effectresui/linglongbaojing.unity3d
+lz4/effectresui/meirilibao.unity3d
+lz4/effectresui/pokemonegg.unity3d
+lz4/effectresui/pokemonmain.unity3d
+lz4/effectresui/practice.unity3d
+lz4/effectresui/recruit.unity3d
+lz4/effectresui/shejidadian.unity3d
+lz4/effectresui/shop.unity3d
+lz4/effectresui/story.unity3d
+lz4/effectresui/xunbaomizong.unity3d
+lz4/icon/item.unity3d
+lz4/prefabs/effect/aoe/c_daji_0094_skeff_slidesk_screeneff.unity3d
+lz4/prefabs/effect/aoe/c_leizhenzi_0095_skeff_slidesk_screeneff.unity3d
+lz4/prefabs/effect/aoe/c_nezha_0089_slidesk_slidesk_screeneff.unity3d
+lz4/prefabs/effect/aoe/c_yqj_0042_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/aoe/fx_effect_cst_skill03.unity3d
+lz4/prefabs/effect/aoe/s_jieling_lms_3009_skeff_casting_attacked.unity3d
+lz4/prefabs/effect/aoe/s_jieling_sl_3005_skeff_casting_attacked.unity3d
+lz4/prefabs/effect/aoe/s_jieling_tl_3004_skeff_casting_attacked.unity3d
+lz4/prefabs/effect/aoe/s_jieling_zlz_3001_skeff_casting_attacked.unity3d
+lz4/prefabs/effect/buff/fx_ranshao_zong.unity3d
+lz4/prefabs/effect/bullet/c_nezha_0089_tapsk_slidesk_ballistic.unity3d
+lz4/prefabs/effect/bullet/c_wuchen_0106_tapsk_slidesk_ballistic.unity3d
+lz4/prefabs/effect/casting/fx_c_yxz_0057_skill01.unity3d
+lz4/prefabs/effect/casting/s_jieling_dlg_3010_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_fl_3008_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_hg_3002_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_hs_3006_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_jhj_3003_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_lms_3009_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_sl_3005_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/casting/s_jieling_zlz_3001_skeff_casting_screeneff.unity3d
+lz4/prefabs/effect/floating/c_y_0013_skeff_slidesk_debuff.unity3d
+lz4/prefabs/effect/floating/s_jieling_dlg_3010_skeff_casting_buff.unity3d
+lz4/prefabs/effect/floating/s_jieling_fl_3008_skeff_casting_buff_01.unity3d
+lz4/prefabs/effect/floating/s_jieling_hg_3002_skeff_casting_buff.unity3d
+lz4/prefabs/effect/floating/s_jieling_jhj_3003_skeff_casting_buff.unity3d
+lz4/prefabs/effect/floating/s_jieling_lms_3009_skeff_casting_buff01.unity3d
+lz4/prefabs/effect/floating/s_jieling_md_3007_skeff_casting_buff_01.unity3d
+lz4/prefabs/effect/floating/s_jieling_sl_3005_skeff_casting_buff_01.unity3d
+lz4/prefabs/effect/floating/s_jieling_zlz_3001_skeff_casting_buff.unity3d
+lz4/prefabs/effect/hit/c_nezha_0089_tapsk_slidesk_attacked.unity3d
+lz4/prefabs/effect/hit/c_syf_0016_skeff_slidesk_attacked.unity3d
+lz4/prefabs/effect/hit/c_wuchen_0106_tapsk_slidesk_attacked.unity3d
+lz4/prefabs/effect/hit/c_yqj_0042_tapsk_slidesk_attacked.unity3d
+lz4/prefabs/effect/hit/c_ywg_0045_skeff_slidesk_attacked.unity3d
+lz4/prefabs/effect/hit/normal_effect.unity3d
+lz4/prefabs/effect/monster/m_bahy_0017_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_djy_0013_skeff_slide_attacked.unity3d
+lz4/prefabs/effect/monster/m_djy_0013_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_ds_0011_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_hydyg_0001_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_hypd_0003_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_kn_0018_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_sm_0021_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/monster/m_syjm_0026_skeff_tap_doteff.unity3d
+lz4/prefabs/effect/monster/m_xdd_0015_skeff_tap_attacked.unity3d
+lz4/prefabs/effect/skill/change_shouji.unity3d
+lz4/prefabs/effect/skill/c_cy_daoguangjizhong.unity3d
+lz4/prefabs/effect/skill/c_cy_shifalong.unity3d
+lz4/prefabs/effect/skill/c_eh_00035_attack.unity3d
+lz4/prefabs/effect/skill/effect_c_jmm_0006_attack_02.unity3d
+lz4/prefabs/effect/skill/effect_c_nz_00029_t3_attack_02.unity3d
+lz4/prefabs/effect/skill/effect_c_yc_00052_001_02.unity3d
+lz4/prefabs/live2d/live2d_c_0038_02.unity3d
+lz4/prefabs/live2d/live2d_c_0043_02.unity3d
+lz4/prefabs/live2d/live2d_c_sjnn_00012_02.unity3d
+lz4/prefabs/map/ui_map_xunbaoeffect_hit.unity3d
+lz4/prefabs/ui/battle.unity3d
+lz4/prefabs/ui/carbon.unity3d
+lz4/prefabs/ui/expert.unity3d
+lz4/prefabs/ui/fight.unity3d
+lz4/prefabs/ui/fuxinggaozhao.unity3d
+lz4/prefabs/ui/generalpanel.unity3d
+lz4/prefabs/ui/guide.unity3d
+lz4/prefabs/ui/linglong.unity3d
+lz4/prefabs/ui/login.unity3d
+lz4/prefabs/ui/main.unity3d
+lz4/prefabs/ui/map.unity3d
+lz4/prefabs/ui/popup.unity3d
+lz4/prefabs/ui/practice.unity3d
+lz4/prefabs/ui/recruit.unity3d
+lz4/prefabs/ui/shopview.unity3d
+lz4/prefabs/ui/treasurestore.unity3d
+lz4/prefabs/ui/uiroot.unity3d
+lz4/publicartres/materials.unity3d
+lz4/publicartres/models.unity3d
+lz4/publicartres/shaders.unity3d
+lz4/spine/c_0038_02.unity3d
+lz4/spine/c_0043_02.unity3d
+lz4/spine/c_sjnn_00012_02.unity3d
+lzma/luabytes.unity3d
+lzma/resconfigs.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_test_6790df59831c5e7447f52bbfcb0f4970ac6f3b12_2021_08_23_22_28_54.log

@@ -0,0 +1,12 @@
+热更文件版本：china/test_6790df59831c5e7447f52bbfcb0f4970ac6f3b12_2021_08_23_22_28_54
+热更文件的工程对应的提交信息：
+commit 6790df59831c5e7447f52bbfcb0f4970ac6f3b12
+Author: ZhangBiao <b1a0.2han9@gmail.com>
+Date:   Mon Aug 23 20:59:30 2021 +0800
+
+    【送神祠】
+热更大小：7.69909381866455078125
+热更文件：
+lz4/prefabs/ui/login.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_test_6790df59831c5e7447f52bbfcb0f4970ac6f3b12_2021_08_24_11_59_46.log

@@ -0,0 +1,12 @@
+热更文件版本：china/test_6790df59831c5e7447f52bbfcb0f4970ac6f3b12_2021_08_24_11_59_46
+热更文件的工程对应的提交信息：
+commit 6790df59831c5e7447f52bbfcb0f4970ac6f3b12
+Author: ZhangBiao <b1a0.2han9@gmail.com>
+Date:   Mon Aug 23 20:59:30 2021 +0800
+
+    【送神祠】
+热更大小：7.66427135467529296875
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_test_7fc6ee71f0c5fa61731f118957f0342c4daa3802_2021_08_25_15_00_44.log

@@ -0,0 +1,12 @@
+热更文件版本：china/test_7fc6ee71f0c5fa61731f118957f0342c4daa3802_2021_08_25_15_00_44
+热更文件的工程对应的提交信息：
+commit 7fc6ee71f0c5fa61731f118957f0342c4daa3802
+Author: gaoxin <gaoxin@ljsd.com>
+Date:   Wed Aug 25 14:27:08 2021 +0800
+
+    【打开网页】添加打开内置浏览器和外部浏览器的配置，解决老包无法打开网页的问题
+热更大小：7.66495037078857421875
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_test_9744f908a5e57c7ee8e10debe3d0bdde4b3c98ce_2021_08_30_18_32_33.log

@@ -0,0 +1,12 @@
+热更文件版本：china/test_9744f908a5e57c7ee8e10debe3d0bdde4b3c98ce_2021_08_30_18_32_33
+热更文件的工程对应的提交信息：
+commit 9744f908a5e57c7ee8e10debe3d0bdde4b3c98ce
+Author: gaoxin <gaoxin@ljsd.com>
+Date:   Mon Aug 30 18:15:54 2021 +0800
+
+    【数数】修复Android平台下IOS组件找不到的问题
+热更大小：7.67016315460205078125
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_test_cb8589eba61caa52a5cf1b344712fd53610923af_2021_08_31_15_42_56.log

@@ -0,0 +1,12 @@
+热更文件版本：china/test_cb8589eba61caa52a5cf1b344712fd53610923af_2021_08_31_15_42_56
+热更文件的工程对应的提交信息：
+commit cb8589eba61caa52a5cf1b344712fd53610923af
+Author: gaoxin <gaoxin@ljsd.com>
+Date:   Tue Aug 31 15:26:22 2021 +0800
+
+    【包配置】修改专服包的母包功能
+热更大小：7.6709423065185546875
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_xq_4b6bce3b3292919d73e019a9e699d760aad34c5b_2021_09_02_22_31_38.log

@@ -0,0 +1,39 @@
+热更文件版本：china/xq_4b6bce3b3292919d73e019a9e699d760aad34c5b_2021_09_02_22_31_38
+热更文件的工程对应的提交信息：
+commit 4b6bce3b3292919d73e019a9e699d760aad34c5b
+Merge: 03b62b4e44 e35b64be86
+Author: zhangshanxue <zhangshanxue911@gmail.com>
+Date:   Thu Sep 2 20:16:05 2021 +0800
+
+    Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq
+热更大小：24.44347095489501953125
+热更文件：
+lz4/atlas/fourelement.unity3d
+lz4/atlas/monstercampatlas.unity3d
+lz4/atlas/sacredtreeatlas.unity3d
+lz4/atlas/tagbuttonatlas.unity3d
+lz4/bg/r_shouchao_yaoquan.unity3d
+lz4/effectresskill/effect_skill_yangjian.unity3d
+lz4/effectresui/recruit.unity3d
+lz4/effectresui/recruitpanel.unity3d
+lz4/icon/hero.unity3d
+lz4/prefabs/live2d/live2d_c_zn_001.unity3d
+lz4/prefabs/ui/arena.unity3d
+lz4/prefabs/ui/bag.unity3d
+lz4/prefabs/ui/carbon.unity3d
+lz4/prefabs/ui/expedition.unity3d
+lz4/prefabs/ui/fightlevel.unity3d
+lz4/prefabs/ui/generalpanel.unity3d
+lz4/prefabs/ui/itemview.unity3d
+lz4/prefabs/ui/monstercamp.unity3d
+lz4/prefabs/ui/popup.unity3d
+lz4/prefabs/ui/practice.unity3d
+lz4/prefabs/ui/recruit.unity3d
+lz4/prefabs/ui/roleinfo.unity3d
+lz4/prefabs/ui/sacredtree.unity3d
+lz4/prefabs/ui/view.unity3d
+lz4/publicartres/models.unity3d
+lz4/spine/c_zn_001.unity3d
+lzma/luabytes.unity3d
+lzma/resconfigs.unity3d
+files.unity3d

Root/mht_china/kf/Android/_log/china_xq_8c277426e597d3e0f59e5a5bc6dcc131895440ae_2021_09_06_15_19_12.log

@@ -0,0 +1,33 @@
+热更文件版本：china/xq_8c277426e597d3e0f59e5a5bc6dcc131895440ae_2021_09_06_15_19_12
+热更文件的工程对应的提交信息：
+commit 8c277426e597d3e0f59e5a5bc6dcc131895440ae
+Author: zhangshanxue <zhangshanxue911@gmail.com>
+Date:   Mon Sep 6 13:55:12 2021 +0800
+
+    【奖励】修复关闭界面时部分数据未还原
+热更大小：10.55395412445068359375
+热更文件：
+lz4/atlas/practiceatlas.unity3d
+lz4/bg/map/map99/wjfb-99_1.unity3d
+lz4/bg/map/map99/wjfb-99_10.unity3d
+lz4/bg/map/map99/wjfb-99_11.unity3d
+lz4/bg/map/map99/wjfb-99_13.unity3d
+lz4/bg/map/map99/wjfb-99_14.unity3d
+lz4/bg/map/map99/wjfb-99_15.unity3d
+lz4/bg/map/map99/wjfb-99_16.unity3d
+lz4/bg/map/map99/wjfb-99_17.unity3d
+lz4/bg/map/map99/wjfb-99_19.unity3d
+lz4/bg/map/map99/wjfb-99_2.unity3d
+lz4/bg/map/map99/wjfb-99_20.unity3d
+lz4/bg/map/map99/wjfb-99_21.unity3d
+lz4/bg/map/map99/wjfb-99_22.unity3d
+lz4/bg/map/map99/wjfb-99_23.unity3d
+lz4/bg/map/map99/wjfb-99_3.unity3d
+lz4/bg/map/map99/wjfb-99_4.unity3d
+lz4/bg/map/map99/wjfb-99_5.unity3d
+lz4/bg/map/map99/wjfb-99_7.unity3d
+lz4/bg/map/map99/wjfb-99_8.unity3d
+lz4/bg/map/map99/wjfb-99_9.unity3d
+lzma/luabytes.unity3d
+lzma/resconfigs.unity3d
+files.unity3d