diff --git a/Root/mht_china/xq/Android/_log/china$test_cff3a5647c3d2a62e744d0cb0f602f7ad1154049_2021_07_20_17_46_28.log b/Root/mht_china/xq/Android/_log/china$test_cff3a5647c3d2a62e744d0cb0f602f7ad1154049_2021_07_20_17_46_28.log new file mode 100644 index 000000000..47d0731ac --- /dev/null +++ b/Root/mht_china/xq/Android/_log/china$test_cff3a5647c3d2a62e744d0cb0f602f7ad1154049_2021_07_20_17_46_28.log @@ -0,0 +1,41 @@ +热更文件版本:china/test_cff3a5647c3d2a62e744d0cb0f602f7ad1154049_2021_07_20_17_46_28 +热更文件的工程对应的提交信息: +commit cff3a5647c3d2a62e744d0cb0f602f7ad1154049 +Merge: 658a87f499 1e80b80c82 +Author: JieLing +Date: Tue Jul 20 16:41:36 2021 +0800 + + Merge branch 'china/dev' into china/test + + # Conflicts: + # Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab + # Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua + # Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +热更大小:23.3792266845703125 +热更文件: +lz4/atlas/activityaltas.unity3d +lz4/atlas/dynamicactivityatlas.unity3d +lz4/atlas/fightlevelatlas.unity3d +lz4/atlas/journeywithwindatlas.unity3d +lz4/atlas/linglongatlas.unity3d +lz4/atlas/mainatlas.unity3d +lz4/atlas/recruitatlas.unity3d +lz4/atlas/timelimituphero.unity3d +lz4/dynamicatlas/y_yjj_128kuang001.unity3d +lz4/effectresui/linglongbaojing.unity3d +lz4/icon/item.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/fightlevel.unity3d +lz4/prefabs/ui/firstrecharge.unity3d +lz4/prefabs/ui/generalpanel.unity3d +lz4/prefabs/ui/linglong.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/operating.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/recruit.unity3d +lz4/prefabs/ui/upppermonthcardview.unity3d +lz4/publicartres/materials.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 930a48f0c..b65140ed7 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/activityaltas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/activityaltas.unity3d index 26f041f41..734ef2125 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/activityaltas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/activityaltas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d index 6fa2518e7..ed7ce645e 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/dynamicactivityatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d index dbd0173aa..75fe590b0 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/fightlevelatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d index ce6540607..9c4215712 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/journeywithwindatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/linglongatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/linglongatlas.unity3d new file mode 100644 index 000000000..692729510 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/atlas/linglongatlas.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/atlas/mainatlas.unity3d b/Root/mht_china/xq/Android/lz4/atlas/mainatlas.unity3d index d37c6fcde..aa93ac1c2 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/mainatlas.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/mainatlas.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 53c3ec69a..4ca5da1aa 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/timelimituphero.unity3d b/Root/mht_china/xq/Android/lz4/atlas/timelimituphero.unity3d index f38568a7e..af236ecd4 100644 Binary files a/Root/mht_china/xq/Android/lz4/atlas/timelimituphero.unity3d and b/Root/mht_china/xq/Android/lz4/atlas/timelimituphero.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/dynamicatlas/y_yjj_128kuang001.unity3d b/Root/mht_china/xq/Android/lz4/dynamicatlas/y_yjj_128kuang001.unity3d index 7cd168802..9df3fd8de 100644 Binary files a/Root/mht_china/xq/Android/lz4/dynamicatlas/y_yjj_128kuang001.unity3d and b/Root/mht_china/xq/Android/lz4/dynamicatlas/y_yjj_128kuang001.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/effectresui/linglongbaojing.unity3d b/Root/mht_china/xq/Android/lz4/effectresui/linglongbaojing.unity3d new file mode 100644 index 000000000..c56364604 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/effectresui/linglongbaojing.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 0560656a5..4ca68ccf5 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/dynamicacticity.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 05c9d331c..f9ccf5333 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/fightlevel.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.unity3d index d520e040c..ec29d0220 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/fightlevel.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d index f1b6a8ace..59143fa83 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/firstrecharge.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 328f31799..1ea615f13 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/linglong.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/linglong.unity3d new file mode 100644 index 000000000..7a9691a55 Binary files /dev/null and b/Root/mht_china/xq/Android/lz4/prefabs/ui/linglong.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 3c35ce784..17eb254cd 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/operating.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/operating.unity3d index a3da20fb7..bca080ccd 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/operating.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/operating.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 456109573..367b5c443 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 21e8a2824..d36e35e0a 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/upppermonthcardview.unity3d b/Root/mht_china/xq/Android/lz4/prefabs/ui/upppermonthcardview.unity3d index 2b3c063db..fcb5eff57 100644 Binary files a/Root/mht_china/xq/Android/lz4/prefabs/ui/upppermonthcardview.unity3d and b/Root/mht_china/xq/Android/lz4/prefabs/ui/upppermonthcardview.unity3d differ diff --git a/Root/mht_china/xq/Android/lz4/publicartres/materials.unity3d b/Root/mht_china/xq/Android/lz4/publicartres/materials.unity3d index 0ad6b904a..21b154b69 100644 Binary files a/Root/mht_china/xq/Android/lz4/publicartres/materials.unity3d and b/Root/mht_china/xq/Android/lz4/publicartres/materials.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 607e8d783..c54962d86 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 445442af7..f9eb9bbda 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 551b3f1fc..06258a1e7 100644 Binary files a/Root/mht_china/xq/Android/lzma/resconfigs.unity3d and b/Root/mht_china/xq/Android/lzma/resconfigs.unity3d differ