diff --git a/Root/mht_china/xq/Android/_log/china_test_2dccecd18549284e056d5dc123a274e8d82bdd12_2021_08_21_19_28_47.log b/Root/mht_china/xq/Android/_log/china_test_2dccecd18549284e056d5dc123a274e8d82bdd12_2021_08_21_19_28_47.log new file mode 100644 index 000000000..9e4ab9d76 --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china_test_2dccecd18549284e056d5dc123a274e8d82bdd12_2021_08_21_19_28_47.log @@ -0,0 +1,44 @@ +热更文件版本:china/test_2dccecd18549284e056d5dc123a274e8d82bdd12_2021_08_21_19_28_47 +热更文件的工程对应的提交信息: +commit 2dccecd18549284e056d5dc123a274e8d82bdd12 +Merge: 00f64578af 259b43f2c6 +Author: zhangshanxue +Date: Sat Aug 21 14:45:17 2021 +0800 + + Merge branch 'china/dev' into china/test + + # Conflicts: + # Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +热更大小:21.8130950927734375 +热更文件: +files.unity3d +lz4/atlas/recruitatlas.unity3d +lz4/atlas/taichumijuan.unity3d +lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d +lz4/audio/skill/skill/audio_normal_effect_02.unity3d +lz4/audio/skill/skill/audio_normal_effect_03.unity3d +lz4/audio/skill/skill/audio_normal_effect_04.unity3d +lz4/audio/skill/skill/audio_normal_effect_05.unity3d +lz4/audio/skill/skill/audio_normal_effect_06.unity3d +lz4/audio/skill/skill/audio_pg_yhdd.unity3d +lz4/dynamicatlas/commonatlas/artfont/t_taichumijuan_zhujiemiananniu.unity3d +lz4/effectresui/baibaoshanghui.unity3d +lz4/effectresui/chenghao_tasuilingxiao.unity3d +lz4/effectresui/recruit.unity3d +lz4/icon/item.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/chat.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/harmony.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/pokemon.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/treasurestore.unity3d +lz4/publicartres/shaders.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/mht_china/xq/Android/files.unity3d b/Root/mht_china/xq/Android/files.unity3d index c4f856dbe..6325dd579 100644 Binary files a/Root/mht_china/xq/Android/files.unity3d and b/Root/mht_china/xq/Android/files.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d index 33e20038d..07209d656 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/recruitatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/taichumijuan.unity3d b/Root/mht_china/xq/Android/lz4/atlas/taichumijuan.unity3d new file mode 100644 index 000000000..2c105631d Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/taichumijuan.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d index 924a7fbff..c086f74d2 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d and b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_02.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_02.unity3d index d7c8f60e1..3066fbc40 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_02.unity3d and b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_02.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_03.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_03.unity3d index 9537ff21b..52a318fc2 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_03.unity3d and b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_03.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_04.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_04.unity3d index ad13ada54..0bb7af31c 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_04.unity3d and b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_04.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_05.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_05.unity3d index 514902fd1..32713c052 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_05.unity3d and b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_05.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_06.unity3d b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_06.unity3d index 80c609283..5fff2b3fc 100644 Binary files a/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_06.unity3d and b/Root/mht_china/xq/Android/lz4/audio/skill/skill/audio_normal_effect_06.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/dynamicatlas/commonatlas/artfont/t_taichumijuan_zhujiemiananniu.unity3d b/Root/mht_china/xq/Android/lz4/dynamicatlas/commonatlas/artfont/t_taichumijuan_zhujiemiananniu.unity3d new file mode 100644 index 000000000..8e1be0893 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/dynamicatlas/commonatlas/artfont/t_taichumijuan_zhujiemiananniu.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/baibaoshanghui.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/baibaoshanghui.unity3d index f18caa377..8651f79d0 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/baibaoshanghui.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/baibaoshanghui.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d index d1532bf42..8193c8c7d 100644 Binary files a/Root/mht_china/xq/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d and b/Root/mht_china/xq/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/recruit.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/recruit.unity3d new file mode 100644 index 000000000..2293ca623 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresui/recruit.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/icon/item.unity3d b/Root/mht_china/xq/Android/lz4/icon/item.unity3d index 605fca9c8..b47166f0e 100644 Binary files a/Root/mht_china/xq/Android/lz4/icon/item.unity3d and b/Root/mht_china/xq/Android/lz4/icon/item.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d index 1305babf7..91e6d8f59 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/chat.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/chat.unity3d index db6aab122..21004ecaf 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/chat.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/chat.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 677ae18ed..d7d07e385 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d index 1ea615f13..eca9e9f55 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.unity3d index 0f27bb9e0..a4761247f 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/harmony.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/harmony.unity3d index 2e866deac..23ac1a2a7 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/harmony.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/harmony.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d index 1c692f281..f2302cc6b 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d index 871cef88b..bf77162d3 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/pokemon.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d index 6d7163611..08e1cb918 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/recruit.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/recruit.unity3d index bffbd188f..9f4240b00 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/recruit.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d index 4157f2a1b..2147c6b8c 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d index 05a1be38c..82e32bc0c 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/treasurestore.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d b/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d index 04311b783..c7472af64 100644 Binary files a/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d and b/Root/mht_china/xq/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/luabytes.unity3d b/Root/mht_china/xq/Android/lzma/luabytes.unity3d index fd9ec4652..c411204d1 100644 Binary files a/Root/mht_china/xq/Android/lzma/luabytes.unity3d and b/Root/mht_china/xq/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d index f1e926383..1ceae0278 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ