diff --git a/Root/lanjing/sw/Android/_log/china_mht_sw_df5dc0dbac976a40608d0c35fc31dc4471042d12_2021_12_24_16_02_30.log b/Root/lanjing/sw/Android/_log/china_mht_sw_df5dc0dbac976a40608d0c35fc31dc4471042d12_2021_12_24_16_02_30.log new file mode 100644 index 000000000..0b27b52c9 --- /dev/null +++ b/Root/lanjing/sw/Android/_log/china_mht_sw_df5dc0dbac976a40608d0c35fc31dc4471042d12_2021_12_24_16_02_30.log @@ -0,0 +1,44 @@ +热更文件版本:china/mht_sw_df5dc0dbac976a40608d0c35fc31dc4471042d12_2021_12_24_16_02_30 +热更文件的工程对应的提交信息: +commit df5dc0dbac976a40608d0c35fc31dc4471042d12 +Merge: 8e407baa28 f1e92330ed +Author: zhangshanxue +Date: Fri Dec 24 14:33:25 2021 +0800 + + Merge branch 'china/zf_test' into china/mht_sw +热更大小:35.17917919158935546875 +热更文件: +lz4/icons.unity3d +lz4/atlas/arenaatlas.unity3d +lz4/atlas/battleatlas.unity3d +lz4/atlas/continuepackageatlas.unity3d +lz4/atlas/fightatlas.unity3d +lz4/atlas/floatingviewatlas.unity3d +lz4/atlas/jingjishilianatlas.unity3d +lz4/atlas/roleinfoatlas.unity3d +lz4/atlas/tagbuttonatlas.unity3d +lz4/atlas/vipatlas.unity3d +lz4/atlas/zhizhunjiangshiatlas.unity3d +lz4/effectresskill/effect_skill_nverguowang.unity3d +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/battle.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/continuepackage.unity3d +lz4/prefabs/ui/dynamicacticity.unity3d +lz4/prefabs/ui/fight.unity3d +lz4/prefabs/ui/fightlevel.unity3d +lz4/prefabs/ui/itemview.unity3d +lz4/prefabs/ui/jumpview.unity3d +lz4/prefabs/ui/main.unity3d +lz4/prefabs/ui/map.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/practice.unity3d +lz4/prefabs/ui/rechargeview.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/tailsmansoulview.unity3d +lz4/prefabs/ui/treasureofheaven.unity3d +lz4/publicartres/shaders.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/lanjing/sw/Android/files.unity3d b/Root/lanjing/sw/Android/files.unity3d index 6c4726389..1c3a34b79 100644 Binary files a/Root/lanjing/sw/Android/files.unity3d and b/Root/lanjing/sw/Android/files.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/arenaatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/arenaatlas.unity3d new file mode 100644 index 000000000..ca290879c Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/arenaatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d index cd207a2bd..c584c25ba 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/battleatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d index 945e2224c..33fa0e750 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/continuepackageatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/fightatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/fightatlas.unity3d new file mode 100644 index 000000000..efb8bca5a Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/fightatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/floatingviewatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/floatingviewatlas.unity3d index 25b066536..fdf3b895a 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/floatingviewatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/floatingviewatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/jingjishilianatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/jingjishilianatlas.unity3d new file mode 100644 index 000000000..f6e6df740 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/jingjishilianatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/roleinfoatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/roleinfoatlas.unity3d new file mode 100644 index 000000000..9421be328 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/roleinfoatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/tagbuttonatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/tagbuttonatlas.unity3d index 986b9c32d..e7af91362 100644 Binary files a/Root/lanjing/sw/Android/lz4/atlas/tagbuttonatlas.unity3d and b/Root/lanjing/sw/Android/lz4/atlas/tagbuttonatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/vipatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/vipatlas.unity3d new file mode 100644 index 000000000..a2d2d8377 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/vipatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d b/Root/lanjing/sw/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d new file mode 100644 index 000000000..5450dc152 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/atlas/zhizhunjiangshiatlas.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d b/Root/lanjing/sw/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d new file mode 100644 index 000000000..c46cbfd95 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/effectresskill/effect_skill_nverguowang.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/icons.unity3d b/Root/lanjing/sw/Android/lz4/icons.unity3d index 249f06591..65bc35e4f 100644 Binary files a/Root/lanjing/sw/Android/lz4/icons.unity3d and b/Root/lanjing/sw/Android/lz4/icons.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/bag.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/bag.unity3d index fac34c3fb..cf8cd2436 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/bag.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/battle.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/battle.unity3d index 256f9c0c3..f003b6843 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/battle.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/battle.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d index fd7d171c0..8b456752a 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d index 723dd9786..e03888fcf 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/continuepackage.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d index 63ed27ce7..d9485b9dd 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/dynamicacticity.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/fight.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/fight.unity3d new file mode 100644 index 000000000..7f2c47f3e Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/fight.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d index b43845a87..cc7aa9e21 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/fightlevel.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/itemview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/itemview.unity3d index b6b0423fd..4ae9848f5 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/itemview.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/itemview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/jumpview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/jumpview.unity3d new file mode 100644 index 000000000..1d7f979d8 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/jumpview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d new file mode 100644 index 000000000..8be05d2ce Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/main.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/map.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/map.unity3d index 0fd41d18b..9289c6d7b 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/map.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/map.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d new file mode 100644 index 000000000..5083bcf11 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d index 8b682ce2e..303be9e8d 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d index 2b0ef8aa3..75f37eced 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/practice.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d new file mode 100644 index 000000000..07c65a6c3 Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/rechargeview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d index ad8561757..67caac92c 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/tailsmansoulview.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/tailsmansoulview.unity3d index d93e3c9aa..55da2c075 100644 Binary files a/Root/lanjing/sw/Android/lz4/prefabs/ui/tailsmansoulview.unity3d and b/Root/lanjing/sw/Android/lz4/prefabs/ui/tailsmansoulview.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/prefabs/ui/treasureofheaven.unity3d b/Root/lanjing/sw/Android/lz4/prefabs/ui/treasureofheaven.unity3d new file mode 100644 index 000000000..df64047fa Binary files /dev/null and b/Root/lanjing/sw/Android/lz4/prefabs/ui/treasureofheaven.unity3d differ diff --git a/Root/lanjing/sw/Android/lz4/publicartres/shaders.unity3d b/Root/lanjing/sw/Android/lz4/publicartres/shaders.unity3d index 0a5a9b094..dd868d421 100644 Binary files a/Root/lanjing/sw/Android/lz4/publicartres/shaders.unity3d and b/Root/lanjing/sw/Android/lz4/publicartres/shaders.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/luabytes.unity3d b/Root/lanjing/sw/Android/lzma/luabytes.unity3d index b80bf0c78..d8a05a9e7 100644 Binary files a/Root/lanjing/sw/Android/lzma/luabytes.unity3d and b/Root/lanjing/sw/Android/lzma/luabytes.unity3d differ diff --git a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d index e24969b1e..fb14ec8f9 100644 Binary files a/Root/lanjing/sw/Android/lzma/resconfigs.unity3d and b/Root/lanjing/sw/Android/lzma/resconfigs.unity3d differ