diff --git a/Root/mht_china/zf/Android/_log/china_zf_test_a98eea6c3400aaf5e328d15092199111d3b675d0_2021_08_24_15_56_53.log b/Root/mht_china/zf/Android/_log/china_zf_test_a98eea6c3400aaf5e328d15092199111d3b675d0_2021_08_24_15_56_53.log new file mode 100644 index 000000000..21b2b88a4 --- /dev/null +++ b/Root/mht_china/zf/Android/_log/china_zf_test_a98eea6c3400aaf5e328d15092199111d3b675d0_2021_08_24_15_56_53.log @@ -0,0 +1,33 @@ +热更文件版本:china/zf_test_a98eea6c3400aaf5e328d15092199111d3b675d0_2021_08_24_15_56_53 +热更文件的工程对应的提交信息: +commit a98eea6c3400aaf5e328d15092199111d3b675d0 +Merge: 4aa0a17a7b 8500ce94ff +Author: JieLing +Date: Tue Aug 24 15:36:04 2021 +0800 + + Merge remote-tracking branch 'origin/china/test' into china/zf_test +热更大小:21.728145599365234375 +热更文件: +lz4/atlas/recruitatlas.unity3d +lz4/atlas/taichumijuan.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/dynamicacticity.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/harmony.unity3d +lz4/prefabs/ui/login.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/zf/Android/files.unity3d b/Root/mht_china/zf/Android/files.unity3d index 5484b087d..be016389b 100644 Binary files a/Root/mht_china/zf/Android/files.unity3d and b/Root/mht_china/zf/Android/files.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d b/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d index 33e20038d..07209d656 100644 Binary files a/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d and b/Root/mht_china/zf/Android/lz4/atlas/recruitatlas.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/atlas/taichumijuan.unity3d b/Root/mht_china/zf/Android/lz4/atlas/taichumijuan.unity3d new file mode 100644 index 000000000..2c105631d Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/atlas/taichumijuan.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/dynamicatlas/commonatlas/artfont/t_taichumijuan_zhujiemiananniu.unity3d b/Root/mht_china/zf/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/zf/Android/lz4/dynamicatlas/commonatlas/artfont/t_taichumijuan_zhujiemiananniu.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d index f18caa377..8651f79d0 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/baibaoshanghui.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d index d1532bf42..8193c8c7d 100644 Binary files a/Root/mht_china/zf/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d and b/Root/mht_china/zf/Android/lz4/effectresui/chenghao_tasuilingxiao.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/effectresui/recruit.unity3d b/Root/mht_china/zf/Android/lz4/effectresui/recruit.unity3d new file mode 100644 index 000000000..2293ca623 Binary files /dev/null and b/Root/mht_china/zf/Android/lz4/effectresui/recruit.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/icon/item.unity3d b/Root/mht_china/zf/Android/lz4/icon/item.unity3d index 605fca9c8..3f0679faa 100644 Binary files a/Root/mht_china/zf/Android/lz4/icon/item.unity3d and b/Root/mht_china/zf/Android/lz4/icon/item.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d index 1305babf7..91e6d8f59 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 670beeb33..aef83a94d 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d index 1ea615f13..eca9e9f55 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d index 0f27bb9e0..a4761247f 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/harmony.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/harmony.unity3d index 2e866deac..23ac1a2a7 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/harmony.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/harmony.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/login.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/login.unity3d index c941acc32..da24c7bf5 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/login.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/login.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d index 1c692f281..f2302cc6b 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d index 871cef88b..bf77162d3 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/pokemon.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d index 6d7163611..08e1cb918 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d index bffbd188f..9f4240b00 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/recruit.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d index 4157f2a1b..2147c6b8c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d b/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d index 05a1be38c..82e32bc0c 100644 Binary files a/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d and b/Root/mht_china/zf/Android/lz4/prefabs/ui/treasurestore.unity3d differ diff --git a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d index c7472af64..04311b783 100644 Binary files a/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d and b/Root/mht_china/zf/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/luabytes.unity3d b/Root/mht_china/zf/Android/lzma/luabytes.unity3d index 940efc748..fefdd84cb 100644 Binary files a/Root/mht_china/zf/Android/lzma/luabytes.unity3d and b/Root/mht_china/zf/Android/lzma/luabytes.unity3d differ diff --git a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d index bcd422e0d..dc0510f1c 100644 Binary files a/Root/mht_china/zf/Android/lzma/resconfigs.unity3d and b/Root/mht_china/zf/Android/lzma/resconfigs.unity3d differ diff --git a/Root/mht_china/zf/cdn_mht_zf_test/__Download/files.unity3d b/Root/mht_china/zf/cdn_mht_zf_test/__Download/files.unity3d index f687b2300..5484b087d 100644 Binary files a/Root/mht_china/zf/cdn_mht_zf_test/__Download/files.unity3d and b/Root/mht_china/zf/cdn_mht_zf_test/__Download/files.unity3d differ diff --git a/Root/mht_china/zf/cdn_mht_zf_test/__Download/version.txt b/Root/mht_china/zf/cdn_mht_zf_test/__Download/version.txt index 84422a811..d3adf5eef 100644 --- a/Root/mht_china/zf/cdn_mht_zf_test/__Download/version.txt +++ b/Root/mht_china/zf/cdn_mht_zf_test/__Download/version.txt @@ -1 +1 @@ -{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_test/","packageVersion":"0.1","version":"0.1.34","serverUrl":"http://106.52.216.131:8080/"} \ No newline at end of file +{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_test/","packageVersion":"0.1","version":"0.1.35","serverUrl":"http://106.52.216.131:8080/"} \ No newline at end of file diff --git a/Root/mht_china/zf/cdn_mht_zf_test/__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34.log b/Root/mht_china/zf/cdn_mht_zf_test/__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34.log new file mode 100644 index 000000000..233630022 --- /dev/null +++ b/Root/mht_china/zf/cdn_mht_zf_test/__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34.log @@ -0,0 +1,23 @@ +lz4/atlas/recruitatlas.unity3d +lz4/atlas/taichumijuan.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/dynamicacticity.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/harmony.unity3d +lz4/prefabs/ui/login.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/zf/cdn_mht_zf_test/__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34_UpLoad.log b/Root/mht_china/zf/cdn_mht_zf_test/__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34_UpLoad.log new file mode 100644 index 000000000..38ffc8d23 --- /dev/null +++ b/Root/mht_china/zf/cdn_mht_zf_test/__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34_UpLoad.log @@ -0,0 +1,31 @@ +热更文件版本:mht_china/zf_cdn_mht_zf_test_2021_08_24_15_57_34 +热更版本号:0.1.36 +热更大小:21.728145599365234375 +热更文件: +lz4/atlas/recruitatlas.unity3d +lz4/atlas/taichumijuan.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/dynamicacticity.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/harmony.unity3d +lz4/prefabs/ui/login.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 +CDN TYPE: cos +TOOLS DIR: E:/HotFix/Tools/cos +UPLOAD COMMAND: python UpLoad.py E:/HotFix/Root/mht_china/zf cdn_mht_zf_test mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34>>E:/HotFix/Root/mht_china/zf/cdn_mht_zf_test//__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34_UpLoad.log +Flush COMMAND: python Flush.py http://jl.tyu89.wang/mht_china/mht_zf_test/>>E:/HotFix/Root/mht_china/zf/cdn_mht_zf_test//__HotFixLog/mht_china_zf_cdn_mht_zf_test_2021_08_24_15_57_34_UpLoad.log diff --git a/Root/mht_china/zf/cdn_mht_zf_test/version.txt b/Root/mht_china/zf/cdn_mht_zf_test/version.txt index d3adf5eef..ec62546ee 100644 --- a/Root/mht_china/zf/cdn_mht_zf_test/version.txt +++ b/Root/mht_china/zf/cdn_mht_zf_test/version.txt @@ -1 +1 @@ -{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_test/","packageVersion":"0.1","version":"0.1.35","serverUrl":"http://106.52.216.131:8080/"} \ No newline at end of file +{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_test/","packageVersion":"0.1","version":"0.1.36","serverUrl":"http://106.52.216.131:8080/"} \ No newline at end of file