diff --git a/Root/tcx_haizei/Android/_log/onepiece_online_and_928db8d99a982249b228d721d7529fb7f18f776a_2024_05_21_23_17_23.log b/Root/tcx_haizei/Android/_log/onepiece_online_and_928db8d99a982249b228d721d7529fb7f18f776a_2024_05_21_23_17_23.log new file mode 100644 index 000000000..f74436444 --- /dev/null +++ b/Root/tcx_haizei/Android/_log/onepiece_online_and_928db8d99a982249b228d721d7529fb7f18f776a_2024_05_21_23_17_23.log @@ -0,0 +1,37 @@ +热更文件版本:onepiece_online_and_928db8d99a982249b228d721d7529fb7f18f776a_2024_05_21_23_17_23 +热更文件的工程对应的提交信息: +commit 928db8d99a982249b228d721d7529fb7f18f776a +Merge: 037fda371b 0ba416f280 +Author: wangzhenxing <1545929779@qq.com> +Date: Tue May 21 19:03:05 2024 +0800 + + Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo +热更大小:19.71856689453125 +热更文件: +lz4/prefabs/ui/bag.unity3d +lz4/prefabs/ui/carbon.unity3d +lz4/prefabs/ui/common.unity3d +lz4/prefabs/ui/cumulativesigninpage.unity3d +lz4/prefabs/ui/formation.unity3d +lz4/prefabs/ui/gmpanel.unity3d +lz4/prefabs/ui/godsway.unity3d +lz4/prefabs/ui/growthgiftpageview.unity3d +lz4/prefabs/ui/guild.unity3d +lz4/prefabs/ui/monstercamp.unity3d +lz4/prefabs/ui/monthcardpageview.unity3d +lz4/prefabs/ui/newactivity.unity3d +lz4/prefabs/ui/popup.unity3d +lz4/prefabs/ui/qijieshilian.unity3d +lz4/prefabs/ui/roleinfo.unity3d +lz4/prefabs/ui/sevendaycarnival.unity3d +lz4/prefabs/ui/shop.unity3d +lz4/prefabs/ui/shopview.unity3d +lz4/prefabs/ui/story.unity3d +lz4/rtexture/cardtexture14.unity3d +lz4/rtexture/cardtexture15.unity3d +lz4/rtexture/cardtexture16.unity3d +lz4/rtexture/cardtexture17.unity3d +lz4/rtexture/cardtexture18.unity3d +lzma/luabytes.unity3d +lzma/resconfigs.unity3d +files.unity3d diff --git a/Root/tcx_haizei/Android/files.unity3d b/Root/tcx_haizei/Android/files.unity3d index aa05b89ee..871499c16 100644 Binary files a/Root/tcx_haizei/Android/files.unity3d and b/Root/tcx_haizei/Android/files.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/bag.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/bag.unity3d new file mode 100644 index 000000000..dbb633f46 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/bag.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/carbon.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/carbon.unity3d new file mode 100644 index 000000000..8952f63f4 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/carbon.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/common.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/common.unity3d new file mode 100644 index 000000000..b10eb2313 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/common.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d new file mode 100644 index 000000000..699f3c269 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/cumulativesigninpage.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/formation.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/formation.unity3d new file mode 100644 index 000000000..07d6b4702 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/formation.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/gmpanel.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/gmpanel.unity3d new file mode 100644 index 000000000..a1c34c39e Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/gmpanel.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/godsway.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/godsway.unity3d new file mode 100644 index 000000000..83b646105 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/godsway.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/growthgiftpageview.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/growthgiftpageview.unity3d new file mode 100644 index 000000000..4283005ef Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/growthgiftpageview.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/guild.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/guild.unity3d new file mode 100644 index 000000000..4eba4abf2 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/guild.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/monstercamp.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/monstercamp.unity3d new file mode 100644 index 000000000..e037aabcd Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/monstercamp.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/monthcardpageview.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/monthcardpageview.unity3d new file mode 100644 index 000000000..e58c22b22 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/monthcardpageview.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/newactivity.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/newactivity.unity3d new file mode 100644 index 000000000..371cb3b77 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/newactivity.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/popup.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/popup.unity3d new file mode 100644 index 000000000..0ffb4af9a Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/qijieshilian.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/qijieshilian.unity3d new file mode 100644 index 000000000..487a92101 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/qijieshilian.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/roleinfo.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/roleinfo.unity3d new file mode 100644 index 000000000..2b7625b8e Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/sevendaycarnival.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/sevendaycarnival.unity3d new file mode 100644 index 000000000..6a3e610d1 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/sevendaycarnival.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/shop.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/shop.unity3d new file mode 100644 index 000000000..00b0d7b16 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/shop.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/shopview.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/shopview.unity3d new file mode 100644 index 000000000..ed96f4428 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/shopview.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/prefabs/ui/story.unity3d b/Root/tcx_haizei/Android/lz4/prefabs/ui/story.unity3d new file mode 100644 index 000000000..4ca22bfae Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/prefabs/ui/story.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/rtexture/cardtexture14.unity3d b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture14.unity3d new file mode 100644 index 000000000..2f5849e9e Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture14.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/rtexture/cardtexture15.unity3d b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture15.unity3d new file mode 100644 index 000000000..213c083a1 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture15.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/rtexture/cardtexture16.unity3d b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture16.unity3d new file mode 100644 index 000000000..65f549455 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture16.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/rtexture/cardtexture17.unity3d b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture17.unity3d new file mode 100644 index 000000000..5908e3b6b Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture17.unity3d differ diff --git a/Root/tcx_haizei/Android/lz4/rtexture/cardtexture18.unity3d b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture18.unity3d new file mode 100644 index 000000000..225b59880 Binary files /dev/null and b/Root/tcx_haizei/Android/lz4/rtexture/cardtexture18.unity3d differ diff --git a/Root/tcx_haizei/Android/lzma/luabytes.unity3d b/Root/tcx_haizei/Android/lzma/luabytes.unity3d index eb3881746..33191fc0b 100644 Binary files a/Root/tcx_haizei/Android/lzma/luabytes.unity3d and b/Root/tcx_haizei/Android/lzma/luabytes.unity3d differ diff --git a/Root/tcx_haizei/Android/lzma/resconfigs.unity3d b/Root/tcx_haizei/Android/lzma/resconfigs.unity3d new file mode 100644 index 000000000..f77447ea6 Binary files /dev/null and b/Root/tcx_haizei/Android/lzma/resconfigs.unity3d differ