diff --git a/Root/you_gu/Android/_log/dev_one_discount_c40a554361b74e97a3486c1cfcd8a57d23e59126_2024_01_08_11_33_07.log b/Root/you_gu/Android/_log/dev_one_discount_c40a554361b74e97a3486c1cfcd8a57d23e59126_2024_01_08_11_33_07.log new file mode 100644 index 000000000..f8c5a0a0b --- /dev/null +++ b/Root/you_gu/Android/_log/dev_one_discount_c40a554361b74e97a3486c1cfcd8a57d23e59126_2024_01_08_11_33_07.log @@ -0,0 +1,43 @@ +热更文件版本:dev_one_discount_c40a554361b74e97a3486c1cfcd8a57d23e59126_2024_01_08_11_33_07 +热更文件的工程对应的提交信息: +commit c40a554361b74e97a3486c1cfcd8a57d23e59126 +Merge: 2f8f2b264 49bf0b384 +Author: DESKTOP-RH64908\Administrator <1545929779@qq.com> +Date: Tue Sep 26 16:47:03 2023 +0800 + + Merge branch 'dev_oneDis' into dev_one_discount +热更大小:29.97813892364501953125 +热更文件: +lz4/atlas/gmaltas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/roleinfoatlas.unity3d +lz4/atlas/settingplayeratlas.unity3d +lz4/effectresui/chenghao.unity3d +lz4/icon/chenghao.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/expedition.unity3d +lz4/prefabs/ui/findtreasure.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/gmpanel.unity3d +lz4/prefabs/ui/godprint.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/handbook.unity3d +lz4/prefabs/ui/homeland.unity3d +lz4/prefabs/ui/itemview.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/monthcardpageview.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/rechargeview.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/rewardbox.unity3d +lz4/prefabs/ui/rolegift.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/soulprint.unity3d +lz4/prefabs/ui/stargridview.unity3d +lz4/prefabs/ui/tailsmansoulview.unity3d +lz4/publicartres/models.unity3d +lz4/spine/zq_niu.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/you_gu/Android/files.unity3d b/Root/you_gu/Android/files.unity3d index 92bbf2d58..41b1cc15a 100644 Binary files a/Root/you_gu/Android/files.unity3d and b/Root/you_gu/Android/files.unity3d differ diff --git a/Root/you_gu/Android/lz4/atlas/gmaltas.unity3d b/Root/you_gu/Android/lz4/atlas/gmaltas.unity3d index acf120983..207f01339 100644 Binary files a/Root/you_gu/Android/lz4/atlas/gmaltas.unity3d and b/Root/you_gu/Android/lz4/atlas/gmaltas.unity3d differ diff --git a/Root/you_gu/Android/lz4/atlas/mainatlas.unity3d b/Root/you_gu/Android/lz4/atlas/mainatlas.unity3d index 85bc34b40..c28d70021 100644 Binary files a/Root/you_gu/Android/lz4/atlas/mainatlas.unity3d and b/Root/you_gu/Android/lz4/atlas/mainatlas.unity3d differ diff --git a/Root/you_gu/Android/lz4/atlas/roleinfoatlas.unity3d b/Root/you_gu/Android/lz4/atlas/roleinfoatlas.unity3d index 93b4d6dcd..8f6ce783e 100644 Binary files a/Root/you_gu/Android/lz4/atlas/roleinfoatlas.unity3d and b/Root/you_gu/Android/lz4/atlas/roleinfoatlas.unity3d differ diff --git a/Root/you_gu/Android/lz4/atlas/settingplayeratlas.unity3d b/Root/you_gu/Android/lz4/atlas/settingplayeratlas.unity3d index 38fc79218..2e51e31f9 100644 Binary files a/Root/you_gu/Android/lz4/atlas/settingplayeratlas.unity3d and b/Root/you_gu/Android/lz4/atlas/settingplayeratlas.unity3d differ diff --git a/Root/you_gu/Android/lz4/effectresui/chenghao.unity3d b/Root/you_gu/Android/lz4/effectresui/chenghao.unity3d index 3774e67c1..3a346fd01 100644 Binary files a/Root/you_gu/Android/lz4/effectresui/chenghao.unity3d and b/Root/you_gu/Android/lz4/effectresui/chenghao.unity3d differ diff --git a/Root/you_gu/Android/lz4/icon/chenghao.unity3d b/Root/you_gu/Android/lz4/icon/chenghao.unity3d index 20292f070..de4c7b6a2 100644 Binary files a/Root/you_gu/Android/lz4/icon/chenghao.unity3d and b/Root/you_gu/Android/lz4/icon/chenghao.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/bag.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/bag.unity3d index 70f8ccdce..4e2f12a8a 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/bag.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/carbon.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/carbon.unity3d index 049e1243d..68eedd56a 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/expedition.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/expedition.unity3d index 69e7ddf85..02a43ba72 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/expedition.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/expedition.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/findtreasure.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/findtreasure.unity3d index 655850cfc..733f07094 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/findtreasure.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/findtreasure.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/generalpanel.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/generalpanel.unity3d index 9ad6a4513..a2c1be31c 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/generalpanel.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/generalpanel.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/gmpanel.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/gmpanel.unity3d index 305847c0b..4e1d28de3 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/gmpanel.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/gmpanel.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/godprint.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/godprint.unity3d index 4642df357..078546306 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/godprint.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/godprint.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/guild.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/guild.unity3d index 725953872..25b96747a 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/guild.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/handbook.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/handbook.unity3d index 6d62bd703..cd2f09a0d 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/handbook.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/handbook.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/homeland.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/homeland.unity3d index aa94b18e7..4468a326f 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/homeland.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/homeland.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/itemview.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/itemview.unity3d index c1188f591..b8d865e0e 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/itemview.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/itemview.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/main.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/main.unity3d index fed20a8e7..a2302b622 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/main.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/monthcardpageview.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/monthcardpageview.unity3d index 2c4044a43..2a5e1554f 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/monthcardpageview.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/monthcardpageview.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/popup.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/popup.unity3d index 060abb41d..93382dabc 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/popup.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/rechargeview.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/rechargeview.unity3d index 55b458a54..eeef4ef34 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/rechargeview.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/rechargeview.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/recruit.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/recruit.unity3d index 12d6b3aac..1b76dfbb3 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/recruit.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/recruit.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/rewardbox.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/rewardbox.unity3d index 25da017b8..40a33cc19 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/rewardbox.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/rewardbox.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/rolegift.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/rolegift.unity3d index 109c54796..6d5f4b893 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/rolegift.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/rolegift.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/roleinfo.unity3d index 87e12437c..52b71ef29 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/soulprint.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/soulprint.unity3d index 64559da23..8b7319c6e 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/soulprint.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/soulprint.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/stargridview.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/stargridview.unity3d index 9a12d0699..e625e8bef 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/stargridview.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/stargridview.unity3d differ diff --git a/Root/you_gu/Android/lz4/prefabs/ui/tailsmansoulview.unity3d b/Root/you_gu/Android/lz4/prefabs/ui/tailsmansoulview.unity3d index 9f766b324..266ac91e4 100644 Binary files a/Root/you_gu/Android/lz4/prefabs/ui/tailsmansoulview.unity3d and b/Root/you_gu/Android/lz4/prefabs/ui/tailsmansoulview.unity3d differ diff --git a/Root/you_gu/Android/lz4/publicartres/models.unity3d b/Root/you_gu/Android/lz4/publicartres/models.unity3d index 41d17c3e3..153a5ac2c 100644 Binary files a/Root/you_gu/Android/lz4/publicartres/models.unity3d and b/Root/you_gu/Android/lz4/publicartres/models.unity3d differ diff --git a/Root/you_gu/Android/lz4/spine/zq_niu.unity3d b/Root/you_gu/Android/lz4/spine/zq_niu.unity3d index c4935d1ea..ac1214602 100644 Binary files a/Root/you_gu/Android/lz4/spine/zq_niu.unity3d and b/Root/you_gu/Android/lz4/spine/zq_niu.unity3d differ diff --git a/Root/you_gu/Android/lzma/luabytes.unity3d b/Root/you_gu/Android/lzma/luabytes.unity3d index ff37dc191..cad5914b5 100644 Binary files a/Root/you_gu/Android/lzma/luabytes.unity3d and b/Root/you_gu/Android/lzma/luabytes.unity3d differ diff --git a/Root/you_gu/Android/lzma/resconfigs.unity3d b/Root/you_gu/Android/lzma/resconfigs.unity3d index ba2793800..2c90cbc60 100644 Binary files a/Root/you_gu/Android/lzma/resconfigs.unity3d and b/Root/you_gu/Android/lzma/resconfigs.unity3d differ