diff --git a/Root/mht_china/zf/IOS/_log/china_ios_ff9d4239a45028a2ed17b1334911d1e48be30799_2021_08_28_20_19_08.log b/Root/mht_china/zf/IOS/_log/china_ios_ff9d4239a45028a2ed17b1334911d1e48be30799_2021_08_28_20_19_08.log new file mode 100644 index 000000000..38ca45b8e --- /dev/null +++ b/Root/mht_china/zf/IOS/_log/china_ios_ff9d4239a45028a2ed17b1334911d1e48be30799_2021_08_28_20_19_08.log @@ -0,0 +1,48 @@ +热更文件版本:china/ios_ff9d4239a45028a2ed17b1334911d1e48be30799_2021_08_28_20_19_08 +热更文件的工程对应的提交信息: +commit ff9d4239a45028a2ed17b1334911d1e48be30799 +Merge: 3ac37b6c87 859ed5fe0b +Author: JLIOSM1 <774727341@qq.com> +Date: Sat Aug 28 19:47:28 2021 +0800 + + Merge commit '859ed5fe0b5d1b2f9ed5429dfea12ac598e2be6f' into china/ios +热更大小:35.2449398040771484375 +热更文件: +files.unity3d +lz4_atlas_loginatlas.unity3d +lz4_effectresskill_effect_c_0035.unity3d +lz4_effectresskill_effect_c_jpw_0024.unity3d +lz4_effectresskill_effect_c_swk_00015_s1.unity3d +lz4_effectresskill_effect_chongsheng.unity3d +lz4_effectresskill_effect_ls_04_zhulong.unity3d +lz4_effectresskill_effect_ls_06_baize.unity3d +lz4_effectresskill_effect_skill_chiyou.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_linglongbaojing.unity3d +lz4_effectresui_pokemonmain.unity3d +lz4_effectresui_practice.unity3d +lz4_effectresui_shejidadian.unity3d +lz4_effectresui_shop.unity3d +lz4_effectresui_story.unity3d +lz4_effectresui_xunbaomizong.unity3d +lz4_prefabs_effect_buff_fx_ranshao_zong.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_ui_carbon.unity3d +lz4_prefabs_ui_linglong.unity3d +lz4_prefabs_ui_login.unity3d +lz4_prefabs_ui_popup.unity3d +lz4_prefabs_ui_shopview.unity3d +lz4_publicartres_materials.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 diff --git a/Root/mht_china/zf/IOS/files.unity3d b/Root/mht_china/zf/IOS/files.unity3d index 121b612e8..b501b7865 100644 Binary files a/Root/mht_china/zf/IOS/files.unity3d and b/Root/mht_china/zf/IOS/files.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_atlas_loginatlas.unity3d b/Root/mht_china/zf/IOS/lz4_atlas_loginatlas.unity3d index e93c0a0a8..8279770a6 100644 Binary files a/Root/mht_china/zf/IOS/lz4_atlas_loginatlas.unity3d and b/Root/mht_china/zf/IOS/lz4_atlas_loginatlas.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_0035.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_0035.unity3d index f74de6248..1e06855e4 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_0035.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_0035.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_jpw_0024.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_jpw_0024.unity3d index 15498a410..8a9894ce4 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_jpw_0024.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_jpw_0024.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_swk_00015_s1.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_swk_00015_s1.unity3d index 3b5ece7be..42ad22a19 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_swk_00015_s1.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_c_swk_00015_s1.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_chongsheng.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_chongsheng.unity3d new file mode 100644 index 000000000..7e48a3270 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_chongsheng.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_04_zhulong.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_04_zhulong.unity3d index 58232d7eb..140b83a5d 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_04_zhulong.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_04_zhulong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_06_baize.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_06_baize.unity3d index b6673938d..b318587f1 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_06_baize.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_ls_06_baize.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_chiyou.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_chiyou.unity3d index 65e6b6a35..5de1fe369 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_chiyou.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_chiyou.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_jinzha.unity3d b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_jinzha.unity3d index acc79f573..847088eda 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_jinzha.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresskill_effect_skill_jinzha.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d index 8e01a7539..ed3544c8a 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_baibaoshanghui.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d index e9c647398..28c03307b 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_carbons.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_new.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_new.unity3d index 1e531b9ad..73334d17b 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_new.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_new.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_tasuilingxiao.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_tasuilingxiao.unity3d index 4b9e16afe..7fc3c4284 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_tasuilingxiao.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_chenghao_tasuilingxiao.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_linglongbaojing.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_linglongbaojing.unity3d index b11301c49..4a96bc386 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_linglongbaojing.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_linglongbaojing.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_pokemonmain.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_pokemonmain.unity3d index 3bf73d4ce..db0f2eccd 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_pokemonmain.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_pokemonmain.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_practice.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_practice.unity3d index 2a29ea1dc..82a975157 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_practice.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_practice.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_shejidadian.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_shejidadian.unity3d index f6e028d08..4d5f518cd 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_shejidadian.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_shejidadian.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_shop.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_shop.unity3d index 285ee5724..91493759d 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_shop.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_shop.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_story.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_story.unity3d index 3ad8ce38e..9f23938f1 100644 Binary files a/Root/mht_china/zf/IOS/lz4_effectresui_story.unity3d and b/Root/mht_china/zf/IOS/lz4_effectresui_story.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d b/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d new file mode 100644 index 000000000..af7666a02 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_effectresui_xunbaomizong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_effect_buff_fx_ranshao_zong.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_effect_buff_fx_ranshao_zong.unity3d new file mode 100644 index 000000000..938b44e72 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_effect_buff_fx_ranshao_zong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_0038_02.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_0038_02.unity3d new file mode 100644 index 000000000..0ec3b46d3 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_0038_02.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_0043_02.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_0043_02.unity3d new file mode 100644 index 000000000..49d422058 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_0043_02.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_sjnn_00012_02.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_sjnn_00012_02.unity3d new file mode 100644 index 000000000..96331a8a4 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_prefabs_live2d_live2d_c_sjnn_00012_02.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d index 88200ae6a..47aa4dda8 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_carbon.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_linglong.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_linglong.unity3d index 10e97df0c..1f7c7f358 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_linglong.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_linglong.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d index e0a29d76f..b692760f9 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_login.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d index bf7db9c21..414787e25 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_popup.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d b/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d index 0ec5c8354..29b454804 100644 Binary files a/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d and b/Root/mht_china/zf/IOS/lz4_prefabs_ui_shopview.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_publicartres_materials.unity3d b/Root/mht_china/zf/IOS/lz4_publicartres_materials.unity3d index bd694edbc..38c21be7d 100644 Binary files a/Root/mht_china/zf/IOS/lz4_publicartres_materials.unity3d and b/Root/mht_china/zf/IOS/lz4_publicartres_materials.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d b/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d index a88cede7a..24ed6c19a 100644 Binary files a/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d and b/Root/mht_china/zf/IOS/lz4_publicartres_shaders.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_spine_c_0038_02.unity3d b/Root/mht_china/zf/IOS/lz4_spine_c_0038_02.unity3d new file mode 100644 index 000000000..878bfd455 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_spine_c_0038_02.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_spine_c_0043_02.unity3d b/Root/mht_china/zf/IOS/lz4_spine_c_0043_02.unity3d new file mode 100644 index 000000000..4ecc906ee Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_spine_c_0043_02.unity3d differ diff --git a/Root/mht_china/zf/IOS/lz4_spine_c_sjnn_00012_02.unity3d b/Root/mht_china/zf/IOS/lz4_spine_c_sjnn_00012_02.unity3d new file mode 100644 index 000000000..dd499ed13 Binary files /dev/null and b/Root/mht_china/zf/IOS/lz4_spine_c_sjnn_00012_02.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d index 61fdcd94b..8bb52deac 100644 Binary files a/Root/mht_china/zf/IOS/lzma_luabytes.unity3d and b/Root/mht_china/zf/IOS/lzma_luabytes.unity3d differ diff --git a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d index 8da5fce74..e3f27fa48 100644 Binary files a/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d and b/Root/mht_china/zf/IOS/lzma_resconfigs.unity3d differ